record_collection 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e447d692e69db528f32f29de1a0532b893b1e686
-  data.tar.gz: 06d7b54baeff7b9787328dcebe3e21b4c0e40d81
+  metadata.gz: c8fb416a4a6126f07276fd4293037396b32a7c71
+  data.tar.gz: c5890ee4024f4f22f96881d392ea08a64c526d77
 SHA512:
-  metadata.gz: de192342a3af0d2b7688b84ce772d073a211aca22577a4c02ff3ba2294c0bd167cd42936407b53ceb87fc04ca632074a688636c1bf4184d3dbfae299138174e1
-  data.tar.gz: 9b91e33a7a272c081dc69a0c0bd6a1bb7f3395c12e47f862db563d3792facdea73d84d6307ec2d4b1b97edf1e7cba4f31ac88587722a242159842d66dd042373
+  metadata.gz: 102e1dfc77bc9690ac28ad763a833d48c7ddf27bfb13863acfb7532c776e56599bb3e9e8ab87ad12946993a152f62aa1395c034eaa3bdf9c066246e58886ec96
+  data.tar.gz: 86a25cf562311ab9c2548a98560fd504c37ea66643205a51dbbff7e75802f16348a91e872430f53b088831ec1c72894c3c88333b245221941fc1c266fe4235b0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+2015-12-28 - v0.10.4
+--------------------
+### Added
+* Allow #find(ids) on collection instance that could be the result of a
+  `joins` or an `includes` scope setup call
+
 2015-12-26 - v0.10.3
 --------------------
 ### Added

data/lib/record_collection/base.rb

@@ -46,7 +46,7 @@ module RecordCollection
       alias_method :old_validates, :validates
       def validates(attr, options)
         # Collection nil attributes mean they do not play a role for the collection.
-        # So validating when the value is nil is not the default behaviour. I to be turned on explicitly
+        # So validating when the value is nil is not the default behaviour. I to be used explicitly
         # by specifying allow_nil: false
         options[:allow_nil] = true unless options.has_key?(:allow_nil)
         old_validates attr, options
@@ -63,23 +63,15 @@ module RecordCollection
         self.new(collection)
       end
 
-      # Create a new collection with the scope set to the result of the query on the record_class
-      def where(*args)
-        self.new(record_class.where(*args))
-      end
-
-      # Create a new collection with the scope set to the result of the query on the record_class
-      def joins(*args)
-        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))
+      # instantiate a new instance of the collection with the
+      # scope set to the received argument:
+      #   Collection.joins(:project).where(projects: {state: 'active'})
+      # The joins returns the instance, the second where is handled by
+      # the instance itself as an instance delegate method
+      %i[where joins includes all].each do |delegate_method|
+        define_method delegate_method do |*args|
+          self.new(record_class.public_send(delegate_method, *args))
+        end
       end
     end
 
@@ -143,7 +135,7 @@ module RecordCollection
     end
 
     def persisted?
-      # Behave like an update in forms, this triggers plural routes
+      # Behave like a non persisted record in forms, this triggers plural (collection) routes
       false
     end
 
@@ -200,27 +192,17 @@ module RecordCollection
       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
+    # delegate methods to the collection returning self
+    %i[joins includes where not].each do |delegate_method|
+      define_method delegate_method do |*args|
+        @collection = @collection.public_send(delegate_method, *args)
+        self
+      end
     end
 
-    # update existing scope with new one having applied not clause if possible
-    def not(*args)
-      @collection = @collection.not(*args)
+    def find(ids)
+      ids = ids.split(RecordCollection.ids_separator) if ids.is_a?(String)
+      @collection = @collection.find(Array.wrap(ids))
       self
     end
   end

data/lib/record_collection/version.rb

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

data/spec/base/finding_records_spec.rb

@@ -23,6 +23,26 @@ RSpec.describe Employee::Collection do
         employee2 = Employee.create name: 'E2', section: 'QNP', admin: false, vegan: false
         described_class.find([employee1.id, employee2.id]).collection.should match_array [employee1, employee2]
       end
+
+      it "works with an includes statement (find on instance)" do
+        employee1 = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+        described_class.includes(:project).find([employee1.id]).should be_a RecordCollection::Base
+      end
+
+      it "works with an includes statement (find on instance) and string argument" do
+        employee1 = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+        employee2 = Employee.create name: 'E2', section: 'QNP', admin: false, vegan: false
+        result = described_class.includes(:project).find("#{employee1.id}~#{employee2.id}")
+        result.should be_a RecordCollection::Base
+        result.collection.should match_array [employee1, employee2]
+      end
+
+      it "works with an includes statement (find on instance) and integer id argument" do
+        employee1 = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+        result = described_class.includes(:project).find(employee1.id)
+        result.should be_a RecordCollection::Base
+        result.collection.should eq [employee1]
+      end
     end
 
     it "finds single id as string as collection" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler