api-model 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c94f2b66c8f85cf256adbf1dfd4a3725e4ac22ab
-  data.tar.gz: c83649ded772f0f02b420d2021cfb1cce13f6ec5
+  metadata.gz: 7d0dd9a26e6eafcc5cfde5f0f7efe1fb7f1ef3e4
+  data.tar.gz: efea549d31e9bc395b67f02f02d0bd9e2761e191
 SHA512:
-  metadata.gz: a27cd7390f3c73ac46689f45624a295f8511aa05393e656817ad20db76cea717a522c6bdf75a3b9ee2c8b48e774da75c85541dc096168eb2ea0daf0eb403d3b1
-  data.tar.gz: 3799f90cc7cae5f731689caf61765b2d060b39716c6c2bb5d972ec48f190fbf582597caa1b15cfdb61f7b16db4d89daf2f0a9a1d911f677d14b0fbd6afdb0c30
+  metadata.gz: 0151bb44bddbf6764c40719142841857b1ee27d5dd0ce2a67f7dccb541862c54129eef6b035d1a501a13909ac9eb151c3e2efb62a3b08eba11c4882d50a91c1d
+  data.tar.gz: 0d2abb36cbc68bdc02555f99fb8ae9435fc4822b2c76d9ccd682974f91d461a17b1d02f2a90339830718a27e148cd4bfe19b2565ef942268729dcd9bd01c189a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.6.0)
+    api-model (2.7.0)
       activemodel (~> 4.1)
       activesupport (~> 4.1)
       hash-pipe (~> 0.0)
@@ -12,10 +12,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activesupport (4.2.2)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,7 +40,7 @@ GEM
     equalizer (0.0.11)
     ethon (0.7.4)
       ffi (>= 1.3.0)
-    ffi (1.9.8)
+    ffi (1.9.10)
     hash-pipe (0.3.0)
       activesupport (~> 4.1)
     http-cookie (1.0.2)

data/README.md

@@ -192,6 +192,9 @@ an API which returns something other than JSON, you can set custom parsers to de
 before they are sent to builder classes. The parser should work in the same way as a custom builder, except it needs
 to respond to `#parse`, with the raw response body as an argument.
 
+Parsers can also access the raw `response` object, like builders, by using a #parse method which takes two
+arguments.
+
 ### Raising exceptions
 
 ```ruby

data/api-model.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "api-model"
-  s.version     = "2.6.0"
+  s.version     = "2.7.0"
   s.authors     = ["Damien Timewell", "Erik Rothoff Andersson"]
   s.email       = ["mail@damientimewell.com", "erik.rothoff@gmail.com"]
   s.licenses    = ['MIT']

data/lib/api_model/response.rb

@@ -46,7 +46,13 @@ module ApiModel
     end
 
     def response_body
-      @response_body ||= @_config.parser.parse http_response.api_call.body
+      return @response_body if @response_body.present?
+
+      if @_config.parser.method(:parse).arity == 2
+        @response_body = @_config.parser.parse self, http_response.api_call.body
+      else
+        @response_body = @_config.parser.parse http_response.api_call.body
+      end
     end
 
     def successful?

data/spec/api-model/parser_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'support/mock_models/blog_post'
+
+describe "Parsing" do
+
+  after :each do
+    BlogPost.reset_api_configuration
+  end
+
+  describe "Default parser" do
+    it "should produce a hash given valid json" do
+      ApiModel::ResponseParser::Json.new.parse("{\"name\":\"foo\"}")["name"].should eq "foo"
+    end
+
+    it "should catch errors from parsing invalid json" do
+      ApiModel::Log.should_receive(:info).with "Could not parse JSON response: blah"
+
+      expect {
+        ApiModel::ResponseParser::Json.new.parse("blah")
+      }.to_not raise_error
+    end
+  end
+
+  describe "Parser with response handling" do
+    class CustomResponseParser
+      def parse(response, body)
+        response.metadata.foobar = "Baz"
+        { name: "A blog post" }
+      end
+    end
+
+    before do
+      BlogPost.api_config do |config|
+        config.parser = CustomResponseParser.new
+      end
+    end
+
+    it "should use the response object" do
+      VCR.use_cassette('posts') do
+        res = BlogPost.get_json "http://api-model-specs.com/single_post"
+        res.metadata.foobar.should eq "Baz"
+        res.name.should eq "A blog post"
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-model
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Damien Timewell
@@ -183,7 +183,7 @@ files:
 - spec/api-model/configuration_spec.rb
 - spec/api-model/http_request_spec.rb
 - spec/api-model/initializer_spec.rb
-- spec/api-model/json_response_parser_spec.rb
+- spec/api-model/parser_spec.rb
 - spec/api-model/response_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/cars.yml
@@ -226,7 +226,7 @@ test_files:
 - spec/api-model/configuration_spec.rb
 - spec/api-model/http_request_spec.rb
 - spec/api-model/initializer_spec.rb
-- spec/api-model/json_response_parser_spec.rb
+- spec/api-model/parser_spec.rb
 - spec/api-model/response_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/cars.yml

data/spec/api-model/json_response_parser_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe ApiModel::ResponseParser::Json do
-
-  it "should produce a hash given valid json" do
-    ApiModel::ResponseParser::Json.new.parse("{\"name\":\"foo\"}")["name"].should eq "foo"
-  end
-
-  it "should catch errors from parsing invalid json" do
-    ApiModel::Log.should_receive(:info).with "Could not parse JSON response: blah"
-
-    expect {
-      ApiModel::ResponseParser::Json.new.parse("blah")
-    }.to_not raise_error
-  end
-
-end