activerecord-collections 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48403614a6f714267ffc6a749d2318a94a246987
-  data.tar.gz: 6658db0230f63496689196fe2da3d98dc58d733e
+  metadata.gz: 94403cc736dd576a2be4ca9e465eb22766bf8890
+  data.tar.gz: 0ebfc8a5da14a0f36fb9a5bfb262725f92ff0bb6
 SHA512:
-  metadata.gz: b2a5163e7d978ec2e4814b6d1e253436f30882487774370501a4f0ea43a9ccebcd6481e7fa5ceccd196d92a85e2e44605b50fecdbfb767d6a2df2a7790878f02
-  data.tar.gz: ba491d965bfd9e90dd454b76bd7d20bebf95e953fba635110111d73f58ca7866f9f20a69126b8b2c4be90f70a08c9032492631f5f0f40acde3e61144603b1d97
+  metadata.gz: ab2f87844ce73790ca91a9c74231f3f4adbbfb1bd958f67b5fe2a0ab36e84fef9c1f23f78583c1b4f5a29f3a9dab152ac0f85a142a847299f6cc95bc3514467e
+  data.tar.gz: f9bf87d4ca6d010c642b77c31383e865438f2b7a0c00d87fb4f8f20f3b81bd8ac2ee405a2c44a96d3e11e410fb720b963828bc02ee6174bd18e0cdbb42277bd7

data/lib/active_record/collections/collectable.rb

@@ -0,0 +1,34 @@
+module ActiveRecord
+  module Collections
+    module Collectable
+      module Model
+        def collection(*criteria)
+          ActiveRecord::Collection.new(self, *criteria)
+        end
+        alias_method :collect, :collection
+      end
+
+      module Relation
+        def collection
+          ActiveRecord::Collection.from_hash({
+            klass:      klass,
+            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} },
+            limit:      limit_value,
+            offset:     offset_value
+          })
+        end
+        alias_method :collect, :collection
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :extend, ActiveRecord::Collections::Collectable::Model
+ActiveRecord::Relation.send :include, ActiveRecord::Collections::Collectable::Relation

data/lib/active_record/collections/serialization.rb

@@ -12,7 +12,7 @@ module ActiveRecord
 
         def from_hash(hash)
           hash.symbolize_keys!
-          collection = new
+          collection = new(hash[:klass])
           collection.select!(*hash[:select]) unless hash[:select].empty?
           collection.distinct! if hash[:distinct] == true
           collection.joins!(*hash[:joins]) unless hash[:joins].empty?
@@ -20,8 +20,8 @@ module ActiveRecord
           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.order!(hash[:order]) unless hash[:order].empty?
-          collection.limit!(hash[:limit]) unless hash[:limit].empty?
-          collection.offset!(hash[:offset]) unless hash[:offset].empty?
+          collection.limit!(hash[:limit]) unless hash[:limit].nil?
+          collection.offset!(hash[:offset]) unless hash[:offset].nil?
           collection
         end
       end

data/lib/active_record/collections/version.rb

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

data/lib/activerecord-collections.rb

@@ -4,4 +4,4 @@ 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'
+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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mark Rebec
@@ -105,8 +105,8 @@ extra_rdoc_files: []
 files:
 - lib/active_record/collection.rb
 - lib/active_record/collections/batching.rb
+- lib/active_record/collections/collectable.rb
 - lib/active_record/collections/delegation.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

data/lib/active_record/collections/model_collection.rb

@@ -1,18 +0,0 @@
-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