mongoid 1.0.1 → 1.0.2

data/HISTORY

@@ -1,3 +1,17 @@
+=== 1.0.2
+- Named scopes get added functionality:
+
+  - named scopes can now be criteria objects.
+
+  - named scoped can now be procs with criteria.
+
+  - named scopes and class methods that return
+    criteria can be chained with each other.
+
+- When calling save on an embedded document whose
+  validation passes but the parent's validation
+  fails, it will properly return false.
+
 === 1.0.1
 - Documents now have named_scopes similar to
   ActiveRecord named scopes. Please see rdoc or

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/mongoid.rb

@@ -45,14 +45,15 @@ require "mongoid/commands"
 require "mongoid/config"
 require "mongoid/complex_criterion"
 require "mongoid/criteria"
-require "mongoid/named_scopes"
 require "mongoid/extensions"
 require "mongoid/errors"
-require "mongoid/fields/field"
+require "mongoid/field"
 require "mongoid/fields"
 require "mongoid/finders"
 require "mongoid/indexes"
 require "mongoid/memoization"
+require "mongoid/named_scope"
+require "mongoid/scope"
 require "mongoid/timestamps"
 require "mongoid/versioning"
 require "mongoid/components"

data/lib/mongoid/commands/save.rb

@@ -15,9 +15,12 @@ module Mongoid #:nodoc:
         doc.run_callbacks :before_save
         parent = doc._parent
         doc.new_record = false
-        parent ? Save.execute(parent) : doc.collection.save(doc.attributes)
-        doc.run_callbacks :after_save
-        return true
+        if parent ? Save.execute(parent, validate) : doc.collection.save(doc.attributes)
+          doc.run_callbacks :after_save
+          return true
+        else
+          return false
+        end
       end
     end
   end

data/lib/mongoid/components.rb

@@ -15,7 +15,7 @@ module Mongoid #:nodoc
         include Observable
         include Validatable
         extend Finders
-        extend NamedScopes
+        extend NamedScope
       end
     end
   end

data/lib/mongoid/criteria.rb

@@ -103,7 +103,7 @@ module Mongoid #:nodoc:
       @count ||= @klass.collection.find(@selector, process_options).count
     end
 
-    # Translate the supplied argument hash
+    # Merges the supplied argument hash into a single criteria
     #
     # Options:
     #
@@ -111,10 +111,10 @@ module Mongoid #:nodoc:
     #
     # Example:
     #
-    # <tt>criteria.translate(:where => { :field => "value"}, :limit => 20)</tt>
+    # <tt>criteria.fuse(:where => { :field => "value"}, :limit => 20)</tt>
     #
     # Returns <tt>self</tt>
-    def criteria(criteria_conditions = {})
+    def fuse(criteria_conditions = {})
       criteria_conditions.inject(self) do |criteria, (key, value)|
         criteria.send(key, value)
       end
@@ -453,6 +453,12 @@ module Mongoid #:nodoc:
       (@options[:limit] || 20).to_i
     end
 
+    # Returns the selector and options as a +Hash+ that would be passed to a
+    # scope for use with named scopes.
+    def scoped
+      { :where => @selector }.merge(@options)
+    end
+
     # Adds a criterion to the +Criteria+ that specifies how many results to skip
     # when returning Documents. This is mostly used in conjunction with
     # <tt>limit()</tt> to handle paginated results, and is similar to the

data/lib/mongoid/extensions.rb

@@ -11,9 +11,11 @@ require "mongoid/extensions/hash/accessors"
 require "mongoid/extensions/hash/assimilation"
 require "mongoid/extensions/hash/conversions"
 require "mongoid/extensions/hash/criteria_helpers"
+require "mongoid/extensions/hash/scoping"
 require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/nil/assimilation"
 require "mongoid/extensions/object/conversions"
+require "mongoid/extensions/proc/scoping"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
@@ -46,6 +48,7 @@ class Hash #:nodoc
   include Mongoid::Extensions::Hash::Accessors
   include Mongoid::Extensions::Hash::Assimilation
   include Mongoid::Extensions::Hash::CriteriaHelpers
+  include Mongoid::Extensions::Hash::Scoping
   extend Mongoid::Extensions::Hash::Conversions
 end
 
@@ -61,6 +64,10 @@ class Object #:nodoc:
   include Mongoid::Extensions::Object::Conversions
 end
 
+class Proc #:nodoc:
+  include Mongoid::Extensions::Proc::Scoping
+end
+
 class String #:nodoc
   include Mongoid::Extensions::String::Inflections
   extend Mongoid::Extensions::String::Conversions

data/lib/mongoid/extensions/hash/scoping.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Hash #:nodoc:
+      module Scoping #:nodoc:
+        def scoped(*args)
+          self
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/proc/scoping.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Proc #:nodoc:
+      module Scoping #:nodoc:
+        def scoped(*args)
+          call(*args).scoped
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/named_scope.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module NamedScope
+    # Creates a named_scope for the +Document+, similar to ActiveRecord's
+    # named_scopes. +NamedScopes+ are proxied +Criteria+ objects that can be
+    # chained.
+    #
+    # Example:
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     field :active, :type => Boolean
+    #     field :count, :type => Integer
+    #
+    #     named_scope :active, :where => { :active => true }
+    #     named_scope :count_gt_one, :where => { :count.gt => 1 }
+    #     named_scope :at_least_count, lambda { |count| { :where => { :count.gt => count } } }
+    #   end
+    def named_scope(name, options = {}, &block)
+      name = name.to_sym
+      scopes[name] = lambda do |parent, *args|
+        Scope.new(parent, options.scoped(*args), &block)
+      end
+      (class << self; self; end).class_eval <<-EOT
+        def #{name}(*args)
+          scopes[:#{name}].call(self, *args)
+        end
+      EOT
+    end
+
+    # Return the scopes or default to an empty +Hash+.
+    def scopes
+      read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
+    end
+
+  end
+end
+

data/lib/mongoid/scope.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  class Scope #:nodoc:
+
+    delegate :scopes, :to => "@parent"
+
+    # Create the new +Scope+. If a block is passed in, this Scope will extend
+    # the block.
+    #
+    # Options:
+    #
+    # parent: The class the scope belongs to, or a parent +Scope+.
+    # conditions: A +Hash+ of conditions.
+    #
+    # Example:
+    #
+    #   Mongoid::Scope.new(Person, { :title => "Sir" }) do
+    #     def knighted?
+    #       title == "Sir"
+    #     end
+    #   end
+    def initialize(parent, conditions, &block)
+      @parent, @conditions = parent, conditions
+      extend Module.new(&block) if block_given?
+    end
+
+    # Return the class for the +Scope+. This will be the parent if the parent
+    # is a class, otherwise will be nil.
+    def klass
+      @klass ||= @parent unless @parent.is_a?(Scope)
+    end
+
+    # Chaining is supported through method_missing. If a scope is already
+    # defined with the method name the call will be passed there, otherwise it
+    # will be passed to the target or parent.
+    def method_missing(name, *args, &block)
+      if scopes.include?(name)
+        scopes[name].call(self, *args)
+      elsif klass
+        target.send(name, *args, &block)
+      else
+        @parent.fuse(@conditions); @parent.send(name, *args, &block)
+      end
+    end
+
+    # The +Scope+ must respond like a +Criteria+ object. If this is a parent
+    # criteria delegate to the target, otherwise bubble up to the parent.
+    def respond_to?(name)
+      super || (klass ? target.respond_to?(name) : @parent.respond_to?(name))
+    end
+
+    # Returns the target criteria if it has already been set or creates a new
+    # criteria from the parent class.
+    def target
+      @target ||= klass.criteria.fuse(@conditions)
+    end
+  end
+end
+

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-01-11}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -61,19 +61,22 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/hash/assimilation.rb",
      "lib/mongoid/extensions/hash/conversions.rb",
      "lib/mongoid/extensions/hash/criteria_helpers.rb",
+     "lib/mongoid/extensions/hash/scoping.rb",
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/nil/assimilation.rb",
      "lib/mongoid/extensions/object/conversions.rb",
+     "lib/mongoid/extensions/proc/scoping.rb",
      "lib/mongoid/extensions/string/conversions.rb",
      "lib/mongoid/extensions/string/inflections.rb",
      "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/extensions/time/conversions.rb",
+     "lib/mongoid/field.rb",
      "lib/mongoid/fields.rb",
-     "lib/mongoid/fields/field.rb",
      "lib/mongoid/finders.rb",
      "lib/mongoid/indexes.rb",
      "lib/mongoid/memoization.rb",
-     "lib/mongoid/named_scopes.rb",
+     "lib/mongoid/named_scope.rb",
+     "lib/mongoid/scope.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
@@ -84,7 +87,7 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
      "spec/integration/mongoid/inheritance_spec.rb",
-     "spec/integration/mongoid/named_scopes_spec.rb",
+     "spec/integration/mongoid/named_scope_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
@@ -120,9 +123,11 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb",
+     "spec/unit/mongoid/extensions/hash/scoping_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/nil/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/proc/scoping_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
@@ -132,7 +137,8 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
-     "spec/unit/mongoid/named_scopes_spec.rb",
+     "spec/unit/mongoid/named_scope_spec.rb",
+     "spec/unit/mongoid/scope_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb",
      "spec/unit/mongoid_spec.rb"
@@ -149,7 +155,7 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
      "spec/integration/mongoid/inheritance_spec.rb",
-     "spec/integration/mongoid/named_scopes_spec.rb",
+     "spec/integration/mongoid/named_scope_spec.rb",
      "spec/spec_helper.rb",
      "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_spec.rb",
@@ -184,9 +190,11 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb",
+     "spec/unit/mongoid/extensions/hash/scoping_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/nil/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/proc/scoping_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
@@ -196,7 +204,8 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
-     "spec/unit/mongoid/named_scopes_spec.rb",
+     "spec/unit/mongoid/named_scope_spec.rb",
+     "spec/unit/mongoid/scope_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb",
      "spec/unit/mongoid_spec.rb"

data/spec/integration/mongoid/named_scope_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+
+describe Mongoid::NamedScope do
+
+  describe ".named_scope" do
+
+    class Person
+      named_scope :doctors, {:where => {:title => 'Dr.'} }
+      named_scope :old, criteria.where(:age.gt => 50)
+    end
+
+    before do
+      @document = Person.create(:title => "Dr.", :age => 65, :terms => true)
+    end
+
+    after do
+      Person.delete_all
+    end
+
+    context "accessing a single named scope" do
+
+      it "returns the document" do
+        Person.doctors.first.should == @document
+      end
+
+    end
+
+    context "chaining named scopes" do
+
+      it "returns the document" do
+        Person.old.doctors.first.should == @document
+      end
+
+    end
+
+    context "mixing named scopes and class methods" do
+
+      it "returns the document" do
+        Person.accepted.old.doctors.first.should == @document
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/commands/save_spec.rb

@@ -5,8 +5,8 @@ describe Mongoid::Commands::Save do
   describe "#execute" do
 
     before do
-      @parent_collection = stub(:save)
-      @doc_collection = stub(:save)
+      @parent_collection = stub(:save => true)
+      @doc_collection = stub(:save => true)
       @parent = stub(:collection => @parent_collection,
                      :valid? => true,
                      :run_callbacks => true,

data/spec/unit/mongoid/criteria_spec.rb

@@ -860,6 +860,19 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#scoped" do
+
+    before do
+      @criteria = Person.where(:title => "Sir").skip(20)
+    end
+
+    it "returns the selector plus the options" do
+      @criteria.scoped.should ==
+        { :where => { :title => "Sir", :_type=>{ "$in" => [ "Doctor", "Person" ] } }, :skip => 20 }
+    end
+
+  end
+
   describe "#skip" do
 
     context "when value provided" do
@@ -1129,15 +1142,15 @@ describe Mongoid::Criteria do
 
   end
 
-  context "#criteria" do
+  context "#fuse" do
 
     it ":where => {:title => 'Test'} returns a criteria with the correct selector" do
-      @result = @criteria.criteria(:where => { :title => 'Test' })
+      @result = @criteria.fuse(:where => { :title => 'Test' })
       @result.selector[:title].should == 'Test'
     end
 
     it ":where => {:title => 'Test'}, :skip => 10 returns a criteria with the correct selector and options" do
-      @result = @criteria.criteria(:where => { :title => 'Test' }, :skip => 10)
+      @result = @criteria.fuse(:where => { :title => 'Test' }, :skip => 10)
       @result.selector[:title].should == 'Test'
       @result.options.should == { :skip => 10 }
     end

data/spec/unit/mongoid/extensions/hash/scoping_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe Mongoid::Extensions::Hash::Scoping do
+
+  describe "#scoped" do
+
+    it "returns self" do
+      { :where => { :active => true } }.scoped.should ==
+        { :where => { :active => true } }
+    end
+
+  end
+
+end

data/spec/unit/mongoid/extensions/proc/scoping_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe Mongoid::Extensions::Proc::Scoping do
+
+  describe "#scoped" do
+
+    context "when the proc accessed a hash" do
+
+      before do
+        @proc = lambda { |number| { :where => { :count => number } } }
+      end
+
+      it "calls the hash with the args" do
+        @proc.scoped(10).should == { :where => { :count => 10 } }
+      end
+
+    end
+
+    context "when the proc calls a criteria" do
+
+      before do
+        @proc = lambda { |title| Person.where(:title => title) }
+      end
+
+      it "returns the criteria scoped" do
+        @proc.scoped("Sir").should ==
+          { :where => { :_type => { "$in" => [ "Doctor", "Person" ] }, :title => "Sir" } }
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/named_scope_spec.rb

@@ -0,0 +1,110 @@
+require "spec_helper"
+
+describe Mongoid::NamedScope do
+
+  class Player
+    include Mongoid::Document
+    field :active, :type => Boolean
+    field :frags, :type => Integer
+    field :deaths, :type => Integer
+    field :status
+
+    named_scope :active, criteria.where(:active => true) do
+      def extension
+        "extension"
+      end
+    end
+    named_scope :inactive, :where => { :active => false }
+    named_scope :frags_over, lambda { |count| { :where => { :frags.gt => count } } }
+    named_scope :deaths_under, lambda { |count| criteria.where(:deaths.lt => count) }
+
+    class << self
+      def alive
+        criteria.where(:status => "Alive")
+      end
+    end
+  end
+
+  describe ".named_scope" do
+
+    it "adds a class method for the scope" do
+      Player.should respond_to(:active)
+    end
+
+    it "adds the scope to the scopes" do
+      Player.scopes.should include(:active)
+    end
+
+    context "when options are a hash" do
+
+      it "adds the selector to the scope" do
+        Player.inactive.selector[:active].should be_false
+      end
+
+    end
+
+    context "when options are a criteria" do
+
+      it "adds the selector to the scope" do
+        Player.active.selector[:active].should be_true
+      end
+
+    end
+
+    context "when options are a proc" do
+
+      context "when the proc delegates to a hash" do
+
+        it "adds the selector to the scope" do
+          Player.frags_over(50).selector[:frags].should == { "$gt" => 50 }
+        end
+
+      end
+
+      context "when the proc delegates to a criteria" do
+
+        it "adds the selector to the scope" do
+          Player.deaths_under(40).selector[:deaths].should == { "$lt" => 40 }
+        end
+
+      end
+
+    end
+
+    context "when a block is supplied" do
+
+      it "adds the block as an extension" do
+        Player.active.extension.should == "extension"
+      end
+
+    end
+
+  end
+
+  context "chained scopes" do
+
+    context "when chaining two named scopes" do
+
+      it "merges the criteria" do
+        selector = Player.active.frags_over(10).selector
+        selector[:active].should be_true
+        selector[:frags].should == { "$gt" => 10 }
+      end
+
+    end
+
+    context "when chaining named scoped with criteria class methods" do
+
+      it "merges the criteria" do
+        selector = Player.active.frags_over(10).alive.selector
+        selector[:active].should be_true
+        selector[:frags].should == { "$gt" => 10 }
+        selector[:status].should == "Alive"
+      end
+
+    end
+
+  end
+
+end
+

data/spec/unit/mongoid/scope_spec.rb

@@ -0,0 +1,166 @@
+require "spec_helper"
+
+describe Mongoid::Scope do
+
+  describe ".initialize" do
+
+    before do
+      @parent = Mongoid::Scope.new(Person, {})
+    end
+
+    context "when parent is another scope" do
+
+      before do
+        @scope = Mongoid::Scope.new(@parent, {})
+      end
+
+      it "does not set the class" do
+        @scope.klass.should be_nil
+      end
+
+    end
+
+    context "when parent is a class" do
+
+      before do
+        @scope = Mongoid::Scope.new(Person, {})
+      end
+
+      it "returns the parent class" do
+        @scope.klass.should == Person
+      end
+
+    end
+
+    context "when a block is passed in" do
+
+      before do
+        @scope = Mongoid::Scope.new(Person, {}) do
+          def extended
+            "extended"
+          end
+        end
+      end
+
+      it "extends the block" do
+        @scope.extended.should == "extended"
+      end
+
+    end
+
+  end
+
+  describe "#method_missing" do
+
+    context "when a scope has been defined for the name" do
+
+      before do
+        @defined = mock
+        @class = mock
+        @class.expects(:scopes).twice.returns({ :testing => @defined })
+        @scope = Mongoid::Scope.new(@class, {})
+      end
+
+      it "calls the matching scope" do
+        @defined.expects(:call).with(@scope, "Testing").returns(true)
+        @scope.testing("Testing").should be_true
+      end
+
+    end
+
+    context "when a scope is not defined for the name" do
+
+      context "when the scope is the parent" do
+
+        before do
+          @target = mock
+          @scope = Mongoid::Scope.new(Person, {})
+          @scope.instance_variable_set("@target", @target)
+        end
+
+        it "sends the call to the target" do
+          @target.expects(:testing).with("Testing").returns(true)
+          @scope.testing("Testing").should be_true
+        end
+
+      end
+
+      context "when the scope is not the parent" do
+
+        before do
+          @parent = mock
+          @criteria = mock
+          @parent.expects(:scopes).returns({})
+          @parent.expects(:is_a?).with(Mongoid::Scope).returns(true)
+          @parent.expects(:fuse)
+          @scope = Mongoid::Scope.new(@parent, {})
+        end
+
+        it "creates a criteria from the parent scope" do
+          @parent.expects(:testing).returns(true)
+          @scope.testing.should be_true
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "#respond_to?" do
+
+    context "when parent is a class" do
+
+      before do
+        @scope = Mongoid::Scope.new(Person, {})
+      end
+
+      it "delegates to the target" do
+        @scope.respond_to?(:only).should be_true
+      end
+
+    end
+
+    context "when parent is a scope" do
+
+      before do
+        @parent = Mongoid::Scope.new(Person, {})
+        @scope = Mongoid::Scope.new(@parent, {})
+      end
+
+      it "delegates to the parent" do
+        @scope.respond_to?(:only).should be_true
+      end
+
+    end
+
+  end
+
+  describe "#scopes" do
+
+    before do
+      @parent = mock
+      @scope = Mongoid::Scope.new(@parent, {})
+    end
+
+    it "delegates to the parent" do
+      @parent.expects(:scopes).returns({})
+      @scope.scopes.should == {}
+    end
+
+  end
+
+  describe "#target" do
+
+    before do
+      @scope = Mongoid::Scope.new(Person, { :where => { :title => "Sir" } })
+    end
+
+    it "returns the conditions criteria" do
+      @scope.target.selector.should ==
+        { :title => "Sir", :_type => { "$in" => [ "Doctor", "Person" ] } }
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -05:00
+date: 2010-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,19 +127,22 @@ files:
 - lib/mongoid/extensions/hash/assimilation.rb
 - lib/mongoid/extensions/hash/conversions.rb
 - lib/mongoid/extensions/hash/criteria_helpers.rb
+- lib/mongoid/extensions/hash/scoping.rb
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/nil/assimilation.rb
 - lib/mongoid/extensions/object/conversions.rb
+- lib/mongoid/extensions/proc/scoping.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time/conversions.rb
+- lib/mongoid/field.rb
 - lib/mongoid/fields.rb
-- lib/mongoid/fields/field.rb
 - lib/mongoid/finders.rb
 - lib/mongoid/indexes.rb
 - lib/mongoid/memoization.rb
-- lib/mongoid/named_scopes.rb
+- lib/mongoid/named_scope.rb
+- lib/mongoid/scope.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/versioning.rb
 - mongoid.gemspec
@@ -150,7 +153,7 @@ files:
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/finders_spec.rb
 - spec/integration/mongoid/inheritance_spec.rb
-- spec/integration/mongoid/named_scopes_spec.rb
+- spec/integration/mongoid/named_scope_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/mongoid/associations/belongs_to_related_spec.rb
@@ -186,9 +189,11 @@ files:
 - spec/unit/mongoid/extensions/hash/assimilation_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb
+- spec/unit/mongoid/extensions/hash/scoping_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/nil/assimilation_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
+- spec/unit/mongoid/extensions/proc/scoping_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
@@ -198,7 +203,8 @@ files:
 - spec/unit/mongoid/finders_spec.rb
 - spec/unit/mongoid/indexes_spec.rb
 - spec/unit/mongoid/memoization_spec.rb
-- spec/unit/mongoid/named_scopes_spec.rb
+- spec/unit/mongoid/named_scope_spec.rb
+- spec/unit/mongoid/scope_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 - spec/unit/mongoid_spec.rb
@@ -237,7 +243,7 @@ test_files:
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/finders_spec.rb
 - spec/integration/mongoid/inheritance_spec.rb
-- spec/integration/mongoid/named_scopes_spec.rb
+- spec/integration/mongoid/named_scope_spec.rb
 - spec/spec_helper.rb
 - spec/unit/mongoid/associations/belongs_to_related_spec.rb
 - spec/unit/mongoid/associations/belongs_to_spec.rb
@@ -272,9 +278,11 @@ test_files:
 - spec/unit/mongoid/extensions/hash/assimilation_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb
+- spec/unit/mongoid/extensions/hash/scoping_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/nil/assimilation_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
+- spec/unit/mongoid/extensions/proc/scoping_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
@@ -284,7 +292,8 @@ test_files:
 - spec/unit/mongoid/finders_spec.rb
 - spec/unit/mongoid/indexes_spec.rb
 - spec/unit/mongoid/memoization_spec.rb
-- spec/unit/mongoid/named_scopes_spec.rb
+- spec/unit/mongoid/named_scope_spec.rb
+- spec/unit/mongoid/scope_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 - spec/unit/mongoid_spec.rb

data/lib/mongoid/named_scopes.rb

@@ -1,94 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module NamedScopes
-    # Return the scopes or default to an empty +Hash+.
-    def scopes
-      read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
-    end
-
-    # Creates a named_scope for the +Document+, similar to ActiveRecord's
-    # named_scopes. +NamedScopes+ are proxied +Criteria+ objects that can be
-    # chained.
-    #
-    # Example:
-    #
-    #   class Person
-    #     include Mongoid::Document
-    #     field :active, :type => Boolean
-    #     field :count, :type => Integer
-    #
-    #     named_scope :active, :where => { :active => true }
-    #     named_scope :count_gt_one, :where => { :count.gt => 1 }
-    #     named_scope :at_least_count, lambda { |count| { :where => { :count.gt => count } } }
-    #   end
-    def named_scope(name, options = {}, &block)
-      name = name.to_sym
-      scopes[name] = lambda do |parent_scope, *args|
-        CriteriaProxy.new(parent_scope, Hash === options ? options : options.call(*args), &block)
-      end
-      (class << self; self; end).class_eval <<-EOT
-        def #{name}(*args)
-          scopes[:#{name}].call(self, *args)
-        end
-      EOT
-    end
-
-    class CriteriaProxy #:nodoc
-      attr_accessor :conditions, :klass, :parent_scope
-
-      delegate :scopes, :to => :parent_scope
-
-      # Instantiate the new +CriteriaProxy+. If the conditions contains an
-      # extension, the proxy will extend from that module. If a block is given
-      # it will be extended as well.
-      #
-      # Example:
-      #
-      # <tt>CriteriaProxy.new(parent, :where => { :active => true })</tt>
-      def initialize(parent_scope, conditions, &block)
-        conditions ||= {}
-        [ conditions.delete(:extend) ].flatten.each do |extension|
-          extend extension
-        end if conditions.include?(:extend)
-        extend Module.new(&block) if block_given?
-        self.klass = parent_scope unless CriteriaProxy === parent_scope
-        self.parent_scope, self.conditions = parent_scope, conditions
-      end
-
-      # First check if the proxy has the scope defined, otherwise look to the
-      # parent scope.
-      def respond_to?(method, include_private = false)
-        super || if klass
-          proxy_found.respond_to?(method, include_private)
-        else
-          parent_scope.respond_to?(method, include_private)
-        end
-      end
-
-      protected
-
-      def proxy_found
-        @found || load_found
-      end
-
-      private
-
-      def method_missing(method, *args, &block)
-        if scopes.include?(method)
-          scopes[method].call(self, *args)
-        elsif klass
-          proxy_found.send(method, *args, &block)
-        else
-          parent_scope.criteria(conditions)
-          parent_scope.send(method, *args, &block)
-        end
-      end
-
-      def load_found
-        @found = Criteria.new(klass)
-        @found.criteria(conditions); @found
-      end
-    end
-  end
-end
-

data/spec/integration/mongoid/named_scopes_spec.rb

@@ -1,25 +0,0 @@
-require "spec_helper"
-
-describe Mongoid::NamedScopes do
-
-  describe ".named_scope" do
-
-    class Person
-      named_scope :doctors, {:where => {:title => 'Dr.'}}
-    end
-
-    before do
-      @document = Person.create(:title => "Dr.")
-    end
-
-    after do
-      Person.delete_all
-    end
-
-    it "returns the document" do
-      Person.doctors.first.should == @document
-    end
-
-  end
-
-end

data/spec/unit/mongoid/named_scopes_spec.rb

@@ -1,86 +0,0 @@
-require "spec_helper"
-
-describe Mongoid::NamedScopes do
-
-  context "AR2 scopes" do
-    module Extension
-      def extension_module_method
-        "extension module method"
-      end
-    end
-
-    class NamedScopeTest
-      include Mongoid::Document
-
-      field :active, :type => Boolean
-      field :count, :type => Integer
-
-      named_scope :active, :where => {:active => true} do
-        def extension_method
-          "extension method"
-        end
-      end
-      named_scope :count_gt_one, :where => { :count.gt => 1 }, :extend => Extension
-      named_scope :at_least_count, lambda { |count| { :where => { :count.gt => count } } }
-    end
-
-    context ".named_scope" do
-      it "adds the named scope to the hash of scopes" do
-        NamedScopeTest.scopes.should have_key(:active)
-      end
-
-      it "creates a class method for the named scope" do
-        NamedScopeTest.should respond_to(:active)
-      end
-    end
-
-    context "accessing a named scope" do
-      it "is a criteria proxy" do
-        Mongoid::NamedScopes::CriteriaProxy.should === NamedScopeTest.active
-      end
-
-      it "responds like a criteria" do
-        NamedScopeTest.active.should respond_to(:selector)
-      end
-
-      it "instantiates the criteria" do
-        criteria = Mongoid::Criteria.new(NamedScopeTest)
-        Mongoid::Criteria.expects(:new).returns(criteria)
-        NamedScopeTest.active.selector
-      end
-
-      it "has set the conditions on the criteria" do
-        NamedScopeTest.active.selector[:active].should be_true
-      end
-
-      it "sets the association extension by block" do
-        NamedScopeTest.active.extension_method.should == "extension method"
-      end
-
-      it "sets the association extension by :extend" do
-        NamedScopeTest.count_gt_one.extension_module_method.should == "extension module method"
-      end
-
-      context "when using a lambda" do
-        it "accepts parameters to the criteria" do
-          NamedScopeTest.at_least_count(3).selector[:count].should == {'$gt' => 3}
-        end
-      end
-    end
-
-    context "chained scopes" do
-      it "instantiates the criteria" do
-        criteria = Mongoid::Criteria.new(NamedScopeTest)
-        Mongoid::Criteria.expects(:new).returns(criteria)
-        NamedScopeTest.active.count_gt_one.selector
-      end
-
-      it "merges the criteria" do
-        selector = NamedScopeTest.active.count_gt_one.selector
-        selector[:count].should == {'$gt' => 1}
-        selector[:active].should be_true
-      end
-    end
-  end
-end
-