mongoid 1.2.7 → 1.2.8

data/lib/mongoid/identity.rb

@@ -27,7 +27,7 @@ module Mongoid #:nodoc:
 
       # Set the _type field on the document.
       def type(doc)
-        doc._type = doc.class.name
+        doc._type = doc.class.name if Mongoid.persist_types
       end
 
       # Generates the composite key for a document.

data/lib/mongoid/javascript.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  class Javascript
+    # Constant for the file that defines all the js functions.
+    FUNCTIONS = File.join(File.dirname(__FILE__), "javascript", "functions.yml")
+
+    # Load the javascript functions and define a class method for each one,
+    # that memoizes the value.
+    #
+    # Example:
+    #
+    # <tt>Mongoid::Javascript.aggregate</tt>
+    YAML.load(File.read(FUNCTIONS)).each_pair do |key, function|
+      (class << self; self; end).class_eval <<-EOT
+        def #{key}
+          @#{key} ||= "#{function}"
+        end
+      EOT
+    end
+  end
+end

data/lib/mongoid/javascript/functions.yml

@@ -0,0 +1,37 @@
+aggregate:
+  "function(obj, prev) {
+     prev.count++;
+   }"
+
+group:
+  "function(obj, prev) {
+     prev.group.push(obj);
+   }"
+
+max:
+  "function(obj, prev) {
+     if (prev.max == 'start') {
+       prev.max = obj.[field];
+     }
+     if (prev.max < obj.[field]) {
+       prev.max = obj.[field];
+     }
+   }"
+
+min:
+  "function(obj, prev) {
+     if (prev.min == 'start') {
+       prev.min = obj.[field];
+     }
+     if (prev.min > obj.[field]) {
+       prev.min = obj.[field];
+     }
+   }"
+
+sum:
+  "function(obj, prev) {
+     if (prev.sum == 'start') {
+       prev.sum = 0;
+     }
+     prev.sum += obj.[field];
+  }"

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.7"
+  s.version = "1.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-25}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
      "lib/mongoid/associations/has_many_related.rb",
      "lib/mongoid/associations/has_one.rb",
      "lib/mongoid/associations/has_one_related.rb",
+     "lib/mongoid/associations/meta_data.rb",
      "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",
@@ -94,6 +96,8 @@ Gem::Specification.new do |s|
      "lib/mongoid/finders.rb",
      "lib/mongoid/identity.rb",
      "lib/mongoid/indexes.rb",
+     "lib/mongoid/javascript.rb",
+     "lib/mongoid/javascript/functions.yml",
      "lib/mongoid/matchers.rb",
      "lib/mongoid/matchers/all.rb",
      "lib/mongoid/matchers/default.rb",
@@ -150,9 +154,11 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_related_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
+     "spec/unit/mongoid/associations/meta_data_spec.rb",
      "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",
@@ -206,6 +212,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/identity_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
+     "spec/unit/mongoid/javascript_spec.rb",
      "spec/unit/mongoid/matchers/all_spec.rb",
      "spec/unit/mongoid/matchers/default_spec.rb",
      "spec/unit/mongoid/matchers/exists_spec.rb",
@@ -267,9 +274,11 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_related_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
+     "spec/unit/mongoid/associations/meta_data_spec.rb",
      "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",
@@ -323,6 +332,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/identity_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
+     "spec/unit/mongoid/javascript_spec.rb",
      "spec/unit/mongoid/matchers/all_spec.rb",
      "spec/unit/mongoid/matchers/default_spec.rb",
      "spec/unit/mongoid/matchers/exists_spec.rb",

data/spec/integration/mongoid/attributes_spec.rb

@@ -12,9 +12,9 @@ describe Mongoid::Attributes do
       Person.delete_all
     end
 
-    it "the field should not exist" do
+    it "the field should exist with a nil value" do
       from_db = Person.find(@person.id)
-      from_db.attributes.has_key?(:score).should be_false
+      from_db.attributes.has_key?(:score).should be_true
     end
 
   end

data/spec/integration/mongoid/commands_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Commands do
 
   before do
-    @person = Person.new(:title => "Sir", :ssn => "6969696")
+    @person = Person.new(:title => "Sir", :ssn => "6969696", :pets => true)
   end
 
   after do
@@ -188,9 +188,11 @@ describe Mongoid::Commands do
       end
 
       it "saves the attributes" do
-        @person.update_attributes(:ssn => "555-55-1235", :title => "Blah")
+        @person.update_attributes(:ssn => "555-55-1235", :pets => false, :title => nil)
         @from_db = Person.find(@person.id)
-        @from_db.title.should == "Blah"
+        @from_db.ssn.should == "555-55-1235"
+        @from_db.pets.should == false
+        @from_db.title.should be_nil
       end
 
     end

data/spec/integration/mongoid/criteria_spec.rb

@@ -50,6 +50,33 @@ describe Mongoid::Criteria do
     end
   end
 
+  describe "#in" do
+
+    context "when searching nil values" do
+
+      before do
+        @person = Person.create(:title => nil)
+      end
+
+      it "returns the correct document" do
+        from_db = Person.criteria.in(:title => [ true, false, nil ]).first
+        from_db.should == @person
+      end
+    end
+
+    context "when searching false values" do
+
+      before do
+        @person = Person.create(:terms => false)
+      end
+
+      it "returns the correct document" do
+        from_db = Person.criteria.in(:terms => [ true, false, nil ]).first
+        from_db.should == @person
+      end
+    end
+  end
+
   describe "#max" do
 
     context "without results" do

data/spec/models/game.rb

@@ -3,4 +3,5 @@ class Game
   field :high_score, :default => 500
   field :score, :type => Integer, :default => 0
   belongs_to_related :person
-end
+  enslave and cache
+end

data/spec/models/post.rb

@@ -12,4 +12,4 @@ class Post
       where(:created_at => { "$lt" => 30.days.ago })
     end
   end
-end
+end

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

@@ -11,7 +11,11 @@ describe Mongoid::Associations::HasManyRelated do
   end
 
   let(:options) do
-    Mongoid::Associations::Options.new(:name => :posts, :extend => block)
+    Mongoid::Associations::Options.new(
+      :name => :posts,
+      :foreign_key => "person_id",
+      :extend => block
+    )
   end
 
   describe "#<<" do

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

@@ -0,0 +1,88 @@
+require "spec_helper"
+
+describe Mongoid::Associations::MetaData do
+
+  before do
+    @extension = lambda { "Test" }
+  end
+
+  let(:association) do
+    Mongoid::Associations::HasManyRelated
+  end
+
+  let(:options) do
+    Mongoid::Associations::Options.new(
+      :name => :games,
+      :extend => @extension,
+      :foreign_key => "person_id",
+      :inverse_of => :people
+    )
+  end
+
+  let(:metadata) do
+    Mongoid::Associations::MetaData.new(association, options)
+  end
+
+  describe "#extension" do
+
+    it "delegates to the options" do
+      metadata.extension.should == @extension
+    end
+  end
+
+  describe "#foreign_key" do
+
+    it "delegates to the options" do
+      metadata.foreign_key.should == "person_id"
+    end
+  end
+
+  describe "#inverse_of" do
+
+    it "delegates to the options" do
+      metadata.inverse_of.should == :people
+    end
+  end
+
+  describe "#klass" do
+
+    it "returns the associated klass" do
+      metadata.klass.should == Game
+    end
+  end
+
+  describe "#macro" do
+
+    it "returns the association macro" do
+      metadata.macro.should == :has_many_related
+    end
+  end
+
+  describe "#name" do
+
+    it "delegates to the options" do
+      metadata.name.should == "games"
+    end
+  end
+
+  describe "#options" do
+
+    it "returns the association options" do
+      metadata.options.should == options
+    end
+  end
+
+  describe "#polymorphic" do
+
+    it "delegates to the options" do
+      metadata.polymorphic.should be_false
+    end
+  end
+
+  describe "#association" do
+
+    it "returns the association type" do
+      metadata.association.should == Mongoid::Associations::HasManyRelated
+    end
+  end
+end

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

@@ -75,15 +75,29 @@ describe Mongoid::Associations::Options do
 
   describe "#foreign_key" do
 
-    before do
-      @attributes = { :name => :game }
-      @options = Mongoid::Associations::Options.new(@attributes)
-    end
+    context "when no custom key defined" do
+
+      before do
+        @attributes = { :name => :posts }
+        @options = Mongoid::Associations::Options.new(@attributes)
+      end
 
-    it "returns the association foreign_key" do
-      @options.foreign_key.should == "game_id"
+      it "returns the association foreign_key" do
+        @options.foreign_key.should == "post_id"
+      end
     end
 
+    context "when a custom key is defined" do
+
+      before do
+        @attributes = { :name => :posts, :foreign_key => "blog_post_id" }
+        @options = Mongoid::Associations::Options.new(@attributes)
+      end
+
+      it "returns the custom foreign_key" do
+        @options.foreign_key.should == "blog_post_id"
+      end
+    end
   end
 
   describe "#inverse_of" do
@@ -146,19 +160,6 @@ describe Mongoid::Associations::Options do
 
   end
 
-  describe "#parent_key" do
-
-    before do
-      @attributes = { :parent_key => :person_id }
-      @options = Mongoid::Associations::Options.new(@attributes)
-    end
-
-    it "returns the parent's foreign key value" do
-      @options.parent_key.should == :person_id
-    end
-
-  end
-
   describe "#polymorphic" do
 
     context "when attribute provided" do

data/spec/unit/mongoid/associations_spec.rb

@@ -94,6 +94,17 @@ describe Mongoid::Associations do
 
   end
 
+  describe "#associations" do
+
+    before do
+      @person = Person.new
+    end
+
+    it "is a hash with name keys and meta data values" do
+      @person.associations["addresses"].should be_a_kind_of(Mongoid::Associations::MetaData)
+    end
+  end
+
   describe ".belongs_to" do
 
     it "creates a reader for the association" do
@@ -429,6 +440,10 @@ describe Mongoid::Associations do
       @game.should respond_to(:person)
     end
 
+    it "defaults the foreign_key option to the name_id" do
+      @game.associations["person"].foreign_key.should == "person_id"
+    end
+
     context "when document is root level" do
 
       it "puts an index on the foreign key" do
@@ -494,15 +509,34 @@ describe Mongoid::Associations do
 
     context "when associations exist" do
 
-      before do
-        @related = stub(:id => "100", :person= => true)
-        @person = Person.new
-        @person.posts = [@related]
+      context "when the document is a new record" do
+
+        before do
+          @related = stub(:id => "100", :person= => true)
+          @person = Person.new
+          @person.posts = [@related]
+        end
+
+        it "saves each association" do
+          @related.expects(:save).returns(@related)
+          @person.update_associations(:posts)
+        end
+
       end
 
-      it "saves each association" do
-        @related.expects(:save).returns(@related)
-        @person.update_associations(:posts)
+      context "when the document is not new" do
+
+        before do
+          @related = stub(:id => "100", :person= => true)
+          @person = Person.new
+          @person.instance_variable_set(:@new_record, false)
+          @person.posts = [@related]
+        end
+
+        it "does not save each association" do
+          @person.update_associations(:posts)
+        end
+
       end
 
     end