mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/mongoid.gemspec

@@ -5,11 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "2.0.0.beta1"
-
+  s.version = "2.0.0.pre"
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-02-09}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -17,6 +16,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      ".watchr",
+     "HISTORY",
      "MIT_LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -24,13 +24,12 @@ Gem::Specification.new do |s|
      "caliper.yml",
      "lib/mongoid.rb",
      "lib/mongoid/associations.rb",
+     "lib/mongoid/associations/belongs_to.rb",
      "lib/mongoid/associations/belongs_to_related.rb",
-     "lib/mongoid/associations/embed_many.rb",
-     "lib/mongoid/associations/embed_one.rb",
-     "lib/mongoid/associations/embedded_in.rb",
+     "lib/mongoid/associations/has_many.rb",
      "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",
@@ -53,7 +52,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/config.rb",
      "lib/mongoid/contexts.rb",
      "lib/mongoid/contexts/enumerable.rb",
-     "lib/mongoid/contexts/ids.rb",
      "lib/mongoid/contexts/mongo.rb",
      "lib/mongoid/contexts/paging.rb",
      "lib/mongoid/criteria.rb",
@@ -62,8 +60,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/criterion/inclusion.rb",
      "lib/mongoid/criterion/optional.rb",
      "lib/mongoid/cursor.rb",
-     "lib/mongoid/deprecation.rb",
-     "lib/mongoid/dirty.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/errors.rb",
      "lib/mongoid/extensions.rb",
@@ -72,8 +68,6 @@ 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",
@@ -86,21 +80,17 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/nil/assimilation.rb",
      "lib/mongoid/extensions/object/conversions.rb",
-     "lib/mongoid/extensions/objectid/conversions.rb",
      "lib/mongoid/extensions/proc/scoping.rb",
      "lib/mongoid/extensions/string/conversions.rb",
      "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",
      "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",
@@ -115,14 +105,10 @@ Gem::Specification.new do |s|
      "lib/mongoid/matchers/size.rb",
      "lib/mongoid/memoization.rb",
      "lib/mongoid/named_scope.rb",
-     "lib/mongoid/observable.rb",
-     "lib/mongoid/paths.rb",
      "lib/mongoid/scope.rb",
-     "lib/mongoid/state.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/validations.rb",
      "lib/mongoid/validations/associated.rb",
-     "lib/mongoid/validations/locale/en.yml",
      "lib/mongoid/validations/uniqueness.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
@@ -132,7 +118,6 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/contexts/enumerable_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
-     "spec/integration/mongoid/dirty_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/extensions_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
@@ -140,7 +125,6 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/named_scope_spec.rb",
      "spec/models/address.rb",
      "spec/models/animal.rb",
-     "spec/models/callbacks.rb",
      "spec/models/comment.rb",
      "spec/models/country_code.rb",
      "spec/models/employer.rb",
@@ -161,12 +145,11 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
-     "spec/unit/mongoid/associations/embed_many_spec.rb",
-     "spec/unit/mongoid/associations/embed_one_spec.rb",
-     "spec/unit/mongoid/associations/embedded_in_spec.rb",
+     "spec/unit/mongoid/associations/belongs_to_spec.rb",
      "spec/unit/mongoid/associations/has_many_related_spec.rb",
+     "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_related_spec.rb",
-     "spec/unit/mongoid/associations/meta_data_spec.rb",
+     "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
@@ -186,23 +169,18 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/config_spec.rb",
      "spec/unit/mongoid/contexts/enumerable_spec.rb",
      "spec/unit/mongoid/contexts/mongo_spec.rb",
-     "spec/unit/mongoid/contexts_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/criterion/complex_spec.rb",
      "spec/unit/mongoid/criterion/exclusion_spec.rb",
      "spec/unit/mongoid/criterion/inclusion_spec.rb",
      "spec/unit/mongoid/criterion/optional_spec.rb",
      "spec/unit/mongoid/cursor_spec.rb",
-     "spec/unit/mongoid/deprecation_spec.rb",
-     "spec/unit/mongoid/dirty_spec.rb",
      "spec/unit/mongoid/document_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",
@@ -220,14 +198,12 @@ 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",
      "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",
@@ -242,10 +218,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/matchers_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
-     "spec/unit/mongoid/observable_spec.rb",
-     "spec/unit/mongoid/paths_spec.rb",
      "spec/unit/mongoid/scope_spec.rb",
-     "spec/unit/mongoid/state_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/validations/associated_spec.rb",
      "spec/unit/mongoid/validations/uniqueness_spec.rb",
