htty 1.2.1 → 1.3.0

data/lib/htty/cli/command.rb

@@ -200,15 +200,13 @@ public
 
 protected
 
-  # Yields the last request in #session. If that request already has a response,
-  # then it adds the result of the +yield+ to the requests of #session.
-  def add_request_if_has_response
+  # Yields the last request in #session. If the block returns a different
+  # request, it is added to the requests of #session.
+  def add_request_if_new
     requests     = session.requests
     last_request = requests.last
-    if last_request.response
-      requests << yield(last_request)
-    else
-      requests[requests.length - 1] = yield(last_request)
+    unless (new_request = yield(last_request)).equal?(last_request)
+      requests << new_request
     end
     self
   end

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

@@ -80,7 +80,7 @@ class HTTY::CLI::Commands::Address < HTTY::CLI::Command
 
   # Performs the _address_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.address(*arguments)
       end

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

@@ -1,4 +1,5 @@
 require File.expand_path("#{File.dirname __FILE__}/../command")
+require File.expand_path("#{File.dirname __FILE__}/body_request_open")
 require File.expand_path("#{File.dirname __FILE__}/body_response")
 require File.expand_path("#{File.dirname __FILE__}/body_set")
 require File.expand_path("#{File.dirname __FILE__}/body_unset")
@@ -32,7 +33,8 @@ class HTTY::CLI::Commands::BodyRequest < HTTY::CLI::Command
 
   # Returns related command classes for the _body-request_ command.
   def self.see_also_commands
