flexirest 1.9.11 → 1.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294f2e24981dde7af931d0bedd578e4eb260538f947f716739a3d4037cd2a6b8
-  data.tar.gz: 5ab2e8babd0e312eea734257e6fdeeb1ccd1701143ec4a953a0ea90b102ed3f4
+  metadata.gz: 70788d1c6cfd0e3490c50e6eec78136eb5f6e1031dd6135e943ab7a1a0367db0
+  data.tar.gz: ed5282f589dd2893fc16db20197d6109382887a6b3a5a936e2f04113c6ba70cf
 SHA512:
-  metadata.gz: ce1125b17e4a41d11bc3cb3be10888d89604beaff46839fe3dbbce1fb663b4d69bbc58f3a8dab9463b2367daae9e182751393c8adc2ed5148e90138ce88ab167
-  data.tar.gz: c4f992e9c9e70b2faabf3384512f6973b6e3f5fb8ebca7515faae48670ec61b630a2c951d908efbf95170506885f19a9e87454ce2bc0caac64a0a6f01a4f9770
+  metadata.gz: 21b69a5820a346cbdfded7e4f0c30e79f5ff10d4f2e272d59f0163070d1e4a729ebaf95d9fe7ccbb70fc15ba952bdee741bcbb994740b40e1882d7c6a0516ba3
+  data.tar.gz: 57fc2b560629d9cf2521d4f06b3f0dcdca059a686a88f3fe7cc8ca2b4ac912bd1896074243c8a589d5989b4019acc8d0eac709dd95d1f2cd7885ac0523eac702

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
+  - 2.7.0
   - 2.6.0
   - 2.5.0
-  - 2.4.0

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 1.9.16
+
+Bugfix:
+
+- Cached responses were always returning as `dirty?`/`changed?` (thanks to AKRathore for the bug report).
+
+## 1.9.15
+
+Bugfix:
+
+- Fix not marking unchanged attributes as dirty (thanks to Khairi Adnan for the bug report).
+
+## 1.9.14
+
+Bugfix:
+
+- Remove deprecation warning for `URI.escape` on Ruby 2.7.x.
+
+## 1.9.13
+
+Change:
+
+- Unified the response body to be `body` for all exceptions instead of sometimes being `body` and sometimes being `raw_response`, although both are available as aliases where they were defined before (thanks to Romain Gisiger for the PR).
+- Adjust parsing of attributes to be done in a more unified way and lighten the CPU load (thanks to Romain Gisiger for the PR)
+
+## 1.9.12
+
+Bugfix:
+
+- Prevent crash on JSONAPI invalid error response (thanks to François Ferrandis for the PR).
+
 ## 1.9.11
 
 Bugfix:

data/docs/httpparse-error-handling.md

@@ -1,16 +1,29 @@
 # *Flexirest:* HTTP/parse error handling
 
-Sometimes the backend server may respond with a non-200/304 header, in which case the code will raise an `Flexirest::HTTPClientException` for 4xx errors or an `Flexirest::HTTPServerException` for 5xx errors. These both have a `status` accessor and a `result` accessor (for getting access to the parsed body):
+## HTTP Errors
+
+Sometimes the backend server may respond with a non-2xx/3xx header, in which case the code will raise an `Flexirest::HTTPClientException` for 4xx errors or an `Flexirest::HTTPServerException` for 5xx errors. 
+
+These both have a `status` accessor, a `result` accessor (for getting access to the parsed body) and a `body` accessor (for getting access to the original unparsed body). However, you can make use of the `message` method (or the `to_s` method) that will build a nice error message for you (containing the URL and the HTTP method used for the request as well as the HTTP status code and the original body of the response).
 
 ```ruby
 begin
   Person.all
 rescue Flexirest::HTTPClientException, Flexirest::HTTPServerException => e
-  Rails.logger.error("API returned #{e.status} : #{e.result.message}")
+  # Display the HTTP status and parsed body
+  puts "Backend returned HTTP #{e.status} with following parsed body: #{e.result}"
+  
+  # Display the unparsed body
+  puts "Original body is: #{e.body}"
+  
+  # Using the message method, same than calling the to_s method
+  puts e.message
 end
 ```
 
