active_rest_client 1.1.0 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a842b5f48d12dcd6e53fe6ffef4ff8bed6ba35
-  data.tar.gz: 2fe79284a9107ababa2758575b61906b2814b9d1
+  metadata.gz: cd42ad7d428093e385b492a421a17154204040a3
+  data.tar.gz: e5b6ee744601dac89141d2bf306d8414cb590060
 SHA512:
-  metadata.gz: f45afa7dde42bc05d0b22cb913ce121b99dd77d20ce2f67e2b7990f3ea0b686cb8c533c4e91a03eb0eb043a00c0bb0953f5e8390e77b945bff319f321136a941
-  data.tar.gz: 12307bd1cb569a0dba41172e052a60667ef27b7c81aacf7f1b2db9df30806d26ab75b717fc9aca10ea4eb740c01d96081dd852ec98d3b539edf29c1ceda75609
+  metadata.gz: 390b20696614bd583b7f981011ccce7c2ea979c6a4bb963d6d42e6d25ca2e15bfe41e8892120c46de35cad7a2a9e99fd6aee79ffd5c45793bd9ae379c18b818c
+  data.tar.gz: 82ef457e99179083edd05b2043efdf297f1bbe9fcdef6f19aae3a4c0407058aa03d14f5982da5462a9ec6813e3880b7177d8c9be51066f65d98a04e487072e9d

data/active_rest_client.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'typhoeus'
 
   spec.add_runtime_dependency "multi_json"
+  spec.add_runtime_dependency "crack"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "faraday"
   spec.add_runtime_dependency "patron", ">= 0.4.9" # 0.4.18 breaks against Curl v0.7.15 but works with webmock

data/lib/active_rest_client/lazy_association_loader.rb

@@ -84,7 +84,7 @@ module ActiveRestClient
         method = MultiJson.load(MultiJson.dump(@request.method),:symbolize_keys => true)
         method[:method] = :get
         method[:options][:url] = @url
-        method[:options][:overriden_name] = @options[:overriden_name]
+        method[:options][:overridden_name] = @options[:overridden_name]
         request = ActiveRestClient::Request.new(method, @request.object)
         request.url = request.forced_url = @url
         @object = request.call

data/lib/active_rest_client/request.rb

@@ -1,5 +1,7 @@
 require "cgi"
 require "multi_json"
+require 'crack'
+require 'crack/xml'
 
 module ActiveRestClient
 
@@ -11,7 +13,7 @@ module ActiveRestClient
       @method[:options]           ||= {}
       @method[:options][:lazy]    ||= []
       @method[:options][:has_one] ||= {}
-      @overriden_name             = @method[:options][:overriden_name]
+      @overridden_name             = @method[:options][:overridden_name]
       @object                     = object
       @response_delegate          = ActiveRestClient::RequestDelegator.new(nil)
       @params                     = params
@@ -116,7 +118,8 @@ module ActiveRestClient
             fake = fake.call(self)
           end
           ActiveRestClient::Logger.debug "  \033[1;4;32m#{ActiveRestClient::NAME}\033[0m #{@instrumentation_name} - Faked response found"
-          return handle_response(OpenStruct.new(status:200, body:fake, response_headers:{"X-ARC-Faked-Response" => "true"}))
+          content_type = @method[:options][:fake_content_type] || "application/json"
+          return handle_response(OpenStruct.new(status:200, body:fake, response_headers:{"X-ARC-Faked-Response" => "true", "Content-Type" => content_type}))
         end
         if object_is_class?
           @object.send(:_filter_request, :before, @method[:name], self)
@@ -322,7 +325,7 @@ module ActiveRestClient
       if (200..399).include?(status)
         if @method[:options][:plain]
           return @response = response.body
-        elsif is_json_response?
+        elsif is_json_response? || is_xml_response?
           if @response.respond_to?(:proxied) && @response.proxied
             ActiveRestClient::Logger.debug "  \033[1;4;32m#{ActiveRestClient::NAME}\033[0m #{@instrumentation_name} - Response was proxied, unable to determine size"
           else
@@ -333,7 +336,7 @@ module ActiveRestClient
           raise ResponseParseException.new(status:status, body:@response.body)
         end
       else
-        if is_json_response?
+        if is_json_response? || is_xml_response?
           error_response = generate_new_object(mutable: false)
         else
           error_response = @response.body
@@ -362,10 +365,10 @@ module ActiveRestClient
       @method[:options][:has_many] ||= {}
       name = name.to_sym rescue nil
       if @method[:options][:has_many][name]
-        overriden_name = name
+        overridden_name = name
         object = @method[:options][:has_many][name].new
       elsif @method[:options][:has_one][name]
-        overriden_name = name
+        overridden_name = name
         object = @method[:options][:has_one][name].new
       else
         object = create_object_instance
@@ -377,16 +380,16 @@ module ActiveRestClient
 
       attributes.each do |k,v|
         k = k.to_sym
-        overriden_name = select_name(k, overriden_name)
+        overridden_name = select_name(k, overridden_name)
         if @method[:options][:lazy].include?(k)
-          object._attributes[k] = ActiveRestClient::LazyAssociationLoader.new(overriden_name, v, self, overriden_name:(overriden_name))
+          object._attributes[k] = ActiveRestClient::LazyAssociationLoader.new(overridden_name, v, self, overridden_name:(overridden_name))
         elsif v.is_a? Hash
-          object._attributes[k] = new_object(v, overriden_name )
+          object._attributes[k] = new_object(v, overridden_name )
         elsif v.is_a? Array
           object._attributes[k] = ActiveRestClient::ResultIterator.new
           v.each do |item|
             if item.is_a? Hash
-              object._attributes[k] << new_object(item, overriden_name)
+              object._attributes[k] << new_object(item, overridden_name)
             else
               object._attributes[k] << item
             end
@@ -469,11 +472,17 @@ module ActiveRestClient
       @response.response_headers['Content-Type'].nil? || @response.response_headers['Content-Type'].include?('json')
     end
 
+    def is_xml_response?
+      @response.response_headers['Content-Type'].include?('xml')
+    end
+
     def generate_new_object(options={})
       if @response.body.is_a?(Array) || @response.body.is_a?(Hash)
         body = @response.body
-      else
+      elsif is_json_response?
         body = @response.body.blank? ? {} : MultiJson.load(@response.body)
+      elsif is_xml_response?
+        body = @response.body.blank? ? {} : Crack::XML.parse(@response.body)
       end
       body = begin
         @method[:name].nil? ? body : translator.send(@method[:name], body)
@@ -483,10 +492,10 @@ module ActiveRestClient
       if body.is_a? Array
         result = ActiveRestClient::ResultIterator.new(@response)
         body.each do |json_object|
-          result << new_object(json_object, @overriden_name)
+          result << new_object(json_object, @overridden_name)
         end
       else
-        result = new_object(body, @overriden_name)
+        result = new_object(body, @overridden_name)
         result._status = @response.status
         result._headers = @response.response_headers
         result._etag = @response.response_headers['ETag']

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "1.1.0"
+  VERSION = "1.1.9"
 end

data/spec/lib/caching_spec.rb

@@ -166,7 +166,7 @@ describe ActiveRestClient::Caching do
       cached_response = ActiveRestClient::CachedResponse.new(
         status:200,
         result:object,
-        etag:@etag,
+        etag:etag,
         expires:Time.now + 30)
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:read).once.with("Person:/").and_return(Marshal.dump(cached_response))
       expect_any_instance_of(ActiveRestClient::Connection).not_to receive(:get)
@@ -179,7 +179,7 @@ describe ActiveRestClient::Caching do
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:read).once.with("Person:/").and_return(nil)
       expect_any_instance_of(CachingExampleCacheStore5).not_to receive(:write)
       expect_any_instance_of(ActiveRestClient::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(OpenStruct.new(status:200, body:"{\"result\":true}", headers:{}))
-      ret = Person.all
+      Person.all
     end
 
     it "should write the response to the cache if there's an etag" do
@@ -187,7 +187,7 @@ describe ActiveRestClient::Caching do
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:write).once.with("Person:/", an_instance_of(String), {})
       expect_any_instance_of(ActiveRestClient::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, body:"{\"result\":true}", response_headers:{etag:"1234567890"})))
       Person.perform_caching true
-      ret = Person.all
+      Person.all
     end
 
     it "should write the response to the cache if there's a hard expiry" do
@@ -195,7 +195,7 @@ describe ActiveRestClient::Caching do
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:write).once.with("Person:/", an_instance_of(String), an_instance_of(Hash))
       expect_any_instance_of(ActiveRestClient::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, body:"{\"result\":true}", response_headers:{expires:(Time.now + 30).rfc822})))
       Person.perform_caching = true
-      ret = Person.all
+      Person.all
     end
 
     it "should not write the response to the cache if there's an invalid expiry" do
@@ -203,7 +203,7 @@ describe ActiveRestClient::Caching do
       expect_any_instance_of(CachingExampleCacheStore5).to_not receive(:write).once.with("Person:/", an_instance_of(String), an_instance_of(Hash))
       expect_any_instance_of(ActiveRestClient::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(OpenStruct.new(status:200, body:"{\"result\":true}", headers:{expires:"0"}))
       Person.perform_caching = true
-      ret = Person.all
+      Person.all
     end
 
   end

data/spec/lib/xml_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+class XmlResponseExample < ActiveRestClient::Base
+  base_url "http://www.example.com/v1/"
+  get :atom, "/atom", fake: %Q{
+    <?xml version="1.0" encoding="utf-8"?>
+    <feed xmlns="http://www.w3.org/2005/Atom">
+
+      <title>Example Feed</title>
+      <link href="http://example.org/"/>
+      <updated>2003-12-13T18:30:02Z</updated>
+      <author>
+        <name>John Doe</name>
+      </author>
+      <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+
+      <entry>
+        <title>Atom-Powered Robots Run Amok</title>
+        <link href="http://example.org/2003/12/13/atom03"/>
+        <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+        <updated>2003-12-13T18:30:02Z</updated>
+        <summary>Some text.</summary>
+      </entry>
+
+      <entry>
+        <title>Something else cool happened</title>
+        <link href="http://example.org/2015/08/11/andyjeffries"/>
+        <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6b</id>
+        <updated>2015-08-11T18:30:02Z</updated>
+        <summary>Some other text.</summary>
+      </entry>
+
+    </feed>}.strip_heredoc, fake_content_type: "application/xml"
+end
+
+describe XmlResponseExample do
+  it "should parse the response without error" do
+    expect {
+      XmlResponseExample.atom
+    }.to_not raise_error
+  end
+
+  it "provides the feed title" do
+    @atom = XmlResponseExample.atom
+    expect(@atom.feed.title).to eq("Example Feed")
+  end
+
+  it "each entry item has a title" do
+    @atom = XmlResponseExample.atom
+    expect(@atom.feed.entry.class).to eq(ActiveRestClient::ResultIterator)
+  end
+
+  it "provides a list of entry items" do
+    @atom = XmlResponseExample.atom
+    expect(@atom.feed.entry[0].title).to eq("Atom-Powered Robots Run Amok")
+    expect(@atom.feed.entry[1].title).to eq("Something else cool happened")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.9
 platform: ruby
 authors:
 - Which Ltd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +307,7 @@ files:
 - spec/lib/request_spec.rb
 - spec/lib/result_iterator_spec.rb
 - spec/lib/validation_spec.rb
+- spec/lib/xml_spec.rb
 - spec/spec_helper.rb
 homepage: http://whichdigital.github.io/
 licenses:
@@ -339,5 +354,6 @@ test_files:
 - spec/lib/request_spec.rb
 - spec/lib/result_iterator_spec.rb
 - spec/lib/validation_spec.rb
+- spec/lib/xml_spec.rb
 - spec/spec_helper.rb
 has_rdoc: