record_collection 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f4c9e834f83c68f653fb61a5e6cc6d64de93b9d
-  data.tar.gz: 63b955eabed631e5d677fd1208f30385a3ab9db5
+  metadata.gz: 6d474fd59cf658f40154411ed1921864f724ef16
+  data.tar.gz: 5a1ab9d2d6215fa356a6a1ab492c8eb46b5ec1ff
 SHA512:
-  metadata.gz: 611ccedfb1c6ed704e081fc8fcdb449373cdb0455f906a3cadd467f32c46bc27c3d9fb1397783d2e8c3670442d6e73d537970cb872d15a815d6a8ea11274d964
-  data.tar.gz: 5281731609ff8f44033a093715599bc19769d84069aa5633f627c2c19de7bcbe8c937f111937e88263a5df655279883876856a187fce3cc0384f0c990f97f71b
+  metadata.gz: a823124e2cc13030e85249442d9ba357098e42fe2e6f006b0abf6b1210faf4a3483175cb7cc673a5b36a7f17e42f3c4d9e2790bf3dc936000bc641f4a506e57f
+  data.tar.gz: a5efd9d8bb02240dbd0ed7c14c296a61ef9e5c63d8f70a085b67a33d2d120628e7d1416c2240c8372f3e764cf227284b32c1ce500fba27be70dfaf719eb81975

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
   - 2.1.6
-  - 2.2.2
+  - 2.2.3
 env:
-  - RAILS_VERSION=4.1.12
-  - RAILS_VERSION=4.2.3
-  #- RAILS_VERSION=master
+  - RAILS_VERSION=4.1.14
+  - RAILS_VERSION=4.2.5
+  - RAILS_VERSION=master
 addons:
   code_climate:
     repo_token: 22819b10ef9110a7fef884ab105239fc16fd0562ac79ae54c2204b5e07343919

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 CHANGELOG
 =========
 
+2015-12-15 - v0.9.2
+-------------------
+
+### Added
+#### Allow initialize with multiple chaning scope
+```
+Employee::Collection.where(a: 1).where(b: 3)
+Employee::Collection.where(a: 1).where.not(b: 3)
+```
+
+2015-12-09 - v0.9.1
+-------------------
+
+### Added
+* Use string separator argument like: RecordCollection.id\_separator
+
 2015-11-03 - v0.9.0
 -------------------
 

data/lib/record_collection/base.rb

@@ -65,11 +65,16 @@ module RecordCollection
 
       # Create a new collection with the scope set to the result of the query on the record_class
       def where(*args)
-        new record_class.where(*args)
+        self.new(record_class.where(*args))
       end
 
-      def all
-        new record_class.all
+      # 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
+
+      def all(*args)
+        self.new(record_class.all(*args))
       end
     end
 
@@ -144,7 +149,7 @@ module RecordCollection
     # This method returns nil when the values of `attr` in the collection
     # are mixed. Otherwise the value itself. For boolean attributes the
     # check is wether the values are truthy or falsy. If the
-    #   set_if_nil: true 
+    #   set_if_nil: true
     # option is given, a uniform value will be set as the collection value if
     # it is not already set. This is important since there might be a uniform
     # value in the collection, but the values of the collection are a result of
@@ -173,5 +178,17 @@ module RecordCollection
     def model_name
       self.class.model_name
     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 not clause if possible
+    def not(*args)
+      @collection = @collection.not(*args)
+      self
+    end
   end
 end

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/base/finding_records_spec.rb

@@ -51,4 +51,28 @@ RSpec.describe Employee::Collection do
       described_class.all.collection.should eq [employee]
     end
   end
+
+  describe '.joins' do
+    let(:project_1){ Project.create name: 'P1', finished: true }
+    let(:project_2){ Project.create name: 'P2', finished: false }
+    let!(:employee_1){ Employee.create name: 'E1', section: 'ABC', project: project_1 }
+    let!(:employee_2){ Employee.create name: 'E1', section: 'ABC', project: project_2 }
+    it "returns a scope having a joins activated without further arguments" do
+      result = described_class.joins(:project)
+      result.should be_a RecordCollection::Base
+      result.map(&:project).should match_array [project_1, project_2]
+    end
+
+    it "modifies the scope when a .where clause is applied on an existing relation" do
+      result = described_class.joins(:project).where(projects: {finished: true})
+      result.should be_a RecordCollection::Base
+      result.map(&:project).should eq [project_1]
+    end
+
+    it "modifies the scope when a .where.not clause is applied on an existing relation" do
+      result = described_class.joins(:project).where.not(projects: {finished: true})
+      result.should be_a RecordCollection::Base
+      result.map(&:project).should eq [project_2]
+    end
+  end
 end

data/spec/dummy/app/models/employee.rb

@@ -1,2 +1,3 @@
 class Employee < ActiveRecord::Base
+  belongs_to :project
 end

data/spec/dummy/app/models/project.rb

@@ -1,2 +1,3 @@
 class Project < ActiveRecord::Base
+  has_many :employees
 end

data/spec/dummy/db/migrate/20151215123553_add_project_id_to_employees.rb

@@ -0,0 +1,5 @@
+class AddProjectIdToEmployees < ActiveRecord::Migration
+  def change
+    add_column :employees, :project_id, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150721122805) do
+ActiveRecord::Schema.define(version: 20151215123553) do
 
   create_table "employees", force: :cascade do |t|
     t.string   "name"
@@ -20,6 +20,7 @@ ActiveRecord::Schema.define(version: 20150721122805) do
     t.datetime "updated_at",                 null: false
     t.boolean  "vegan",      default: true
     t.boolean  "admin",      default: false
+    t.integer  "project_id"
   end
 
   create_table "projects", force: :cascade do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -474,6 +474,7 @@ files:
 - spec/dummy/db/migrate/20150204103925_add_admin_to_employees.rb
 - spec/dummy/db/migrate/20150204125014_create_projects.rb
 - spec/dummy/db/migrate/20150721122805_add_description_to_projects.rb
+- spec/dummy/db/migrate/20151215123553_add_project_id_to_employees.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -594,6 +595,7 @@ test_files:
 - spec/dummy/db/migrate/20150204103925_add_admin_to_employees.rb
 - spec/dummy/db/migrate/20150204125014_create_projects.rb
 - spec/dummy/db/migrate/20150721122805_add_description_to_projects.rb
+- spec/dummy/db/migrate/20151215123553_add_project_id_to_employees.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep