activerecord-collections 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2abef191dff39cbfc9eea961ada24c900a468283
-  data.tar.gz: 6a5e84efad9a8ca109250a6b300dba9ef6dcc25d
+  metadata.gz: 30bfecdfccd0daf5210318a0a0b0ba38552b78d1
+  data.tar.gz: 1fc500acc90fa0467dc711b6991a79d5d5408a66
 SHA512:
-  metadata.gz: 52972f40deada1316b689444eaa8fa2814184f0731ab64ff2b13605b8ae0a8fd685d53e0dbffa58401c209635c2289995d9cb0ed0230e5311af33be5a6a97102
-  data.tar.gz: fcc224924a45de375be95d92485bcfd5583a1f9fb838dc61670109a944a306cfd5d69c6a198c9e1e6aed83fbbeaf13455fefc15447f07c9f5bb893ff05b536c4
+  metadata.gz: 0e29769f0a1122a146425847b98ba2aff294a3a40d2a9c84959d12a0a0fbcf977431b209cb6692345f9b472c16252d60be0d176c8697aba6ef20de874bf7635a
+  data.tar.gz: e74a2a642cf76911383b0cd20760716d4968a9f852d1656c38a49ea43355693a9f0018adf5c285f2234cb4636319883dd114a560ff8ff6d43e6b5763acdb1ab4

data/lib/active_record/collection.rb

@@ -5,6 +5,7 @@ module ActiveRecord
     include ActiveRecord::Collections::Batching
     include ActiveRecord::Collections::Delegation
     include ActiveRecord::Collections::Serialization
+    include ActiveRecord::Collections::Pagination
     attr_reader :relation, :options
 
     class << self
@@ -79,8 +80,7 @@ module ActiveRecord
       @collectable = old.collectable
       @options = old.options.dup
       @records = @relation = old.relation.dup
-      @total_records = old.instance_variable_get(:@total_records)
-      batch!(batch: old.current_batch, batch_size: old.batch_size) if old.is_batch? || old.batched?(false)
+      @total_count = old.instance_variable_get(:@total_count)
       is_batch! if old.is_batch?
     end
   end

data/lib/active_record/collections/batching.rb

@@ -8,12 +8,12 @@ module ActiveRecord
       module ClassMethods
         def default_batch_size(size=nil)
           @default_batch_size = size unless size.nil?
-          @default_batch_size ||= 2_000
+          @default_batch_size ||= 500
         end
 
         def batching_threshold(threshold=nil)
           @batching_threshold = threshold unless threshold.nil?
-          @batching_threshold ||= 10_000
+          @batching_threshold ||= 0
         end
 
         def batch_by_default!
@@ -44,15 +44,53 @@ module ActiveRecord
       def batch_by_default?
         self.class.batch_by_default? ||
         ( batching_threshold > 0 &&
-          total_records >= batching_threshold )
+          total_count >= batching_threshold )
       end
 
-      def should_batch?(check_if_batched=true)
+      def should_batch?
         return false if is_batch?
-        return false if check_if_batched && batched?
         batch_by_default?
       end
 
+      def is_batched?
+        @is_batched || false
+      end
+      alias_method :batched?, :is_batched?
+
+      def batch(btch=1)
+        dup.batch!(btch)
+      end
+
+      def batch!(btch=1)
+        batchify!(btch, default_batch_size)
+      end
+
+      def per_batch(bs=nil)
+        dup.per_batch!(bs)
+      end
+
+      def per_batch!(bs=nil)
+        batchify!(current_batch, (bs || default_batch_size))
+      end
+
+      def batchify!(btch, bs)
+        @is_batched = true
+        limit!(bs)
+        offset!((btch - 1) * bs)
+      end
+
+      def total_batches
+        (total_count.to_f / (relation.limit_value || total_count).to_f).ceil
+      end
+
+      def current_batch
+        (relation.offset_value.to_i / (relation.limit_value || 1)) + 1
+      end
+
+      def batch_size
+        limit_value || total_count
+      end
+
       def is_batch!
         @is_batch = true
         self
@@ -76,7 +114,7 @@ module ActiveRecord
         batched = dup.batch!
         batches = [batched.first_batch!.as_batch]
         while batched.next_batch? do
-          batches << batched.next_batch!.as_batch
+          batches << batched.as_next_batch
         end
         batches
       end
@@ -87,7 +125,7 @@ module ActiveRecord
         batches = [batched.first_batch!.as_batch]
         yield batches.first if block_given?
         while batched.next_batch? do
-          b = batched.next_batch!.as_batch
+          b = batched.as_next_batch
           yield b if block_given?
           batches << b
         end
@@ -95,56 +133,8 @@ module ActiveRecord
       end
       alias_method :in_batches, :as_batches
 
