Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raises errors when giving encryption as non-Hash object #257

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Raises errors when giving encryption as non-Hash object #257

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
717c307
Raises errors when giving encryption as non-Hash object
satoryu Jan 13, 2016
fd71e02
Simplified the condition on a validation for encryption
satoryu Jan 14, 2016
175974d
Made a test title more descriptive
satoryu Jan 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/net/ldap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,9 @@ def initialize(args = {})
@base = args[:base] || DefaultTreebase
@force_no_page = args[:force_no_page] || DefaultForceNoPage
@encryption = args[:encryption] # may be nil
if [email protected]? and [email protected]_a?(Hash)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we switch this to @encryption && [email protected]_a?(Hash)? This makes the nil check implicit, and the && operator is higher precedence than and (doesn't matter in this case, but I prefer it when used in a conditional)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These operators still hurt my brain, if we replace the and operators in the this codebase to && all the tests fail.

http://devblog.avdi.org/2014/08/26/how-to-use-rubys-english-andor-operators-without-going-nuts/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, we could also use a single type check with @encryption.respond_to?(:[]). I don't have a strong preference here.

@mynameisrufus why would && fail here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not here specifically, but when trying to replace and with && throughout the entire codebase (I tried it) all the test fail :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarifying. I wasn't trying to make so bold a claim ;)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jch @mynameisrufus Thank you for pointing out this condition. made my understanding about these operators clear 👍

raise ArgumentError, "encryption must be given as Hash"
end
@connect_timeout = args[:connect_timeout]

if pr = @auth[:password] and pr.respond_to?(:call)
Expand Down
6 changes: 6 additions & 0 deletions test/test_ldap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,10 @@ def test_encryption

assert_equal enc[:method], :start_tls
end

def test_initialize
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good test, but could we rename this to something more descriptive? Perhaps test_initialize_requires_hash_encryption?

assert_raise ArgumentError, "encryption must be given as Hash" do
Net::LDAP.new encryption: [ :simple_tls ]
end
end
end