mongoid 0.9.0 → 0.9.1

data/README.textile

@@ -116,6 +116,30 @@ New School:
   Criteria.translate(:conditions => { :title => "Sir" }).execute
 </pre>
 
+Chaining Scopes:
+
+Class methods that return criteria, either through the Criteria API or the traditional Finder API, can
+be chained, similar to DataMapper.
+
+<pre>
+  class Person < Mongoid::Document
+    field :title
+    field :age, :type => Integer
+
+    class << self
+      def knighted
+        criteria.where(:title => "Sir")
+      end
+      def old
+        criteria.where(:age => { "$gt" > 70 })
+      end
+    end
+  end
+
+  Person.old.knighted
+  Person.old.paginate
+</pre>
+
 Paginate Document search results:
 
 <pre>

data/Rakefile

@@ -12,11 +12,15 @@ begin
     gem.email = "durran@gmail.com"
     gem.homepage = "http://github.com/durran/mongoid"
     gem.authors = ["Durran Jordan"]
+
     gem.add_dependency("durran-validatable", "1.8.2")
     gem.add_dependency("leshill-will_paginate", "2.3.11")
     gem.add_dependency("activesupport", "2.3.4")
     gem.add_dependency("mongo", "0.17.1")
     gem.add_dependency("mongo_ext", "0.17.1")
+
+    gem.add_development_dependency("rspec", "1.2.9")
+    gem.add_development_dependency("mocha", "0.9.8")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -25,13 +29,13 @@ end
 
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
-  spec.spec_opts = ['--options', "spec/spec.opts"]
+  spec.spec_opts = ["--options", "spec/spec.opts"]
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << "lib" << "spec"
   spec.pattern = "spec/**/*_spec.rb"
-  spec.spec_opts = ['--options', "spec/spec.opts"]
+  spec.spec_opts = ["--options", "spec/spec.opts"]
   spec.rcov = true
 end
 
@@ -48,4 +52,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-task :default => ["rcov", "metrics:all"]
+task :default => ["spec"]
+task :metrics => ["rcov", "metrics:all"]

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/mongoid/associations.rb

@@ -91,6 +91,21 @@ module Mongoid # :nodoc:
         add_association(Associations::HasOne, Associations::Options.new(options.merge(:name => name)))
       end
 
+      # Returns the macro associated with the supplied association name. This
+      # will return has_one, has_many, belongs_to or nil.
+      #
+      # Options:
+      #
+      # name: The association name.
+      #
+      # Example:
+      #
+      # <tt>Person.reflect_on_association(:addresses)</tt>
+      def reflect_on_association(name)
+        association = associations[name]
+        association ? association.macro : nil
+      end
+
       private
       # Adds the association to the associations hash with the type as the key,
       # then adds the accessors for the association.

data/lib/mongoid/associations/belongs_to.rb

@@ -22,6 +22,11 @@ module Mongoid #:nodoc:
       end
 
       class << self
+        # Returns the macro used to create the association.
+        def macro
+          :belongs_to
+        end
+
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting a parent object as the association on the
         # +Document+. Will properly set a has_one or a has_many.

data/lib/mongoid/associations/has_many.rb

@@ -82,6 +82,11 @@ module Mongoid #:nodoc:
       end
 
       class << self
+        # Returns the macro used to create the association.
+        def macro
+          :has_many
+        end
+
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting the has_many to the supplied +Enumerable+
         # and setting up the parentization.

data/lib/mongoid/associations/has_one.rb

@@ -35,6 +35,11 @@ module Mongoid #:nodoc:
       end
 
       class << self
+        # Returns the macro used to create the association.
+        def macro
+          :has_one
+        end
+
         # Perform an update of the relationship of the parent and child. This
         # will assimilate the child +Document+ into the parent's object graph.
         #

data/lib/mongoid/criteria.rb

@@ -31,7 +31,7 @@ module Mongoid #:nodoc:
       when Criteria
         self.selector == other.selector && self.options == other.options
       when Enumerable
-        execute
+        @collection ||= execute
         return (@collection == other)
       else
         return false
@@ -81,9 +81,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Integer</tt>
     def count
-      return @count if @count
-      @klass = klass if klass
-      return @klass.collection.find(@selector, @options.dup).count
+      @count ||= @klass.collection.find(@selector, @options.dup).count
     end
 
     # Iterate over each +Document+ in the results. This can take an optional
@@ -261,13 +259,8 @@ module Mongoid #:nodoc:
     #
     # <tt>criteria.merge({ :conditions => { :title => "Sir" } })</tt>
     def merge(other)
-      case other
-      when Hash
-        merge(self.class.translate(@klass, other))
-      else
-        @selector.update(other.selector)
-        @options.update(other.options)
-      end
+      @selector.update(other.selector)
+      @options.update(other.options)
     end
 
     # Used for chaining +Criteria+ scopes together in the for of class methods
@@ -469,9 +462,9 @@ module Mongoid #:nodoc:
       attributes = @klass.collection.find(@selector, @options.dup)
       if attributes
         @count = attributes.count
-        @collection = attributes.collect { |doc| @klass.instantiate(doc) }
+        attributes.collect { |doc| @klass.instantiate(doc) }
       else
-        @collection = []
+        []
       end
     end
 

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -167,12 +167,16 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, ["= 2.3.4"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.17.1"])
       s.add_runtime_dependency(%q<mongo_ext>, ["= 0.17.1"])
+      s.add_development_dependency(%q<rspec>, ["= 1.2.9"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<durran-validatable>, ["= 1.8.2"])
       s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       s.add_dependency(%q<activesupport>, ["= 2.3.4"])
       s.add_dependency(%q<mongo>, ["= 0.17.1"])
       s.add_dependency(%q<mongo_ext>, ["= 0.17.1"])
+      s.add_dependency(%q<rspec>, ["= 1.2.9"])
+      s.add_dependency(%q<mocha>, ["= 0.9.8"])
     end
   else
     s.add_dependency(%q<durran-validatable>, ["= 1.8.2"])
@@ -180,6 +184,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, ["= 2.3.4"])
     s.add_dependency(%q<mongo>, ["= 0.17.1"])
     s.add_dependency(%q<mongo_ext>, ["= 0.17.1"])
+    s.add_dependency(%q<rspec>, ["= 1.2.9"])
+    s.add_dependency(%q<mocha>, ["= 0.9.8"])
   end
 end
 

data/spec/unit/mongoid/associations/belongs_to_spec.rb

@@ -50,7 +50,15 @@ describe Mongoid::Associations::BelongsTo do
 
   end
 
-  describe "#update" do
+  describe ".macro" do
+
+    it "returns :belongs_to" do
+      Mongoid::Associations::BelongsTo.macro.should == :belongs_to
+    end
+
+  end
+
+  describe ".update" do
 
     context "when child is a has one" do
 

data/spec/unit/mongoid/associations/has_many_spec.rb

@@ -116,21 +116,6 @@ describe Mongoid::Associations::HasMany do
 
   end
 
-  describe "#push" do
-
-    before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
-      @address = Address.new
-    end
-
-    it "adds the parent document before appending to the array" do
-      @association.push @address
-      @association.length.should == 3
-      @address.parent.should == @document
-    end
-
-  end
-
   describe "#find" do
 
     before do
@@ -207,6 +192,14 @@ describe Mongoid::Associations::HasMany do
 
   end
 
+  describe ".macro" do
+
+    it "returns :has_many" do
+      Mongoid::Associations::HasMany.macro.should == :has_many
+    end
+
+  end
+
   describe "#push" do
 
     before do
@@ -214,6 +207,13 @@ describe Mongoid::Associations::HasMany do
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
+      @address = Address.new
+    end
+
+    it "adds the parent document before appending to the array" do
+      @association.push @address
+      @association.length.should == 3
+      @address.parent.should == @document
     end
 
     it "appends the document to the end of the array" do
@@ -223,7 +223,7 @@ describe Mongoid::Associations::HasMany do
 
   end
 
-  describe "#update" do
+  describe ".update" do
 
     before do
       @address = Address.new(:street => "Madison Ave")

data/spec/unit/mongoid/associations/has_one_spec.rb

@@ -77,7 +77,15 @@ describe Mongoid::Associations::HasOne do
 
   end
 
-  describe "#update" do
+  describe ".macro" do
+
+    it "returns :has_many" do
+      Mongoid::Associations::HasOne.macro.should == :has_one
+    end
+
+  end
+
+  describe ".update" do
 
     before do
       @name = Name.new(:first_name => "Donald")

data/spec/unit/mongoid/associations_spec.rb

@@ -232,4 +232,12 @@ describe Mongoid::Associations do
 
   end
 
+  describe ".reflect_on_association" do
+
+    it "returns the association class for the name" do
+      Person.reflect_on_association(:addresses).should == :has_many
+    end
+
+  end
+
 end

data/spec/unit/mongoid/criteria_spec.rb

@@ -430,45 +430,6 @@ describe Mongoid::Criteria do
 
     end
 
-    context "with a hash" do
-
-      context "when hash has values" do
-
-        before do
-          @hash = { :conditions => { :name => "Rebecca" }, :sort => [[:name, :desc]] }
-          @selector = { :title => "Sir", :age => 30, :name => "Rebecca" }
-          @options = { :skip => 40, :limit => 20, :sort => [[:name, :desc]] }
-          @criteria.merge(@hash)
-        end
-
-        it "merges the conditions with the selector" do
-          @criteria.selector.should == @selector
-        end
-
-        it "merges all valid other values into the options" do
-          @criteria.options.should == @options
-        end
-
-      end
-
-      context "when hash is empty" do
-
-        before do
-          @hash = {}
-          @selector = { :title => "Sir", :age => 30 }
-          @options = { :skip => 40, :limit => 20 }
-        end
-
-        it "merges nothing" do
-          @criteria.merge(@hash)
-          @criteria.selector.should == @selector
-          @criteria.options.should == @options
-        end
-
-      end
-
-    end
-
   end
 
   describe "#method_missing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -62,6 +62,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.17.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.8
+    version: 
 description: 
 email: durran@gmail.com
 executables: []