dato 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ddbcaa4cd09253d0a43f0f05169498d22e125e
-  data.tar.gz: 16f0cf8243fd0f9519f78bc49fceb1a41cb6c85a
+  metadata.gz: ad3ec619bb80a4704d54452bc49ec677e1b6f498
+  data.tar.gz: 1c4f832a125be15cd51fa8923d7d431707c6c618
 SHA512:
-  metadata.gz: 53899624f929cdc34a587426ab3fc21a18e5096b6b1f87ffe5cf959087d2c8a42bf2ef27baf775acf81aa6e0203774f9667767994e6421723a2ecc60d9b53f9e
-  data.tar.gz: 7363a20c682292080b81a2f55a47d7ed0a7924d2e998dfd6e22c3c2f8b604627319153a7960e8eba65075ccf3d840b3eb36a6b7c6d2d371aa682d841c1c142cd
+  metadata.gz: c69a434cbbfed50009a013c9e23b7d2b1e9fbd62a370f2c90976739958a94c9c31031ef2c04536348042a37a9c173a432473dd2042bb4bde1f1f06c6aa2afd32
+  data.tar.gz: f1e25a2b11be0c93f2e8a7c7577a114bc712a5538c2770231c8a8992043e4d619f757703e4c63d8d043c555386a4182d581e92b41b8d571049277cb4c2b9491d

data/lib/dato/local/items_repo.rb

@@ -127,9 +127,12 @@ module Dato
         item_types.each do |item_type|
           method = item_type_methods[item_type]
           next unless item_type.singleton
-          @collections_by_type[method] = @items_by_id[
-            item_type.singleton_item.id
-          ]
+
+          item = if item_type.singleton_item
+                   @items_by_id[item_type.singleton_item.id]
+                 end
+
+          @collections_by_type[method] = item
         end
       end
 

data/lib/dato/local/json_api_entity.rb

@@ -57,7 +57,7 @@ module Dato
           linkage.map do |item|
             data_source.find_entity(item[:type], item[:id])
           end
-        else
+        elsif linkage.is_a? Hash
           data_source.find_entity(linkage[:type], linkage[:id])
         end
       end

data/lib/dato/local/loader.rb

@@ -31,23 +31,7 @@ module Dato
       end
 
       def all_items
-        items_per_page = 500
-        base_response = client.request(:get, '/items', 'page[limit]' => 500)
-
-        extra_pages = (
-          base_response[:meta][:total_count] / items_per_page.to_f
-        ).ceil - 1
-
-        extra_pages.times do |page|
-          base_response[:data] += client.request(
-            :get,
-            '/items',
-            'page[offset]' => items_per_page * (page + 1),
-            'page[limit]' => items_per_page
-          )[:data]
-        end
-
-        base_response
+        client.items.all({}, false)
       end
     end
   end

data/lib/dato/site/repo/item.rb

@@ -35,8 +35,33 @@ module Dato
           put_request "/items/#{item_id}", body
         end
 
-        def all(filters = {})
-          get_request '/items', filters
+        def all(filters = {}, deserialize_response = true)
+          items_per_page = 500
+
+          base_response = client.request(
+            :get, '/items', filters.dup.merge('page[limit]' => items_per_page)
+          )
+
+          extra_pages = (
+            base_response[:meta][:total_count] / items_per_page.to_f
+          ).ceil - 1
+
+          extra_pages.times do |page|
+            base_response[:data] += client.request(
+              :get,
+              '/items',
+              filters.dup.merge(
+                'page[offset]' => items_per_page * (page + 1),
+                'page[limit]' => items_per_page
+              )
+            )[:data]
+          end
+
+          if deserialize_response
+            JsonApiDeserializer.new.deserialize(base_response)
+          else
+            base_response
+          end
         end
 
         def find(item_id)

data/lib/dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler