mongoid 1.2.7 → 1.2.8

data/spec/unit/mongoid/caching_spec.rb

@@ -0,0 +1,63 @@
+require "spec_helper"
+
+describe Mongoid::Caching do
+
+  before do
+    @klass = Class.new do
+      include Mongoid::Caching
+    end
+  end
+
+  describe ".cache" do
+
+    before do
+      @klass.cache
+    end
+
+    it "sets the cached boolean on the class" do
+      @klass.cached.should be_true
+    end
+
+  end
+
+  describe ".cached" do
+
+    it "defaults to false" do
+      @klass.cached.should be_false
+    end
+  end
+
+  describe ".cached?" do
+
+    context "when the class is cached" do
+
+      before do
+        @klass.cache
+      end
+
+      it "returns true" do
+        @klass.should be_cached
+      end
+    end
+
+    context "when the class is not cached" do
+
+      it "returns false" do
+        @klass.should_not be_cached
+      end
+    end
+
+  end
+
+  describe "#cached?" do
+
+    before do
+      @klass.cache
+      @doc = @klass.new
+    end
+
+    it "returns the class cached? value" do
+      @doc.should be_cached
+    end
+  end
+end

data/spec/unit/mongoid/collection_spec.rb

@@ -42,12 +42,12 @@ describe Mongoid::Collection do
 
   describe "#directed" do
 
-    before do
-      slaves.expects(:empty?).returns(false)
-    end
-
     context "when an enslave option is not passed" do
 
+      before do
+        slaves.expects(:empty?).returns(false)
+      end
+
       before do
         Person.enslave
       end
@@ -63,11 +63,27 @@ describe Mongoid::Collection do
 
     context "when an enslave option is passed" do
 
+      before do
+        slaves.expects(:empty?).returns(false)
+      end
+
       it "overwrites the default" do
         collection.directed(:enslave => true).should == slaves
       end
     end
 
+    context "when cached option is passed" do
+
+      let(:options) do
+        { :cache => true }
+      end
+
+      it "removed the cache option" do
+        collection.directed(options).should == master
+        options[:cache].should be_nil
+      end
+    end
+
   end
 
   describe "#find" do

data/spec/unit/mongoid/config_spec.rb

@@ -39,6 +39,13 @@ describe Mongoid::Config do
     end
   end
 
+  describe "#persist_types" do
+
+    it "defaults to true" do
+      config.persist_types.should == true
+    end
+  end
+
   describe "#persist_in_safe_mode=" do
 
     context "when setting to true" do

data/spec/unit/mongoid/contexts/mongo_spec.rb

@@ -73,7 +73,13 @@ describe Mongoid::Contexts::Mongo do
     before do
       @cursor = stub(:count => 500)
       @collection = mock
-      @klass = stub(:collection => @collection, :hereditary => false, :instantiate => @person)
+      @klass = stub(
+        :collection => @collection,
+        :hereditary => false,
+        :instantiate => @person,
+        :enslaved? => false,
+        :cached? => false
+      )
       @criteria = Mongoid::Criteria.new(@klass)
       @criteria.where(selector).skip(20)
       @context = Mongoid::Contexts::Mongo.new(@criteria)
@@ -151,27 +157,60 @@ describe Mongoid::Contexts::Mongo do
     let(:selector) { { :field => "value"  } }
     let(:options) { { :skip => 20 } }
     let(:klass) { Person }
+    let(:criteria) { Mongoid::Criteria.new(klass) }
+    let(:context) { Mongoid::Contexts::Mongo.new(criteria) }
 
     before do
-      @criteria = Mongoid::Criteria.new(klass)
-      @criteria.where(selector).skip(20)
-      @context = Mongoid::Contexts::Mongo.new(@criteria)
+      criteria.where(selector).skip(20)
     end
 
     it "sets the selector" do
-      @context.selector.should == @criteria.selector
+      context.selector.should == criteria.selector
     end
 
     it "sets the options" do
-      @context.options.should == options
+      context.options.should == options
     end
 
     it "sets the klass" do
-      @context.klass.should == klass
+      context.klass.should == klass
+    end
+
+    context "when persisting type" do
+
+      it "set the selector to query across the _type when it is hereditary" do
+        context.selector[:_type].should == {'$in' => Person._types}
+      end
+
+    end
+
+    context "when not persisting type" do
+
+      before do
+        Mongoid.persist_types = false
+      end
+
+      after do
+        Mongoid.persist_types = true
+      end
+
+      it "does not add the type to the selector" do
+        context.selector[:_type].should be_nil
+      end
+
     end
 
-    it "set the selector to query across the _type of the Criteria's klass when it is hereditary" do
-      @context.selector[:_type].should == {'$in' => Person._types}
+    context "enslaved and cached classes" do
+
+      let(:klass) { Game }
+
+      it "enslaves the criteria" do
+        context.criteria.should be_enslaved
+      end
+
+      it "caches the criteria" do
+        context.criteria.should be_cached
+      end
     end
   end
 
@@ -236,7 +275,7 @@ describe Mongoid::Contexts::Mongo do
   describe "#max" do
 
     before do
-      @reduce = Mongoid::Contexts::Mongo::MAX_REDUCE.gsub("[field]", "age")
+      @reduce = Mongoid::Javascript.max.gsub("[field]", "age")
       @collection = mock
       Person.expects(:collection).returns(@collection)
       @criteria = Mongoid::Criteria.new(Person)
@@ -259,7 +298,7 @@ describe Mongoid::Contexts::Mongo do
   describe "#min" do
 
     before do
