activerecord-collections 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34ee535f77402404d36c364d9a78f8ee1d4d0dc8
-  data.tar.gz: 45d79d06830e4c8a90350bf26a953d75fb4f5f9c
+  metadata.gz: 48403614a6f714267ffc6a749d2318a94a246987
+  data.tar.gz: 6658db0230f63496689196fe2da3d98dc58d733e
 SHA512:
-  metadata.gz: 988fccfb23096549e3367a3e8518596d8ba5f362b9ebda32b32958390cfbac806b9c6879f9a294f9b053a2ab1a0a34aad824b99f19f5e3421ee4c8606c1fe4b4
-  data.tar.gz: 985765df3ed5f409d9b10a83546076a682422f2d9c9608442aed747b6af98ae32c6964e65adcc29c1426db16b64dd91ceae0c9e2bce178a538a5d933945fa114
+  metadata.gz: b2a5163e7d978ec2e4814b6d1e253436f30882487774370501a4f0ea43a9ccebcd6481e7fa5ceccd196d92a85e2e44605b50fecdbfb767d6a2df2a7790878f02
+  data.tar.gz: ba491d965bfd9e90dd454b76bd7d20bebf95e953fba635110111d73f58ca7866f9f20a69126b8b2c4be90f70a08c9032492631f5f0f40acde3e61144603b1d97

data/lib/active_record/collection.rb

@@ -1,11 +1,38 @@
 module ActiveRecord
   class Collection
-    include ActiveRecord::Collections::QueryChain
+    include ActiveRecord::Collections::Relation
     include ActiveRecord::Collections::Records
     include ActiveRecord::Collections::Batching
     include ActiveRecord::Collections::Delegation
     include ActiveRecord::Collections::Serialization
-    attr_reader :model, :relation, :options
+    attr_reader :relation, :options
+
+    class << self
+      def collectable(klass=nil)
+        unless klass.nil?
+          raise ArgumentError, "The collection model must inherit from ActiveRecord::Base" unless klass.ancestors.include?(ActiveRecord::Base)
+          @collectable = klass
+        end
+
+        if @collectable.nil?
+          begin
+            klass = self.name.demodulize.singularize.constantize
+            @collectable = klass if !klass.nil? && klass.ancestors.include?(ActiveRecord::Base)
+          rescue
+            # singularized class doesn't exist
+          end
+        end
+
+        raise "Unable to determine a model to use for your collection, please set one with the `collectable` class method" if @collectable.nil? # TODO implement real exceptions
+        @collectable
+      end
+      alias_method :model, :collectable
+    end
+
+    def collectable
+      @collectable ||= self.class.collectable
+    end
+    alias_method :model, :collectable
 
     # dup relation and call none so that we don't end up inspecting it
     # and loading it before we want it
@@ -19,15 +46,20 @@ module ActiveRecord
 
     protected
 
-    def initialize(model, *criteria)
-      @model = model
+    def initialize(*criteria)
+      if criteria.first.present? && criteria.first.ancestors.include?(ActiveRecord::Base)
+        @collectable = criteria.slice!(0)
+      end
+
+      plural_name = collectable.name.demodulize.pluralize.underscore
+      singular_name = collectable.name.demodulize.singularize.underscore
+
       self.class.instance_eval do
-        model_plural = model.name.demodulize.pluralize.underscore
-        model_singular = model.name.demodulize.singularize.underscore
-        alias_method model_plural.to_sym, :records
-        alias_method "#{model_singular}_ids".to_sym, :record_ids
-        alias_method "on_#{model_plural}".to_sym, :on_records
+        alias_method plural_name.to_sym, :records
+        alias_method "#{singular_name}_ids".to_sym, :record_ids
+        alias_method "on_#{plural_name}".to_sym, :on_records
       end
+
       @options = {} # defaults, not implemented yet
       @options.merge!(criteria.extract_options!) if criteria.length > 1
 
@@ -36,10 +68,10 @@ module ActiveRecord
         if criteria.is_a?(ActiveRecord::Relation)
           @relation = criteria
         elsif criteria.is_a?(Hash) || criteria.is_a?(String) || criteria.is_a?(Array)
-          @relation = model.where(criteria).dup
+          @relation = collectable.where(criteria).dup
         end
       else
-        @relation = model.where(criteria).dup
+        @relation = collectable.where(criteria).dup
       end
     end
 

data/lib/active_record/collections/batching.rb

@@ -44,15 +44,15 @@ module ActiveRecord
       end
 
       def batch_by_default?