-If the response is unparsable (e.g. not in the desired content type), then it will raise an `Flexirest::ResponseParseException` which has a `status` accessor for the HTTP status code and a `body` accessor for the unparsed response body.
+## Parse Error
+
+If the original response is unparsable (e.g. not in the desired content type), then it will raise an `Flexirest::ResponseParseException` which has a `status` accessor for the HTTP status code and a `body` accessor for the unparsed response body.
 
 -----
 

data/flexirest.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency "api-auth", ">= 1.3.1"
+  spec.add_development_dependency "api-auth", ">= 1.3.1", "< 2.4"
   spec.add_development_dependency 'typhoeus'
   spec.add_development_dependency 'activemodel'
 

data/lib/flexirest/attribute_parsing.rb

@@ -3,7 +3,8 @@ module Flexirest
     private
 
     def parse_attribute_value(v)
-      return v if v.is_a?(Date) || v.is_a?(DateTime)
+      return v if v.is_a?(Date) || v.is_a?(DateTime) ||
+                  v.kind_of?(NilClass) || v.kind_of?(TrueClass) || v.kind_of?(FalseClass) || v.kind_of?(Numeric)
 
       if v.to_s[(/\A(((19|20)\d\d[- \/.](0[1-9]|1[012]|[1-9])[- \/.](0[1-9]|[12][0-9]|3[01]|[1-9]))|((0[1-9]|1[012]|[1-9])[- \/.](0[1-9]|[12][0-9]|3[01]|[1-9])[- \/.](19|20)\d\d))\Z/)]
         Date.parse(v) rescue v

data/lib/flexirest/base_without_validation.rb

@@ -41,6 +41,7 @@ module Flexirest
     def _copy_from(result)
       @attributes = result._attributes
       @_status = result._status
+      _clean!
     end
 
     def dirty?
@@ -189,7 +190,7 @@ module Flexirest
       old_value = @dirty_attributes[key.to_sym]
       old_value = @attributes[key.to_sym] unless old_value
       old_value = old_value[0] if old_value and old_value.is_a? Array
-      @dirty_attributes[key.to_sym] = [old_value, value]
+      @dirty_attributes[key.to_sym] = [old_value, value] if old_value != value
       @attributes[key.to_sym] = value
     end
 

data/lib/flexirest/caching.rb

@@ -110,9 +110,12 @@ module Flexirest
       if @result.is_a?(Array)
         ri = ResultIterator.new(self)
         ri.items = @result.map{|i| @class_name.constantize.new(i)}
+        ri._clean!
         ri
       else
-        @class_name.constantize.new(@result)
+        obj = @class_name.constantize.new(@result)
+        obj._clean!
+        obj
       end
     end
   end

data/lib/flexirest/json_api_proxy.rb

@@ -196,8 +196,10 @@ module Flexirest
         # Save resource class for building lazy association loaders
         save_resource_class(object)
 
-        # try to return errors if their is no data
-        return body.fetch("errors", {}) if body['data'].nil?
+        # According to the spec:
+        # "The members data and errors MUST NOT coexist in the same document."
+        # Thus, if the "errors" key is present, we can return it and ignore the "data" key.
+        return body['errors'] if body.include?('errors')
 
         # return early if data is an empty array
         return [] if body['data'] == []

data/lib/flexirest/request.rb

@@ -380,7 +380,7 @@ module Flexirest
           if target.to_s.blank?
             missing << token
           end
-          @url.gsub!(":#{token}", URI.escape(target.to_s).gsub("/", "%2F").gsub("+", "%2B"))
+          @url.gsub!(":#{token}", URI.encode_www_form_component(target.to_s))
         end
       end
 
@@ -656,40 +656,52 @@ module Flexirest
           k = k.to_sym
         end
         overridden_name = select_name(k, overridden_name)
-        if @method[:options][:lazy].include?(k)
-          object._attributes[k] = Flexirest::LazyAssociationLoader.new(overridden_name, v, self, overridden_name:(overridden_name))
-        elsif v.is_a? Hash
-          object._attributes[k] = new_object(v, overridden_name )
-        elsif v.is_a? Array
-          if @method[:options][:array].include?(k)
-            object._attributes[k] = Array.new
-          else
-            object._attributes[k] = Flexirest::ResultIterator.new
-          end
-          v.each do |item|
-            if item.is_a? Hash
-              object._attributes[k] << new_object(item, overridden_name)
-            else
-              object._attributes[k] << item
-            end
-          end
+        set_corresponding_value(v, k, object, overridden_name)
+      end
+      object.clean! unless object_is_class?
+
+      object
+    end
+
+    def set_corresponding_value(value, key = nil, object = nil, overridden_name = nil)
+      optional_args = [key, object, overridden_name]
+      value_from_object = optional_args.all? # trying to parse a JSON Hash value
+      value_from_other_type = optional_args.none? # trying to parse anything else
+      raise Flexirest::InvalidArgumentsException.new("Optional args need all to be filled or none") unless value_from_object || value_from_other_type
+      k = key || :key
+      v = value
+      assignable_hash = value_from_object ? object._attributes : {}
+      if value_from_object && @method[:options][:lazy].include?(k)
+        assignable_hash[k] = Flexirest::LazyAssociationLoader.new(overridden_name, v, self, overridden_name:(overridden_name))
+      elsif v.is_a? Hash
+        assignable_hash[k] = new_object(v, overridden_name )
+      elsif v.is_a? Array
+        if @method[:options][:array].include?(k)
+          assignable_hash[k] = Array.new
         else
-          parse_fields = [ @method[:options][:parse_fields], @object._date_fields ].compact.reduce([], :|)
-          parse_fields = nil if parse_fields.empty?
-          if (parse_fields && parse_fields.include?(k))
-            object._attributes[k] = parse_attribute_value(v)
-          elsif parse_fields
-            object._attributes[k] = v
-          elsif Flexirest::Base.disable_automatic_date_parsing
-            object._attributes[k] = v
+          assignable_hash[k] = Flexirest::ResultIterator.new
+        end
+        v.each do |item|
+          if item.is_a? Hash
+            assignable_hash[k] << new_object(item, overridden_name)
           else
-            object._attributes[k] = parse_attribute_value(v)
+            assignable_hash[k] << set_corresponding_value(item)
           end
         end
+      else
+        parse_fields = [ @method[:options][:parse_fields], @object._date_fields ].compact.reduce([], :|)
+        parse_fields = nil if parse_fields.empty?
+        if (parse_fields && parse_fields.include?(k))
+          assignable_hash[k] = parse_attribute_value(v)
+        elsif parse_fields
+          assignable_hash[k] = v
+        elsif Flexirest::Base.disable_automatic_date_parsing
+          assignable_hash[k] = v
+        else
+          assignable_hash[k] = parse_attribute_value(v)
+        end
       end
-      object.clean! unless object_is_class?
-
-      object
+      value_from_object ? object : assignable_hash[k]
     end
 
     def hal_response?
@@ -822,12 +834,10 @@ module Flexirest
 
     def add_nested_body_to_iterator(result, items)
       items.each do |json_object|
-        if json_object.is_a?(Array)
-          iterator = ResultIterator.new
-          add_nested_body_to_iterator(iterator, json_object)
-          result << iterator
-        else
+        if json_object.is_a? Hash
           result << new_object(json_object, @overridden_name)
+        else
+          result << set_corresponding_value(json_object)
         end
       end
     end
@@ -838,6 +848,7 @@ module Flexirest
   end
 
   class RequestException < StandardError ; end
+  class InvalidArgumentsException < StandardError ; end
 
   class InvalidRequestException < RequestException ; end
   class MissingParametersException < RequestException ; end
@@ -851,18 +862,19 @@ module Flexirest
   end
 
   class HTTPException < RequestException
-    attr_accessor :status, :result, :request_url
+    attr_accessor :status, :result, :request_url, :body, :raw_response
     def initialize(options)
       @status = options[:status]
       @result = options[:result]
       @request_url = options[:url]
-      @raw_response = options[:raw_response]
+      @body = options[:raw_response]
       @method = options[:method]
     end
+    alias_method :body, :raw_response
 
     def message
       method = @method.try(:upcase)
-      "The #{method} to '#{@request_url}' returned a #{@status} status, which raised a #{self.class.to_s} with a body of: #{@raw_response}"
+      "The #{method} to '#{@request_url}' returned a #{@status} status, which raised a #{self.class.to_s} with a body of: #{@body}"
     end
 
     def to_s

data/lib/flexirest/result_iterator.rb

@@ -15,6 +15,10 @@ module Flexirest
       @items << item
     end
 
+    def _clean!
+      @items.map(&:_clean!)
+    end
+
     def size
       @items.size
     end

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.9.11"
+  VERSION = "1.9.16"
 end

data/spec/lib/base_without_validation_spec.rb

@@ -126,6 +126,13 @@ describe Flexirest::BaseWithoutValidation do
     expect(client).to be_dirty
   end
 
+  it "should not mark attributes that don't change as dirty" do
+    client = EmptyExample.new(test: "Foo")
+    client._clean!
+    client.test = client.test
+    expect(client).to_not be_dirty
+  end
+
   it "should store attribute set using []= array notation and mark them as dirty" do
     client = EmptyExample.new()
     client["test"] = "Something"
@@ -171,6 +178,13 @@ describe Flexirest::BaseWithoutValidation do
     expect(client).to be_dirty
   end
 
+  it "should not mark a freshly retrieved object as changed" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with('/find/1', anything).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:"{\"first_name\":\"Billy\"}")))
+    client = AlteringClientExample.find(id: 1)
+    expect(client).to_not be_changed
+    expect(client.changes).to eq({})
+  end
+
   it 'should respond_to? attributes defined in the response' do
     client = EmptyExample.new(hello: "World")
     expect(client.respond_to?(:hello)).to be_truthy

data/spec/lib/caching_spec.rb

@@ -184,6 +184,18 @@ describe Flexirest::Caching do
       expect(ret.first_name).to eq("Johnny")
     end
 
+    it "cache read objects shouldn't be marked as changed" do
+      cached_response = Flexirest::CachedResponse.new(
+        status:200,
+        result:@cached_object,
+        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(Flexirest::Connection).not_to receive(:get)
+      ret = Person.all
+      expect(ret).to_not be_changed
+      expect(ret.changes).to eq({})
+    end
+
     it "should read from the cache store and restore to the same object" do
       cached_response = Flexirest::CachedResponse.new(
         status:200,

data/spec/lib/json_api_spec.rb

@@ -312,28 +312,46 @@ describe 'JSON API' do
       expect(subject.find_all).to be_an_instance_of(Flexirest::ResultIterator)
     end
 
-    context 'when response has "errors" key and no "data" key' do
-      let(:headers) { { "Content-Type" => "application/vnd.api+json" } }
-      let(:response_body) do
-        {
-          errors: [
-            {
-              title: "Record not found",
-              detail: "The record identified by 123456 could not be found",
-              code: "not_found",
-              status: "404",
-            }
-          ]
-        }
-      end
+    describe 'error responses' do
+      subject(:make_request) { JsonAPIExample::Article.real_find(123) }
 
-      it 'should raise a Flexirest error' do
+      before do
+        headers = { "Content-Type" => "application/vnd.api+json" }
         expect_any_instance_of(Flexirest::Connection).
           to receive(:get).with("/articles/123", an_instance_of(Hash)).
           and_return(::FaradayResponseMock.new(OpenStruct.new(body: response_body.to_json, response_headers: headers, status: 404)))
+      end
+
+      context 'when no "data" key is present alongside the "errors" key' do
+        let(:response_body) do
+          {
+            errors: [
+              { detail: "The record identified by 123456 could not be found", }
+            ]
+          }
+        end
+
+        it 'should raise the relevant Flexirest error' do
+          expect(-> { make_request }).to raise_error(Flexirest::HTTPNotFoundClientException) do |exception|
+            expect(exception.result.first.detail).to eq("The record identified by 123456 could not be found")
+          end
+        end
+      end
+
+      context 'when a "data" key is present alongside the "errors" key (although this is forbidden by the spec)' do
+        let(:response_body) do
+          {
+            errors: [
+              { detail: "The record identified by 123456 could not be found", }
+            ],
+            data: {}
+          }
+        end
 
-        expect(-> { JsonAPIExample::Article.real_find(123) }).to raise_error(Flexirest::HTTPNotFoundClientException) do |exception|
-          expect(exception.result.first.title).to eq("Record not found")
+        it 'should ignore the "data" key and raise the relevant Flexirest error' do
+          expect(-> { make_request }).to raise_error(Flexirest::HTTPNotFoundClientException) do |exception|
+            expect(exception.result.first.detail).to eq("The record identified by 123456 could not be found")
+          end
         end
       end
     end

data/spec/lib/request_spec.rb

@@ -31,6 +31,8 @@ describe Flexirest::Request do
       get :flat, "/", params_encoder: :flat
       get :array, "/johnny", array: [:likes, :dislikes]
       get :babies, "/babies", has_many: {children: ExampleOtherClient}
+      get :basket, "/basket", array: [:options]
+      get :dates, "/dates", array: [:dates]
       get :single_association, "/single", has_one: {single: ExampleSingleClient}, has_many: {children: ExampleOtherClient}
       get :headers, "/headers"
       get :cancel_callback, "/cancel-callback"
@@ -38,6 +40,7 @@ describe Flexirest::Request do
       put :headers_json, "/headers_json", request_body_type: :json
       get :find, "/:id", required: [:id]
       get :find_cat, "/:id/cat"
+      get :fruits, "/fruits"
       get :change, "/change"
       get :plain, "/plain/:id", plain: true
       post :create, "/create", rubify_names: true
@@ -46,11 +49,14 @@ describe Flexirest::Request do
       put :update, "/put/:id"
       put :wrapped, "/put/:id", wrap_root: "example"
       put :conversion, "/put/:id", parse_fields: [:converted]
+      put :conversion_child, "/put/:id", parse_fields: [:converted_child]
       delete :remove, "/remove/:id"
       delete :remove_body, "/remove/:id", send_delete_body: true
       get :hal, "/hal", fake:"{\"_links\":{\"child\": {\"href\": \"/child/1\"}, \"other\": {\"href\": \"/other/1\"}, \"cars\":[{\"href\": \"/car/1\", \"name\":\"car1\"}, {\"href\": \"/car/2\", \"name\":\"car2\"}, {\"href\": \"/car/not-embed\", \"name\":\"car_not_embed\"} ], \"lazy\": {\"href\": \"/lazy/load\"}, \"invalid\": [{\"href\": \"/invalid/1\"}]}, \"_embedded\":{\"other\":{\"name\":\"Jane\"},\"child\":{\"name\":\"Billy\"}, \"cars\":[{\"_links\": {\"self\": {\"href\": \"/car/1\"} }, \"make\": \"Bugatti\", \"model\": \"Veyron\"}, {\"_links\": {\"self\": {\"href\": \"/car/2\"} }, \"make\": \"Ferrari\", \"model\": \"F458 Italia\"} ], \"invalid\": [{\"present\":true, \"_links\": {} } ] } }", has_many:{other:ExampleOtherClient}
-      get :fake, "/fake", fake:"{\"result\":true, \"list\":[1,2,3,{\"test\":true}], \"child\":{\"grandchild\":{\"test\":true}}}"
-      get :fake_proc, "/fake", fake:->(request) { "{\"result\":#{request.get_params[:id]}}" }
+      get :fake_object, "/fake", fake:"{\"result\":true, \"list\":[1,2,3,{\"test\":true}], \"child\":{\"grandchild\":{\"test\":true}}}"
+      get :fake_proc_object, "/fake", fake:->(request) { "{\"result\":#{request.get_params[:id]}}" }
+      get :fake_array, "/fake", fake:"[1,2,3,{\"test\":true},null]"
+      get :fake_proc_array, "/fake", fake:->(request) { "[{\"result\":#{request.get_params[:id]}},null]" }
       get :defaults, "/defaults", defaults:{overwrite:"no", persist:"yes"}
       get :requires, "/requires", requires:[:name, :age]
       patch :only_changed_1, "/changed1", only_changed: true
@@ -143,7 +149,8 @@ describe Flexirest::Request do
     class LazyLoadedExampleClient < ExampleClient
       base_url "http://www.example.com"
       lazy_load!
-      get :fake, "/fake", fake:"{\"result\":true, \"list\":[1,2,3,{\"test\":true}], \"child\":{\"grandchild\":{\"test\":true}}}"
+      get :fake_object, "/fake", fake:"{\"result\":true, \"list\":[1,2,3,{\"test\":true}], \"child\":{\"grandchild\":{\"test\":true}}}"
+      get :fake_array, "/fake", fake:"[1,2,3,{\"test\":true},{\"child\":{\"grandchild\":{\"test\":true}}}]"
       get :lazy_test, "/does-not-matter", fake:"{\"people\":[\"http://www.example.com/some/url\"]}", lazy: [:people]
     end
 
@@ -190,7 +197,8 @@ describe Flexirest::Request do
     class WhitelistedDateClient < Flexirest::Base
       base_url "http://www.example.com"
       put :conversion, "/put/:id"
-      parse_date :converted
+      put :conversion_child, "/put/:id"
+      parse_date :converted, :converted_child
     end
 
     allow_any_instance_of(Flexirest::Request).to receive(:read_cached_response)
@@ -336,7 +344,7 @@ describe Flexirest::Request do
   end
 
   it "should pass URL-encode URL parameters" do
-    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/foo%20bar", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/foo+bar", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
     ExampleClient.find id:"foo bar"
   end
 
@@ -511,33 +519,84 @@ describe Flexirest::Request do
     end
   end
 
-  it "should only convert date times in JSON if specified" do
+  it "should only convert date times in JSON if specified when converted is root property" do
     expect_any_instance_of(Flexirest::Connection).to receive(:put).with("/put/1234", "debug=true", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"converted\":\"2012-03-04T01:02:03Z\", \"not_converted\":\"2012-03-04T01:02:03Z\"}", response_headers:{})))
     object = ExampleClient.conversion id:1234, debug:true
     expect(object.converted).to be_an_instance_of(DateTime)
     expect(object.not_converted).to be_an_instance_of(String)
   end
 
