htty 1.1.3 → 1.1.4

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/htty/cli/commands/query_set.rb

@@ -21,24 +21,23 @@ class HTTY::CLI::Commands::QuerySet < HTTY::CLI::Command
     'Navigation'
   end
 
-  # Returns the arguments for the command-line usage of the _query-set_
-  # command.
+  # Returns the arguments for the command-line usage of the _query-set_ command.
   def self.command_line_arguments
-    'name value'
+    'name [value [name [value]] ...]'
   end
 
   # Returns the help text for the _query-set_ command.
   def self.help
-    "Sets a query-string parameter in the request's address"
+    "Sets query-string parameters in the request's address"
   end
 
   # Returns the extended help text for the _query-set_ command.
   def self.help_extended
-    'Sets a query-string parameter used for the request. Does not '            +
+    'Sets one or more query-string parameters used for the request. Does not ' +
     "communicate with the host.\n"                                             +
     "\n"                                                                       +
-    'The name and value of the query-string parameter will be URL-encoded if ' +
-    "necessary.\n"                                                             +
+    'The name(s) and value(s) of the query-string parameter will be URL-'      +
+    "encoded if necessary.\n"                                                  +
     "\n"                                                                       +
     'The console prompt shows the address for the current request.'
   end
@@ -54,9 +53,25 @@ class HTTY::CLI::Commands::QuerySet < HTTY::CLI::Command
   def perform
     add_request_if_has_response do |request|
       self.class.notify_if_cookies_cleared request do
-        request.query_set(*escape_or_warn_of_escape_sequences(arguments))
+        escaped_arguments = escape_or_warn_of_escape_sequences(arguments)
+        in_groups_of(2, escaped_arguments).each do |key_value|
+          request.query_set(*key_value)
+        end
+        request
       end
     end
   end
 
+private
+
+  def in_groups_of(how_many, source)
+    groups = []
+    source = source.dup
+    (source.length / how_many).times do
+      groups << source.slice!(0, how_many)
+    end
+    groups << source unless source.empty?
+    groups
+  end
+
 end

data/lib/htty/request.rb

@@ -376,25 +376,22 @@ public
 
   # Establishes a new #uri, with the specified _value_ for the query-string
   # parameter specified by _name_.
-  def query_set(name, value)
-    query     = uri.query ? "&#{uri.query}&" : ''
-    parameter = Regexp.new("&#{Regexp.escape name}=.+?&")
-    if query =~ parameter
-      new_query = value.nil? ?
-                  query.gsub(parameter, '&') :
-                  query.gsub(parameter, "&#{name}=#{value}&")
-    else
-      new_query = value.nil? ? query : "#{query}#{name}=#{value}"
-    end
-    new_query = new_query.gsub(/^&/, '').gsub(/&$/, '')
-    new_query = nil if (new_query == '')
+  def query_set(name, value=nil)
+    entries = current_query_entries
+    add_or_replace_field(entries, name, value)
+    new_query = entries.empty? ? nil : entries.join('&')
     rebuild_uri :query => new_query
   end
 
   # Establishes a new #uri, without the query-string parameter specified by
   # _name_.
   def query_unset(name)
-    query_set name, nil
+    return unless uri.query
+    entries = current_query_entries
+    entries.delete_if do |entry|
+      entry =~ field_matcher(name)
+    end
+    rebuild_uri :query => entries.join('&')
   end
 
   # Establishes a new #uri without a query string.
@@ -462,16 +459,40 @@ protected
 
 private
 
+  def add_or_replace_field(chunks, name, value)
+    new_entry = name + (value.nil? ? '' : "=#{value}")
+    has_matched = false
+    chunks.each do |chunk|
+      if chunk =~ field_matcher(name)
+        if has_matched
+          chunks.delete chunk
+        else
+          chunks[chunks.index(chunk)] = new_entry
+          has_matched = true
+        end
+      end
+    end
+    chunks << new_entry unless has_matched
+  end
+
   def authority
     self.class.build_authority :userinfo => uri.userinfo,
                                :host     => uri.host,
                                :port     => uri.port
   end
 
+  def current_query_entries
+    uri.query ? uri.query.split('&') : []
+  end
+
   def establish_content_length
     header_set 'Content-Length', body.to_s.length
   end
 
+  def field_matcher(name)
+    Regexp.new "^#{Regexp.escape name}=?.*"
+  end
+
   def request!(method)
     request = response ? dup_without_response : self
     request.instance_variable_set '@request_method', method

data/spec/system/scenarios/exit/actual_stdout

@@ -0,0 +1,2 @@
+*** Welcome to  htty , the HTTP TTY. Heck To The Yeah!
+*** Happy Trails To You!

data/spec/system/scenarios/exit/expected_stdout

@@ -0,0 +1,2 @@
+*** Welcome to  htty , the HTTP TTY. Heck To The Yeah!
+*** Happy Trails To You!

data/spec/system/scenarios/exit/stdin

@@ -0,0 +1 @@
+exit

data/spec/system/scenarios/quit/actual_stdout

@@ -0,0 +1,2 @@
+*** Welcome to  htty , the HTTP TTY. Heck To The Yeah!
+*** Happy Trails To You!

data/spec/system/scenarios/quit/expected_stdout

@@ -0,0 +1,2 @@
+*** Welcome to  htty , the HTTP TTY. Heck To The Yeah!
+*** Happy Trails To You!

data/spec/system/scenarios/quit/stdin

@@ -0,0 +1 @@
+quit

data/spec/system/scenarios_spec.rb

@@ -0,0 +1,46 @@
+require 'spec'
+require 'pathname'
+
+all_dir = Pathname.new("#{File.dirname __FILE__}/scenarios")
+Dir.glob "#{all_dir}/**/*/" do |this_dir|
+  relative_path = Pathname.new(this_dir).relative_path_from(all_dir).to_s
+  context_name = relative_path.split('/').join(' ').gsub('_', ' ')
+  describe context_name do
+    define_method :content do |filename|
+      path = "#{this_dir}/#{filename}"
+      return nil unless File.file?(path)
+      content = File.read(path)
+      return nil if content.empty?
+      content
+    end
+
+    define_method :run_and_capture do |options={}|
+      stdin_filename = "#{this_dir}/stdin"
+      htty_filename = "#{File.dirname __FILE__}/../../bin/htty"
+      stderr_target = options[:combine_stdout_and_stderr] ?
+                      '&1'                                :
+                      "#{this_dir}/actual_stderr"
+      arguments = "#{content 'arguments'} 2>#{stderr_target}"
+      stdout_filename = "#{this_dir}/actual_stdout"
+      system "cat #{stdin_filename} | "         +
+             "#{htty_filename} #{arguments} > " +
+             "#{this_dir}/actual_stdout"
+    end
+
+    it 'should produce the expected stdout' do
+      run_and_capture
+      content('actual_stdout').should == content('expected_stdout')
+    end
+
+    it 'should produce the expected stderr' do
+      run_and_capture
+      content('actual_stderr').should == content('expected_stderr')
+    end
+
+    it 'should produce the expected combined stdout and stderr' do
+      run_and_capture :combine_stdout_and_stderr => true
+      content('actual_stdout_and_stderr').should ==
+      content('expected_stdout_and_stderr')
+    end
+  end
+end

data/spec/unit/htty/cli/commands/query_set_spec.rb

@@ -0,0 +1,70 @@
+require 'spec'
+require File.expand_path("#{File.dirname __FILE__}/../../../../../lib/htty/cli")
+
+describe HTTY::CLI::Commands::QuerySet do
+  before :all do
+    @session = HTTY::Session.new('')
+  end
+
+  describe 'with one argument' do
+    it 'should assign a single key' do
+      query_set = create_query_set_and_perform('test')
+      query_set.session.requests.last.uri.query.should == 'test'
+    end
+  end
+
+  describe 'with two arguments' do
+    it 'should assign a key-value pair' do
+      query_set = create_query_set_and_perform('test', 'true')
+      query_set.session.requests.last.uri.query.should == 'test=true'
+    end
+  end
+
+  describe 'with three arguments' do
+    it 'should assign a key-value pair and a valueless key' do
+      query_set = create_query_set_and_perform('test', 'true', 'more')
+      query_set.session.requests.last.uri.query.should == 'test=true&more'
+    end
+  end
+
+  describe 'with four arguments' do
+    it 'should assign two key-value pairs' do
+      query_set = create_query_set_and_perform('test', 'true', 'more', 'false')
+      query_set.session.requests.last.uri.query.should == 'test=true&more=false'
+    end
+  end
+
+  describe 'with duplicate keys' do
+    it 'should replace existing key' do
+      @session.requests.last.uri.query = 'test=true'
+      query_set = create_query_set_and_perform('test', 'false')
+      query_set.session.requests.last.uri.query.should == 'test=false'
+    end
+
+    it 'should maintain field location' do
+      @session.requests.last.uri.query = 'test=true&more=true'
+      query_set = create_query_set_and_perform('test', 'false')
+      query_set.session.requests.last.uri.query.should == 'test=false&more=true'
+    end
+
+    it 'should replace multiple instances with one' do
+      @session.requests.last.uri.query = 'test=true&more=true&test=true'
+      query_set = create_query_set_and_perform('test', 'false')
+      query_set.session.requests.last.uri.query.should == 'test=false&more=true'
+    end
+
+    it 'should play nice with nested fields' do
+      @session.requests.last.uri.query = 'test[my][]=true'
+      query_set = create_query_set_and_perform('test[my][]', 'false')
+      query_set.session.requests.last.uri.query.should == 'test[my][]=false'
+    end
+  end
+
+  def create_query_set_and_perform(*arguments)
+    query_set = HTTY::CLI::Commands::QuerySet.new(:session => @session,
+                                                  :arguments => arguments)
+    query_set.perform
+    query_set
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -05:00
+date: 2010-10-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,16 @@ files:
 - lib/htty/response.rb
 - lib/htty/session.rb
 - lib/htty.rb
+- spec/system/scenarios/exit/actual_stderr
+- spec/system/scenarios/exit/actual_stdout
+- spec/system/scenarios/exit/expected_stdout
+- spec/system/scenarios/exit/stdin
+- spec/system/scenarios/quit/actual_stderr
+- spec/system/scenarios/quit/actual_stdout
+- spec/system/scenarios/quit/expected_stdout
+- spec/system/scenarios/quit/stdin
+- spec/system/scenarios_spec.rb
+- spec/unit/htty/cli/commands/query_set_spec.rb
 - spec/unit/htty/cli_spec.rb
 - spec/unit/htty/ordered_hash_spec.rb
 - spec/unit/htty/request_spec.rb