Fix bugs related to Array vs Enumerator vs Port for options[:port/host]. #212
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -164,10 +165,11 @@ def port | |||
| # | |||
| def url | |||
| sch = @options[:ssl] ? 'https' : 'http' | |||
| @url ||= if @options[:host].first.include?(':') | |||
| URI("#{sch}://[#{@options[:host].first}]:#{port}").to_s | |||
| flattened_hosts = [@options[:host]].flatten | |||
There was a problem hiding this comment.
Would Array(@options[:host]) be more idiomatic?
There was a problem hiding this comment.
Yeah, I can switch to that! I used the flatten method, because that was what was already in the code, but then I deleted it, so no reason to match it.
tylercloke
force-pushed
the
tc/fix-host-port-options
branch
from
ebe1150
to
072ec60
Compare
| @@ -291,9 +293,17 @@ def start_background(wait = 5) | |||
| ENV['HTTPS'] = 'on' if options[:ssl] | |||
| @server.mount('/', Rack::Handler::WEBrick, app) | |||
|
|
|||
| # If options[:port] can be an Enumerator, an Array, or an Integer, | |||
| # we need something that can respond to .each (Enum and Array can already). | |||
| enumerable = if options[:port].respond_to?(:each) | |||
There was a problem hiding this comment.
If you just say Array(options[:port], that will do what you need without anif` statement.
There was a problem hiding this comment.
Right! This was before I learned more about enumerable. Thanks :)
|
Do we know what's up with the chef gem install? Would be preferable to have green travis. Code changes look fine, though. 👍 |
[options[:port]].flatten does not do the right thing in the case that options[:port] is an Enumerator. options[:host] is not always an Array (can be a String).
tylercloke
force-pushed
the
tc/fix-host-port-options
branch
from
25320df
to
838bdab
Compare
tylercloke
force-pushed
the
tc/fix-host-port-options
branch
from
838bdab
to
5e6847a
Compare
tylercloke
force-pushed
the
tc/fix-host-port-options
branch
from
5e6847a
to
40a969a
Compare
|
👍 looks ok |
tylercloke
force-pushed
the
tc/fix-host-port-options
branch
from
40a969a
to
9c3a06b
Compare
|
👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[options[:port]].flatten does not do the right thing in the case that options[:port] is an Enumerator.
options[:host] is not always an Array (can be a String).