-  it "should convert date times in JSON if whitelisted" do
+  it "should only convert date times in JSON if specified when converted is child property" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:put).with("/put/1234", "debug=true", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"not_converted\":\"2012-03-04T01:02:03Z\", \"child\":{\"converted_child\":\"2012-03-04T01:02:03Z\"}}", response_headers:{})))
+    object = ExampleClient.conversion_child id:1234, debug:true
+    expect(object.child.converted_child).to be_an_instance_of(DateTime)
+    expect(object.not_converted).to be_an_instance_of(String)
+  end
+
+  it "should convert date times in JSON if root property is whitelisted" do
     expect_any_instance_of(Flexirest::Connection).to receive(:put).with("/put/1234", "debug=true", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"converted\":\"2012-03-04T01:02:03Z\", \"not_converted\":\"2012-03-04T01:02:03Z\"}", response_headers:{})))
     object = WhitelistedDateClient.conversion id:1234, debug:true
     expect(object.converted).to be_an_instance_of(DateTime)
     expect(object.not_converted).to be_an_instance_of(String)
   end
 
-  it "should parse JSON and return a nice object for faked responses" do
-    object = ExampleClient.fake id:1234, debug:true
+  it "should convert date times in JSON if child property is whitelisted" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:put).with("/put/1234", "debug=true", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"not_converted\":\"2012-03-04T01:02:03Z\", \"child\":{\"converted_child\":\"2012-03-04T01:02:03Z\"}}", response_headers:{})))
+    object = WhitelistedDateClient.conversion_child id:1234, debug:true
+    expect(object.child.converted_child).to be_an_instance_of(DateTime)
+    expect(object.not_converted).to be_an_instance_of(String)
+  end
+
+  it "should convert date times in JSON from a result iterator response" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/dates", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"[\"2012-03-04T01:02:03Z\", \"2012-03-04T01:02:03Z\"]", response_headers:{})))
+    object = ExampleClient.dates
+    expect(object).to be_a(Flexirest::ResultIterator)
+    expect(object.items).to be_a(Array)
+    expect(object.first).to be_an_instance_of(DateTime)
+  end
+
+  it "should convert date times in JSON even in a pure array" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/dates", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"dates\":[\"2012-03-04T01:02:03Z\", \"2012-03-04T01:02:03Z\"]}", response_headers:{})))
+    object = ExampleClient.dates
+    expect(object).to be_a(ExampleClient)
+    expect(object.dates).to be_a(Array)
+    expect(object.dates.first).to be_an_instance_of(DateTime)
+  end
+
+  it "should parse JSON object and return a nice object for faked responses" do
+    object = ExampleClient.fake_object id:1234, debug:true
     expect(object.result).to eq(true)
     expect(object.list.first).to eq(1)
     expect(object.list.last.test).to eq(true)
     expect(object.child.grandchild.test).to eq(true)
   end
 
