zephyr 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e2da1fdc225a123d196f1f6b320e9b03f3e99da2
+  data.tar.gz: ddf77cb8b1997645cf1e67f82fb25ec0d1c83587
+SHA512:
+  metadata.gz: 73c4c9e71b6ccd8ff8ffcea565dc7a341eba07f2c2e8f12fb13abe0b5f7a67a80a4e6aa0679331bdba291412f61dcffaaee8074e0eb88e094198d3a82c0bf21d
+  data.tar.gz: 6bf7bf3257eef7f2414f15cbd3dac22879ee1d019f10806b0f70d8e0b710c0be2f063c663f7dc0b0dce57e8c50a40a78f301efc7e0950d68104814ca70f36e86

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    zephyr (1.2.1)
+    zephyr (1.2.2)
       typhoeus (~> 0.4.2)
       yajl-ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ffi (1.2.0)
+    ffi (1.7.0)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     metaclass (0.0.1)
-    mime-types (1.19)
+    mime-types (1.22)
     mocha (0.12.0)
       metaclass (~> 0.0.1)
     rake (0.9.2.2)
@@ -29,7 +29,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.1.0)
+  bundler (~> 1.3.0)
   jeweler (~> 1.6.4)
   mocha (~> 0.12.0)
   shoulda (~> 2.11.3)

data/README.md

@@ -11,12 +11,14 @@ unfortunate choice of naming our library Http and suddenly fighting with http_pa
 
 * Coda Hale
 * Benjamin Kudria
+* Brian Morton
 * Jordi Bunster
 * Matthew Knopp
 * Mohammed Rafiq
 * Ryan Kennedy
 * Vidit Drolia
+* Vivek Aggarwal
 
 ### References
 
-* Ruby Riak Client: https://bitbucket.org/basho/riak-ruby-client/src
+* Ruby Riak Client: https://bitbucket.org/basho/riak-ruby-client/src

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/zephyr.rb

@@ -247,6 +247,7 @@ class Zephyr
   def uri(given_parts = [])
     @root_uri.dup.tap do |uri|
       parts     = given_parts.dup.unshift(uri.path) # URI#merge is broken.
+      uri.query = Zephyr.build_query_string(parts.pop) if parts.last.is_a? Hash
       uri.path  = ('/%s' % parts.join('/')).gsub(/\/+/, '/')
     end
   end
@@ -289,7 +290,11 @@ class Zephyr
     params[:headers] = headers
     params[:timeout] = timeout
     params[:follow_location] = false
-    params[:params]  = path_components.pop if path_components.last.is_a?(Hash)
+
+    if path_components.last.is_a?(Hash) && (!data || data.empty?)
+      params[:params]  = path_components.pop
+    end
+
     params[:method]  = method
 
     # seriously, why is this on by default

data/test/test_zephyr.rb

@@ -31,6 +31,27 @@ class TestZephyr < Test::Unit::TestCase
       zephyr = Zephyr.new
       assert_equal 'a=1&a=2', Zephyr.build_query_string(:a => [ 2, 1 ])
     end
+
+    should "be present when POST and body is present" do
+      z = Zephyr.new("http://www.example.com")
+      Typhoeus::Request.expects(:run).with do |uri, params|
+        params[:method] == :post && !params[:params] &&
+          uri == 'http://www.example.com/users/1?something=true' &&
+          params[:body] == 'body present'
+      end.returns(TYPHOEUS_RESPONSE)
+      z.post(200, 1, ["users", 1, {:something => 'true'}], 'body present')
+    end
+
+    should "use form data from path when POST and no body present" do
+      z = Zephyr.new("http://www.example.com")
+      Typhoeus::Request.expects(:run).with do |uri, params|
+        params[:method] == :post &&
+          params[:params] == {:something => 'true'}
+          uri == 'http://www.example.com/users/1' &&
+          !params[:body]
+      end.returns(TYPHOEUS_RESPONSE)
+      z.post(200, 1, ["users", 1, {:something => 'true'}], '')
+    end
   end
 
   context "percent encoding" do

data/zephyr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "zephyr"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
@@ -42,21 +42,21 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<typhoeus>, ["~> 0.4.2"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_development_dependency(%q<mocha>, ["~> 0.12.0"])
     else
       s.add_dependency(%q<typhoeus>, ["~> 0.4.2"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
     end
   else
     s.add_dependency(%q<typhoeus>, ["~> 0.4.2"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zephyr
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Matt Knopp
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   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,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,25 +120,24 @@ files:
 homepage: http://github.com/mhat/zephyr
 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: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 3
 summary: Battle-tested HTTP client using Typhoeus, derived from the Riak client