mongoid 1.2.8 → 1.2.9

data/lib/mongoid/extensions.rb

@@ -4,6 +4,8 @@ require "mongoid/extensions/array/aliasing"
 require "mongoid/extensions/array/assimilation"
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
+require "mongoid/extensions/big_decimal/conversions"
+require "mongoid/extensions/binary/conversions"
 require "mongoid/extensions/boolean/conversions"
 require "mongoid/extensions/date/conversions"
 require "mongoid/extensions/datetime/conversions"
@@ -29,6 +31,14 @@ class Array #:nodoc
   include Mongoid::Extensions::Array::Parentization
 end
 
+class BigDecimal #:nodoc
+  extend Mongoid::Extensions::BigDecimal::Conversions
+end
+
+class Binary #:nodoc
+  extend Mongoid::Extensions::Binary::Conversions
+end
+
 class Boolean #:nodoc
   extend Mongoid::Extensions::Boolean::Conversions
 end

data/lib/mongoid/extensions/big_decimal/conversions.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require "bigdecimal"
+
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module BigDecimal #:nodoc:
+      module Conversions #:nodoc:
+        # Get the string as a +BigDecimal+
+        def get(value)
+          ::BigDecimal.new(value)
+        end
+        # Set the value in the hash as a string.
+        def set(value)
+          value.to_s
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/binary/conversions.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Binary #:nodoc:
+      module Conversions #:nodoc:
+        # Get the value from the db hash.
+        def get(value)
+          value
+        end
+        # Set the value in the db hash.
+        def set(value)
+          value
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/{caching.rb → extras.rb}

@@ -1,13 +1,14 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-  module Caching #:nodoc:
+  module Extras #:nodoc:
     def self.included(base)
       base.class_eval do
         extend ClassMethods
-        class_inheritable_accessor :cached
+        class_inheritable_accessor :cached, :enslaved
         self.cached = false
+        self.enslaved = false
 
-        delegate :cached?, :to => "self.class"
+        delegate :cached?, :enslaved?, :to => "self.class"
       end
     end
 
@@ -36,6 +37,28 @@ module Mongoid #:nodoc:
       def cached?
         self.cached == true
       end
+
+      # Set whether or not this documents read operations should delegate to
+      # the slave database by default.
+      #
+      # Example:
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     enslave
+      #   end
+      def enslave
+        self.enslaved = true
+      end
+
+      # Determines if the class is enslaved or not.
+      #
+      # Returns:
+      #
+      # True if enslaved, false if not.
+      def enslaved?
+        self.enslaved == true
+      end
     end
   end
 end

data/lib/mongoid/field.rb

@@ -1,11 +1,25 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   class Field
+    attr_reader :name, :type
 
-    attr_reader \
-      :default,
-      :name,
-      :type
+    # Determine if the field is able to be accessible via a mass update.
+    #
+    # Returns:
+    #
+    # true if accessible, false if not.
+    def accessible?
+      !!@accessible
+    end
+
+    # Get the default value for the field.
+    #
+    # Returns:
+    #
+    # The primitive value or a copy of the default.
+    def default
+      (@default.is_a?(Array) || @default.is_a?(Hash)) ? @default.dup : @default
+    end
 
     # Create the new field with a name and optional additional options. Valid
     # options are :default
@@ -19,9 +33,9 @@ module Mongoid #:nodoc:
     #
     # <tt>Field.new(:score, :default => 0)</tt>
     def initialize(name, options = {})
-      @name = name
-      @default = options[:default]
+      @name, @default = name, options[:default]
       @type = options[:type] || String
+      @accessible = options.has_key?(:accessible) ? options[:accessible] : true
     end
 
     # Used for setting an object in the attributes hash. If nil is provided the
@@ -34,6 +48,5 @@ module Mongoid #:nodoc:
     def get(object)
       type.get(object)
     end
-
   end
 end

data/lib/mongoid/finders.rb

@@ -1,6 +1,16 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Finders #:nodoc:
+
+    # Delegate to the criteria methods that are natural for creating a new
+    # criteria.
+    [ :all_in, :any_in, :excludes, :limit, :max, :min,
+      :not_in, :only, :order_by, :skip, :sum, :where ].each do |name|
+      define_method(name) do |*args|
+        criteria.send(name, *args)
+      end
+    end
+
     # Find +Documents+ given the conditions.
     #
     # Options:
@@ -100,36 +110,6 @@ module Mongoid #:nodoc:
       find(:last, *args)
     end
 
-    # Convenience method for returning the max value of a field.
-    #
-    # Options:
-    #
-    # field: The field to use when calculating the max.
-    #
-    # Example:
-    #
-    # <tt>Person.max(:age)</tt>
-    #
-    # Returns: <tt>Float</tt> max value.
-    def max(field)
-      criteria.max(field)
-    end
-
-    # Convenience method for returning the min value of a field.
-    #
-    # Options:
-    #
-    # field: The field to use when calculating the min.
-    #
-    # Example:
-    #
-    # <tt>Person.min(:age)</tt>
-    #
-    # Returns: <tt>Float</tt> min value.
-    def min(field)
-      criteria.min(field)
-    end
-
     # Find all documents in paginated fashion given the supplied arguments.
     # If no parameters are passed just default to offset 0 and limit 20.
     #
@@ -147,56 +127,6 @@ module Mongoid #:nodoc:
       Criteria.translate(self, params).paginate
     end
 
-    # Entry point for creating a new criteria from a Document. This will
-    # instantiate a new +Criteria+ object with the supplied select criterion
-    # already added to it.
-    #
-    # Options:
-    #
-    # args: A list of field names to retrict the returned fields to.
-    #
-    # Example:
-    #
-    # <tt>Person.only(:field1, :field2, :field3)</tt>
-    #
-    # Returns: <tt>Criteria</tt>
-    def only(*args)
-      criteria.only(*args)
-    end
-
-    # Convenience method for returning the sum of a specified field for all
-    # documents in the database.
-    #
-    # Options:
-    #
-    # field: The field to use when calculating the sum.
-    #
-    # Example:
-    #
-    # <tt>Person.sum(:age)</tt>
-    #
-    # Returns: <tt>Float</tt> of the sum.
-    def sum(field)
-      criteria.sum(field)
-    end
-
-    # Entry point for creating a new criteria from a Document. This will
-    # instantiate a new +Criteria+ object with the supplied select criterion
-    # already added to it.
-    #
-    # Options:
-    #
-    # selector: A where criteria to initialize.
-    #
-    # Example:
-    #
-    # <tt>Person.where(:field1 => "Value")</tt>
-    #
-    # Returns: <tt>Criteria</tt>
-    def where(selector = nil)
-      criteria.where(selector)
-    end
-
     protected
     # Find the first object or create/initialize it.
     def find_or(method, attrs = {})

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-03-09}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      ".watchr",
-     "HISTORY",
      "MIT_LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -35,7 +34,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/associations/options.rb",
      "lib/mongoid/associations/proxy.rb",
      "lib/mongoid/attributes.rb",
-     "lib/mongoid/caching.rb",
      "lib/mongoid/callbacks.rb",
      "lib/mongoid/collection.rb",
      "lib/mongoid/collections/cyclic_iterator.rb",
@@ -65,7 +63,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/criterion/optional.rb",
      "lib/mongoid/cursor.rb",
      "lib/mongoid/document.rb",
-     "lib/mongoid/enslavement.rb",
      "lib/mongoid/errors.rb",
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/accessors.rb",
@@ -73,6 +70,8 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/array/assimilation.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/array/parentization.rb",
+     "lib/mongoid/extensions/big_decimal/conversions.rb",
+     "lib/mongoid/extensions/binary/conversions.rb",
      "lib/mongoid/extensions/boolean/conversions.rb",
      "lib/mongoid/extensions/date/conversions.rb",
      "lib/mongoid/extensions/datetime/conversions.rb",
@@ -90,6 +89,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/string/inflections.rb",
      "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/extensions/time/conversions.rb",
+     "lib/mongoid/extras.rb",
      "lib/mongoid/factory.rb",
      "lib/mongoid/field.rb",
      "lib/mongoid/fields.rb",
@@ -158,7 +158,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
-     "spec/unit/mongoid/caching_spec.rb",
      "spec/unit/mongoid/callbacks_spec.rb",
      "spec/unit/mongoid/collection_spec.rb",
      "spec/unit/mongoid/collections/cyclic_iterator_spec.rb",
@@ -183,12 +182,13 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criterion/optional_spec.rb",
      "spec/unit/mongoid/cursor_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
-     "spec/unit/mongoid/enslavement_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/big_decimal/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/binary/conversions_spec.rb",
      "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
      "spec/unit/mongoid/extensions/date/conversions_spec.rb",
      "spec/unit/mongoid/extensions/datetime/conversions_spec.rb",
@@ -206,6 +206,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
+     "spec/unit/mongoid/extras_spec.rb",
      "spec/unit/mongoid/factory_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/fields_spec.rb",
@@ -235,7 +236,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://mongoid.org}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ODM framework for MongoDB}
   s.test_files = [
     "spec/integration/mongoid/associations_spec.rb",
@@ -278,7 +279,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
-     "spec/unit/mongoid/caching_spec.rb",
      "spec/unit/mongoid/callbacks_spec.rb",
      "spec/unit/mongoid/collection_spec.rb",
      "spec/unit/mongoid/collections/cyclic_iterator_spec.rb",
@@ -303,12 +303,13 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criterion/optional_spec.rb",
      "spec/unit/mongoid/cursor_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
-     "spec/unit/mongoid/enslavement_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/big_decimal/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/binary/conversions_spec.rb",
      "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
      "spec/unit/mongoid/extensions/date/conversions_spec.rb",
      "spec/unit/mongoid/extensions/datetime/conversions_spec.rb",
@@ -326,6 +327,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
+     "spec/unit/mongoid/extras_spec.rb",
      "spec/unit/mongoid/factory_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/fields_spec.rb",
@@ -361,14 +363,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, ["<= 2.3.5"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_runtime_dependency(%q<durran-validatable>, [">= 2.0.1"])
-      s.add_runtime_dependency(%q<will_paginate>, ["< 3.0.pre"])
+      s.add_runtime_dependency(%q<will_paginate>, ["< 2.9"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
       s.add_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
-      s.add_dependency(%q<will_paginate>, ["< 3.0.pre"])
+      s.add_dependency(%q<will_paginate>, ["< 2.9"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
@@ -376,7 +378,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
     s.add_dependency(%q<mongo>, [">= 0.18.3"])
     s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
-    s.add_dependency(%q<will_paginate>, ["< 3.0.pre"])
+    s.add_dependency(%q<will_paginate>, ["< 2.9"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
   end

data/spec/integration/mongoid/document_spec.rb

@@ -244,7 +244,7 @@ describe Mongoid::Document do
 
     before do
       5.times do |num|
-        Person.create(:title => "Sir", :age => num)
+        Person.create(:title => "Sir", :age => num, :ssn => num)
       end
     end
 

data/spec/models/person.rb

@@ -15,6 +15,7 @@ class Person
   field :score, :type => Integer
   field :blood_alcohol_content, :type => Float, :default => lambda{ 0.0 }
   field :ssn
+  field :owner_id, :accessible => false, :type => Integer
 
   index :age
   index :addresses

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

@@ -134,6 +134,10 @@ describe Mongoid::Associations::BelongsToRelated do
         Mongoid::Associations::BelongsToRelated.update(nil, @child, @options).should be_nil
       end
 
+      it "removes the association" do
+        Mongoid::Associations::BelongsToRelated.update(nil, @child, @options)
+        @child.person.should be_nil
+      end
     end
 
   end

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

@@ -45,16 +45,36 @@ describe Mongoid::Associations::HasManyRelated do
 
     context "when parent document has not been saved" do
 
-      before do
-        @parent = stub(:id => "1", :new_record? => true, :class => Person)
-        Post.expects(:all).returns([])
-        @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
+      context "when appending a non mongoid object" do
+
+        before do
+          @parent = stub(:id => "1", :new_record? => true, :class => Person)
+          Post.expects(:all).returns([])
+          @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
+        end
+
+        it "appends the child document" do
+          @child.expects(:person_id=).with(@parent.id)
+          @association << @child
+          @association.size.should == 1
+        end
       end
 
-      it "appends the child document" do
-        @child.expects(:person_id=).with(@parent.id)
-        @association << @child
-        @association.size.should == 1
+      context "when appending a mongoid document" do
+
+        before do
+          @criteria = mock
+          @parent = stub(:id => "1", :new_record? => true, :class => Person)
+          Post.expects(:all).returns(@criteria)
+          @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
+        end
+
+        it "appends the child document" do
+          @criteria.expects(:entries).returns([])
+          @child.expects(:person_id=).with(@parent.id)
+          @association << @child
+          @association.size.should == 1
+        end
       end
 
     end
@@ -81,8 +101,10 @@ describe Mongoid::Associations::HasManyRelated do
   describe "#build" do
 
     before do
-      @parent = stub(:id => "5", :class => Person)
-      Post.expects(:all).returns([])
+      @criteria = mock
+      @criteria.expects(:entries).returns([])
+      @parent = stub(:id => "5", :class => Person, :new_record? => true)
+      Post.expects(:all).returns(@criteria)
       @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
     end
 
@@ -169,18 +191,25 @@ describe Mongoid::Associations::HasManyRelated do
   describe "#create" do
 
     before do
-      @parent = stub(:id => "5", :class => Person)
+      @post = mock
+      @parent = stub(:id => "5", :class => Person, :new_record? => true)
       Post.expects(:all).returns([])
-      Mongoid::Commands::Save.expects(:execute)
       @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
+      Post.expects(:instantiate).returns(@post)
     end
 
     it "builds and saves the new object" do
+      @post.expects(:run_callbacks).with(:before_create)
+      @post.expects(:save).returns(true)
+      @post.expects(:run_callbacks).with(:after_create)
       @association.create(:title => "Sassy")
     end
 
     it "returns the new object" do
-      @association.create(:title => "Sassy").should be_a_kind_of(Post)
+      @post.expects(:run_callbacks).with(:before_create)
+      @post.expects(:save).returns(true)
+      @post.expects(:run_callbacks).with(:after_create)
+      @association.create(:title => "Sassy").should == @post
     end
 
   end