hurley 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70bb285608ba9cef1503ea1acf003fbdc48c0648
-  data.tar.gz: 0b9e00c2e5880c432c41865ed996cffdb9174d46
+  metadata.gz: 6ffa214bf8dbce13368948420d335923d636595a
+  data.tar.gz: 26d36be2f4e2a2701b3de9fa30575e45a51b63c8
 SHA512:
-  metadata.gz: a9d694cf97f96c3099171fa5479b6c2ad5e3037ec02fa53776945a1b1166e45084e13508c660d5948e2c4b4445fa29020eae28e2187f1474629e28c05509b324
-  data.tar.gz: f48211a98ac3616638afbdd58c5b95dca7e6e486cf2eec6503147321ea628c2f6bbe082840568cff4923e865f9842247aadf5d3c3a352fe2b69a0b887660317a
+  metadata.gz: 33fb1096bc78337005394615c78bc62dc9f1f289f0d9c3b6bec0144dcb9566cfa988963481dce6d2beae4e2349ffa68905e038fbba970d3e454e735c51c60ad9
+  data.tar.gz: 37cca53badb8ed4a89b8240443b06219682c2d633e82aa39c1f4667f8cd7a019782e106c5b9d7705ce7a335484753d4cc251a54bc8afeb2afd9c94c0ce816403

data/.gitignore

@@ -1,4 +1,4 @@
 log
 tmp
 pkg
-
+Gemfile.lock

data/Gemfile

@@ -1,2 +1,10 @@
 source "https://rubygems.org"
 gemspec
+
+gem "addressable", "~> 2.3", ">= 2.3.6"
+gem "rake", "~> 10.4.0", ">= 10.4.2"
+
+group :test do
+  gem "minitest", "~> 5.6"
+  gem "sinatra", "~> 1.4", ">= 1.4.5"
+end

data/README.md

@@ -309,9 +309,12 @@ client.get("/user").body # => {"id": 1}
 ## TODO
 
 * [ ] Backport Faraday adapters as gems
+  * [x] Excon
+  * [ ] Typhoeus
 * [ ] Integrate into Faraday reliant gems:
   * [ ] [Sawyer](https://github.com/lostisland/sawyer)
   * [ ] [Octokit](https://github.com/octokit/octokit.rb)
   * [ ] [Elastomer](https://github.com/github/elastomer-client)
+* [ ] Tomdoc all the things
 * [ ] Fix allll the bugs
 * [ ] Release v1.0

data/contributors.yaml

@@ -6,3 +6,4 @@
 Rick Olson: technoweenie@gmail.com
 Wynn Netherland:
 Ben Maraney:
+Kevin Kirsche: kev.kirsche@gmail.com

data/hurley.gemspec

@@ -8,11 +8,7 @@ require "yaml"
 contributors = YAML.load(IO.read(File.expand_path("../contributors.yaml", __FILE__)))
 
 Gem::Specification.new do |spec|
-  spec.add_development_dependency "addressable", "~> 2.3", ">= 2.3.6"
   spec.add_development_dependency "bundler", "~> 1.0"
-  spec.add_development_dependency "minitest", "~> 5.5", ">= 5.5.0"
-  spec.add_development_dependency "rake", "~> 10.4.0", ">= 10.4.2"
-  spec.add_development_dependency "sinatra", "~> 1.4", ">= 1.4.5"
   spec.authors = contributors.keys.compact
   spec.description = %q{Hurley provides a common interface for working with different HTTP adapters.}
   spec.email = contributors.values.compact

data/lib/hurley.rb

@@ -2,7 +2,7 @@ require "forwardable"
 require "thread"
 
 module Hurley
-  VERSION = "0.1".freeze
+  VERSION = "0.2".freeze
   USER_AGENT = "Hurley v#{VERSION}".freeze
   LIB_PATH = __FILE__[0...-3]
   MUTEX = Mutex.new
@@ -14,7 +14,9 @@ module Hurley
   end
 
   def self.default_client
-    @default_client ||= mutex { Client.new }
+    mutex do
+      @default_client ||= Client.new
+    end
   end
 
   class << self
@@ -31,9 +33,11 @@ module Hurley
   end
 
   def self.default_connection
-    @default_connection ||= mutex do
-      Hurley.require_lib "connection"
-      Connection.new
+    mutex do
+      @default_connection ||= begin
+        Hurley.require_lib "connection"
+        Connection.new
+      end
     end
   end
 

data/lib/hurley/client.rb

@@ -176,40 +176,53 @@ module Hurley
     end
 
     def prepare!
-      if value = !header[:authorization] && url.basic_auth
-        header[:authorization] = value
-      end
+      prepare_basic_auth!
 
       if body
-        ctype = nil
-        case body
-        when Query
-          ctype, io = body.to_form
-          self.body = io
-        when Hash
-          ctype, io = options.build_form(body)
-          self.body = io
-        end
-        header[:content_type] ||= ctype || DEFAULT_TYPE
+        prepare_body!
       else
         return unless REQUIRED_BODY_VERBS.include?(verb)
       end
 
-      if !header.key?(:content_length) && header[:transfer_encoding] != CHUNKED
-        if body
-          if sizer = SIZE_METHODS.detect { |method| body.respond_to?(method) }
-            header[:content_length] = body.send(sizer).to_i
-          else
-            header[:transfer_encoding] = CHUNKED
-          end
+      prepare_content_length!
+    end
+
+    private
+
+    def prepare_basic_auth!
+      value = !header[:authorization] && url.basic_auth
+      header[:authorization] = value if value
+    end
+
+    def prepare_body!
+      ctype = nil
+      case body
+      when Query
+        ctype, io = body.to_form
+        self.body = io
+      when Hash
+        ctype, io = options.build_form(body)
+        self.body = io
+      end
+      header[:content_type] ||= ctype || DEFAULT_TYPE
+    end
+
+    def prepare_content_length!
+      if header.key?(:content_length) || header[:transfer_encoding] == CHUNKED
+        return
+      end
+
+      if body
+        if sizer = SIZE_METHODS.detect { |method| body.respond_to?(method) }
+          header[:content_length] = body.send(sizer).to_i
         else
-          header[:content_length] = 0
+          header[:transfer_encoding] = CHUNKED
         end
+      else
+        header[:content_length] = 0
       end
     end
 
-    private
-
     def body_receiver
       @body_receiver ||= [nil, BodyReceiver.new]
     end
@@ -235,7 +248,13 @@ module Hurley
       @receiver = nil
       @timing = nil
       @started_at = Time.now.to_f
-      yield self if block_given?
+      if block_given?
+        yield self
+        complete!
+      end
+    end
+
+    def complete!
       @ended_at = Time.now.to_f
       if @receiver.respond_to?(:join)
         @body = @receiver.join

data/lib/hurley/options.rb

@@ -20,7 +20,7 @@ module Hurley
     :proxy,
 
     # Integer limit on the number of redirects that are automatically followed.
-    # Default: 5
+    # Set to < 1 to disable automatic redirections. Default: 5
     :redirection_limit,
 
     # Hurley::Query subclass to use for query objects.  Defaults to
@@ -28,6 +28,14 @@ module Hurley
     :query_class,
   )
 
+    def timeout_ms
+      self[:timeout].to_i * 1000
+    end
+
+    def open_timeout_ms
+      self[:open_timeout].to_i * 1000
+    end
+
     def redirection_limit
       self[:redirection_limit] ||= 5
     end

data/lib/hurley/query.rb

@@ -42,6 +42,7 @@ module Hurley
 
     def parse_query(raw_query)
       raw_query.to_s.split(AMP).each do |pair|
+        next if pair.empty?
         escaped_key, escaped_value = pair.split(EQ, 2)
         key = CGI.unescape(escaped_key)
         value = escaped_value ? CGI.unescape(escaped_value) : nil

data/lib/hurley/url.rb

@@ -152,7 +152,7 @@ module Hurley
     def basic_auth
       return unless @user
       userinfo = @password ? "#{@user}:#{@password}" : @user
-      "Basic #{Base64.encode64(userinfo).rstrip}"
+      "Basic #{Base64.encode64(userinfo).gsub(/\n/, EMPTY)}"
     end
 
     def query_class

data/script/test

@@ -17,6 +17,8 @@
 #
 #   # Run against multiple rbenv versions
 #   $ RBENV_VERSIONS="1.9.3-p194 ree-1.8.7-2012.02" script/test
+#   # Run tests with Addressable::URI
+#   $ HURLEY_ADDRESSABLE=1 script/test
 set -e
 
 port=3999

data/test/query_test.rb

@@ -185,5 +185,15 @@ module Hurley
       expected.gsub! /\[|\]/, "[" => "%5B", "]" => "%5D"
       assert_equal expected, actual
     end
+
+    def test_parse_double_equal_sign_in_nested_query
+      q = Query::Nested.parse("a[]=1&b[]=2&&c[]=3")
+      assert_equal %w(a b c), q.keys
+    end
+
+    def test_parse_double_equal_sign_in_flat_query
+      q = Query::Flat.parse("a[]=1&b[]=2&&c[]=3")
+      assert_equal %w(a[] b[] c[]), q.keys
+    end
   end
 end

data/test/url_test.rb

@@ -397,14 +397,22 @@ module Hurley
       u = Url.parse("http://a%20b:1%20%2B%202@foo.com")
       assert_equal "a b", u.user
       assert_equal "1 + 2", u.password
-      assert_equal "Basic #{Base64.encode64("a b:1 + 2").rstrip}", u.basic_auth
+      assert_equal "Basic YSBiOjEgKyAy", u.basic_auth
+    end
+
+    def test_basic_auth_user_with_non_encoded_password
+      u = Url.parse("http://a%20b:MxYut8Rj8tQi6%3DwNf.miTxf%3Eq49%3F%2Cf%40v" \
+                    "QX8og3YT%3Fs.%5D8L3h9)@foo.com")
+      assert_equal "a b", u.user
+      assert_equal "MxYut8Rj8tQi6=wNf.miTxf>q49?,f@vQX8og3YT?s.]8L3h9)", u.password
+      assert_equal "Basic YSBiOk14WXV0OFJqOHRRaTY9d05mLm1pVHhmPnE0OT8sZkB2UVg4b2czWVQ/cy5dOEwzaDkp", u.basic_auth
     end
 
     def test_basic_auth_user_without_password
       u = Url.parse("http://a%20b@foo.com")
       assert_equal "a b", u.user
       assert_nil u.password
-      assert_equal "Basic #{Base64.encode64("a b").rstrip}", u.basic_auth
+      assert_equal "Basic YSBi", u.basic_auth
     end
 
     def test_join_url_with_auth_url

metadata

@@ -1,37 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: hurley
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Rick Olson
 - Wynn Netherland
 - Ben Maraney
+- Kevin Kirsche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -46,69 +27,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.5.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.4.2
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.5
 description: Hurley provides a common interface for working with different HTTP adapters.
 email:
 - technoweenie@gmail.com
+- kev.kirsche@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,7 +38,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
@@ -166,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: HTTP client wrapper

data/Gemfile.lock

@@ -1,28 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hurley (0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    minitest (5.5.0)
-    rack (1.6.0)
-    rack-protection (1.5.3)
-      rack
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable (~> 2.3.6)
-  bundler (~> 1.0)
-  hurley!
-  minitest (~> 5.5.0)
-  sinatra (~> 1.4.5)