mongoid 1.0.6 → 1.1.0

data/spec/unit/mongoid/criteria_spec.rb

@@ -7,6 +7,111 @@ describe Mongoid::Criteria do
     @canvas_criteria = Mongoid::Criteria.new(Canvas)
   end
 
+  describe "#+" do
+
+    before do
+      @sir = Person.new(:title => "Sir")
+      @madam = Person.new(:title => "Madam")
+      @canvas = Canvas.new
+    end
+
+    context "when the criteria has not been executed" do
+
+      before do
+        @collection = mock
+        @cursor = stub(:count => 1, :collect => [ @sir, @madam ])
+        Person.expects(:collection).returns(@collection)
+        @collection.expects(:find).returns(@cursor)
+      end
+
+      it "executes the criteria and concats the results" do
+        results = @criteria + [ @canvas ]
+        results.should == [ @sir, @madam, @canvas ]
+      end
+
+    end
+
+    context "when the criteria has been executed" do
+
+      before do
+        @criteria.instance_variable_set(:@collection, [ @sir, @madam ])
+      end
+
+      it "concats the results" do
+        results = @criteria + [ @canvas ]
+        results.should == [ @sir, @madam, @canvas ]
+      end
+
+    end
+
+    context "when the other is a criteria" do
+
+      before do
+        @criteria.instance_variable_set(:@collection, [ @sir, @madam ])
+        @canvas_criteria.instance_variable_set(:@collection, [ @canvas ])
+      end
+
+      it "concats the results" do
+        results = @criteria + @canvas_criteria
+        results.should == [ @sir, @madam, @canvas ]
+      end
+
+    end
+
+  end
+
+  describe "#-" do
+
+    before do
+      @sir = Person.new(:title => "Sir")
+      @madam = Person.new(:title => "Madam")
+    end
+
+    context "when the criteria has not been executed" do
+
+      before do
+        @collection = mock
+        @cursor = stub(:count => 1, :collect => [ @sir, @sir, @madam ])
+        Person.expects(:collection).returns(@collection)
+        @collection.expects(:find).returns(@cursor)
+      end
+
+      it "executes the criteria and returns the difference" do
+        results = @criteria - [ @sir ]
+        results.should == [ @madam ]
+      end
+
+    end
+
+    context "when the criteria has been executed" do
+
+      before do
+        @criteria.instance_variable_set(:@collection, [@sir, @sir, @madam])
+      end
+
+      it "returns the difference" do
+        results = @criteria - [ @sir ]
+        results.should == [ @madam ]
+      end
+
+    end
+
+    context "when the other is a criteria" do
+
+      before do
+        @criteria.instance_variable_set(:@collection, [@sir, @sir, @madam])
+        @canvas_criteria.instance_variable_set(:@collection, [@sir])
+      end
+
+      it "returns the difference" do
+        results = @criteria - @canvas_criteria
+        results.should == [ @madam ]
+      end
+
+    end
+
+  end
+
   describe "#[]" do
 
     before do
@@ -89,7 +194,59 @@ describe Mongoid::Criteria do
 
   end
 
-  describe "#collect" do
+  describe "#context" do
+
+    context "when the context has been set" do
+
+      before do
+        @context = stub
+        @criteria.instance_variable_set(:@context, @context)
+      end
+
+      it "returns the memoized context" do
+        @criteria.context.should == @context
+      end
+
+    end
+
+    context "when the context has not been set" do
+
+      before do
+        @context = stub
+      end
+
+      it "creates a new context" do
+        Mongoid::Contexts::Mongo.expects(:new).with(
+          @criteria.selector, @criteria.options, @criteria.klass
+        ).returns(@context)
+        @criteria.context.should == @context
+      end
+
+    end
+
+    context "when the class is embedded" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(Address)
+      end
+
+      it "returns an enumerable context" do
+        @criteria.context.should be_a_kind_of(Mongoid::Contexts::Enumerable)
+      end
+
+    end
+
+    context "when the class is not embedded" do
+
+      it "returns a mongo context" do
+        @criteria.context.should be_a_kind_of(Mongoid::Contexts::Mongo)
+      end
+
+    end
+
+  end
+
+  describe "#entries" do
 
     context "filtering" do
 
@@ -101,7 +258,7 @@ describe Mongoid::Criteria do
       end
 
       it "filters out unused params" do
-        @criteria.collect
+        @criteria.entries
         @criteria.options[:page].should be_nil
         @criteria.options[:per_page].should be_nil
       end
@@ -119,7 +276,7 @@ describe Mongoid::Criteria do
       end
 
       it "adds the count instance variable" do
-        @criteria.collect.should == []
+        @criteria.entries.should == []
         @criteria.count.should == 44
       end
 
@@ -132,7 +289,7 @@ describe Mongoid::Criteria do
         collection = mock
         Person.expects(:collection).returns(collection)
         collection.expects(:find).with(@criteria.selector, @criteria.options).returns([])
-        criteria.collect.should == []
+        criteria.entries.should == []
       end
 
     end
@@ -141,18 +298,6 @@ describe Mongoid::Criteria do
 
   describe "#count" do
 
-    context "when criteria has not been executed" do
-
-      before do
-        @criteria.instance_variable_set(:@count, 34)
-      end
-
-      it "returns a count from the cursor" do
-        @criteria.count.should == 34
-      end
-
-    end
-
     context "when criteria has been executed" do
 
       before do
@@ -508,7 +653,7 @@ describe Mongoid::Criteria do
   describe "#max" do
 
     before do
-      @reduce = Mongoid::Criteria::MAX_REDUCE.gsub("[field]", "age")
+      @reduce = Mongoid::Contexts::Mongo::MAX_REDUCE.gsub("[field]", "age")
       @collection = mock
       Person.expects(:collection).returns(@collection)
     end
@@ -564,6 +709,22 @@ describe Mongoid::Criteria do
           @criteria.selector.should == @selector
           @criteria.options.should == @options
         end
+
+      end
+
+      context "when the other has a document collection" do
+
+        before do
+          @documents = [ stub ]
+          @other = Mongoid::Criteria.new(Person)
+          @other.documents = @documents
+        end
+
+        it "merges the documents collection in" do
+          @criteria.merge(@other)
+          @criteria.documents.should == @documents
+        end
+
       end
 
     end
@@ -605,7 +766,7 @@ describe Mongoid::Criteria do
       describe "#[]" do
 
         it "collects the criteria and calls []" do
-          @criteria.expects(:collect).returns([@document])
+          @criteria.expects(:entries).returns([@document])
           @criteria[0].should == @document
         end
 
@@ -614,7 +775,7 @@ describe Mongoid::Criteria do
       describe "#rand" do
 
         it "collects the criteria and call rand" do
-          @criteria.expects(:collect).returns(@array)
+          @criteria.expects(:entries).returns(@array)
           @array.expects(:send).with(:rand).returns(@document)
           @criteria.rand
         end
@@ -628,7 +789,7 @@ describe Mongoid::Criteria do
   describe "#min" do
 
     before do
-      @reduce = Mongoid::Criteria::MIN_REDUCE.gsub("[field]", "age")
+      @reduce = Mongoid::Contexts::Mongo::MIN_REDUCE.gsub("[field]", "age")
       @collection = mock
       Person.expects(:collection).returns(@collection)
     end
@@ -917,7 +1078,7 @@ describe Mongoid::Criteria do
     context "when klass not provided" do
 
       before do
-        @reduce = Mongoid::Criteria::SUM_REDUCE.gsub("[field]", "age")
+        @reduce = Mongoid::Contexts::Mongo::SUM_REDUCE.gsub("[field]", "age")
         @collection = mock
         Person.expects(:collection).returns(@collection)
       end

data/spec/unit/mongoid/extensions/array/accessors_spec.rb

@@ -7,12 +7,12 @@ describe Mongoid::Extensions::Array::Accessors do
     context "when the attributes exist" do
 
       before do
-        @array = [{ :_id => 1, :name => "James T. Kirk" }]
+        @array = [{ "_id" => 1, "name" => "James T. Kirk" }]
       end
 
       it "overwrites with the new attributes" do
-        @array.update({ :_id => 1, :name => "Spock" })
-        @array.first[:name].should == "Spock"
+        @array.update({ "_id" => 1, "name" => "Spock" })
+        @array.first["name"].should == "Spock"
       end
 
     end
@@ -20,13 +20,13 @@ describe Mongoid::Extensions::Array::Accessors do
     context "when the attributes do not exist" do
 
       before do
-        @array = [{ :_id => 1, :name => "James T. Kirk" }]
+        @array = [{ "_id" => 1, "name" => "James T. Kirk" }]
       end
 
       it "appends the new attributes" do
-        @array.update({ :_id => 2, :name => "Scotty" })
+        @array.update({ "_id" => 2, "name" => "Scotty" })
         @array.size.should == 2
-        @array.last[:name].should == "Scotty"
+        @array.last["name"].should == "Scotty"
       end
 
     end
@@ -34,13 +34,13 @@ describe Mongoid::Extensions::Array::Accessors do
     context "when the new attribtues have no id" do
 
       before do