@@ -256,7 +229,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.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{ODM framework for MongoDB}
   s.test_files = [
     "spec/integration/mongoid/associations_spec.rb",
@@ -264,7 +237,6 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/contexts/enumerable_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
-     "spec/integration/mongoid/dirty_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/extensions_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
@@ -272,7 +244,6 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/named_scope_spec.rb",
      "spec/models/address.rb",
      "spec/models/animal.rb",
-     "spec/models/callbacks.rb",
      "spec/models/comment.rb",
      "spec/models/country_code.rb",
      "spec/models/employer.rb",
@@ -292,12 +263,11 @@ Gem::Specification.new do |s|
      "spec/models/vet_visit.rb",
      "spec/spec_helper.rb",
      "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
-     "spec/unit/mongoid/associations/embed_many_spec.rb",
-     "spec/unit/mongoid/associations/embed_one_spec.rb",
-     "spec/unit/mongoid/associations/embedded_in_spec.rb",
+     "spec/unit/mongoid/associations/belongs_to_spec.rb",
      "spec/unit/mongoid/associations/has_many_related_spec.rb",
+     "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_related_spec.rb",
-     "spec/unit/mongoid/associations/meta_data_spec.rb",
+     "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
@@ -317,23 +287,18 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/config_spec.rb",
      "spec/unit/mongoid/contexts/enumerable_spec.rb",
      "spec/unit/mongoid/contexts/mongo_spec.rb",
-     "spec/unit/mongoid/contexts_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/criterion/complex_spec.rb",
      "spec/unit/mongoid/criterion/exclusion_spec.rb",
      "spec/unit/mongoid/criterion/inclusion_spec.rb",
      "spec/unit/mongoid/criterion/optional_spec.rb",
      "spec/unit/mongoid/cursor_spec.rb",
-     "spec/unit/mongoid/deprecation_spec.rb",
-     "spec/unit/mongoid/dirty_spec.rb",
      "spec/unit/mongoid/document_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",
@@ -351,14 +316,12 @@ 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",
      "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",
@@ -373,10 +336,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/matchers_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
-     "spec/unit/mongoid/observable_spec.rb",
-     "spec/unit/mongoid/paths_spec.rb",
      "spec/unit/mongoid/scope_spec.rb",
-     "spec/unit/mongoid/state_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/validations/associated_spec.rb",
      "spec/unit/mongoid/validations/uniqueness_spec.rb",
@@ -392,21 +352,21 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.pre"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 3.0.pre"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0.19.1"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.18.2"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<activemodel>, [">= 3.0.pre"])
       s.add_dependency(%q<will_paginate>, [">= 3.0.pre"])
-      s.add_dependency(%q<mongo>, [">= 0.19.1"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<mongo>, [">= 0.18.2"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
   else
     s.add_dependency(%q<activemodel>, [">= 3.0.pre"])
     s.add_dependency(%q<will_paginate>, [">= 3.0.pre"])
-    s.add_dependency(%q<mongo>, [">= 0.19.1"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<mongo>, [">= 0.18.2"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
   end
 end

data/spec/integration/mongoid/associations_spec.rb

@@ -20,7 +20,7 @@ describe Mongoid::Associations do
       @person.save
     end
 
-    context "when defined on an embeds_many" do
+    context "when defined on a has_many" do
 
       it "applies the extension" do
         addresses = @person.addresses.find_by_street("Oxford")
@@ -49,16 +49,6 @@ describe Mongoid::Associations do
 
   end
 
-  context "creation of an embedded association on a callback" do
-
-    it "allows the use of create!" do
-      artist = Artist.create!(:name => "Depeche Mode")
-      artist.songs.size.should == 2
-      artist.songs.first.title.should == "0"
-      artist.songs.last.title.should == "1"
-    end
-  end
-
   context "criteria on has many embedded associations" do
 
     before do
@@ -226,33 +216,10 @@ describe Mongoid::Associations do
 
         end
 
-        context "calling criteria methods" do
-
-          before do
-            @post.title = "New Title"
-            @post.save
-          end
-
-          it "returns the proper object for the criteria" do
-            posts = @from_db.posts.where(:title => "New Title")
-            posts.size.should == 1
-          end
-
-          context "when calling with a new criteria" do
-
-            before do
-              @from_db.posts.create(:title => "Other Title")
-            end
-
-            it "does not retain the old criteria" do
-              @from_db.posts.where(:title => "New Title").size.should == 1
-              @from_db.posts.size.should == 2
-              @from_db.posts.where(:title => "Other Title").size.should == 1
-            end
-          end
-        end
       end
+
     end
+
   end
 
   context "nested embedded associations" do
@@ -273,12 +240,6 @@ describe Mongoid::Associations do
         @person.name.last_name.should == "Brown"
       end
 
-      it "sets the new_record values properly" do
-        from_db = Person.find(@person.id)
-        new_name = from_db.create_name(:first_name => "Flash")
-        new_name.new_record?.should be_false
-      end
-
     end
 
     context "multiple levels nested" do

data/spec/integration/mongoid/attributes_spec.rb

@@ -12,9 +12,9 @@ describe Mongoid::Attributes do
       Person.delete_all
     end
 
-    it "the field should exist with a nil value" do
+    it "the field should not exist" do
       from_db = Person.find(@person.id)
-      from_db.attributes.has_key?(:score).should be_true
+      from_db.attributes.has_key?(:score).should be_false
     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", :pets => true)
+    @person = Person.new(:title => "Sir", :ssn => "6969696")
   end
 
   after do
@@ -142,8 +142,11 @@ describe Mongoid::Commands do
           from_db = Person.find(@person.id)
           from_db.addresses.should be_empty
         end
+
       end
+
     end
+
   end
 
   describe "#save" do
@@ -185,46 +188,29 @@ describe Mongoid::Commands do
       end
 
       it "saves the attributes" do
-        @person.update_attributes(:ssn => "555-55-1235", :pets => false, :title => nil)
+        @person.update_attributes(:ssn => "555-55-1235", :title => "Blah")
         @from_db = Person.find(@person.id)
-        @from_db.ssn.should == "555-55-1235"
-        @from_db.pets.should == false
-        @from_db.title.should be_nil
+        @from_db.title.should == "Blah"
       end
 
     end
 
   end
 
-  describe "#delete_all" do
-
-    before do
-      @person.save
-    end
+  describe ".delete_all" do
 
-    it "deletes all the documents" do
-      Person.delete_all
-      Person.count.should == 0
+    it "returns true" do
+      Person.delete_all.should be_true
     end
 
-    it "returns the number of documents deleted" do
-      Person.delete_all.should == 1
-    end
   end
 
-  describe "#destroy_all" do
-
-    before do
-      @person.save
-    end
+  describe ".destroy_all" do
 
-    it "destroys all the documents" do
-      Person.destroy_all
-      Person.count.should == 0
+    it "returns true" do
+      Person.destroy_all.should be_true
     end
 
-    it "returns the number of documents destroyed" do
-      Person.destroy_all.should == 1
-    end
   end
+
 end

data/spec/integration/mongoid/contexts/enumerable_spec.rb

@@ -17,17 +17,4 @@ describe Mongoid::Contexts::Enumerable do
       addresses.size.should == 5
     end
   end
-
-  describe "limit and skip" do
-
-    it "limits" do
-      @person.addresses.criteria.limit(5).size.should == 5
-    end
-
-    it "skips" do
-      @person.addresses.criteria.skip(5).limit(10).
-        map(&:number).should == [5, 6, 7, 8, 9]
-    end
-
-  end
 end

data/spec/integration/mongoid/criteria_spec.rb

@@ -10,27 +10,6 @@ describe Mongoid::Criteria do
     Person.delete_all
   end
 
-  describe "#avg" do
-
-    context "without results" do
-      it "should return nil" do
-        Person.avg(:age).should == nil
-      end
-    end
-
-    context "with results" do
-      before do
-        10.times do |n|
-          Person.create(:title => "Sir", :age => ((n + 1) * 10), :aliases => ["D", "Durran"], :ssn => "#{n}")
-        end
-      end
-
-      it "provides min for the field provided" do
-        Person.avg(:age).should == 55
-      end
-    end
-  end
-
   describe "#excludes" do
 
     before do
@@ -71,33 +50,6 @@ 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.any_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
@@ -117,6 +69,7 @@ describe Mongoid::Criteria do
         Person.max(:age).should == 90.0
       end
     end
+
   end
 
   describe "#min" do
@@ -263,9 +216,9 @@ describe Mongoid::Criteria do
 
     it "iterates over the cursor only once" do
       criteria = Person.where(:title => "Sir").cache
-      criteria.collect.to_a.size.should == 10
+      criteria.collect.size.should == 10
       # Do it again!
-      criteria.collect.to_a.size.should == 10
+      criteria.collect.size.should == 10
     end
   end