mongomodel 0.2.20 → 0.3.0

data/lib/mongomodel/tasks/database.rake

@@ -1,9 +1,61 @@
 namespace :db do
+  desc "Migrate string-based object ids to BSON object ids"
+  task :migrate_ids => :environment do
+    MongoModel.database.collections.each do |collection|
+      unless collection.name =~ /(.*\.)?system\..*/
+        puts "Updating collection #{collection.name}..."
+        
+        updated_documents = 0
+        updated_ids = 0
+        updated_fks = 0
+        updated_fk_arrays = 0
+        
+        collection.find.each do |doc|
+          id = doc['_id']
+          
+          update_required = false
+          
+          doc.each do |k, v|
+            if k =~ /_id$/ && v.is_a?(String) && BSON::ObjectId.legal?(v)
+              doc[k] = BSON::ObjectId(v)
+              update_required = true
+              
+              if k == "_id"
+                updated_ids += 1
+              else
+                updated_fks += 1
+              end
+            elsif k =~ /_ids$/ && v.is_a?(Array)
+              ids = v.map { |id| id.is_a?(String) && BSON::ObjectId.legal?(id) ? BSON::ObjectId(id) : id }
+              
+              unless doc[k] == ids
+                doc[k] = ids
+                update_required = true
+                updated_fk_arrays += 1
+              end
+            end
+          end
+          
+          if id != doc['_id']
+            collection.remove('_id' => id)
+          end
+          
+          if update_required
+            collection.save(doc)
+            updated_documents += 1
+          end
+        end
+        
+        puts "  (updated #{updated_documents} documents, #{updated_ids} ids, #{updated_fks} foreign keys, #{updated_fk_arrays} foreign key arrays)\n\n"
+      end
+    end
+  end
+  
   unless Rake::Task.task_defined?("db:drop")
     desc 'Drops all the collections for the database for the current Rails.env'
     task :drop => :environment do
-      MongoModel.database.collections.each do |coll|
-        coll.drop unless coll.name =~ /(.*\.)?system\..*/
+      MongoModel.database.collections.each do |collection|
+        collection.drop unless collection.name =~ /(.*\.)?system\..*/
       end
     end
   end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.20"
+  VERSION = "0.3.0"
 end

data/spec/mongomodel/attributes/store_spec.rb

@@ -14,6 +14,7 @@ module MongoModel
       properties[:array]   = MongoModel::Properties::Property.new(:array, Array)
       properties[:date]    = MongoModel::Properties::Property.new(:date, Date)
       properties[:time]    = MongoModel::Properties::Property.new(:time, Time)
+      properties[:rational] = MongoModel::Properties::Property.new(:rational, Rational)
       properties[:custom]  = MongoModel::Properties::Property.new(:custom, CustomClass)
       properties[:custom_default] = MongoModel::Properties::Property.new(:custom_default, CustomClassWithDefault)
       properties[:default] = MongoModel::Properties::Property.new(:default, String, :default => 'Default')
@@ -129,6 +130,11 @@ module MongoModel
             "Sat Jan 01 20:15:01.123456 UTC 2000"    => Time.utc(2000, 1, 1, 20, 15, 1, 123000),
             "2009/3/4"                               => Time.utc(2009, 3, 4, 0, 0, 0, 0),
             nil                                      => nil
+          },
+        :rational =>
+          {
+            Rational(1, 15) => Rational(1, 15),
+            "2/3"           => Rational(2, 3)
           }
       }
     
@@ -165,10 +171,11 @@ module MongoModel
         :string => [ "abc", 123 ],
         :integer => [ 123, 55.123, "999", "12.123" ],
         :float => [ 55.123, 123, "12.123" ],
-        :boolean => [ true, false, "true", "false", 1, 0, "1", "0" ],
+        :boolean => [ true, false, "true", "false", 1, 0, "1", "0", "" ],
         :symbol => [ :some_symbol, "some_string" ],
         :hash => [ { :foo => 'bar' } ],
         :array => [ [123, 'abc', :foo, true] ],
+        :rational => [ "2/3" ],
         :date => [ Date.civil(2009, 11, 15), Time.local(2008, 12, 3, 0, 0, 0, 0), "2009/3/4", "Sat Jan 01 20:15:01 UTC 2000" ],
         :time => [ Time.local(2008, 5, 14, 1, 2, 3, 4), Date.civil(2009, 11, 15), "Sat Jan 01 20:15:01 UTC 2000", "2009/3/4" ]
       }
@@ -176,7 +183,7 @@ module MongoModel
       BeforeTypeCastExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
-            it "should access pre-typecasted value of #{example.inspect}" do
+            it "should access pre-typecast value of #{example.inspect}" do
               subject[type] = example
               subject.before_type_cast(type).should == example
             end
@@ -196,6 +203,7 @@ module MongoModel
         :array => [ [''], [123, 'abc', :foo, true] ],
         :date => [ Date.civil(2009, 11, 15) ],
         :time => [ Time.local(2008, 5, 14, 1, 2, 3, 4) ],
+        :rational => [ Rational(2, 3) ],
         :custom => [ CustomClass.new('foobar'), 'baz' ]
       }
     
@@ -209,6 +217,7 @@ module MongoModel
         :array => [ [] ],
         :date => [ nil, '' ],
         :time => [ nil, '' ],
+        :rational => [ nil ],
         :custom => [ nil ]
       }
     
@@ -246,6 +255,7 @@ module MongoModel
         subject[:array] = [ 123, 'abc', 45.67, true, :bar, CustomClass.new('custom in array') ]
         subject[:date] = Date.civil(2009, 11, 15)
         subject[:time] = Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5)
+        subject[:rational] = Rational(2, 3)
         subject[:custom] = CustomClass.new('custom')
         subject[:as] = "As property"
         subject[:non_property] = "Hello World"
@@ -261,6 +271,7 @@ module MongoModel
           'array' => [ 123, 'abc', 45.67, true, :bar, { :name => 'custom in array' } ],
           'date' => "2009/11/15",
           'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0),
+          'rational' => "2/3",
           'custom' => { :name => 'custom' },
           '_custom_as' => "As property",
           'non_property' => "Hello World",
@@ -279,6 +290,7 @@ module MongoModel
           'array' => [ 123, 'abc', 45.67, true, :bar ],
           'date' => Time.utc(2009, 11, 15),
           'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5),
+          'rational' => "2/3",
           'custom' => { :name => 'custom' },
           '_custom_as' => "As property",
           'custom_non_property' => { :name => 'custom non property' }
@@ -293,6 +305,7 @@ module MongoModel
         subject[:array].should == [ 123, 'abc', 45.67, true, :bar ]
         subject[:date].should == Date.civil(2009, 11, 15)
         subject[:time].should == Time.local(2008, 5, 14, 1, 2, 3, 4, 0)
+        subject[:rational].should == Rational(2, 3)
         subject[:custom].should == CustomClass.new('custom')
         subject[:as].should == "As property"
         subject[:custom_non_property].should == { :name => 'custom non property' }

data/spec/mongomodel/concerns/logging_spec.rb

@@ -5,7 +5,7 @@ module MongoModel
     describe "logging" do
       define_class(:TestDocument, described_class)
       
-      let(:logger) { mock('logger') }
+      let(:logger) { mock('logger').as_null_object }
       before(:all) { MongoModel.logger = logger }
       
       it "should have a logger reader on the class" do

data/spec/mongomodel/document/collection_modifiers_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+module MongoModel
+  specs_for(Document) do
+    describe "collection modifiers" do
+      define_class(:Post, Document) do
+        property :hits, Integer
+        property :available, Integer
+        property :tags, Array
+      end
+      
+      let(:collection) { Post.collection }
+      subject { Post }
+      
+      def self.should_update_collection(expression, &block)
+        it "should update the collection" do
+          collection.should_receive(:update).with(selector, expression, :multi => true)
+          instance_eval(&block)
+        end
+      end
+      
+      shared_examples_for "collection modifiers" do
+        describe "increase!" do
+          should_update_collection('$inc' => { 'hits' => 1, 'available' => -1 }) do
+            subject.increase!(:hits => 1, :available => -1)
+          end
+        end
+      
+        describe "set!" do
+          should_update_collection('$set' => { 'hits' => 20, 'available' => 100 }) do
+            subject.set!(:hits => 20, :available => 100)
+          end
+        end
+        
+        describe "unset!" do
+          should_update_collection('$unset' => { 'hits' => 1, 'available' => 1 }) do
+            subject.unset!(:hits, :available)
+          end
+        end
+        
+        describe "push!" do
+          should_update_collection('$push' => { 'tags' => 'abc' }) do
+            subject.push!(:tags => 'abc')
+          end
+        end
+        
+        describe "push_all!" do
+          should_update_collection('$pushAll' => { 'tags' => ['xxx', 'yyy', 'zzz'] }) do
+            subject.push_all!(:tags => ['xxx', 'yyy', 'zzz'])
+          end
+        end
+        
+        describe "add_to_set!" do
+          should_update_collection('$addToSet' => { 'tags' => 'xxx' }) do
+            subject.add_to_set!(:tags => 'xxx')
+          end
+        end
+        
+        describe "pull!" do
+          should_update_collection('$pull' => { 'tags' => 'abc' }) do
+            subject.pull!(:tags => 'abc')
+          end
+        end
+        
+        describe "pull_all!" do
+          should_update_collection('$pullAll' => { 'tags' => ['xxx', 'yyy', 'zzz'] }) do
+            subject.pull_all!(:tags => ['xxx', 'yyy', 'zzz'])
+          end
+        end
+        
+        describe "pop!" do
+          should_update_collection('$pop' => { 'tags' => 1 }) do
+            subject.pop!(:tags)
+          end
+        end
+        
+        describe "shift!" do
+          should_update_collection('$pop' => { 'tags' => -1 }) do
+            subject.shift!(:tags)
+          end
+        end
+        
+        describe "rename!" do
+          should_update_collection('$rename' => { 'tags' => :tag_collection }) do
+            subject.rename!(:tags => :tag_collection)
+          end
+        end
+      end
+      
+      describe "class methods" do
+        let(:selector) { {} }
+        it_should_behave_like "collection modifiers"
+      end
+      
+      describe "instance methods" do
+        subject { Post.new }
+        before { subject.save }
+        let(:selector) { { '_id' => subject.id } }
+        it_should_behave_like "collection modifiers"
+      end
+    end
+  end
+end

data/spec/mongomodel/document/persistence_spec.rb

@@ -22,7 +22,7 @@ module MongoModel
             subject.save
 
             doc = User.collection.find_one
-            doc['_id'].to_s.should == subject.attributes[:id]
+            doc['_id'].to_s.should == subject.attributes[:id].to_s
             doc['name'].should == 'Test'
           end
         end
@@ -97,8 +97,8 @@ module MongoModel
       end
 
       describe "#collection" do
-        it "should be a mongo collection" do
-          User.collection.should be_a(Mongo::Collection)
+        it "should be an instrumented collection" do
+          User.collection.should be_a(InstrumentedCollection)
         end
 
         it "should use the correct collection name" do

data/spec/mongomodel/mongomodel_spec.rb

@@ -42,7 +42,7 @@ describe MongoModel do
   end
   
   it "should have a logger accessor" do
-    logger = mock('logger')
+    logger = mock('logger').as_null_object
     MongoModel.logger = logger
     MongoModel.logger.should == logger
   end

data/spec/mongomodel/support/scope_spec.rb

@@ -927,13 +927,17 @@ module MongoModel
       
       subject { scoped }
       
+      def truncate_timestamp(time)
+        time.change(:usec => (time.usec / 1000.0).floor * 1000)
+      end
+      
       def model
         OtherPost
       end
       
       def finder_options
         {
-          :conditions => { "author" => "Sam", "published" => true, "date" => { "$lt" => timestamp } },
+          :conditions => { "author" => "Sam", "published" => true, "date" => { "$lt" => truncate_timestamp(timestamp.utc) } },
           :order => [:author.asc, :published.desc],
           :select => [:author, :published],
           :offset => 15,

data/spec/support/helpers/document_finder_stubs.rb

@@ -4,13 +4,13 @@ module DocumentFinderStubs
   include Spec::Mocks::ExampleMethods
   
   def stub_find(result)
-    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }, :count => result.size)
+    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }, :count => result.size).as_null_object
     collection.stub!(:find).and_return(find_result)
   end
   
   def should_find(expected={}, result=[])
     selector, options = MongoModel::MongoOptions.new(self, expected).to_a
-    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo })
+    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }).as_null_object
     collection.should_receive(:find).once.with(selector, options).and_return(find_result)
     yield if block_given?
   end
@@ -22,7 +22,7 @@ module DocumentFinderStubs
 
   def should_count(expected={}, result=[])
     selector, options = MongoModel::MongoOptions.new(self, expected).to_a
-    find_result = mock('find result', :count => result)
+    find_result = mock('find result', :count => result).as_null_object
     collection.should_receive(:find).once.with(selector, options).and_return(find_result)
     yield if block_given?
   end
@@ -38,7 +38,7 @@ module DocumentFinderStubs
   
   def should_delete(conditions={})
     selector, options = MongoModel::MongoOptions.new(self, :conditions => conditions).to_a
-    collection.should_receive(:remove).once.with(selector)
+    collection.should_receive(:remove).once.with(selector, options)
     yield if block_given?
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 20
-  version: 0.2.20
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 +10:30
+date: 2011-02-07 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -166,6 +166,7 @@ files:
 - lib/mongomodel/concerns/validations/associated.rb
 - lib/mongomodel/document.rb
 - lib/mongomodel/document/callbacks.rb
+- lib/mongomodel/document/collection_modifiers.rb
 - lib/mongomodel/document/dynamic_finders.rb
 - lib/mongomodel/document/indexes.rb
 - lib/mongomodel/document/optimistic_locking.rb
@@ -175,12 +176,15 @@ files:
 - lib/mongomodel/document/validations/uniqueness.rb
 - lib/mongomodel/embedded_document.rb
 - lib/mongomodel/locale/en.yml
+- lib/mongomodel/log_subscriber.rb
 - lib/mongomodel/railtie.rb
+- lib/mongomodel/railties/controller_runtime.rb
 - lib/mongomodel/support/collection.rb
 - lib/mongomodel/support/configuration.rb
 - lib/mongomodel/support/core_extensions.rb
 - lib/mongomodel/support/dynamic_finder.rb
 - lib/mongomodel/support/exceptions.rb
+- lib/mongomodel/support/instrumented_collection.rb
 - lib/mongomodel/support/map.rb
 - lib/mongomodel/support/mongo_operator.rb
 - lib/mongomodel/support/mongo_options.rb
@@ -190,6 +194,7 @@ files:
 - lib/mongomodel/support/scope/batches.rb
 - lib/mongomodel/support/scope/dynamic_finders.rb
 - lib/mongomodel/support/scope/finder_methods.rb
+- lib/mongomodel/support/scope/load_methods.rb
 - lib/mongomodel/support/scope/pagination.rb
 - lib/mongomodel/support/scope/query_methods.rb
 - lib/mongomodel/support/scope/spawn_methods.rb
@@ -202,6 +207,7 @@ files:
 - lib/mongomodel/support/types/hash.rb
 - lib/mongomodel/support/types/integer.rb
 - lib/mongomodel/support/types/object.rb
+- lib/mongomodel/support/types/rational.rb
 - lib/mongomodel/support/types/set.rb
 - lib/mongomodel/support/types/string.rb
 - lib/mongomodel/support/types/symbol.rb
@@ -235,6 +241,7 @@ files:
 - spec/mongomodel/concerns/translation_spec.rb
 - spec/mongomodel/concerns/validations_spec.rb
 - spec/mongomodel/document/callbacks_spec.rb
+- spec/mongomodel/document/collection_modifiers_spec.rb
 - spec/mongomodel/document/dynamic_finders_spec.rb
 - spec/mongomodel/document/finders_spec.rb
 - spec/mongomodel/document/indexes_spec.rb
@@ -298,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomodel
-rubygems_version: 1.4.1
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails