record_collection 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcab48b2d629719112ad1018b7db7ae7af101fdc
-  data.tar.gz: 08acdff4c80ebd73341af33e17906a50ed9fff6c
+  metadata.gz: e447d692e69db528f32f29de1a0532b893b1e686
+  data.tar.gz: 06d7b54baeff7b9787328dcebe3e21b4c0e40d81
 SHA512:
-  metadata.gz: 56ca6b536b3dd12d31e34f1f647815180e871e9a1890e1c67d1c7b4d186378ee060d29a0d445adcaa14ca8c4ae77609abeeba8f62a3d79b2993e8d865c0b3ba6
-  data.tar.gz: a90ba75c5683a66f1294ad818df6485091df90a45fe8658d02aa9e470177b0d7b2ab9e8402337c2713b92bb58fb2689a57973bf47d5c4952554ae2cafbab1bf0
+  metadata.gz: de192342a3af0d2b7688b84ce772d073a211aca22577a4c02ff3ba2294c0bd167cd42936407b53ceb87fc04ca632074a688636c1bf4184d3dbfae299138174e1
+  data.tar.gz: 9b91e33a7a272c081dc69a0c0bd6a1bb7f3395c12e47f862db563d3792facdea73d84d6307ec2d4b1b97edf1e7cba4f31ac88587722a242159842d66dd042373

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 CHANGELOG
 =========
 
+2015-12-26 - v0.10.3
+--------------------
+### Added
+#### Add includes option for initializing a collection
+```
+  employees = Employee::Collection.includes(:project).where(state: 'active')
+  employee.map(&:project) #=> one query
+```
+
+####
+Add `#refine_relation` option to refine the collection by means of a
+scope or include
+```
+  class Employee
+    def self.with_project
+      includes(:project)
+    end
+  end
+  employees = Employee::Collection.where(state: 'active')
+  employees.refine_relation{ with_project } #=> collection object with refined ActiveRecord relation object if it is instantiated as such
+```
+
 2015-12-26 - v0.10.2
 --------------------
 ### Added

data/lib/record_collection/base.rb

@@ -73,6 +73,11 @@ module RecordCollection
         self.new(record_class.joins(*args))
       end
 
+      # Create a new collection with the scope set to the result of the query on the record_class
+      def includes(*args)
+        self.new(record_class.includes(*args))
+      end
+
       def all(*args)
         self.new(record_class.all(*args))
       end
@@ -188,12 +193,31 @@ module RecordCollection
       self.class.model_name
     end
 
+    def refine_relation(&blk)
+      return self unless defined?(ActiveRecord::Relation)
+      return self unless @collection.is_a?(ActiveRecord::Relation)
+      @collection = @collection.instance_eval(&blk)
+      self
+    end
+
     # update existing scope with new one having applied where clause if possible
     def where(*args)
       @collection = @collection.where(*args)
       self
     end
 
+    # update existing scope with new one having applied joins clause if possible
+    def joins(*args)
+      @collection = @collection.joins(*args)
+      self
+    end
+
+    # update existing scope with new one having applied includes clause if possible
+    def includes(*args)
+      @collection = @collection.includes(*args)
+      self
+    end
+
     # update existing scope with new one having applied not clause if possible
     def not(*args)
       @collection = @collection.not(*args)

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/spec/base/refine_relation_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+RSpec.describe RecordCollection::Base do
+  describe '#refine_relation' do
+    it "does not blow up when array and not ActiveRecord::Relation is given" do
+      expect{ described_class.new([]).refine_relation }.not_to raise_error
+      described_class.new([]).refine_relation{ }.should be_a described_class
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Benjamin ter Kuile
@@ -434,6 +434,7 @@ files:
 - spec/base/behaviour_spec.rb
 - spec/base/finding_records_spec.rb
 - spec/base/inheritance_spec.rb
+- spec/base/refine_relation_spec.rb
 - spec/base/validations_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -559,6 +560,7 @@ test_files:
 - spec/base/behaviour_spec.rb
 - spec/base/finding_records_spec.rb
 - spec/base/inheritance_spec.rb
+- spec/base/refine_relation_spec.rb
 - spec/base/validations_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile