From 0e6808448e5463111372fa01c8b7a490cf6e8b30 Mon Sep 17 00:00:00 2001 From: Rufus Post Date: Mon, 11 Jan 2016 14:15:57 +1100 Subject: [PATCH] fix space inside brackets --- .rubocop_todo.yml | 11 ----------- lib/net/ber.rb | 2 +- lib/net/ldap.rb | 6 +++--- lib/net/ldap/connection.rb | 8 ++++---- lib/net/ldap/filter.rb | 2 +- test/test_ldap_connection.rb | 14 +++++++------- testserver/ldapserver.rb | 2 +- 7 files changed, 17 insertions(+), 28 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 4c6c68d2..469260d5 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -571,17 +571,6 @@ Style/SpaceBeforeBlockBraces: Style/SpaceInsideBlockBraces: Enabled: false -# Offense count: 37 -# Cop supports --auto-correct. -Style/SpaceInsideBrackets: - Exclude: - - 'lib/net/ber.rb' - - 'lib/net/ldap.rb' - - 'lib/net/ldap/connection.rb' - - 'lib/net/ldap/filter.rb' - - 'test/test_ldap_connection.rb' - - 'testserver/ldapserver.rb' - # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles. diff --git a/lib/net/ber.rb b/lib/net/ber.rb index 3bc7a2ba..baf08e14 100644 --- a/lib/net/ber.rb +++ b/lib/net/ber.rb @@ -235,7 +235,7 @@ def self.compile_syntax(syntax) # TODO 20100327 AZ: Should we be allocating an array of 256 values # that will either be +nil+ or an object type symbol, or should we # allocate an empty Hash since unknown values return +nil+ anyway? - out = [ nil ] * 256 + out = [nil] * 256 syntax.each do |tag_class_id, encodings| tag_class = TAG_CLASS[tag_class_id] encodings.each do |encoding_id, classes| diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb index 32414250..5f328a24 100644 --- a/lib/net/ldap.rb +++ b/lib/net/ldap.rb @@ -264,14 +264,14 @@ class Net::LDAP SearchScope_BaseObject = 0 SearchScope_SingleLevel = 1 SearchScope_WholeSubtree = 2 - SearchScopes = [ SearchScope_BaseObject, SearchScope_SingleLevel, - SearchScope_WholeSubtree ] + SearchScopes = [SearchScope_BaseObject, SearchScope_SingleLevel, + SearchScope_WholeSubtree] DerefAliases_Never = 0 DerefAliases_Search = 1 DerefAliases_Find = 2 DerefAliases_Always = 3 - DerefAliasesArray = [ DerefAliases_Never, DerefAliases_Search, DerefAliases_Find, DerefAliases_Always ] + DerefAliasesArray = [DerefAliases_Never, DerefAliases_Search, DerefAliases_Find, DerefAliases_Always] primitive = { 2 => :null } # UnbindRequest body constructed = { diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb index e16f4096..1ac9dfd7 100644 --- a/lib/net/ldap/connection.rb +++ b/lib/net/ldap/connection.rb @@ -513,9 +513,9 @@ def self.modify_ops(operations) # TODO, fix the following line, which gives a bogus error if the # opcode is invalid. op_ber = MODIFY_OPERATIONS[op.to_sym].to_ber_enumerated - values = [ values ].flatten.map { |v| v.to_ber if v }.to_ber_set - values = [ attrib.to_s.to_ber, values ].to_ber_sequence - ops << [ op_ber, values ].to_ber + values = [values].flatten.map { |v| v.to_ber if v }.to_ber_set + values = [attrib.to_s.to_ber, values].to_ber_sequence + ops << [op_ber, values].to_ber end end ops @@ -604,7 +604,7 @@ def add(args) add_dn = args[:dn] or raise Net::LDAP::EmptyDNError, "Unable to add empty DN" add_attrs = [] a = args[:attributes] and a.each do |k, v| - add_attrs << [ k.to_s.to_ber, Array(v).map { |m| m.to_ber}.to_ber_set ].to_ber_sequence + add_attrs << [k.to_s.to_ber, Array(v).map { |m| m.to_ber}.to_ber_set].to_ber_sequence end message_id = next_msgid diff --git a/lib/net/ldap/filter.rb b/lib/net/ldap/filter.rb index d4542e3d..084b997d 100644 --- a/lib/net/ldap/filter.rb +++ b/lib/net/ldap/filter.rb @@ -23,7 +23,7 @@ class Net::LDAP::Filter ## # Known filter types. - FilterTypes = [ :ne, :eq, :ge, :le, :and, :or, :not, :ex, :bineq ] + FilterTypes = [:ne, :eq, :ge, :le, :and, :or, :not, :ex, :bineq] def initialize(op, left, right) #:nodoc: unless FilterTypes.include?(op) diff --git a/test/test_ldap_connection.rb b/test/test_ldap_connection.rb index 51e30c3f..6b34ab5e 100644 --- a/test/test_ldap_connection.rb +++ b/test/test_ldap_connection.rb @@ -112,23 +112,23 @@ def test_raises_unknown_exceptions end def test_modify_ops_delete - args = { :operations => [ [ :delete, "mail" ] ] } + args = { :operations => [[:delete, "mail"]] } result = Net::LDAP::Connection.modify_ops(args[:operations]) - expected = [ "0\r\n\x01\x010\b\x04\x04mail1\x00" ] + expected = ["0\r\n\x01\x010\b\x04\x04mail1\x00"] assert_equal(expected, result) end def test_modify_ops_add - args = { :operations => [ [ :add, "mail", "testuser@example.com" ] ] } + args = { :operations => [[:add, "mail", "testuser@example.com"]] } result = Net::LDAP::Connection.modify_ops(args[:operations]) - expected = [ "0#\n\x01\x000\x1E\x04\x04mail1\x16\x04\x14testuser@example.com" ] + expected = ["0#\n\x01\x000\x1E\x04\x04mail1\x16\x04\x14testuser@example.com"] assert_equal(expected, result) end def test_modify_ops_replace - args = { :operations =>[ [ :replace, "mail", "testuser@example.com" ] ] } + args = { :operations =>[[:replace, "mail", "testuser@example.com"]] } result = Net::LDAP::Connection.modify_ops(args[:operations]) - expected = [ "0#\n\x01\x020\x1E\x04\x04mail1\x16\x04\x14testuser@example.com" ] + expected = ["0#\n\x01\x020\x1E\x04\x04mail1\x16\x04\x14testuser@example.com"] assert_equal(expected, result) end @@ -463,7 +463,7 @@ def test_search_net_ldap_connection_event # search data search_data_ber = Net::BER::BerIdentifiedArray.new([1, [ "uid=user1,ou=People,dc=rubyldap,dc=com", - [ ["uid", ["user1"]] ] + [["uid", ["user1"]]] ]]) search_data_ber.ber_identifier = Net::LDAP::PDU::SearchReturnedData search_data = [1, search_data_ber] diff --git a/testserver/ldapserver.rb b/testserver/ldapserver.rb index 24578ffb..25e38799 100644 --- a/testserver/ldapserver.rb +++ b/testserver/ldapserver.rb @@ -156,7 +156,7 @@ def handle_search_request pdu def send_ldap_response pkt_tag, msgid, code, dn, text - send_data( [msgid.to_ber, [code.to_ber, dn.to_ber, text.to_ber].to_ber_appsequence(pkt_tag) ].to_ber ) + send_data( [msgid.to_ber, [code.to_ber, dn.to_ber, text.to_ber].to_ber_appsequence(pkt_tag)].to_ber ) end end