passive_record 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a1452f744235927c24058ecabbe3e0314a21f6
-  data.tar.gz: e62c71b8af66ad7e22ce0d9ecae97d2c5b541ac1
+  metadata.gz: 291605bad255c42e5aeb6a91e58738cb4d0ac646
+  data.tar.gz: dbb92d140be813f5374c219d5eb37731d112f1e1
 SHA512:
-  metadata.gz: e00bbcd3a411a87b31937a7bba75268568c451ca78b645da61e818e6fa27ddc269e25fc9a951bd087b620995c739d396c436301518fffc97ac7dac6d060a7662
-  data.tar.gz: 426d3d9ec2026ac6a10c53ffac4d6ef35e5f919c3e5019faf9e676233c687b5320a2f35e8561e1722a78961169c6783e7652920621751218dfc6bfb300a834a3
+  metadata.gz: 24297308bdad6a014e87126f7dcf7334d24ba87e0638bc6c97bf6189114f580918fb0bb47f6af8941f974ed07058562c5276940db40d8301c1c2f9bf5864ffe6
+  data.tar.gz: 23e3adc6f921481527447089a6bbb0af921bd5cde00ec051fd272595570e916a124bc184f80c02c972e65a35ae2e1f5c42e5ee11da2afaa87731e50d3daa1036

data/lib/passive_record/class_methods.rb

@@ -45,7 +45,7 @@ module PassiveRecord
       end
     end
 
-    def where(conditions)
+    def where(conditions={})
       Query.new(self, conditions)
     end
 

data/lib/passive_record/core/query.rb

@@ -9,6 +9,11 @@ module PassiveRecord
       def initialize(klass,conditions={})
         @klass = klass
         @conditions = conditions
+        @subqueries = []
+      end
+
+      def not(conditions={})
+        NegatedQuery.new(@klass, conditions)
       end
 
       def all
@@ -45,6 +50,10 @@ module PassiveRecord
       end
 
       protected
+      def negated?
+        false
+      end
+
       def evaluate_nested_conditions(instance, field, value)
         association = instance.send(field)
         association && value.all? do |(association_field,val)|
@@ -56,5 +65,26 @@ module PassiveRecord
         end
       end
     end
+
+    class NegatedQuery < Query
+      def all
+        return [] unless conditions
+        klass.select do |instance|
+          conditions.none? do |(field,value)|
+            if value.is_a?(Hash)
+              evaluate_nested_conditions(instance, field, value)
+            elsif value.is_a?(Range) || value.is_a?(Array)
+              value.include?(instance.send(field))
+            else
+              instance.send(field) == value
+            end
+          end
+        end
+      end
+
+      def negated?
+        true
+      end
+    end
   end
 end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/passive_record_spec.rb

@@ -176,7 +176,16 @@ describe "passive record models" do
             Model.create(id: 12)
             expect(Model.find_all_by(id: [10,11])).to eq([model_a, model_b])
           end
+        end
+
+        context 'queries with negations' do
+          it 'should find where attribute value is NOT equal' do
+            model_a = Model.create(id: 'alpha')
+            model_b = Model.create(id: 'beta')
 
+            expect(Model.where.not(id: 'alpha').first).to eq(model_b)
+            expect(Model.where.not(id: 'beta').first).to eq(model_a)
+          end
         end
       end
     end

metadata

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