passive_record 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50c7310ba09f037ee279f9ee0fb42cadb875c7b8
-  data.tar.gz: 6d61cec9dca1338c117a996fa2330580e66861b4
+  metadata.gz: 7f039ca57502dbf0119be19278464cfc7cae14ab
+  data.tar.gz: 414f80e091cf917d897fd89fd28902c6f2563398
 SHA512:
-  metadata.gz: 7422229e4baeac8309309ab02e043a1bda67ecdec36be394eea4ec29ad5c25dc21eeda9384c5f3e6b46120a3f28cfe36a81e350050596ce9f8d846e093d61fc9
-  data.tar.gz: ef897faa83e6699f666f46c29334045ae1962ebe071ac87a19efbf840c9b3716d2c0e6ea176ec4b868f9d007dab8d0d75796a3c344538a714aa548fb6d7e26cd
+  metadata.gz: 24ce6d75265f9edf97ecf7aa55bb1e4d10f4deed2c7452c0f08758d5890db1bb12fd6369709e7ef06f6ac5bd66df1097ac64a7ca580bf1b5fffbba2bbd1f384b
+  data.tar.gz: 1f25bb2ec4160669a6332da359410a7f1f8fc0359bb175189f54fd4b84139d61565f92e74bc6e0640f220abda45b01905df3cb16296f44af73e33e92fa00099b

data/lib/passive_record/core/query.rb

@@ -40,21 +40,19 @@ module PassiveRecord
         if @scope
           matching = @scope.method(:matching_instances)
           if negated?
-            @klass.all.each do |instance| #reject(&matching)
+            @klass.all.each do |instance|
               yield instance unless matching[instance]
             end
           else
             @klass.all.each do |instance|
               yield instance if matching[instance]
             end
-            # @klass.select(&matching)
           end
         else
           matching = method(:matching_instances)
           @klass.all.each do |instance|
             yield instance if matching[instance]
           end
-          # @klass.select(&matching)
         end
       end
 
@@ -152,14 +150,15 @@ module PassiveRecord
     end
 
     class DisjoinedQuery < Query
-      def initialize(klass, first_query, second_query)
+      def initialize(klass, first_query, second_query, conditions={})
         @klass = klass
         @first_query = first_query
         @second_query = second_query
+        @conditions = conditions
       end
 
       def all
-        (@first_query.all + @second_query.all).uniq
+        (@first_query.where(conditions).all + @second_query.where(conditions).all).uniq
       end
 
       def disjoined?
@@ -168,18 +167,15 @@ module PassiveRecord
     end
 
     class ConjoinedQuery < Query
-      def initialize(klass, first_query, second_query)
+      def initialize(klass, first_query, second_query, conditions={})
         @klass = klass
         @first_query = first_query
         @second_query = second_query
+        @conditions = conditions
       end
 
       def all
-        @first_query.all & @second_query.all
-      end
-
-      def where(new_conditions={})
-        @first_query.where(new_conditions)
+        @first_query.where(conditions).all & @second_query.all
       end
 
       def conjoined?

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/passive_record_spec.rb

@@ -19,7 +19,7 @@ end
 describe "passive record models" do
   before(:each) { PassiveRecord.drop_all }
 
-  context "with a simple model including PR" do
+  context "a simple model including PR" do
     let!(:model) { SimpleModel.create(foo: value) }
     let(:value) { 'foo_value' }
 
@@ -72,6 +72,7 @@ describe "passive record models" do
       describe "#id" do
         it 'should be retrievable by id' do
           expect(SimpleModel.find_by(model.id)).to eq(model)
+          expect(SimpleModel.find(model.id)).to eq(model)
         end
       end
     end
@@ -216,17 +217,35 @@ describe "passive record models" do
         end
 
         context 'queries with disjunctions' do
+          let(:poms_or_pugs) do
+            Family::Dog.
+              where(breed: 'pom').or(Family::Dog.where(breed: 'pug'))
+          end
+
+          let(:poms_or_small_dogs) do
+            Family::Dog.
+              where(breed: 'pom').or(Family::Dog.where(size: %w[ tiny small ]))
+          end
+
+          before do
+            @pom = Family::Dog.create(breed: 'pom', size: 'tiny')
+            @pug = Family::Dog.create(breed: 'pug', size: 'big')
+
+            Family::Dog.create(breed: 'mutt', size: 'medium')
+            Family::Dog.create(breed: 'lab', size: 'large')
+
+            @pap = Family::Dog.create(breed: 'papillon', size: 'small')
+          end
+
           it 'should find where attributes match EITHER query' do
-            pom = Family::Dog.create breed: 'pom'
-            pug = Family::Dog.create breed: 'pug'
-            Family::Dog.create breed: 'mutt'
-            Family::Dog.create breed: 'lab'
-            Family::Dog.create breed: 'papillon'
+            expect(poms_or_pugs.all).to eq([@pom, @pug])
+            expect(poms_or_small_dogs.all).to eq([@pom, @pap])
+          end
 
+          it 'should be able to refine a disjunction' do
             expect(
-              Family::Dog.
-                where(breed: 'pom').or(Family::Dog.where(breed: 'pug')).all
-            ).to eq([pom, pug])
+              poms_or_pugs.where(size: %w[ tiny small ]).all
+            ).to eq([@pom])
           end
         end
 

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ end
 module Family
   class Dog < Model
     attr_reader :sound
-    attr_accessor :breed
+    attr_accessor :breed, :size
     belongs_to :child
     before_create { @breed = %w[pom pug].sample }
     after_create { @sound = 'bark' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Joseph Weissman