-    [HTTY::CLI::Commands::BodySet,
+    [HTTY::CLI::Commands::BodyRequestOpen,
+     HTTY::CLI::Commands::BodySet,
      HTTY::CLI::Commands::BodyUnset,
      HTTY::CLI::Commands::HeadersRequest,
      HTTY::CLI::Commands::BodyResponse]

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

@@ -0,0 +1,46 @@
+require File.expand_path("#{File.dirname __FILE__}/../body_open_command")
+require File.expand_path("#{File.dirname __FILE__}/../command")
+require File.expand_path("#{File.dirname __FILE__}/body_request")
+require File.expand_path("#{File.dirname __FILE__}/body_response_open")
+
+module HTTY; end
+
+class HTTY::CLI; end
+
+module HTTY::CLI::Commands; end
+
+# Encapsulates the _body-request-open_ command.
+class HTTY::CLI::Commands::BodyRequestOpen < HTTY::CLI::Command
+
+  include HTTY::CLI::BodyOpenCommand
+
+  # Returns the name of a category under which help for the _body-request-open_
+  # command should appear.
+  def self.category
+    'Building Requests'
+  end
+
+  # Returns the help text for the _body-request-open_ command.
+  def self.help
+    'Opens the body of the request in an external program'
+  end
+
+  # Returns the preamble to the extended help text for the _body-request-open_
+  # command.
+  def self.help_extended_preamble
+    'Opens the body content used for the request in a program on your system ' +
+    'that is mapped to the type of content. Does not communicate with the host.'
+  end
+
+  # Returns related command classes for the _body-request-open_ command.
+  def self.see_also_commands
+    [HTTY::CLI::Commands::BodyRequest,
+     HTTY::CLI::Commands::BodyResponseOpen]
+  end
+
+  # Performs the _body-request-open_ command.
+  def perform
+    open session.requests.last
+  end
+
+end

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

@@ -1,6 +1,7 @@
 require File.expand_path("#{File.dirname __FILE__}/../../no_response_error")
 require File.expand_path("#{File.dirname __FILE__}/../command")
 require File.expand_path("#{File.dirname __FILE__}/body_request")
+require File.expand_path("#{File.dirname __FILE__}/body_response_open")
 require File.expand_path("#{File.dirname __FILE__}/headers_response")
 require File.expand_path("#{File.dirname __FILE__}/status")
 
@@ -13,8 +14,8 @@ module HTTY::CLI::Commands; end
 # Encapsulates the _body-response_ command.
 class HTTY::CLI::Commands::BodyResponse < HTTY::CLI::Command
 
-  # Returns the name of a category under which help for the _body_ command
-  # should appear.
+  # Returns the name of a category under which help for the _body-response_
+  # command should appear.
   def self.category
     'Inspecting Responses'
   end
@@ -38,7 +39,8 @@ class HTTY::CLI::Commands::BodyResponse < HTTY::CLI::Command
 
   # Returns related command classes for the _body-response_ command.
   def self.see_also_commands
-    [HTTY::CLI::Commands::HeadersResponse,
+    [HTTY::CLI::Commands::BodyResponseOpen,
+     HTTY::CLI::Commands::HeadersResponse,
      HTTY::CLI::Commands::Status,
      HTTY::CLI::Commands::BodyRequest]
   end

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

@@ -0,0 +1,57 @@
+require File.expand_path("#{File.dirname __FILE__}/../../no_response_error")
+require File.expand_path("#{File.dirname __FILE__}/../body_open_command")
+require File.expand_path("#{File.dirname __FILE__}/../command")
+require File.expand_path("#{File.dirname __FILE__}/body_request_open")
+require File.expand_path("#{File.dirname __FILE__}/body_response")
+
+module HTTY; end
+
+class HTTY::CLI; end
+
+module HTTY::CLI::Commands; end
+
+# Encapsulates the _body-response-open_ command.
+class HTTY::CLI::Commands::BodyResponseOpen < HTTY::CLI::Command
+
+  include HTTY::CLI::BodyOpenCommand
+
+  # Returns the name of a category under which help for the _body-response-open_
+  # command should appear.
+  def self.category
+    'Inspecting Responses'
+  end
+
+  # Returns the string used to invoke the _body-response-open_ command from the
+  # command line.
+  def self.command_line
+    'body[-response]-open'
+  end
+
+  # Returns the help text for the _body-response-open_ command.
+  def self.help
+    'Opens the body of the response in an external program'
+  end
+
+  # Returns the preamble to the extended help text for the _body-response-open_
+  # command.
+  def self.help_extended_preamble
+    'Opens the body content received in the response in a program on your '    +
+    'system that is mapped to the type of content. Does not communicate with ' +
+    'the host.'
+  end
+
+  # Returns related command classes for the _body-response-open_ command.
+  def self.see_also_commands
+    [HTTY::CLI::Commands::BodyResponse,
+     HTTY::CLI::Commands::BodyRequestOpen]
+  end
+
+  # Performs the _body-response-open_ command.
+  def perform
+    unless (response = session.last_response)
+      raise HTTY::NoResponseError
+    end
+    open response
+  end
+
+end

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

@@ -41,7 +41,7 @@ class HTTY::CLI::Commands::BodySet < HTTY::CLI::Command
 
   # Performs the _body-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       puts notice('Hit Return three times to signify the end of the body')
       lines            = []
       empty_line_count = 0

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

@@ -35,7 +35,7 @@ class HTTY::CLI::Commands::BodyUnset < HTTY::CLI::Command
 
   # Performs the _body-unset_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.body_unset
     end
   end

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

@@ -52,7 +52,7 @@ class HTTY::CLI::Commands::CookiesAdd < HTTY::CLI::Command
 
   # Performs the _cookies-add_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.cookie_add(*arguments)
     end
   end

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

@@ -50,7 +50,7 @@ class HTTY::CLI::Commands::CookiesRemove < HTTY::CLI::Command
 
   # Performs the _cookies-remove_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.cookie_remove(*arguments)
     end
   end

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

@@ -40,7 +40,7 @@ class HTTY::CLI::Commands::CookiesRemoveAll < HTTY::CLI::Command
 
   # Performs the _cookies-remove-all_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.cookies_remove_all(*arguments)
     end
   end

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

@@ -52,7 +52,7 @@ class HTTY::CLI::Commands::CookiesUse < HTTY::CLI::Command
             "wrong number of arguments (#{arguments.length} for 0)"
     end
 
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       changed_request = request.cookies_use(session.last_response)
       phrase = pluralize('cookie', changed_request.cookies.length)
       phrase = phrase[0..0].upcase + phrase[1..-1]

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

@@ -43,7 +43,7 @@ class HTTY::CLI::Commands::Follow < HTTY::CLI::Command
             "wrong number of arguments (#{arguments.length} for 0)"
     end
 
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.follow session.last_response
       end

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

@@ -48,7 +48,7 @@ class HTTY::CLI::Commands::FragmentSet < HTTY::CLI::Command
 
   # Performs the _fragment-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       clean_arguments = arguments.collect do |a|
         a.gsub(/^#/, '')
       end

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

@@ -38,7 +38,7 @@ class HTTY::CLI::Commands::FragmentUnset < HTTY::CLI::Command
 
   # Performs the _fragment-unset_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.fragment_unset(*arguments)
       end

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

@@ -47,7 +47,7 @@ class HTTY::CLI::Commands::HeadersSet < HTTY::CLI::Command
 
   # Performs the _headers-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.header_set(*arguments)
     end
   end

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

@@ -43,7 +43,7 @@ class HTTY::CLI::Commands::HeadersUnset < HTTY::CLI::Command
 
   # Performs the _headers-unset_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.header_unset(*arguments)
     end
   end

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

@@ -38,7 +38,7 @@ class HTTY::CLI::Commands::HeadersUnsetAll < HTTY::CLI::Command
 
   # Performs the _headers-unset-all_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       request.headers_unset_all(*arguments)
     end
   end

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

@@ -44,7 +44,7 @@ class HTTY::CLI::Commands::HostSet < HTTY::CLI::Command
 
   # Performs the _host-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.host_set(*arguments)
       end

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

@@ -46,7 +46,7 @@ class HTTY::CLI::Commands::PathSet < HTTY::CLI::Command
 
   # Performs the _path-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.path_set(*escape_or_warn_of_escape_sequences(arguments))
       end

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

@@ -45,7 +45,7 @@ class HTTY::CLI::Commands::PortSet < HTTY::CLI::Command
 
   # Performs the _port-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.port_set(*arguments)
       end

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

@@ -60,7 +60,7 @@ class HTTY::CLI::Commands::QueryAdd < HTTY::CLI::Command
 
   # Performs the _query-add_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         escaped_arguments = escape_or_warn_of_escape_sequences(arguments)
         escaped_arguments.each_slice 2 do |name, value|

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

@@ -62,7 +62,7 @@ class HTTY::CLI::Commands::QueryRemove < HTTY::CLI::Command
 
   # Performs the _query-remove_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.query_remove(*escape_or_warn_of_escape_sequences(arguments))
       end

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

@@ -60,7 +60,7 @@ class HTTY::CLI::Commands::QuerySet < HTTY::CLI::Command
 
   # Performs the _query-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         escaped_arguments = escape_or_warn_of_escape_sequences(arguments)
         escaped_arguments.each_slice 2 do |name, value|

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

@@ -61,7 +61,7 @@ class HTTY::CLI::Commands::QueryUnset < HTTY::CLI::Command
 
   # Performs the _query-unset_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         unset_method = (arguments.length == 2) ? :query_remove : :query_unset
         request.send(unset_method,

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

@@ -40,7 +40,7 @@ class HTTY::CLI::Commands::QueryUnsetAll < HTTY::CLI::Command
 
   # Performs the _query-unset-all_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.query_unset_all(*arguments)
       end

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

@@ -64,7 +64,7 @@ class HTTY::CLI::Commands::Reuse < HTTY::CLI::Command
             "index must be between 1 and #{requests_with_responses.length}"
     end
 
-    add_request_if_has_response do
+    add_request_if_new do
       requests[index - 1].send :dup_without_response
     end
 

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

@@ -59,7 +59,7 @@ class HTTY::CLI::Commands::SchemeSet < HTTY::CLI::Command
 
   # Performs the _scheme-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.scheme_set(*arguments)
       end

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

@@ -55,7 +55,7 @@ class HTTY::CLI::Commands::UserinfoSet < HTTY::CLI::Command
 
   # Performs the _userinfo-set_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       arguments = self.arguments
       if (arguments.length == 1) && (arguments.first.scan(':').length == 1)
         arguments = arguments.first.split(':')

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

@@ -37,7 +37,7 @@ class HTTY::CLI::Commands::UserinfoUnset < HTTY::CLI::Command
 
   # Performs the _userinfo-unset_ command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
         request.userinfo_unset(*arguments)
       end

data/lib/htty/cli/http_method_command.rb

@@ -33,7 +33,7 @@ module HTTY::CLI::HTTPMethodCommand
 
   # Performs the command.
   def perform
-    add_request_if_has_response do |request|
+    add_request_if_new do |request|
       unless body? || request.body.to_s.empty?
         puts notice("The body of your #{method.to_s.upcase} request is not " +
                     'being sent')

data/lib/htty/platform.rb

@@ -0,0 +1,10 @@
+module HTTY; end
+
+# Provides methods for ascertaining system characteristics.
+module HTTY::Platform
+
+  def self.windows?
+    !(RUBY_PLATFORM =~ /(mswin|mingw)/i).nil?
+  end
+
+end

data/lib/htty/request.rb

@@ -1,7 +1,7 @@
 require 'base64'
 require 'pathname'
 require 'uri'
-require File.expand_path("#{File.dirname __FILE__}/../htty")
+require File.expand_path("#{File.dirname __FILE__}/../htty/version")
 require File.expand_path("#{File.dirname __FILE__}/cookies_util")
 require File.expand_path("#{File.dirname __FILE__}/no_location_header_error")
 require File.expand_path("#{File.dirname __FILE__}/no_response_error")
@@ -62,6 +62,10 @@ class HTTY::Request < HTTY::Payload
   # * <tt>:fragment</tt>
   def self.build_uri(components)
     scheme                  = (components[:scheme] || 'http') + '://'
+    unless %w(http:// https://).include?(scheme)
+      raise ArgumentError, 'only http:// and https:// schemes are supported'
+    end
+
     authority               = build_authority(components)
     path_query_and_fragment = build_path_query_and_fragment(components)
     path_query_and_fragment ||= '/' if authority