activeset 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b2aa11544be377a08e047b5040128f7d3d10f1c
-  data.tar.gz: ddb9a50f0b72ca006b98538a03ffbbeb5cd05f7f
+  metadata.gz: d7cdef49d5066bfce1716a02c22c6944be6e78b5
+  data.tar.gz: 2e24745f57ba9312dce23a5d8d9ce3ad95f035fd
 SHA512:
-  metadata.gz: '018352eadd91866a0b5bfa05aae1f1653ae7e4f674f681e89fbf497d22e42d76b43fdd44df8b0e961cdb56179c1e83f84e9fed5bd13086022c141e400c1d542a'
-  data.tar.gz: 69a1acc99c63fbcd6b25def52599d0553c072c424ba689deddafc34444ad8d9ae0bbe8dada17835667ddd6ad9454ebccd462063d4c129ab0564c9cd73f224e51
+  metadata.gz: afd9e636ca59c097baca307dd47e1bb25f8c18745a09f5665e5d118d2fca5e604f3a1bdafe73a997fea6d49941ae6bb6c556432c5289aa04cf0060de58955c05
+  data.tar.gz: 40f35bb0ec2f2b83c1b7b1b511fd0641d4a45e962b4058b59565fc70bc2609eec616ab8aa9eb8425b78025eede79982472ba09580d38f9723e9366269c0d74cd

data/CHANGELOG

@@ -1,3 +1,8 @@
+v 0.5.2
+  - Add an ActiveRecord adapter for the PaginateProcessor
+  - Update the EnumerableAdapter for the PaginateProcessor to more consistently handle edgecases
+      When asking for a page number that is outside of the meaningful range (e.g. page 10 of a collection that would only have 5 meaningful pages), should return an empty collection.
+  - Ensure that the built up intstruction and the base size of the original set are readable from any chained instance of ActiveSet
 v 0.5.1
   - Fix bug where `transform` method tried to return a new instance of ActiveSet. It should simply returned the transformed value.
   - Fail if tranformer can’t handle passed format

data/lib/active_set.rb

@@ -10,10 +10,12 @@ require 'active_set/processors/transform_processor'
 class ActiveSet
   include Enumerable
 
-  attr_reader :set
+  attr_reader :set, :instructions, :total_count
 
-  def initialize(set)
+  def initialize(set, instructions: {}, total_count: nil)
     @set = set
+    @instructions = instructions
+    @total_count = total_count || @set.count
   end
 
   def each(&block)
@@ -35,17 +37,23 @@ class ActiveSet
 
   def filter(instructions)
     filterer = FilterProcessor.new(@set, instructions)
-    self.class.new(filterer.process)
+    self.class.new(filterer.process,
+                   instructions: @instructions.merge(filter: instructions),
+                   total_count: @total_count)
   end
 
   def sort(instructions)
     sorter = SortProcessor.new(@set, instructions)
-    self.class.new(sorter.process)
+    self.class.new(sorter.process,
+                   instructions: @instructions.merge(sort: instructions),
+                   total_count: @total_count)
   end
 
   def paginate(instructions)
     paginater = PaginateProcessor.new(@set, instructions)
-    self.class.new(paginater.process)
+    self.class.new(paginater.process,
+                   instructions: @instructions.merge(paginate: instructions),
+                   total_count: @total_count)
   end
 
   def transform(instructions)

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative '../base_adapter'
+require_relative '../base_processor'
+
+class ActiveSet
+  class PaginateProcessor < BaseProcessor
+    class ActiveRecordAdapter < BaseAdapter
+      def process
+        return return_set unless @set.respond_to? :to_sql
+
+        return_set(paginated_set)
+      end
+
+      private
+
+      def paginated_set
+        return @set.none if @set.count <= page_size && page_number > 1
+        @set.limit(page_size).offset(page_offset)
+      end
+
+      def page_offset
+        return 0 if page_number == 1
+        page_size * page_number
+      end
+
+      def page_size
+        @instruction.value
+      end
+
+      def page_number
+        num = @instruction.attribute.to_i
+        return 1 if (num - 1).negative?
+        return 1 if (num - 1).zero?
+        num
+      end
+    end
+  end
+end

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

@@ -7,22 +7,34 @@ class ActiveSet
   class PaginateProcessor < BaseProcessor
     class EnumerableAdapter < BaseAdapter
       def process
-        return return_set if @set.count < pagesize
         return_set(paginated_set)
       end
 
       private
 
       def paginated_set
-        @set.each_slice(pagesize).take(page_number).last
+        return [] if @set.count <= page_size && page_number > 1
+
+        @set[page_start..page_end] || []
+      end
+
+      def page_start
+        return 0 if page_number == 1
+        page_size * (page_number - 1)
+      end
+
+      def page_end
+        return page_start if page_size == 1
+        page_start + page_size - 1
       end
 
-      def pagesize
+      def page_size
         @instruction.value
       end
 
       def page_number
-        @instruction.attribute.to_i
+        num = @instruction.attribute.to_i
+        (num.to_i - 1).negative? ? 0 : num
       end
     end
   end

data/lib/active_set/processors/paginate_processor.rb

@@ -2,6 +2,7 @@
 
 require_relative './base_processor'
 require_relative './paginate/enumerable_adapter'
+require_relative './paginate/active_record_adapter'
 
 class ActiveSet
   class PaginateProcessor < BaseProcessor

data/lib/active_set/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -181,6 +181,7 @@ files:
 - lib/active_set/processors/filter/active_record_adapter.rb
 - lib/active_set/processors/filter/enumerable_adapter.rb
 - lib/active_set/processors/filter_processor.rb
+- lib/active_set/processors/paginate/active_record_adapter.rb
 - lib/active_set/processors/paginate/enumerable_adapter.rb
 - lib/active_set/processors/paginate_processor.rb
 - lib/active_set/processors/sort/active_record_adapter.rb