passive_record 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591c37c1582ed2d258fbbf7d3eea96f7c4de7f18
-  data.tar.gz: 701f18bb12ea8af351ead02b2f174d7d97600b01
+  metadata.gz: fc8b97dbc45fa4523ccd68e4ab1fcd5e8cb7a195
+  data.tar.gz: 6213a7c2a314d2b6231d56708cd189fc4cc33d82
 SHA512:
-  metadata.gz: ac2947495a7ab5167c060b406caef11a459be520e8816257f05fdeffbd4319315ead5ea55c42f02210d40ea6600bec2f1ad0d2b1d4979df0912d52969edc2f78
-  data.tar.gz: 99ec487dc69d34798e9a742cc0972d5ad868d95f2415e9112a878e7db42afc5ed9b6f42c551d859372dd0f329ded458b95dbef0b9b21873e9ed65c20066cb42a
+  metadata.gz: 9ef69a79461f22a4d8f633996b7783d29eca541f448638087e57015f2513df998c24ca5208bf6cb9b46f254e0c582b27b6edc60cfdf2568830193969868f030a
+  data.tar.gz: 29506381b9effa9c5e2864e2ddb48137a6b3d716c39aa754ea3e8d16071e83b28331f353012728315bda8f1793bfba12d0365d2e2925bf95509e4cff8a156b58

data/README.md

@@ -140,7 +140,7 @@ PassiveRecord may be right for you!
   - `parent.children<<` (insert a related model)
   - `parent.children.all?(&predicate)`
   - `parent.children.empty?`
-  - `parent.children.where` (returns a `Core::Query`)
+  - `parent.children.where(conditions)` (returns a `Core::Query`)
 
 ### Relations
 
@@ -155,7 +155,7 @@ PassiveRecord may be right for you!
 
 ### Queries
 
-  `Core::Query` objects acquired through `where` are chainable, accept nested queries, and have the following public methods:
+  `Core::Query` objects acquired through `where` are chainable, accept nested queries and scopes, 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.
@@ -163,6 +163,7 @@ PassiveRecord may be right for you!
   - `where(conditions).first_or_create(attrs)`
   - `where(conditions).where(further_conditions)` (chaining)
   - `where.not(conditions)` (negation)
+  - `where.scope` (scoping with model class methods that return a query)
 
 ## Hooks
 

data/lib/passive_record/core/query.rb

@@ -9,7 +9,7 @@ module PassiveRecord
       def initialize(klass,conditions={})
         @klass = klass
         @conditions = conditions
-        @subqueries = []
+        @scope = nil
       end
 
       def not(conditions={})
@@ -19,7 +19,15 @@ module PassiveRecord
       def all
         return [] unless conditions
         matching = method(:matching_instances)
-        klass.select(&matching)
+        if @scope
+          if negated?
+            klass.reject(&@scope.method(:matching_instances))
+          else
+            klass.select(&@scope.method(:matching_instances))
+          end
+        else
+          klass.select(&matching)
+        end
       end
       def_delegators :all, :each
 
@@ -46,19 +54,22 @@ module PassiveRecord
         @klass == other_query.klass && @conditions == other_query.conditions
       end
 
+      def negated?
+        false
+      end
+
       def method_missing(meth,*args,&blk)
         if klass.methods.include?(meth)
-          klass.send(meth,*args,&blk)
+          # okay, so this thing is a query
+          # and we need to 'compose' with it somehow
+          @scope = klass.send(meth,*args,&blk)
+          self
         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)

data/lib/passive_record/version.rb

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

data/spec/passive_record_spec.rb

@@ -48,7 +48,7 @@ describe "passive record models" do
           child.dogs << dog
           expect(dog.inspect).to eq("Family::Dog (id: #{dog.id.inspect}, breed: \"#{dog.breed}\", created_at: #{dog.created_at}, sound: \"bark\", child_id: #{child.id.inspect})")
 
-          expect(child.inspect).to eq("Family::Child (id: #{child.id.inspect}, created_at: #{dog.created_at}, name: \"Alice\", toy_id: nil, dog_ids: [#{dog.id.inspect}], parent_id: nil)")
+          expect(child.inspect).to eq("Family::Child (id: #{child.id.inspect}, created_at: #{child.created_at}, name: \"Alice\", toy_id: nil, dog_ids: [#{dog.id.inspect}], parent_id: nil)")
         end
       end
 
@@ -189,12 +189,29 @@ describe "passive record models" do
         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)
+          let(:post) { Post.create(published_at: 10.days.ago) }
+          let(:another_post) {Post.create(published_at: 2.days.ago)}
+
+          describe 'should restrict using class method' do
+            it 'should use a class method as a scope' do
+              expect(Post.recent).not_to include(post)
+              expect(Post.recent).to include(another_post)
+            end
+
+            it 'should negate a nullary scope' do
+              expect(Post.where.not.recent).to include(post)
+              expect(Post.where.not.recent).not_to include(another_post)
+            end
+
+            it 'should use a class method with an argument as a scope' do
+              expect(Post.where.published_within_days(3)).not_to include(post)
+              expect(Post.where.published_within_days(3)).to include(another_post)
+            end
+
+            it 'should negate a scope with an argument' do
+              expect(Post.where.not.published_within_days(3)).to include(post)
+              expect(Post.where.not.published_within_days(3)).not_to include(another_post)
+            end
           end
         end
       end

data/spec/spec_helper.rb

@@ -87,7 +87,7 @@ class Role < Model
   has_and_belongs_to_many :users
 end
 
-### 
+###
 
 class Post < Model
   has_many :comments 
@@ -95,7 +95,14 @@ class Post < Model
 
   attr_accessor :published_at
   before_create { @published_at = Time.now }
-  def self.recent; where(:published_at => 3.days.ago..Time.now) end
+
+  def self.recent
+    where(:published_at => 3.days.ago..Time.now) 
+  end
+
+  def self.published_within_days(n)
+    where(:published_at => n.days.ago..Time.now) 
+  end
 end
 
 class User < Model

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport