dato 0.3.28 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d302526098db939d94ffa7579ad99155bd13cfa3
-  data.tar.gz: 29290a0a6f3f6dccbc9a91e7c8dc67beb06f9f3a
+  metadata.gz: a1061c027f8e5c25e3c419ea494c95fe1f794181
+  data.tar.gz: 59252bf63438b2456a0174e260776fb8447bd53e
 SHA512:
-  metadata.gz: 522527bbfa6fbab102087645d7c554d300dd6f55a63053461a229aa6df23fef8fdd80e4b5eda2f6d257da3bdf152f2e6cb1c570b2dacec35781447a51a093e82
-  data.tar.gz: b3bdcd08808c3203101cdcbac03a05260c6b45133c7d94ed96e0d32fb4b8fe8479b1a591da8aa662ae0a7fb8448a193f0f693f43a62d423c43a8b0b79ebf3b8c
+  metadata.gz: 4ff063b70d83e36ac695744531146bc37b0ee36d8d53a223ec23d3fa675e6a286f1d2df5bc15a00c54cdd71228df89167755f5139af1a262105ff922a37ea000
+  data.tar.gz: bc13fa98fadc1f254002432318e80f377b635f99f91c38d8c029f006535560c07a288d550e0f5e41caaad9ada82a88fd8883d397f731d643f5399c1a128610e1

data/Rakefile

@@ -14,7 +14,7 @@ task :regenerate do
   BuildClient.new(
     open('https://site-api.datocms.com/docs/site-api-hyperschema.json').read,
     'site',
-    %w(session item user#update)
+    %w(session item upload user#update)
   ).build
 
   BuildClient.new(

data/lib/dato/local/loader.rb

@@ -31,7 +31,7 @@ module Dato
       end
 
       def all_items
-        client.items.all({}, false)
+        client.items.all({}, deserialize_response: false, all_pages: true)
       end
     end
   end

data/lib/dato/site/paginator.rb

@@ -0,0 +1,35 @@
+module Dato
+  module Site
+    class Paginator
+      def initialize(client, base_endpoint, filters)
+        @client, @base_endpoint, @filters = client, base_endpoint, filters
+      end
+
+      def response
+        items_per_page = 500
+
+        base_response = @client.request(
+          :get, @base_endpoint, @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,
+            @base_endpoint,
+            @filters.dup.merge(
+              'page[offset]' => items_per_page * (page + 1),
+              'page[limit]' => items_per_page
+            )
+          )[:data]
+        end
+
+        base_response
+      end
+    end
+  end
+end
+

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 require 'dato/site/repo/base'
+require 'dato/site/paginator'
 require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/keys'
 
 module Dato
   module Site
@@ -37,32 +39,22 @@ module Dato
           put_request "/items/#{item_id}", body
         end
 
-        def all(filters = {}, deserialize_response = true)
-          items_per_page = 500
+        def all(filters = {}, options = {})
+          options.symbolize_keys!
 
-          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
+          deserialize_response = options.fetch(:deserialize_response, true)
+          all_pages = options.fetch(:all_pages, false)
 
-          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]
+          response = if all_pages
+            Paginator.new(client, '/items', filters).response
+          else
+            client.request(:get, '/items', filters)
           end
 
           if deserialize_response
-            JsonApiDeserializer.new.deserialize(base_response)
+            JsonApiDeserializer.new.deserialize(response)
           else
-            base_response
+            response
           end
         end
 

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 require 'dato/site/repo/base'
+require 'dato/site/paginator'
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/keys'
 
 module Dato
   module Site
@@ -15,8 +18,23 @@ module Dato
           post_request '/uploads', body
         end
 
-        def all(query)
-          get_request '/uploads', query
+        def all(filters = {}, options = {})
+          options.symbolize_keys!
+
+          deserialize_response = options.fetch(:deserialize_response, true)
+          all_pages = options.fetch(:all_pages, false)
+
+          response = if all_pages
+            Paginator.new(client, '/uploads', filters).response
+          else
+            client.request(:get, '/uploads', filters)
+          end
+
+          if deserialize_response
+            JsonApiDeserializer.new.deserialize(response)
+          else
+            response
+          end
         end
 
         def find(upload_id)

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.3.28
+  version: 0.3.29
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -422,6 +422,7 @@ files:
 - lib/dato/local/site.rb
 - lib/dato/migrate_slugs/runner.rb
 - lib/dato/site/client.rb
+- lib/dato/site/paginator.rb
 - lib/dato/site/repo/access_token.rb
 - lib/dato/site/repo/base.rb
 - lib/dato/site/repo/deploy_event.rb