activerecord-collections 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d82df13bf116718055700ca2c6e5ac38822bc1e
-  data.tar.gz: 6ab953c834c0eeea548bb42489fb65f7e4acc44d
+  metadata.gz: a957127ae2a21f3a1b1d86589127c32b61ea74ec
+  data.tar.gz: ea061b5fa0357a66cd1f93d63332b297d25ac8f9
 SHA512:
-  metadata.gz: 277865f754c3ecfa851b060c43dc4cce68d5ae5e23f41bcb294b6499c726820928f06cd76cd02f04001e434fb24376f10b9660a6182d099af3fcd6c1c6a82516
-  data.tar.gz: 196da9b376e13ff8074b6c1c5e7bc8b4e79de781346d7fc929f6b07a996630ff7f4c90a25c846e649a2af691fc36fb11de2a4018a538bcda5eb307fcbd60bd49
+  metadata.gz: 9b05f147793bc3239373ef8c0ecc232650f6e8972d1ee7d98942f1259904e0b3451caf3c45422dae6167ecef2708968e06d7a80a0b8e5f7904aaf98a0c52038f
+  data.tar.gz: ea45a2d8364d10f0c1d9a998ca9a372db81ab7098fc39ceffc71cc2732491891bf673270cea2c8fb0358e9f7a8bc5b98bfcd36d742ea8f35ac21d865ab4c4e6e

data/lib/active_record/collection.rb

@@ -9,6 +9,11 @@ module ActiveRecord
     attr_reader :relation, :options
 
     class << self
+      attr_reader :collections
+      def inherited(subclass)
+        (@collections ||= []) << subclass
+      end
+
       def collectable(klass=nil)
         unless klass.nil?
           raise ArgumentError, "The collection model must inherit from ActiveRecord::Base" unless klass.ancestors.include?(ActiveRecord::Base)

data/lib/active_record/collections/batching.rb

@@ -57,20 +57,20 @@ module ActiveRecord
       end
       alias_method :batched?, :is_batched?
 
-      def batch(btch=1)
-        dup.batch!(btch)
+      def batch(batch_size: nil)
+        dup.batch!(batch_size: batch_size)
       end
 
-      def batch!(btch=1)
-        batchify!(btch, default_batch_size)
+      def batch!(batch_size: nil)
+        batchify!(1, (batch_size || limit_value || default_batch_size))
       end
 
-      def per_batch(bs=nil)
+      def per_batch(bs)
         dup.per_batch!(bs)
       end
 
-      def per_batch!(bs=nil)
-        batchify!(current_batch, (bs || default_batch_size))
+      def per_batch!(bs)
+        batchify!(current_batch, bs)
       end
 
       def batchify!(btch, bs)
@@ -80,11 +80,11 @@ module ActiveRecord
       end
 
       def total_batches
-        (total_count.to_f / (relation.limit_value || total_count).to_f).ceil
+        (total_count.to_f / (limit_value || total_count).to_f).ceil
       end
 
       def current_batch
-        (relation.offset_value.to_i / (relation.limit_value || 1)) + 1
+        (offset_value.to_i / (limit_value || 1)) + 1
       end
 
       def batch_size
@@ -134,18 +134,16 @@ module ActiveRecord
       alias_method :in_batches, :as_batches
 
       def each_batch(&block)
-        batch!
-
         if total_batches <= 1
-          yield to_a if block_given?
-          return [to_a]
+          yield dup.as_batch if block_given?
+          return [dup.as_batch]
         end
 
-        first_batch!
         batched = []
+        first_batch!
         total_batches.times do
-          batched << to_a
-          yield to_a if block_given?
+          batched << dup.as_batch
+          yield dup.as_batch if block_given?
           next_batch!
         end
         first_batch!
@@ -153,16 +151,14 @@ module ActiveRecord
       end
 
       def batch_map(&block)
-        batch!
-
         if total_batches <= 1
-          return (block_given? ? yield(to_a) : to_a)
+          return (block_given? ? yield(dup.as_batch) : dup.as_batch)
         end
 
-        first_batch!
         batched = []
+        first_batch!
         total_batches.times do
-          batched << (block_given? ? yield(to_a) : to_a)
+          batched << (block_given? ? yield(dup.as_batch) : dup.as_batch)
           next_batch!
         end
         first_batch!
@@ -178,7 +174,7 @@ module ActiveRecord
       end
 
       def first_batch!
-        batch!(1)
+        batchify!(1, batch_size)
       end
 
       def next_batch?
@@ -190,7 +186,7 @@ module ActiveRecord
       end
 
       def next_batch!
-        batch!(current_batch + 1) if next_batch?
+        batchify!(current_batch + 1, batch_size)
       end
 
       def prev_batch?
@@ -202,7 +198,7 @@ module ActiveRecord
       end
 
       def prev_batch!
-        batch!(current_batch - 1) if prev_batch?
+        batchify!(current_batch - 1, batch_size)
       end
 
       def last_batch
@@ -210,7 +206,7 @@ module ActiveRecord
       end
 
       def last_batch!
-        batch!(total_batches)
+        batchify!(total_batches, batch_size)
       end
     end
   end

data/lib/active_record/collections/collectable.rb

@@ -2,16 +2,29 @@ module ActiveRecord
   module Collections
     module Collectable
       module Model
+        def collection_class(klass=nil)
+          @collection_class = klass unless klass.nil?
+          @collection_class
+        end
+
+        def kollektion
+          @collection_class || ActiveRecord::Collection.collections.to_a.select { |c| c.collectable == self }.first || ActiveRecord::Collection
+        end
+
         def collection(*criteria)
-          ActiveRecord::Collection.new(self, *criteria)
+          kollektion.new(self, *criteria)
         end
         alias_method :collect, :collection
       end
 
       module Relation
+        def kollektion
+          klass.kollektion
+        end
+
         def collection
           # do this with a hash so that we don't cause the relation query to execute
-          ActiveRecord::Collection.from_hash({
+          kollektion.from_hash({
             klass:      klass,
             select:     select_values,
             distinct:   distinct_value,
@@ -19,7 +32,8 @@ module ActiveRecord
             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 },
+            group:      group_values.map { |v| (v.is_a?(String) || v.is_a?(Symbol)) ? v : v.to_sql },
+            order:      order_values.map { |v| (v.is_a?(String) || v.is_a?(Symbol)) ? v : v.to_sql },
             bind:       bind_values.map { |b| {name: b.first.name, value: b.last} },
             limit:      limit_value,
             offset:     offset_value

data/lib/active_record/collections/delegation.rb

@@ -66,8 +66,8 @@ module ActiveRecord
       protected
 
       def call_on_records(meth, *args)
-        return batch_map do |batch|
-          if model.columns.map(&:name).include?(meth.to_s) && !batch.loaded?
+        return flat_batch_map do |batch|
+          if collectable.columns.map(&:name).include?(meth.to_s) && !batch.loaded?
             batch.pluck(meth)
           else
             batch.map { |record| record.send(meth, *args) }
@@ -76,8 +76,8 @@ module ActiveRecord
       end
 
       def records_respond_to?(meth, include_private=false)
-        model.public_instance_methods.include?(meth) ||
-        (include_private && model.private_instance_methods.include?(meth)) ||
+        collectable.public_instance_methods.include?(meth) ||
+        (include_private && collectable.private_instance_methods.include?(meth)) ||
         (!records.nil? && records.loaded? && records.first.respond_to?(meth, include_private))
       end
 

data/lib/active_record/collections/relation.rb

@@ -53,7 +53,6 @@ module ActiveRecord
       end
 
       def select!(*args)
-        #reset!
         @relation = relation.select(*args)
         self
       end
@@ -63,7 +62,6 @@ module ActiveRecord
       end
 
       def distinct!(bool=true)
-        #reset!
         @relation = relation.distinct(bool)
         self
       end
@@ -73,8 +71,7 @@ module ActiveRecord
       end
 
       def where!(*args, &block)
-        #reset!
-        relation.where!(*args, &block)
+        @relation = relation.where(*args, &block)
         self
       end
 
@@ -83,7 +80,6 @@ module ActiveRecord
       end
 
       def not!(*args, &block)
-        #reset!
         @relation = relation.where.not(*args, &block)
         self
       end
@@ -93,7 +89,6 @@ module ActiveRecord
       end
 
       def or!(*args, &block)
-        #reset!
         @relation = relation.or.where(*args, &block)
         self
       end
@@ -103,18 +98,25 @@ module ActiveRecord
       end
 
       def order!(*args, &block)
-        #reset!(false)
         relation.order!(*args, &block)
         self
       end
 
+      def group(*args)
+        dup.group!(*args)
+      end
+
+      def group!(*args)
+        @relation = relation.group(*args)
+        self
+      end
+
       def limit(*args, &block)
         dup.limit!(*args, &block)
       end
 
       def limit!(*args, &block)
-        #reset!
-        relation.limit!(*args, &block)
+        @relation = relation.limit(*args, &block)
         self
       end
 
@@ -123,8 +125,7 @@ module ActiveRecord
       end
 
       def offset!(*args, &block)
-        #reset!
-        relation.offset!(*args, &block)
+        @relation = relation.offset(*args, &block)
         self
       end
 
@@ -133,8 +134,7 @@ module ActiveRecord
       end
 
       def joins!(*args)
-        #reset!
-        relation.joins!(*args)
+        @relation = relation.joins(*args)
         self
       end
 
@@ -143,8 +143,7 @@ module ActiveRecord
       end
 
       def includes!(*args)
-        #reset!
-        relation.includes!(*args)
+        @relation = relation.includes(*args)
         self
       end
 
@@ -153,8 +152,7 @@ module ActiveRecord
       end
 
       def references!(*table_names)
-        #reset!
-        relation.references!(*table_names)
+        @relation = relation.references(*table_names)
         self
       end
 

data/lib/active_record/collections/serialization.rb

@@ -19,6 +19,7 @@ module ActiveRecord
           collection.references!(*hash[:references]) unless hash[:references].empty?
           collection.includes!(*hash[:includes]) unless hash[:includes].empty?
           collection.where!(*hash[:bind].map { |b| b[:value] }.unshift(hash[:where].join(" AND ").gsub(/\$\d/,'?'))) unless hash[:where].empty?
+          collection.group!(hash[:group]) unless hash[:group].empty?
           collection.order!(hash[:order]) unless hash[:order].empty?
           collection.limit!(hash[:limit]) unless hash[:limit].nil?
           collection.offset!(hash[:offset]) unless hash[:offset].nil?
@@ -38,7 +39,8 @@ module ActiveRecord
           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 },
+          group:      group_values.map { |v| (v.is_a?(String) || v.is_a?(Symbol)) ? v : v.to_sql },
+          order:      order_values.map { |v| (v.is_a?(String) || v.is_a?(Symbol)) ? v : v.to_sql },
           bind:       bind_values.map { |b| {name: b.first.name, value: b.last} }
         }
         if include_limit || try(:is_batch?)

data/lib/active_record/collections/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Collections
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord