productive 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81064343d92daff334e6e911c4cbf7e98a9fd84
-  data.tar.gz: ca2a00d084fa22ddf13d009a2a491dffa3c1f7bb
+  metadata.gz: 7870e1199efedbcd44e8e4d006cae81d38896617
+  data.tar.gz: 7bc9d3c1ba970f5122c909ea2b89d5df66acfa4c
 SHA512:
-  metadata.gz: ce9d7bb602bde8f85b5f2af219e484f7acfcbbbe0527c46deb22583bf752a2083a603d14a27e40d37b9f2edbeb2b6dd52dec4509cb2fbddf1b66a8d0d2cfea32
-  data.tar.gz: 89d981fb1075221f9a661966a99d231f039bcccdfd1fdb94d6e0035328e4eb38f614b17fd9efe06027cdec19871a2a8191b32ba2934723f543998a72f301678f
+  metadata.gz: 06d73d9ce29a16a171e1465b5772dd1d8015c1e5302f716d86bb9e2c91b3856e4016b28d6d238e56c1127f14d6439b41380602e09b65f4abad22ceb6279c02dd
+  data.tar.gz: 8ca21e2c83da1836b5ce2c06721d95dbdb98e6792048abdcc0ff833a26d0cd5fe08d6e6f6d20ad1f7cfc0137aee80e3763f6632ba58c491031699b7947072d3e

data/lib/json_api_query_builder.rb

@@ -0,0 +1,15 @@
+class JsonApiQueryBuilder < JsonApiClient::Query::Builder
+  def all
+    @all ||= begin
+      results = page = find
+
+      loop do
+        page = page.pages.next
+        break if page.nil?
+        results += page
+      end
+
+      results
+    end
+  end
+end

data/lib/productive/configuration.rb

@@ -1,14 +1,16 @@
 require 'json_api_paginator'
+require 'json_api_query_builder'
 
 module Productive
   class Configuration
-    attr_accessor :api_key, :account_id, :base_url, :paginator, :connection_options
+    attr_accessor :api_key, :account_id, :base_url, :paginator, :query_builder, :connection_options
 
     def initialize
       self.api_key = ENV['PRODUCTIVE_API_KEY']
       self.account_id = ENV['PRODUCTIVE_ACCOUNT_ID']
       self.base_url = 'https://api.productive.io/api/v2/'
       self.paginator = JsonApiPaginator
+      self.query_builder = JsonApiQueryBuilder
       self.connection_options = {}
     end
   end

data/lib/productive/resources/base.rb

@@ -30,6 +30,7 @@ module Productive
       site_setup config
       connection_options_setup config
       paginator_setup config
+      query_builder_setup config
       reset_connection
     end
 
@@ -51,49 +52,12 @@ module Productive
       self.paginator = config.paginator
     end
 
-    def self.reset_connection
-      connection(rebuild: true)
-    end
-
-    def self.all(args = {})
-      depaginate(BaseItems.new([]), args).items
-    end
-
-    def self.lazy_all(args = {})
-      Enumerator.new do |yielder|
-        depaginate(LazyItems.new(yielder), args)
-      end.lazy
-    end
-
-    def self.depaginate(items, args)
-      page = paginate(per_page: PER_PAGE).find(args)
-      items.append(page)
-
-      loop do
-        page = page.pages.next
-        raise StopIteration if page.nil?
-        items.append(page)
-      end
-
-      items
-    end
-
-    class BaseItems
-      attr_reader :items
-
-      def initialize(items)
-        @items = items
-      end
-
-      def append(results)
-        @items += results
-      end
+    def self.query_builder_setup(config)
+      self.query_builder = config.query_builder
     end
 
-    class LazyItems < BaseItems
-      def append(results)
-        results.each { |item| @items << item }
-      end
+    def self.reset_connection
+      connection(rebuild: true)
     end
   end
 end

data/lib/productive/version.rb

@@ -1,3 +1,3 @@
 module Productive
-  VERSION = '0.6.12'.freeze
+  VERSION = '0.6.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: productive
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Josip Bišćan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -65,6 +65,7 @@ files:
 - README.md
 - lib/generators/productive/productive_generator.rb
 - lib/json_api_paginator.rb
+- lib/json_api_query_builder.rb
 - lib/productive.rb
 - lib/productive/configuration.rb
 - lib/productive/railtie.rb