flexirest 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96c037bf934becbdc7d5381bfaef226550e1a3c1
-  data.tar.gz: 99c2aa6b76d361c1b6862c9bf82fc28b1914737a
+  metadata.gz: 4ef0d167d4d731cacdb7ac4f272ca0cf0c1ebb24
+  data.tar.gz: b56d4dc78f1f6e5875f57e737cab0a1b4efd749f
 SHA512:
-  metadata.gz: fe9c061af6b61f68cdffc1243546285f4a33450624dd08b77b8428cb9f58a4ecbf2be4605ff21654f86a35a41713e10055ba92badd4d0c4aaead4a6ff6d5c6f0
-  data.tar.gz: c7342b08bb159edbb8691166668e49d0235cd87c7aee73a27c7a127de495f1e81f17a44cbe95e5e58e003ea276d265739b1e67bd3709b4a52518b4328a0bbebd
+  metadata.gz: 6cc9bfa84951e23c7ac5f12804967e27724f7f8f9a4de62d6cf4b293f57aaeb8a61138f6c7baccd7559b5707c83b3bcfc854492e6c838fcd976ff542630bc31f
+  data.tar.gz: 2bf14a68818a51363b2f3e3817dfc88b4e599516a2b2bc7125da773e05b041e2f0445dad4d561aa709ae3bd6e88ff28f3a1d86ea58442c22ac6704db5a628249

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.6.2
+
+Bugfix:
+
+- Flexirest wasn't supporting nested arrays in responses, it does now. Thanks to Rui Ribeiro for pointing this out.
+
 ## 1.6.1
 
 Feature:

data/README.md

@@ -1204,7 +1204,7 @@ The following attributes will pass validation since they explicitly `allow_nil`:
 
 ### Filtering result lists
 
-If the API returns a JSON list of items, this is retured to you as a `Flexirest::ResultIterator` object. A `ResultIterator` sorts simple filtering of the list based on values matching a specified criteria (or matching using regular expressions):
+If the API returns a JSON list of items, this is retured to you as a `Flexirest::ResultIterator` object. A `ResultIterator` sorts simple filtering of the list using a `where` method based on values matching a specified criteria (or matching using regular expressions):
 
 ```ruby
 class Article < Flexirest::Base

data/lib/flexirest/request.rb

@@ -727,9 +727,7 @@ module Flexirest
       end
       if body.is_a? Array
         result = Flexirest::ResultIterator.new(@response)
-        body.each do |json_object|
-          result << new_object(json_object, @overridden_name)
-        end
+        add_nested_body_to_iterator(result, body)
       else
         result = new_object(body, @overridden_name)
         result._status = @response.status
@@ -743,6 +741,18 @@ module Flexirest
       end
       result
     end
+
+    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
+          result << new_object(json_object, @overridden_name)
+        end
+      end
+    end
   end
 
   class RequestException < StandardError ; end

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/spec/lib/request_spec.rb

@@ -150,7 +150,7 @@ describe Flexirest::Request do
     expect(connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
     servers = []
     # TODO: this next test is potentially flakey, if over 10 runs of []#sample it doesn't return both variants, but it's so unlikely...
-    10.times do
+    30.times do
       expect(Flexirest::ConnectionManager).to receive(:get_connection) do |arg|
         servers << arg
         connection
@@ -436,6 +436,15 @@ describe Flexirest::Request do
     expect(object._status).to eq(200)
   end
 
+  it "should parse a nested array within JSON to be a result iterator" 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:"[[{}, {\"first_name\":\"Johnny\"}, {\"first_name\":\"Billy\"}]]", status:200, response_headers:{})))
+    object = ExampleClient.update id:1234, debug:true
+    expect(object).to be_instance_of(Flexirest::ResultIterator)
+    expect(object[0][1].first_name).to eq("Johnny")
+    expect(object[0][2].first_name).to eq("Billy")
+    expect(object._status).to eq(200)
+  end
+
   it "should parse an attribute to be an array if attribute included in array option" 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\", \"likes\":[\"donuts\", \"bacon\"], \"dislikes\":[\"politicians\", \"lawyers\", \"taxes\"]}", status:200, response_headers:{})))
     object = ExampleClient.array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Andy Jeffries