-        self.class.batch_by_default?
+        self.class.batch_by_default? ||
+        ( batching_threshold > 0 &&
+          total_records >= batching_threshold )
       end
 
       def should_batch?(check_if_batched=true)
         return false if is_batch?
         return false if check_if_batched && batched?
-        batch_by_default? ||
-        ( batching_threshold > 0 &&
-          total_records >= batching_threshold )
+        batch_by_default?
       end
 
       def is_batch!
@@ -97,6 +97,7 @@ module ActiveRecord
       end
       alias_method :in_batches, :as_batches
 
+      # TODO Mark need to either depend on kaminari or check for it before using page/per
       def page(*num)
         dup.page!(*num)
       end
@@ -153,6 +154,8 @@ module ActiveRecord
       alias_method :total_batches, :total_pages
 
       def each_page(&block)
+        batch! if should_batch?
+
         if total_pages <= 1
           yield to_a if block_given?
           return [to_a]
@@ -171,6 +174,8 @@ module ActiveRecord
       alias_method :each_batch, :each_page
 
       def page_map(&block)
+        batch! if should_batch?
+
         if total_pages <= 1
           return (block_given? ? yield(to_a) : to_a)
         end

data/lib/active_record/collections/model_collection.rb

@@ -0,0 +1,18 @@
+module ActiveRecord
+  module Collections
+    module ModelCollection
+      def self.included(base)
+        base.send :extend, ClassMethods
+      end
+
+      module ClassMethods
+        def collection(*criteria)
+          ActiveRecord::Collection.new(self, *criteria)
+        end
+        alias_method :collect, :collection
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, ActiveRecord::Collections::ModelCollection

data/lib/active_record/collections/records.rb

@@ -23,7 +23,6 @@ module ActiveRecord
       end
 
       def total_count
-        #batch! if try(:should_batch?)
         total_records
       end
       alias_method :total, :total_count
@@ -38,28 +37,31 @@ module ActiveRecord
       end
 
       def each(&block)
-        batch! if try(:should_batch?)
+        records.each { |record| block_given? ? yield(record) : record }
+      end
 
-        if try(:batched?)
-          flat_batch_map.each { |record| block_given? ? yield(record) : record }
-        else
-          records.each { |record| block_given? ? yield(record) : record }
-        end
+      def each_in_batches(batch_size=nil, &block)
+        batch_size!(batch_size)
+        flat_batch_map.each { |record| block_given? ? yield(record) : record }
       end
 
       def map(&block)
-        batch! if try(:should_batch?)
+        each.map { |record| block_given? ? yield(record) : record }
+      end
 
-        if try(:batched?)
-          flat_batch_map.map { |record| block_given? ? yield(record) : record }
-        else
-          each.map { |record| block_given? ? yield(record) : record }
-        end
+      def map_in_batches(batch_size=nil, &block)
+        batch_size!(batch_size)
+        flat_batch_map.map { |record| block_given? ? yield(record) : record }
       end
 
       def flat_map(&block)
         map(&block).flatten
       end
+
+      def flat_map_in_batches(batch_size=nil, &block)
+        batch_size!(batch_size)
+        flat_batch_map.map { |record| block_given? ? yield(record) : record }
+      end
     end
   end
 end

data/lib/active_record/collections/{query_chain.rb → relation.rb}

@@ -1,6 +1,6 @@
 module ActiveRecord
   module Collections
-    module QueryChain
+    module Relation
       def self.included(base)
         base.send :extend, ClassMethods
       end

data/lib/active_record/collections/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Collections
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/activerecord-collections.rb

@@ -1,6 +1,7 @@
 require 'active_record/collections/batching'
 require 'active_record/collections/delegation'
-require 'active_record/collections/query_chain'
+require 'active_record/collections/relation'
 require 'active_record/collections/records'
 require 'active_record/collections/serialization'
 require 'active_record/collection'
+require 'active_record/collections/model_collection'

data/spec/support/models.rb

@@ -20,10 +20,4 @@ end
 class StockedProducts < ActiveRecord::Collection
   default_batch_size 200
   batching_threshold 500
-
-  protected
-
-  def initialize(*criteria)
-    super(StockedProduct, *criteria)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,8 +106,9 @@ files:
 - lib/active_record/collection.rb
 - lib/active_record/collections/batching.rb
 - lib/active_record/collections/delegation.rb
-- lib/active_record/collections/query_chain.rb
+- lib/active_record/collections/model_collection.rb
 - lib/active_record/collections/records.rb
+- lib/active_record/collections/relation.rb
 - lib/active_record/collections/serialization.rb
 - lib/active_record/collections/version.rb
 - lib/activerecord-collections.rb