-      @reduce = Mongoid::Contexts::Mongo::MIN_REDUCE.gsub("[field]", "age")
+      @reduce = Mongoid::Javascript.min.gsub("[field]", "age")
       @collection = mock
       Person.expects(:collection).returns(@collection)
       @criteria = Mongoid::Criteria.new(Person)
@@ -371,7 +410,7 @@ describe Mongoid::Contexts::Mongo do
     context "when klass not provided" do
 
       before do
-        @reduce = Mongoid::Contexts::Mongo::SUM_REDUCE.gsub("[field]", "age")
+        @reduce = Mongoid::Javascript.sum.gsub("[field]", "age")
         @collection = mock
         @criteria = Mongoid::Criteria.new(Person)
         @context = Mongoid::Contexts::Mongo.new(@criteria)

data/spec/unit/mongoid/criteria_spec.rb

@@ -318,7 +318,12 @@ describe Mongoid::Criteria do
 
       before do
         Person.expects(:collection).returns(@collection)
-        @collection.expects(:find).with({ :_type => { "$in" => ["Doctor", "Person"] }, :title => "Sir" }, {}).returns(@cursor)
+        @collection.expects(:find).with(
+          { :_type => { "$in" => ["Doctor", "Person"] },
+            :title => "Sir"
+          },
+          { :cache => true }
+        ).returns(@cursor)
         @cursor.expects(:each).yields(@person)
         @criteria.cache
         @criteria.each do |doc|
@@ -387,6 +392,7 @@ describe Mongoid::Criteria do
     it "sets the klass to the given class" do
       criteria.klass.should == Person
     end
+
   end
 
   describe "#last" do
@@ -704,6 +710,22 @@ describe Mongoid::Criteria do
 
       end
 
+      context "when Person, :conditions => {:id => id}" do
+
+        before do
+          @criteria = Mongoid::Criteria.translate(Person, :conditions => { :id => "1234e567" })
+        end
+
+        it "returns a criteria with a selector from the conditions" do
+          @criteria.selector.should == { :_id => "1234e567" }
+        end
+
+        it "returns a criteria with klass Person" do
+          @criteria.klass.should == Person
+        end
+
+      end
+
       context "when :all, :conditions => {}" do
 
         before do

data/spec/unit/mongoid/criterion/inclusion_spec.rb

@@ -66,6 +66,14 @@ describe Mongoid::Criterion::Inclusion do
         }
     end
 
+    it "#any_in is aliased to #in" do
+      @criteria.any_in(:title => ["title1", "title2"], :text => ["test"])
+      @criteria.selector.should ==
+        {
+          :title => { "$in" => ["title1", "title2"] }, :text => { "$in" => ["test"] }
+        }
+    end
+
     it "returns self" do
       @criteria.in(:title => ["title1"]).should == @criteria
     end

data/spec/unit/mongoid/criterion/optional_spec.rb

@@ -30,16 +30,6 @@ describe Mongoid::Criterion::Optional do
       it "returns true" do
         @criteria.cached?.should be_true
       end
-
-      it "removes cache from the options" do
-        @criteria.cached?
-        @criteria.options[:cache].should be_nil
-      end
-
-      it "sets the cache instance variable" do
-        @criteria.cached?
-        @criteria.instance_variable_get(:@cached).should be_true
-      end
     end
 
     context "when the criteria has no cache option" do

data/spec/unit/mongoid/identity_spec.rb

@@ -6,9 +6,30 @@ describe Mongoid::Identity do
 
     let(:name) { Name.new }
 
-    it "sets the document _type to the class name" do
-      Mongoid::Identity.create(name)
-      name._type.should == "Name"
+    context "when persisting types" do
+
+      it "sets the document _type to the class name" do
+        Mongoid::Identity.create(name)
+        name._type.should == "Name"
+      end
+
+    end
+
+    context "when not persisting types" do
+
+      before do
+        Mongoid.persist_types = false
+        @name = Name.new
+      end
+
+      after do
+        Mongoid.persist_types = true
+      end
+
+      it "does not set the type" do
+        @name._type.should be_nil
+      end
+
     end
 
     it "returns the document" do

data/spec/unit/mongoid/javascript_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+describe Mongoid::Javascript do
+
+  let(:js) do
+    Mongoid::Javascript
+  end
+
+  describe ".aggregate" do
+
+    it "returns the aggregate function" do
+      js.aggregate.should == "function(obj, prev) { prev.count++; }"
+    end
+  end
+
+  describe ".group" do
+
+    it "returns the group function" do
+      js.group.should == "function(obj, prev) { prev.group.push(obj); }"
+    end
+  end
+
+  describe ".max" do
+
+    it "returns the max function" do
+      js.max.should == "function(obj, prev) { if (prev.max == 'start') { " +
+        "prev.max = obj.[field]; } if (prev.max < obj.[field]) { prev.max = obj.[field];" +
+        " } }"
+    end
+  end
+
+  describe ".min" do
+
+    it "returns the min function" do
+      js.min.should == "function(obj, prev) { if (prev.min == 'start') { " +
+        "prev.min = obj.[field]; } if (prev.min > obj.[field]) { prev.min = obj.[field];" +
+        " } }"
+    end
+  end
+
+  describe ".sum" do
+
+    it "returns the sum function" do
+      js.sum.should == "function(obj, prev) { if (prev.sum == 'start') { prev.sum = 0; " +
+        "} prev.sum += obj.[field]; }"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,9 +97,11 @@ files:
 - 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
@@ -160,6 +162,8 @@ files:
 - 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
@@ -216,9 +220,11 @@ files:
 - 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
@@ -272,6 +278,7 @@ files:
 - 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
@@ -355,9 +362,11 @@ test_files:
 - 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
@@ -411,6 +420,7 @@ test_files:
 - 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