json_api_client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04df1b6b993e798bab8a46fe194ade5c9021c7c1
-  data.tar.gz: bf6a0a9c89b8cc8c36458e560e4c113d70977e5e
+  metadata.gz: cd3a5cd09cfe62026ca92b0f96bdf96bbbf448fa
+  data.tar.gz: fff1f331e95db8247b97220be4be16b8d5b89b2a
 SHA512:
-  metadata.gz: 4a112dc70bdf54b4140a0fafdd613950c92c5493939010040d098e61d835ab125cac11dc4647963f057df1eb186a7ca627a05c5c5d2d280d7403ab53cc211ece
-  data.tar.gz: a07f7dae424b11d9a17459a3da5027623ec1ffd840de6541ac2b772bb30dd93fec75b837a7d72c21bffed67d1d3b3b92053ca0c2f47d2cbc29b1d75ce9dae668
+  metadata.gz: 2c4abe201352dd98b06d362c88a0b44ef57a048000835bce3d43524bce91dfccba953d238de9329ac0f2869d30fe4ed8e6d358fc92675ca99f5c7f2546c62b51
+  data.tar.gz: f5e3c21c58d71b682372da6c550030c8176a3d56d9d6c7f7dfb8a167031f21d1a38335c359ceb9a7ce519e5df39c673b30c5b17ad279584beeb9c0828d9a63aa

data/lib/json_api_client/connection.rb

@@ -8,7 +8,7 @@ module JsonApiClient
         builder.request :url_encoded
         builder.use Middleware::JsonRequest
         builder.use Middleware::Status
-        builder.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
+        builder.use Middleware::ParseJson
         builder.adapter Faraday.default_adapter
       end
       yield(self) if block_given?
@@ -17,7 +17,7 @@ module JsonApiClient
     # insert middleware before ParseJson - middleware executed in reverse order - 
     #   inserted middleware will run after json parsed
     def use(middleware, *args, &block)
-      faraday.builder.insert_before(FaradayMiddleware::ParseJson, middleware, *args, &block)
+      faraday.builder.insert_before(Middleware::ParseJson, middleware, *args, &block)
     end
 
     def delete(middleware)

data/lib/json_api_client/middleware/parse_json.rb

@@ -0,0 +1,31 @@
+module JsonApiClient
+  module Middleware
+    class ParseJson < Faraday::Middleware
+
+      def call(environment)
+        @app.call(environment).on_complete do |env|
+          if process_response_type?(response_type(env))
+            env[:raw_body] = env[:body]
+            env[:body] = parse(env[:body])
+          end
+        end
+      end
+
+      private
+
+      def parse(body)
+        ::JSON.parse(body) unless body.strip.empty?
+      end
+
+      def response_type(env)
+        type = env[:response_headers]['Content-Type'].to_s
+        type = type.split(';', 2).first if type.index(';')
+        type
+      end
+
+      def process_response_type?(type)
+        !!type.match(/\bjson$/)
+      end
+    end
+  end
+end

data/lib/json_api_client/middleware.rb

@@ -1,6 +1,7 @@
 module JsonApiClient
   module Middleware
     autoload :JsonRequest, 'json_api_client/middleware/json_request'
+    autoload :ParseJson, 'json_api_client/middleware/parse_json'
     autoload :Status, 'json_api_client/middleware/status'
   end
 end

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/json_api_client.rb

@@ -1,5 +1,4 @@
 require 'faraday'
-require 'faraday_middleware'
 require 'json'
 
 module JsonApiClient

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,7 @@ files:
 - lib/json_api_client/helpers/serializable.rb
 - lib/json_api_client/middleware.rb
 - lib/json_api_client/middleware/json_request.rb
+- lib/json_api_client/middleware/parse_json.rb
 - lib/json_api_client/middleware/status.rb
 - lib/json_api_client/parser.rb
 - lib/json_api_client/query.rb