-  it "should parse JSON from a fake response generated by a proc" do
-    object = ExampleClient.fake_proc id:1234
+  it "should parse JSON object from a fake response generated by a proc" do
+    object = ExampleClient.fake_proc_object id:1234
     expect(object.result).to eq(1234)
   end
 
+  it "should parse JSON array and return a nice result iterator for faked responses" do
+    object = ExampleClient.fake_array debug:true
+    expect(object).to be_instance_of(Flexirest::ResultIterator)
+    expect(object.size).to eq(5)
+    expect(object.first).to eq(1)
+    expect(object.last).to eq(nil)
+    expect(object[3]).to be_instance_of(ExampleClient)
+    expect(object[3].test).to eq(true)
+    expect(object._status).to eq(200)
+  end
+
+  it "should parse JSON array from a fake response generated by a proc" do
+    object = ExampleClient.fake_proc_array id:1234
+    expect(object).to be_instance_of(Flexirest::ResultIterator)
+    expect(object.size).to eq(2)
+    expect(object.first).to be_instance_of(ExampleClient)
+    expect(object.first.result).to eq(1234)
+    expect(object.last).to eq(nil)
+    expect(object._status).to eq(200)
+  end
+
   it "should not parse JSON from a plain request" do
     response_body = "This is another non-JSON string"
     expect_any_instance_of(Flexirest::Connection).to receive(:get).with(any_args).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:response_body)))
@@ -570,19 +629,36 @@ describe Flexirest::Request do
     expect(ExampleClient.all).to be_truthy
   end
 
-  it "should return a lazy loader object if lazy loading is enabled" do
-    object = LazyLoadedExampleClient.fake id:1234, debug:true
+  it "should return a lazy loader object if lazy loading is enabled for JSON object" do
+    object = LazyLoadedExampleClient.fake_object id:1234, debug:true
     expect(object).to be_an_instance_of(Flexirest::LazyLoader)
   end
 
-  it "should proxy through nice object for lazy loaded responses" do
-    object = LazyLoadedExampleClient.fake id:1234, debug:true
-    expect(object.result).to eq(true)
+  it "should proxy through nice object for lazy loaded responses from JSON object" do
+    object = LazyLoadedExampleClient.fake_object id:1234, debug:true
+    expect(object.instance_variable_get(:@result)).to be(nil)
+    expect(object.result).to eq(true) # method call the attribute received in response and never the instance attribute of the LazyLoader class
+    expect(object.instance_variable_get(:@result)).to be_a(LazyLoadedExampleClient)
     expect(object.list.first).to eq(1)
     expect(object.list.last.test).to eq(true)
     expect(object.child.grandchild.test).to eq(true)
   end
 
+  it "should return a lazy loader object if lazy loading is enabled for JSON array" do
+    object = LazyLoadedExampleClient.fake_array debug:true
+    expect(object).to be_an_instance_of(Flexirest::LazyLoader)
+  end
+
+  it "should proxy through nice result iterator for lazy loaded responses from JSON array" do
+    object = LazyLoadedExampleClient.fake_array debug:true
+    expect(object.instance_variable_get(:@result)).to be(nil)
+    expect(object.items).to be_a(Array)
+    expect(object.instance_variable_get(:@result)).to be_a(Flexirest::ResultIterator)
+    expect(object.first).to eq(1)
+    expect(object[3].test).to eq(true)
+    expect(object.last.child.grandchild.test).to eq(true)
+  end
+
   it "should return a LazyAssociationLoader for lazy loaded properties" do
     object = LazyLoadedExampleClient.lazy_test
     expect(object.people.size).to eq(1)
@@ -592,7 +668,7 @@ describe Flexirest::Request do
   it "should log faked responses" do
     allow(Flexirest::Logger).to receive(:debug)
     expect(Flexirest::Logger).to receive(:debug).with(/Faked response found/)
-    ExampleClient.fake id:1234, debug:true
+    ExampleClient.fake_object id:1234, debug:true
   end
 
   it "should parse an array within JSON to be a result iterator" do
@@ -628,6 +704,51 @@ describe Flexirest::Request do
     #TODO
   end
 
+  it "should parse an attribute to be an array if attribute included in a nested array" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/johnny", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"first_name\":\"Johnny\", \"nested_array\":[[{\"likes\":[\"donuts\", \"bacon\"], \"dislikes\":[\"politicians\", \"lawyers\", \"taxes\"]}]]}", status:200, response_headers:{})))
+    object = ExampleClient.array
+    nested_array = object.nested_array[0][0]
+    expect(nested_array.likes).to be_instance_of(Array)
+    expect(nested_array.likes.size).to eq(2)
+    expect(nested_array.likes[0]).to eq("donuts")
+    expect(nested_array.likes[1]).to eq("bacon")
+    expect(nested_array.dislikes).to be_instance_of(Array)
+    expect(nested_array.dislikes.size).to eq(3)
+    expect(nested_array.dislikes[0]).to eq("politicians")
+    expect(nested_array.dislikes[1]).to eq("lawyers")
+    expect(nested_array.dislikes[2]).to eq("taxes")
+    #TODO - Pasted from the Test above
+  end
+
+  it "should parse an attribute to be either a result iterator or an array and containing simple values like integers" do
+      expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/basket", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"products\":[101, 55, 37], \"options\":[854, 225, 772]}", status:200, response_headers:{})))
+      object = ExampleClient.basket
+      expect(object).to be_instance_of(ExampleClient)
+      expect(object.products).to be_a(Flexirest::ResultIterator)
+      expect(object.products.size).to eq(3)
+      expect(object.products.first).to eq(101)
+      expect(object.products[1]).to eq(55)
+      expect(object.products.last).to eq(37)
+      expect(object.options).to be_a(Array)
+      expect(object.options.size).to eq(3)
+      expect(object.options.first).to eq(854)
+      expect(object.options[1]).to eq(225)
+      expect(object.options.last).to eq(772)
+      expect(object._status).to eq(200)
+      #TODO - Pasted from the Test above
+    end
+
+  it "should parse the response to be a result iterator and containing simple values like strings" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/fruits", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"[\"apple\", \"banana\", \"pear\", \"watermelon\"]", status:200, response_headers:{})))
+    object = ExampleClient.fruits
+    expect(object).to be_instance_of(Flexirest::ResultIterator)
+    expect(object.first).to eq('apple')
+    expect(object[1]).to eq('banana')
+    expect(object.last).to eq('watermelon')
+    expect(object._status).to eq(200)
+    #TODO - Pasted from the Test above
+  end
+
   it "should only send changed attributes if only_changed:true" do
     expect_any_instance_of(Flexirest::Connection).to receive(:patch).with("/changed1", "debug=true", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"[{\"first_name\":\"Johnny\"}, {\"first_name\":\"Billy\"}, {\"debug\":\"true\"}]", status:200, response_headers:{})))
     object = ExampleClient.new

data/spec/spec_helper.rb

@@ -66,12 +66,12 @@ class FaradayResponseMock < ::Flexirest::FaradayResponseProxy
     @finished = false
   end
 
-  def on_complete
+  def on_complete(&block)
     if @auto_resolve
       @finished = true
       yield(@response)
     else
-      @callback = Proc.new
+      @callback = block
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.16
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,6 +139,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -364,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: This gem is for accessing REST services in a flexible way.  ActiveResource