passive_record 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291605bad255c42e5aeb6a91e58738cb4d0ac646
-  data.tar.gz: dbb92d140be813f5374c219d5eb37731d112f1e1
+  metadata.gz: 591c37c1582ed2d258fbbf7d3eea96f7c4de7f18
+  data.tar.gz: 701f18bb12ea8af351ead02b2f174d7d97600b01
 SHA512:
-  metadata.gz: 24297308bdad6a014e87126f7dcf7334d24ba87e0638bc6c97bf6189114f580918fb0bb47f6af8941f974ed07058562c5276940db40d8301c1c2f9bf5864ffe6
-  data.tar.gz: 23e3adc6f921481527447089a6bbb0af921bd5cde00ec051fd272595570e916a124bc184f80c02c972e65a35ae2e1f5c42e5ee11da2afaa87731e50d3daa1036
+  metadata.gz: ac2947495a7ab5167c060b406caef11a459be520e8816257f05fdeffbd4319315ead5ea55c42f02210d40ea6600bec2f1ad0d2b1d4979df0912d52969edc2f78
+  data.tar.gz: 99ec487dc69d34798e9a742cc0972d5ad868d95f2415e9112a878e7db42afc5ed9b6f42c551d859372dd0f329ded458b95dbef0b9b21873e9ed65c20066cb42a

data/README.md

@@ -85,7 +85,7 @@ PassiveRecord may be right for you!
     => [Dog (id: 1, child_id: 1)]
 ````
 
-## Interface
+## PassiveRecord API
 
   A class including PassiveRecord will gain the following new instance and class methods.
 
@@ -109,8 +109,6 @@ PassiveRecord may be right for you!
   - `User.descendants`
   - `User.destroy_all`
 
-## Relationships
-
 ### Belongs To
 
   A model `Child` which is declared `belongs_to :parent` will gain:
@@ -144,9 +142,9 @@ PassiveRecord may be right for you!
   - `parent.children.empty?`
   - `parent.children.where` (returns a `Core::Query`)
 
-### Explicit Relations
+### Relations
 
-  Parent models which declare `has_many :children` gain a `parent.children` instance that returns an explicit PassiveRecord relation object, which has the following public interface:
+  Parent models which declare `has_many :children` gain a `parent.children` instance that returns an explicit PassiveRecord relation object, which has the following public methods:
 
   - `parent.children.all`
   - `parent.children.each` enumerates over `parent.children.all`, giving `parent.children.count`, `parent.children.first`, etc.
@@ -157,13 +155,14 @@ PassiveRecord may be right for you!
 
 ### Queries
 
-  `Core::Query` objects acquired through `where` are chainable and have their own API.
+  `Core::Query` objects acquired through `where` are chainable, accept nested queries, and have the following public methods:
 
   - `where(conditions).all`
   - `where(conditions).each` enumerates over `where(conditions).all`, so we have `where(conditions).count`, `where(conditions).first`, etc.
   - `where(conditions).create(attrs)`
   - `where(conditions).first_or_create(attrs)`
   - `where(conditions).where(further_conditions)` (chaining)
+  - `where.not(conditions)` (negation)
 
 ## Hooks
 

data/lib/passive_record/core/query.rb

@@ -18,20 +18,17 @@ module PassiveRecord
 
       def all
         return [] unless conditions
-        klass.select do |instance|
-          conditions.all? 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
+        matching = method(:matching_instances)
+        klass.select(&matching)
       end
       def_delegators :all, :each
 
+      def matching_instances(instance)
+        conditions.all? do |(field,value)|
+          evaluate_condition(instance, field, value)
+        end
+      end
+
       def create(attrs={})
         klass.create(conditions.merge(attrs))
       end
@@ -49,11 +46,29 @@ module PassiveRecord
         @klass == other_query.klass && @conditions == other_query.conditions
       end
 
+      def method_missing(meth,*args,&blk)
+        if klass.methods.include?(meth)
+          klass.send(meth,*args,&blk)
+        else
+          super(meth,*args,&blk)
+        end
+      end
+
       protected
       def negated?
         false
       end
 
+      def evaluate_condition(instance, 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
+
       def evaluate_nested_conditions(instance, field, value)
         association = instance.send(field)
         association && value.all? do |(association_field,val)|
@@ -67,18 +82,9 @@ module PassiveRecord
     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
+      def matching_instances(instance)
+        conditions.none? do |(field,value)|
+          evaluate_condition(instance, field, value)
         end
       end
 

data/lib/passive_record/version.rb

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

data/spec/passive_record_spec.rb

@@ -187,6 +187,16 @@ describe "passive record models" do
             expect(Model.where.not(id: 'beta').first).to eq(model_a)
           end
         end
+
+        context 'queries with scopes' do
+          it 'should find using class method' do
+            post = Post.create(published_at: 10.days.ago)
+            another_post = Post.create(published_at: 2.days.ago)
+            expect(Post.recent).not_to include(post)
+            expect(Post.recent).to include(another_post)
+            expect(Post.where.not.recent).to include(another_post)
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -92,6 +92,10 @@ end
 class Post < Model
   has_many :comments 
   has_many :commenters, :through => :comments, :class_name => "User"
+
+  attr_accessor :published_at
+  before_create { @published_at = Time.now }
+  def self.recent; where(:published_at => 3.days.ago..Time.now) end
 end
 
 class User < Model

metadata

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