zephyr 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/zephyr.rb

@@ -57,6 +57,8 @@ class Zephyr
   end
 
   class << self
+    @debug_mode = false
+    
     def logger
       @@logger
     end
@@ -64,6 +66,14 @@ class Zephyr
     def logger=(logger)
       @@logger = logger
     end
+
+    def debug_mode
+      @debug_mode
+    end
+
+    def debug_mode=(mode)
+      @debug_mode = mode
+    end
   end
 
   @@logger = Logger.new(STDOUT)
@@ -194,7 +204,6 @@ 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 = build_query_string(parts.pop) if parts.last.is_a? Hash
       uri.path  = ('/%s' % parts.join('/')).gsub(/\/+/, '/')
     end
   end
@@ -209,21 +218,6 @@ class Zephyr
     Typheous::Hydra.hydra.cleanup
   end
 
-  # Assembles a query string from a Hash, escaping values and keys. If a
-  # value is an Array, the query parameter simply appears twice.
-  #
-  # Stolen from Rack (with minor changes for sorting).
-  #
-  def build_query_string(params)
-    params.map do |k, v|
-      if v.kind_of? Array
-        build_query_string(v.map { |x| [k, x] })
-      else
-        "#{percent_encode(k)}=#{percent_encode(v)}"
-      end
-    end.sort.join '&'
-  end
-
   def percent_encode(value)
     typhoeus_easy.send(:easy_escape, value.to_s, value.to_s.bytesize)
   end
@@ -266,17 +260,18 @@ class Zephyr
     params[:headers] = headers
     params[:timeout] = timeout
     params[:follow_location] = false
-  
-    # seriously, why is this on by default 
+    params[:params]  = path_components.pop if path_components.last.is_a?(Hash)
+
+    # seriously, why is this on by default
     Typhoeus::Hydra.hydra.disable_memoization
 
     # if you want debugging
-    # params[:verbose]         = true 
+    params[:verbose] = Zephyr.debug_mode
 
     # have a vague feeling this isn't going to work as expected
     if method == :post || method == :put
       data = data.read if data.respond_to?(:read)
-      params[:body] = data
+      params[:body] = data if data != ''
     end
 
     # request has class methods for :delete, :get, :head, :put, and :post

data/zephyr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zephyr"
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
-  s.date = "2012-03-16"
+  s.date = "2012-07-05"
   s.description = "Simple HTTP client using Typheous, derived from the Riak client"
   s.email = "matt.knopp@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zephyr
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70159647046820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70159647046820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70159647045860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159647045860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70159646995840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70159646995840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70159646993360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70159646993360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70159646992740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70159646992740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.3
 description: Simple HTTP client using Typheous, derived from the Riak client
 email: matt.knopp@gmail.com
 executables: []
@@ -99,9 +124,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2863491660694697364
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple HTTP client using Typheous, derived from the Riak client