activeset 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0342d1f291390f1b5e3e0654409d9071f381dc8f
-  data.tar.gz: 83c5079292686ff333a02c502b9018760067fb91
+  metadata.gz: 7d5e68a1195e14dbb27b6e12c2be3fcbb3438dfd
+  data.tar.gz: 41147254b36a900c9bbdf85bf5b1f64345cd0d6e
 SHA512:
-  metadata.gz: bb3429bee37af5438798de2c18f7aef16bca7508918054bb6afea0bddfb0641bf945477863f892ce9e4d3c9a6d26ac09d8d7a985d9c69e1115650e2231a243f2
-  data.tar.gz: 39bbf742bc1420ddf751a14bf8ea66b42115b799d5682b60c5d7126c77c44eef70f92f144e8b690d26afc288189ce4883a93b09bc78d7bc6a5be522d422538fd
+  metadata.gz: 6ee3ed0cca9255e022e57548649f2464b1b08a29877e96b2e0187298b04c347b2caf3ea42739a3bffab34af6ac9081bed494feb875c7b9c583038f5ad69752a7
+  data.tar.gz: c2e67201fb0e76b5f2bd995bcbc6038c1948a27f5efdbeccb9f19b5eea0b4ae901d75f878265a9925daa3e3c4e5989d1a8fe2e5f59bff6853694080c3caa1169

data/CHANGELOG

@@ -1,3 +1,7 @@
+v 0.5.4
+  - Ensure that Instructions wrap a Hash with indifferent access
+  - Wire up both adapters for the PaginateProcessor
+  - Fix bug where ActiveRecord Paginator didn’t offset pages correctly
 v 0.5.3
   - Extract logic for creating new ActiveSet instance after an operation into separate method
   - Ensure that the instructions logged for the paginate operation handle defaults

data/lib/active_set/instructions/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/indifferent_access'
 
 require_relative './entry'
 
@@ -9,7 +10,7 @@ class ActiveSet
     attr_reader :hash
 
     def initialize(hash)
-      @hash = hash
+      @hash = hash.with_indifferent_access
       @flattened_hash = hash.flatten_keys.transform_keys { |k| k.map(&:to_s) }
     end
 

data/lib/active_set/processors/paginate/active_record_adapter.rb

@@ -21,7 +21,7 @@ class ActiveSet
 
       def page_offset
         return 0 if page_number == 1
-        page_size * page_number
+        page_size * (page_number - 1)
       end
 
       def page_size

data/lib/active_set/processors/paginate_processor.rb

@@ -6,17 +6,21 @@ require_relative './paginate/active_record_adapter'
 
 class ActiveSet
   class PaginateProcessor < BaseProcessor
+    queue_adapter ActiveRecordAdapter
+    queue_adapter EnumerableAdapter
+
     def process
-      output = adapter.new(@set, instruction).process
-      output[:set]
-    end
+      adapters.each do |adapter|
+        output = adapter.new(@set, instruction).process
 
-    private
+        return output[:set] if output[:processed]
+      end
 
-    def adapter
-      EnumerableAdapter
+      @set
     end
 
+    private
+
     def instruction
       Instructions::Entry.new(page_number, page_size)
     end

data/lib/active_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActiveSet
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport