zephyr 1.0.5 → 1.0.6

data/README.md

@@ -15,6 +15,7 @@ unfortunate choice of naming our library Http and suddenly fighting with http_pa
 * Matthew Knopp
 * Mohammed Rafiq
 * Ryan Kennedy
+* Vidit Drolia
 
 ### References
 

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/zephyr.rb

@@ -45,7 +45,7 @@ class Zephyr
   def default_headers
     {
       'Accept'      => 'application/json;q=0.7, */*;q=0.5',
-      'User-Agent'  => 'lib-http.rb',
+      'User-Agent'  => 'zephyr',
     }
   end
 
@@ -87,15 +87,7 @@ class Zephyr
   # application/json) and adds it under the :json key in the returned hash.
   def get_json(expected_statuses, timeout, path_components, headers={}, yajl_opts={})
     response = get(expected_statuses, timeout, path_components, headers)
-
-    content_type = response[:headers]['content-type']
-    content_type = content_type.first if content_type.respond_to?(:first)
-
-    if content_type.to_s.strip.match /^application\/json/
-      response[:json] = Yajl::Parser.parse(response[:body], yajl_opts)
-    end
-
-    response
+    create_json_response(response, yajl_opts)
   end
 
   # Performs a PUT request to the specified resource.
@@ -119,7 +111,8 @@ class Zephyr
   # The same thing as #put, but encodes the entity as JSON and specifies
   # "application/json" as the request entity content type.
   def put_json(expected_statuses, timeout, path_components, entity, headers={})
-    put(expected_statuses, timeout, path_components, Yajl::Encoder.encode(entity), headers.merge("Content-Type" => "application/json"))
+    response = put(expected_statuses, timeout, path_components, Yajl::Encoder.encode(entity), headers.merge("Content-Type" => "application/json"))
+    create_json_response(response)
   end
 
   # Performs a POST request to the specified resource.
@@ -143,13 +136,14 @@ class Zephyr
   # The same thing as #post, but encodes the entity as JSON and specifies
   # "application/json" as the request entity content type.
   def post_json(expected_statuses, timeout, path_components, entity, headers={})
-    post(
-         expected_statuses,
-         timeout,
-         path_components,
-         Yajl::Encoder.encode(entity),
-         headers.merge("Content-Type" => "application/json")
-         )
+    response = post(
+                    expected_statuses,
+                    timeout,
+                    path_components,
+                    Yajl::Encoder.encode(entity),
+                    headers.merge("Content-Type" => "application/json")
+                   )
+    create_json_response(response)
   end
 
   # Performs a DELETE request to the specified resource.
@@ -308,6 +302,18 @@ class Zephyr
       end
     end
   end
+
+  def create_json_response(response, yajl_opts = {})
+    return response if response.nil? || !response.key?(:headers) || !response[:headers].key?('content-type')
+    content_type = response[:headers]['content-type']
+    content_type = content_type.first if content_type.respond_to?(:first)
+
+    if content_type.to_s.strip.match /^application\/json/
+      response[:json] = Yajl::Parser.parse(response[:body], yajl_opts)
+    end
+    response
+  end
+
 end
 
 # Represents headers from an HTTP request or response.

data/zephyr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zephyr}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
-  s.date = %q{2011-10-12}
+  s.date = %q{2011-11-01}
   s.description = %q{Simple HTTP client using Typheous, derived from the Riak client}
   s.email = %q{matt.knopp@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zephyr
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Matt Knopp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 -07:00
+date: 2011-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency