htty 1.4.1 → 1.5.0

data/spec/unit/htty/session_spec.rb

@@ -1,4 +1,4 @@
-require 'rspec'
+require 'spec_helper'
 require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/request")
 require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/session")
 

data/spec/unit/htty/shared_examples_for_requests.rb

@@ -0,0 +1,32 @@
+shared_examples_for 'an empty request' do
+  it 'should have only the default headers' do
+    request.headers.should == [
+      ['User-Agent', "htty/#{HTTY::VERSION}"]
+    ]
+  end
+
+  it 'should have no body' do
+    request.body.should be_nil
+  end
+
+  it 'should have no response' do
+    request.response.should be_nil
+  end
+end
+
+shared_examples_for 'an empty, authenticated request' do
+  it 'should the expected Authorization header plus the default headers' do
+    request.headers.should == [
+      ['User-Agent', "htty/#{HTTY::VERSION}"],
+      HTTY::Headers.basic_authentication_for(username, password)
+    ]
+  end
+
+  it 'should have no body' do
+    request.body.should be_nil
+  end
+
+  it 'should have no response' do
+    request.response.should be_nil
+  end
+end

data/spec/unit/htty/url_escaping.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/cli/url_escaping")
+
+describe HTTY::CLI::UrlEscaping do
+  subject do
+    o = Object.new.extend(HTTY::CLI::UrlEscaping)
+    o.stub(:say)
+    o
+  end
+
+  describe '.escape_or_warn_of_escape_sequences' do
+    context 'when argument is already escaped' do
+      let(:escaped_string) {'Hello%20World'}
+
+      it 'should not escape it twice' do
+        should_not_escape(escaped_string)
+      end
+
+      it 'should warn the user' do
+        subject.should_receive(:say).once
+        escape(escaped_string)
+      end
+    end
+
+    context 'when argument contains reserved characters' do
+      let(:unescaped_string) {'Hello World'}
+
+      it 'should escape it' do
+        should_escape(unescaped_string)
+      end
+
+      it 'should not warn the user' do
+        subject.should_receive(:say).never
+        escape(unescaped_string)
+      end
+    end
+
+    context 'when argument contains not reserved characters' do
+      let(:unescaped_string) {'HelloWorld'}
+
+      it 'should not escape it' do
+        should_not_escape(unescaped_string)
+      end
+
+      it 'should not warn the user' do
+        subject.should_receive(:say).never
+        escape(unescaped_string)
+      end
+    end
+
+    # http://tools.ietf.org/html/rfc3986#section-2.2
+    ":/?#[]@!$&'()*+,;=".each_char do |reserved_character|
+      it "should escape reserved character '#{reserved_character}'" do
+        should_escape(reserved_character)
+      end
+    end
+  end
+
+  def should_escape(s)
+    escape(s).should_not == [s]
+  end
+
+  def should_not_escape(s)
+    escape(s).should == [s]
+  end
+
+  def escape(s)
+    subject.escape_or_warn_of_escape_sequences([s])
+  end
+end

data/spec/unit/htty/version_spec.rb

@@ -1,4 +1,4 @@
-require 'rspec'
+require 'spec_helper'
 require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/version")
 
 describe HTTY do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: htty
 version: !ruby/object:Gem::Version
-  version: 1.4.1
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Nils Jonsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,16 +48,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-description: ! 'htty is a console application for interacting with web servers.
-
-  It''s a fun way to explore web APIs and to learn the ins and
-
-  outs of HTTP.'
+description: |-
+  htty is a console application for interacting with web servers.
+  It's a fun way to explore web APIs and to learn the ins and
+  outs of HTTP.
 email:
 - htty@nilsjonsson.com
 executables:
@@ -73,12 +65,13 @@ extra_rdoc_files: []
 files:
 - .gemtest
 - .gitignore
+- .rspec
 - .travis.yml
 - .yardopts
 - Gemfile
 - Guardfile
 - History.markdown
-- MIT-LICENSE.markdown
+- License.markdown
 - README.markdown
 - Rakefile
 - bin/htty
@@ -90,6 +83,7 @@ files:
 - lib/htty/cli/commands.rb
 - lib/htty/cli/commands/address.rb
 - lib/htty/cli/commands/body_clear.rb
+- lib/htty/cli/commands/body_edit.rb
 - lib/htty/cli/commands/body_request.rb
 - lib/htty/cli/commands/body_request_open.rb
 - lib/htty/cli/commands/body_response.rb
@@ -161,13 +155,15 @@ files:
 - lib/htty/cli/commands/userinfo_unset.rb
 - lib/htty/cli/display.rb
 - lib/htty/cli/http_method_command.rb
+- lib/htty/cli/input_device.rb
 - lib/htty/cli/url_escaping.rb
 - lib/htty/cookies_util.rb
+- lib/htty/headers.rb
 - lib/htty/http_patch.rb
+- lib/htty/no_header_error.rb
 - lib/htty/no_location_header_error.rb
 - lib/htty/no_response_error.rb
 - lib/htty/no_set_cookie_header_error.rb
-- lib/htty/ordered_hash.rb
 - lib/htty/payload.rb
 - lib/htty/platform.rb
 - lib/htty/preferences.rb
@@ -176,13 +172,16 @@ files:
 - lib/htty/response.rb
 - lib/htty/session.rb
 - lib/htty/tempfile_preserving_extname.rb
+- lib/htty/uri.rb
 - lib/htty/version.rb
 - spec/integration/htty/cli/commands/query_add_spec.rb
 - spec/integration/htty/cli/commands/query_remove_spec.rb
 - spec/integration/htty/cli/commands/query_set_spec.rb
 - spec/integration/htty/cli/commands/query_unset_spec.rb
+- spec/spec_helper.rb
 - spec/unit/htty/cli/commands/address_spec.rb
 - spec/unit/htty/cli/commands/body_clear_spec.rb
+- spec/unit/htty/cli/commands/body_edit_spec.rb
 - spec/unit/htty/cli/commands/body_request_spec.rb
 - spec/unit/htty/cli/commands/body_response_spec.rb
 - spec/unit/htty/cli/commands/body_set_spec.rb
@@ -242,6 +241,7 @@ files:
 - spec/unit/htty/cli/commands/quit_spec.rb
 - spec/unit/htty/cli/commands/reuse_spec.rb
 - spec/unit/htty/cli/commands/scheme_set_spec.rb
+- spec/unit/htty/cli/commands/shared_examples_for_commands.rb
 - spec/unit/htty/cli/commands/ssl_verification_off_spec.rb
 - spec/unit/htty/cli/commands/ssl_verification_on_spec.rb
 - spec/unit/htty/cli/commands/ssl_verification_spec.rb
@@ -250,48 +250,53 @@ files:
 - spec/unit/htty/cli/commands/userinfo_clear_spec.rb
 - spec/unit/htty/cli/commands/userinfo_set_spec.rb
 - spec/unit/htty/cli/commands/userinfo_unset_spec.rb
+- spec/unit/htty/cli/display_spec.rb
 - spec/unit/htty/cli_spec.rb
-- spec/unit/htty/ordered_hash_spec.rb
+- spec/unit/htty/command.rb
+- spec/unit/htty/headers_spec.rb
+- spec/unit/htty/payload_spec.rb
 - spec/unit/htty/preferences_spec.rb
+- spec/unit/htty/request_follow_spec.rb
 - spec/unit/htty/request_spec.rb
+- spec/unit/htty/request_userinfo_spec.rb
 - spec/unit/htty/response_spec.rb
 - spec/unit/htty/session_spec.rb
+- spec/unit/htty/shared_examples_for_requests.rb
+- spec/unit/htty/url_escaping.rb
 - spec/unit/htty/version_spec.rb
-homepage: http://htty.github.com
+homepage: http://htty.github.io
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3927749428844555458
 requirements: []
 rubyforge_project: htty
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The HTTP TTY
 test_files:
 - spec/integration/htty/cli/commands/query_add_spec.rb
 - spec/integration/htty/cli/commands/query_remove_spec.rb
 - spec/integration/htty/cli/commands/query_set_spec.rb
 - spec/integration/htty/cli/commands/query_unset_spec.rb
+- spec/spec_helper.rb
 - spec/unit/htty/cli/commands/address_spec.rb
 - spec/unit/htty/cli/commands/body_clear_spec.rb
+- spec/unit/htty/cli/commands/body_edit_spec.rb
 - spec/unit/htty/cli/commands/body_request_spec.rb
 - spec/unit/htty/cli/commands/body_response_spec.rb
 - spec/unit/htty/cli/commands/body_set_spec.rb
@@ -351,6 +356,7 @@ test_files:
 - spec/unit/htty/cli/commands/quit_spec.rb
 - spec/unit/htty/cli/commands/reuse_spec.rb
 - spec/unit/htty/cli/commands/scheme_set_spec.rb
+- spec/unit/htty/cli/commands/shared_examples_for_commands.rb
 - spec/unit/htty/cli/commands/ssl_verification_off_spec.rb
 - spec/unit/htty/cli/commands/ssl_verification_on_spec.rb
 - spec/unit/htty/cli/commands/ssl_verification_spec.rb
@@ -359,11 +365,18 @@ test_files:
 - spec/unit/htty/cli/commands/userinfo_clear_spec.rb
 - spec/unit/htty/cli/commands/userinfo_set_spec.rb
 - spec/unit/htty/cli/commands/userinfo_unset_spec.rb
+- spec/unit/htty/cli/display_spec.rb
 - spec/unit/htty/cli_spec.rb
-- spec/unit/htty/ordered_hash_spec.rb
+- spec/unit/htty/command.rb
+- spec/unit/htty/headers_spec.rb
+- spec/unit/htty/payload_spec.rb
 - spec/unit/htty/preferences_spec.rb
+- spec/unit/htty/request_follow_spec.rb
 - spec/unit/htty/request_spec.rb
+- spec/unit/htty/request_userinfo_spec.rb
 - spec/unit/htty/response_spec.rb
 - spec/unit/htty/session_spec.rb
+- spec/unit/htty/shared_examples_for_requests.rb
+- spec/unit/htty/url_escaping.rb
 - spec/unit/htty/version_spec.rb
 has_rdoc: true

data/lib/htty/ordered_hash.rb

@@ -1,68 +0,0 @@
-module HTTY; end
-
-# Represents a Hash that preserves the insertion order of values. This class
-# exists because Hash did not have this behavior in Ruby v1.8.7 and earlier.
-class HTTY::OrderedHash
-
-  def initialize(hash={})
-    @inner_hash = {}
-    hash.each_pair do |key, value|
-      @inner_hash[key] = value
-    end
-    @inner_keys = []
-    @inner_hash.each_key do |k|
-      @inner_keys << k
-    end
-  end
-
-  # @private
-  def initialize_copy(source)
-    super
-    @inner_hash = @inner_hash.dup
-    @inner_keys = @inner_keys.dup
-  end
-
-  def [](key)
-    @inner_hash[key]
-  end
-
-  def []=(key, value)
-    @inner_keys << key unless @inner_hash.key?(key)
-    @inner_hash[key] = value
-    self
-  end
-
-  def ==(other_hash)
-    if other_hash.kind_of?(self.class)
-      return (other_hash.instance_variable_get('@inner_hash') == @inner_hash) &&
-             (other_hash.instance_variable_get('@inner_keys') == @inner_keys)
-    end
-    if other_hash.kind_of?(@inner_hash.class)
-      return other_hash.keys.all? do |k|
-        other_hash[k] == @inner_hash[k]
-      end
-    end
-    false
-  end
-
-  def clear
-    @inner_hash.clear
-    @inner_keys.clear
-  end
-
-  def delete(key)
-    @inner_keys.delete(key) if @inner_hash.key?(key)
-    @inner_hash.delete key
-  end
-
-  def empty?
-    @inner_hash.empty?
-  end
-
-  def to_a
-    @inner_keys.inject([]) do |result, key|
-      result + [[key, @inner_hash[key]]]
-    end
-  end
-
-end