-      def batch(batch: 1, batch_size: nil)
-        dup.batch!(batch: batch, batch_size: batch_size)
-      end
-
-      def batch!(batch: 1, batch_size: nil)
-        reset!(false, false)
-        @current_batch = batch
-        @batch_size = batch_size unless batch_size.nil?
-        @batch_size ||= default_batch_size
-        @relation = relation.limit(@batch_size).offset((@current_batch - 1) * @batch_size)
-        self
-      end
-
-      def per_batch(num=nil)
-        dup.per_batch!(num)
-      end
-
-      def per_batch!(num=nil)
-        reset!(false, false)
-        @current_batch ||= 1
-        @batch_size = num || default_batch_size
-        @relation = relation.limit(@batch_size).offset((@current_batch - 1) * @batch_size)
-        self
-      end
-
-      def batched?(check_if_should=false)
-        return true if !(@current_batch.nil? && @batch_size.nil?)
-        if check_if_should && should_batch?(false)
-          batch!
-          true
-        else
-          false
-        end
-      end
-
-      def current_batch
-        @current_batch || 1
-      end
-
-      def batch_size
-        @batch_size || total_count
-      end
-
-      def total_batches
-        return 1 if is_batch?
-        (total_count.to_f / batch_size.to_f).ceil
-      end
-
       def each_batch(&block)
-        batch! if should_batch?
+        batch!
 
         if total_batches <= 1
           yield to_a if block_given?
@@ -163,7 +153,7 @@ module ActiveRecord
       end
 
       def batch_map(&block)
-        batch! if should_batch?
+        batch!
 
         if total_batches <= 1
           return (block_given? ? yield(to_a) : to_a)
@@ -188,7 +178,7 @@ module ActiveRecord
       end
 
       def first_batch!
-        batch!(batch: 1)
+        batch!(1)
       end
 
       def next_batch?
@@ -200,7 +190,7 @@ module ActiveRecord
       end
 
       def next_batch!
-        batch!(batch: current_batch + 1) if next_batch?
+        batch!(current_batch + 1) if next_batch?
       end
 
       def prev_batch?
@@ -212,7 +202,7 @@ module ActiveRecord
       end
 
       def prev_batch!
-        batch!(batch: current_batch - 1) if prev_batch?
+        batch!(current_batch - 1) if prev_batch?
       end
 
       def last_batch
@@ -220,7 +210,7 @@ module ActiveRecord
       end
 
       def last_batch!
-        batch!(batch: total_batches)
+        batch!(total_batches)
       end
     end
   end

data/lib/active_record/collections/collectable.rb

@@ -10,6 +10,7 @@ module ActiveRecord
 
       module Relation
         def collection
