activeset 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7cdef49d5066bfce1716a02c22c6944be6e78b5
-  data.tar.gz: 2e24745f57ba9312dce23a5d8d9ce3ad95f035fd
+  metadata.gz: 0342d1f291390f1b5e3e0654409d9071f381dc8f
+  data.tar.gz: 83c5079292686ff333a02c502b9018760067fb91
 SHA512:
-  metadata.gz: afd9e636ca59c097baca307dd47e1bb25f8c18745a09f5665e5d118d2fca5e604f3a1bdafe73a997fea6d49941ae6bb6c556432c5289aa04cf0060de58955c05
-  data.tar.gz: 40f35bb0ec2f2b83c1b7b1b511fd0641d4a45e962b4058b59565fc70bc2609eec616ab8aa9eb8425b78025eede79982472ba09580d38f9723e9366269c0d74cd
+  metadata.gz: bb3429bee37af5438798de2c18f7aef16bca7508918054bb6afea0bddfb0641bf945477863f892ce9e4d3c9a6d26ac09d8d7a985d9c69e1115650e2231a243f2
+  data.tar.gz: 39bbf742bc1420ddf751a14bf8ea66b42115b799d5682b60c5d7126c77c44eef70f92f144e8b690d26afc288189ce4883a93b09bc78d7bc6a5be522d422538fd

data/CHANGELOG

@@ -1,3 +1,6 @@
+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
 v 0.5.2
   - Add an ActiveRecord adapter for the PaginateProcessor
   - Update the EnumerableAdapter for the PaginateProcessor to more consistently handle edgecases

data/lib/active_set.rb

@@ -37,27 +37,31 @@ class ActiveSet
 
   def filter(instructions)
     filterer = FilterProcessor.new(@set, instructions)
-    self.class.new(filterer.process,
-                   instructions: @instructions.merge(filter: instructions),
-                   total_count: @total_count)
+    new_active_set(filterer.process, :filter, instructions)
   end
 
   def sort(instructions)
     sorter = SortProcessor.new(@set, instructions)
-    self.class.new(sorter.process,
-                   instructions: @instructions.merge(sort: instructions),
-                   total_count: @total_count)
+    new_active_set(sorter.process, :sort, instructions)
   end
 
   def paginate(instructions)
     paginater = PaginateProcessor.new(@set, instructions)
-    self.class.new(paginater.process,
-                   instructions: @instructions.merge(paginate: instructions),
-                   total_count: @total_count)
+    full_instructions = instructions.reverse_merge(page: paginater.send(:page_number),
+                                                   size: paginater.send(:page_size))
+    new_active_set(paginater.process, :paginate, full_instructions)
   end
 
   def transform(instructions)
     transformer = TransformProcessor.new(@set, instructions)
     transformer.process
   end
+
+  private
+
+  def new_active_set(set, method, instructions)
+    self.class.new(set,
+                   instructions: @instructions.merge(method => instructions),
+                   total_count: @total_count)
+  end
 end

data/lib/active_set/processors/paginate_processor.rb

@@ -18,14 +18,14 @@ class ActiveSet
     end
 
     def instruction
-      Instructions::Entry.new(page_number, pagesize)
+      Instructions::Entry.new(page_number, page_size)
     end
 
     def page_number
       @instructions.get(:page) || 1
     end
 
-    def pagesize
+    def page_size
       @instructions.get(:size) || 25
     end
   end

data/lib/active_set/version.rb

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

metadata

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