-        @array = [{ :_id => 1, :name => "James T. Kirk" }]
+        @array = [{ "_id" => 1, :name => "James T. Kirk" }]
       end
 
       it "appends the new attributes" do
-        @array.update({:name => "Scotty" })
+        @array.update({"name" => "Scotty" })
         @array.size.should == 2
-        @array.last[:name].should == "Scotty"
+        @array.last["name"].should == "Scotty"
       end
 
     end

data/spec/unit/mongoid/extensions/date/conversions_spec.rb

@@ -21,7 +21,8 @@ describe Mongoid::Extensions::Date::Conversions do
       context "when string is a date" do
 
         it "returns a time from the string" do
-          Date.set("01/15/2007").should == Date.new(2007, 1, 15).at_midnight.utc
+          date = RUBY_VERSION.start_with?("1.9") ? "15/01/2007" : "01/15/2007"
+          Date.set(date).should == Date.new(2007, 1, 15).at_midnight.utc
         end
 
       end

data/spec/unit/mongoid/extensions/float/conversions_spec.rb

@@ -12,9 +12,9 @@ describe Mongoid::Extensions::Float::Conversions do
 
     end
 
-    context "when the string is not a number" do
+    context "when the value is not a number" do
 
-      context "when the string is non numerical" do
+      context "when the value is non numerical" do
 
         it "returns the string" do
           Float.set("foo").should == "foo"
@@ -33,7 +33,7 @@ describe Mongoid::Extensions::Float::Conversions do
       context "when the string is empty" do
 
         it "returns 0.0" do
-          Float.set("").should == 0.0
+          Float.set("").should be_nil
         end
 
       end
@@ -41,7 +41,7 @@ describe Mongoid::Extensions::Float::Conversions do
       context "when the string is nil" do
 
         it "returns 0.0" do
-          Float.set(nil).should == 0.0
+          Float.set(nil).should be_nil
         end
 
       end

data/spec/unit/mongoid/extensions/integer/conversions_spec.rb

@@ -33,7 +33,7 @@ describe Mongoid::Extensions::Integer::Conversions do
       context "when the string is empty" do
 
         it "returns an empty string" do
-          Integer.set("").should be_blank
+          Integer.set("").should be_nil
         end
 
       end

data/spec/unit/mongoid/fields_spec.rb

@@ -95,17 +95,17 @@ describe Mongoid::Fields do
       end
 
       it "uses the alias to write the attribute" do
-        @person.expects(:write_attribute).with(:aliased, true)
+        @person.expects(:write_attribute).with("aliased", true)
         @person.alias = true
       end
 
       it "uses the alias to read the attribute" do
-        @person.expects(:read_attribute).with(:aliased)
+        @person.expects(:read_attribute).with("aliased")
         @person.alias
       end
 
       it "uses the alias for the query method" do
-        @person.expects(:read_attribute).with(:aliased)
+        @person.expects(:read_attribute).with("aliased")
         @person.alias?
       end
 

data/spec/unit/mongoid/identity_spec.rb

@@ -19,7 +19,7 @@ describe Mongoid::Identity do
 
       before do
         @address = Address.allocate
-        @address.instance_variable_set(:@attributes, { :street => "Market St"})
+        @address.instance_variable_set(:@attributes, { "street" => "Market St"})
       end
 
       it "sets the id to the composite key" do
@@ -51,7 +51,7 @@ describe Mongoid::Identity do
 
         before do
           @person = Person.allocate
-          @person.instance_variable_set(:@attributes, { :_id => "5" })
+          @person.instance_variable_set(:@attributes, { "_id" => "5" })
         end
 
         it "returns the existing id" do

data/spec/unit/mongoid/matchers/all_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Mongoid::Matchers::All do
+
+  let(:matcher) { Mongoid::Matchers::All.new(["first", "second"]) }
+
+  describe "#matches?" do
+
+    context "when the values are equal" do
+
+      it "returns true" do
+        matcher.matches?("$all" => ["first", "second"]).should be_true
+      end
+
+    end
+
+    context "when the values are not equal" do
+
+      it "returns false" do
+        matcher.matches?("$all" => ["first"]).should be_false
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/matchers/default_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Mongoid::Matchers::Default do
+
+  let(:matcher) { Mongoid::Matchers::Default.new("Testing") }
+
+  describe "#matches?" do
+
+    context "when the values are equal" do
+
+      it "returns true" do
+        matcher.matches?("Testing").should be_true
+      end
+
+    end
+
+    context "when the values are not equal" do
+
+      it "returns false" do
+        matcher.matches?("Other").should be_false
+      end
+
+    end
+
+  end
+
+end