+          # do this with a hash so that we don't cause the relation query to execute
           ActiveRecord::Collection.from_hash({
             klass:      klass,
             select:     select_values,

data/lib/active_record/collections/pagination.rb

@@ -0,0 +1,81 @@
+module ActiveRecord
+  module Collections
+    module Pagination
+      def self.included(base)
+        base.send :extend, ClassMethods
+      end
+
+      module ClassMethods
+        def default_per_page(pp=nil)
+          @default_per_page = pp unless pp.nil?
+          @default_per_page ||= 25
+        end
+      end
+
+      def default_per_page
+        self.class.default_per_page
+      end
+
+      def page(pg=1)
+        dup.page!(pg)
+      end
+
+      def page!(pg=1)
+        paginate!(pg, default_per_page)
+      end
+
+      def per(pp=nil)
+        dup.per!(pp)
+      end
+
+      def per!(pp=nil)
+        paginate!(current_page, (pp || default_per_page))
+      end
+
+      def paginate!(pg, pp)
+        limit!(pp)
+        offset!((pg - 1) * pp)
+      end
+
+      def total_pages
+        (total_count.to_f / (relation.limit_value || total_count).to_f).ceil
+      end
+
+      def current_page
+        (relation.offset_value.to_i / (relation.limit_value || 1)) + 1
+      end
+
+      def per_page
+        limit_value || total_count
+      end
+
+      def next_page
+        current_page + 1 unless last_page?
+      end
+
+      def prev_page
+        current_page - 1 unless first_page?
+      end
+
+      def next_page?
+        !last_page?
+      end
+
+      def prev_page?
+        !first_page?
+      end
+
+      def first_page?
+        current_page == 1
+      end
+
+      def last_page?
+        current_page == total_pages
+      end
+
+      def out_of_range?
+        current_page > total_pages
+      end
+    end
+  end
+end

data/lib/active_record/collections/records.rb

@@ -18,12 +18,8 @@ module ActiveRecord
       end
       alias_method :to_a, :to_ary
 
-      def total_records
-        @total_records ||= relation.limit(nil).count
-      end
-
       def total_count
-        total_records
+        @total_count ||= relation.dup.limit(nil).offset(nil).count
       end
       alias_method :total, :total_count
       alias_method :count, :total_count

data/lib/active_record/collections/relation.rb

@@ -53,7 +53,7 @@ module ActiveRecord
       end
 
       def select!(*args)
-        reset!
+        #reset!
         @relation = relation.select(*args)
         self
       end
@@ -63,7 +63,7 @@ module ActiveRecord
       end
 
       def distinct!(bool=true)
-        reset!
+        #reset!
         @relation = relation.distinct(bool)
         self
       end
@@ -73,7 +73,7 @@ module ActiveRecord
       end
 
       def where!(*args, &block)
-        reset!
+        #reset!
         relation.where!(*args, &block)
         self
       end
@@ -83,7 +83,7 @@ module ActiveRecord
       end
 
       def not!(*args, &block)
-        reset!
+        #reset!
         @relation = relation.where.not(*args, &block)
         self
       end
@@ -93,7 +93,7 @@ module ActiveRecord
       end
 
       def or!(*args, &block)
-        reset!
+        #reset!
         @relation = relation.or.where(*args, &block)
         self
       end
@@ -103,7 +103,7 @@ module ActiveRecord
       end
 
       def order!(*args, &block)
-        reset!(false)
+        #reset!(false)
         relation.order!(*args, &block)
         self
       end
@@ -113,7 +113,7 @@ module ActiveRecord
       end
 
       def limit!(*args, &block)
-        reset!
+        #reset!
         relation.limit!(*args, &block)
         self
       end
@@ -123,31 +123,17 @@ module ActiveRecord
       end
 
       def offset!(*args, &block)
-        reset!
+        #reset!
         relation.offset!(*args, &block)
         self
       end
 
-      # TODO make this not dependent on kaminari
-      def page!(*args)
-        @relation = relation.page(*args)
-        self
-      end
-      alias_method :page, :page!
-
-      def per!(*args)
-        @relation = relation.page((relation.offset_value / relation.limit_value) + 1).per(*args)
-        self
-      end
-      alias_method :per, :per!
-      # END kaminari
-
       def joins(*args)
         dup.joins!(*args)
       end
 
       def joins!(*args)
-        reset!
+        #reset!
         relation.joins!(*args)
         self
       end
@@ -157,7 +143,7 @@ module ActiveRecord
       end
 
       def includes!(*args)
-        reset!
+        #reset!
         relation.includes!(*args)
         self
       end
@@ -167,21 +153,27 @@ module ActiveRecord
       end
 
       def references!(*table_names)
-        reset!
+        #reset!
         relation.references!(*table_names)
         self
       end
 
+      %i(bind_values select_values distinct_value joins_values includes_values references_values where_values order_values limit_value offset_value).each do |meth|
+        define_method meth do
+          relation.send(meth)
+        end
+      end
+
       def reset(clear_total=true, clear_batches=true)
         dup.reset!(clear_total, clear_batches)
       end
 
       def reset!(clear_total=true, clear_batches=true)
         @records = @record_ids = @size = nil
-        @total_records = nil if clear_total
+        @total_count = nil if clear_total
         relation.reset
         if clear_batches
-          @current_batch = @batch_size = nil
+          @is_batched = false
           relation.limit!(nil).offset!(nil)
         end
         self

data/lib/active_record/collections/serialization.rb

@@ -32,18 +32,18 @@ module ActiveRecord
 
       def to_hash(include_limit=false)
         h = {
-          select:     relation.select_values,
-          distinct:   relation.distinct_value,
-          joins:      relation.joins_values,
-          references: relation.references_values,
-          includes:   relation.includes_values,
-          where:      relation.where_values.map { |v| v.is_a?(String) ? v : v.to_sql },
-          order:      relation.order_values.map { |v| v.is_a?(String) ? v : v.to_sql },
-          bind:       relation.bind_values.map { |b| {name: b.first.name, value: b.last} }
+          select:     select_values,
+          distinct:   distinct_value,
+          joins:      joins_values,
+          references: references_values,
+          includes:   includes_values,
+          where:      where_values.map { |v| v.is_a?(String) ? v : v.to_sql },
+          order:      order_values.map { |v| v.is_a?(String) ? v : v.to_sql },
+          bind:       bind_values.map { |b| {name: b.first.name, value: b.last} }
         }
         if include_limit || try(:is_batch?)
-          h[:limit] = relation.limit_value
-          h[:offset] = relation.offset_value
+          h[:limit] = limit_value
+          h[:offset] = offset_value
         end
         h
       end

data/lib/active_record/collections/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Collections
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/activerecord-collections.rb

@@ -1,7 +1,8 @@
 require 'active_record/collections/batching'
 require 'active_record/collections/delegation'
-require 'active_record/collections/relation'
+require 'active_record/collections/pagination'
 require 'active_record/collections/records'
+require 'active_record/collections/relation'
 require 'active_record/collections/serialization'
 require 'active_record/collection'
 require 'active_record/collections/collectable'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mark Rebec
@@ -107,6 +107,7 @@ files:
 - lib/active_record/collections/batching.rb
 - lib/active_record/collections/collectable.rb
 - lib/active_record/collections/delegation.rb
+- lib/active_record/collections/pagination.rb
 - lib/active_record/collections/records.rb
 - lib/active_record/collections/relation.rb
 - lib/active_record/collections/serialization.rb