mongo_mapper 0.7.2 → 0.7.3

data/Rakefile

@@ -13,7 +13,7 @@ Jeweler::Tasks.new do |gem|
   gem.version     = MongoMapper::Version
 
   gem.add_dependency('activesupport', '>= 2.3.4')
-  gem.add_dependency('mongo', '0.19.1')
+  gem.add_dependency('mongo', '0.19.3')
   gem.add_dependency('jnunemaker-validatable', '1.8.3')
 
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
@@ -32,21 +32,5 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-namespace :test do
-  Rake::TestTask.new(:units) do |test|
-    test.libs << 'test'
-    test.ruby_opts << '-rubygems'
-    test.pattern = 'test/unit/**/test_*.rb'
-    test.verbose = true
-  end
-
-  Rake::TestTask.new(:functionals) do |test|
-    test.libs << 'test'
-    test.ruby_opts << '-rubygems'
-    test.pattern = 'test/functional/**/test_*.rb'
-    test.verbose = true
-  end
-end
-
 task :default  => :test
 task :test     => :check_dependencies

data/lib/mongo_mapper.rb

@@ -1,19 +1,13 @@
+# Make sure you have the following libs in your load path or you could have issues:
+#   gem 'activesupport', '>= 2.3.4'
+#   gem 'mongo', '0.19.3'
+#   gem 'jnunemaker-validatable', '1.8.3'
+# gem 'activesupport', '= 2.3.4'
 require 'set'
 require 'uri'
-
-# if Gem is defined i'll assume you are using rubygems and lock specific versions
-# call me crazy but a plain old require will just get the latest version you have installed
-# so i want to make sure that if you are using gems you do in fact have the correct versions
-# if there is a better way to do this, please enlighten me!
-if self.class.const_defined?(:Gem)
-  gem 'activesupport', '>= 2.3.4'
-  gem 'mongo', '0.19.1'
-  gem 'jnunemaker-validatable', '1.8.3'
-end
-
-require 'active_support/all'
 require 'mongo'
 require 'validatable'
+require 'active_support/all'
 
 module MongoMapper
   # generic MM error
@@ -113,21 +107,6 @@ module MongoMapper
     end
   end
 
-  # @api private
-  def self.use_time_zone?
-    Time.respond_to?(:zone) && Time.zone ? true : false
-  end
-
-  # @api private
-  def self.time_class
-    use_time_zone? ? Time.zone : Time
-  end
-
-  # @api private
-  def self.normalize_object_id(value)
-    value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
-  end
-
   autoload :Query,            'mongo_mapper/query'
   autoload :Document,         'mongo_mapper/document'
   autoload :EmbeddedDocument, 'mongo_mapper/embedded_document'

data/lib/mongo_mapper/document.rb

@@ -19,6 +19,7 @@ module MongoMapper
         plugin Plugins::Logger
         plugin Plugins::Modifiers
         plugin Plugins::Pagination
+        plugin Plugins::Persistence
         plugin Plugins::Protected
         plugin Plugins::Rails
         plugin Plugins::Serialization
@@ -39,14 +40,8 @@ module MongoMapper
         super
       end
 
-      def ensure_index(name_or_array, options={})
-        keys_to_index = if name_or_array.is_a?(Array)
-          name_or_array.map { |pair| [pair[0], pair[1]] }
-        else
-          name_or_array
-        end
-
-        collection.create_index(keys_to_index, options[:unique])
+      def ensure_index(spec, options={})
+        collection.create_index(spec, options)
       end
 
       def find(*args)
@@ -150,43 +145,6 @@ module MongoMapper
         false
       end
 
-      def connection(mongo_connection=nil)
-        if mongo_connection.nil?
-          @connection ||= MongoMapper.connection
-        else
-          @connection = mongo_connection
-        end
-        @connection
-      end
-
-      def set_database_name(name)
-        @database_name = name
-      end
-
-      def database_name
-        @database_name
-      end
-
-      def database
-        if database_name.nil?
-          MongoMapper.database
-        else
-          connection.db(database_name)
-        end
-      end
-
-      def set_collection_name(name)
-        @collection_name = name
-      end
-
-      def collection_name
-        @collection_name ||= self.to_s.tableize.gsub(/\//, '.')
-      end
-
-      def collection
-        database.collection(collection_name)
-      end
-
       def single_collection_inherited?
         keys.key?(:_type) && single_collection_inherited_superclass?
       end
@@ -287,14 +245,6 @@ module MongoMapper
     end
 
     module InstanceMethods
-      def collection
-        self.class.collection
-      end
-
-      def database
-        self.class.database
-      end
-
       def save(options={})
         options.assert_valid_keys(:validate, :safe)
         options.reverse_merge!(:validate => true)

data/lib/mongo_mapper/embedded_document.rb

@@ -15,6 +15,7 @@ module MongoMapper
         plugin Plugins::Inspect
         plugin Plugins::Keys
         plugin Plugins::Logger
+        plugin Plugins::Persistence
         plugin Plugins::Protected
         plugin Plugins::Rails
         plugin Plugins::Serialization

data/lib/mongo_mapper/plugins.rb

@@ -21,6 +21,7 @@ module MongoMapper
     autoload :Keys,           'mongo_mapper/plugins/keys'
     autoload :Logger,         'mongo_mapper/plugins/logger'
     autoload :Modifiers,      'mongo_mapper/plugins/modifiers'
+    autoload :Persistence,    'mongo_mapper/plugins/persistence'
     autoload :Protected,      'mongo_mapper/plugins/protected'
     autoload :Rails,          'mongo_mapper/plugins/rails'
     autoload :Serialization,  'mongo_mapper/plugins/serialization'

data/lib/mongo_mapper/plugins/keys.rb

@@ -7,6 +7,7 @@ module MongoMapper
 
       module ClassMethods
         def inherited(descendant)
+          key :_type, String unless keys.keys.include?(:_type)
           descendant.instance_variable_set(:@keys, keys.dup)
           super
         end
@@ -147,7 +148,6 @@ module MongoMapper
       module InstanceMethods
         def initialize(attrs={}, from_database=false)
           default_id_value(attrs)
-          assign_type
           
           if from_database
             @new = false
@@ -156,6 +156,8 @@ module MongoMapper
             @new = true
             assign(attrs)
           end
+          
+          assign_type
         end
 
         def persisted?
@@ -214,7 +216,7 @@ module MongoMapper
 
         def id=(value)
           if self.class.using_object_id?
-            value = MongoMapper.normalize_object_id(value)
+            value = ObjectId.to_mongo(value)
           end
 
           self[:_id] = value

data/lib/mongo_mapper/plugins/persistence.rb

@@ -0,0 +1,68 @@
+module MongoMapper
+  module Plugins
+    module Persistence
+      module ClassMethods
+        class Unsupported < MongoMapperError; end
+
+        def connection(mongo_connection=nil)
+          not_supported_by_embedded
+          if mongo_connection.nil?
+            @connection ||= MongoMapper.connection
+          else
+            @connection = mongo_connection
+          end
+          @connection
+        end
+
+        def set_database_name(name)
+          not_supported_by_embedded
+          @database_name = name
+        end
+
+        def database_name
+          not_supported_by_embedded
+          @database_name
+        end
+
+        def database
+          not_supported_by_embedded
+          if database_name.nil?
+            MongoMapper.database
+          else
+            connection.db(database_name)
+          end
+        end
+
+        def set_collection_name(name)
+          not_supported_by_embedded
+          @collection_name = name
+        end
+
+        def collection_name
+          not_supported_by_embedded
+          @collection_name ||= self.to_s.tableize.gsub(/\//, '.')
+        end
+
+        def collection
+          not_supported_by_embedded
+          database.collection(collection_name)
+        end
+
+        private
+          def not_supported_by_embedded
+            raise Unsupported.new('This is not supported for embeddable documents at this time.') if embeddable?
+          end
+      end
+
+      module InstanceMethods
+        def collection
+          _root_document.class.collection
+        end
+
+        def database
+          _root_document.class.database
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/support.rb

@@ -182,14 +182,15 @@ class Time
     if value.nil? || value == ''
       nil
     else
-      time = value.is_a?(Time) ? value : MongoMapper.time_class.parse(value.to_s)
+      time_class = Time.try(:zone).present? ? Time.zone : Time
+      time = value.is_a?(Time) ? value : time_class.parse(value.to_s)
       # Convert time to milliseconds since BSON stores dates with that accurracy, but Ruby uses microseconds
       Time.at((time.to_f * 1000).round / 1000.0).utc if time
     end
   end
   
   def self.from_mongo(value)
-    if MongoMapper.use_time_zone? && value.present?
+    if Time.try(:zone).present? && value.present?
       value.in_time_zone(Time.zone)
     else
       value

data/lib/mongo_mapper/version.rb

@@ -1,3 +1,3 @@
 module MongoMapper
-  Version = '0.7.2'
+  Version = '0.7.3'
 end

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-04-05}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/plugins/modifiers.rb",
      "lib/mongo_mapper/plugins/pagination.rb",
      "lib/mongo_mapper/plugins/pagination/proxy.rb",
+     "lib/mongo_mapper/plugins/persistence.rb",
      "lib/mongo_mapper/plugins/protected.rb",
      "lib/mongo_mapper/plugins/rails.rb",
      "lib/mongo_mapper/plugins/serialization.rb",
@@ -179,7 +180,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.19.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.19.3"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -187,7 +188,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<mongo>, ["= 0.19.1"])
+      s.add_dependency(%q<mongo>, ["= 0.19.3"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -196,7 +197,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<mongo>, ["= 0.19.1"])
+    s.add_dependency(%q<mongo>, ["= 0.19.3"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])

data/test/functional/test_document.rb

@@ -942,7 +942,6 @@ class DocumentTest < Test::Unit::TestCase
     setup do
       class ::DocParent
         include MongoMapper::Document
-        key :_type, String
         key :name, String
       end
       DocParent.collection.remove
@@ -964,6 +963,10 @@ class DocumentTest < Test::Unit::TestCase
       Object.send :remove_const, 'DocGrandSon' if defined?(::DocGrandSon)
     end
 
+    should "automatically add _type key to store class" do
+      DocParent.keys.should include(:_type)
+    end
+
     should "use the same collection in the subclass" do
       DocDaughter.collection.name.should == DocParent.collection.name
     end
@@ -1091,6 +1094,11 @@ class DocumentTest < Test::Unit::TestCase
       }.should change { DocParent.count }.by(-2)
     end
 
+    should "set type from class and ignore _type in attributes" do
+      doc = DocSon.create(:_type => 'DocDaughter', :name => 'John')
+      DocParent.first.should be_instance_of(DocSon)
+    end
+
     should "be able to reload parent inherited class" do
       brian = DocParent.create(:name => 'Brian')
       brian.name = 'B-Dawg'

data/test/functional/test_embedded_document.rb

@@ -126,7 +126,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @doc = @klass.new(:name => 'persisted doc', :pets => [@pet_klass.new(:name => 'persisted pet')])
     end
 
-    should_eventually "be false if new" do
+    should "be false if new" do
       @doc.pets.first.should_not be_persisted
     end
 
@@ -189,4 +189,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     pet.expects(:save!)
     pet.update_attributes!(attributes)
   end
+  
+  should "have database instance method that is equal to root document" do
+    person = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
+    person.pets.first.database.should == person.database
+  end
+  
+  should "have collection instance method that is equal to root document" do
+    person = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
+    person.pets.first.collection.name.should == person.collection.name
+  end
 end

data/test/functional/test_identity_map.rb

@@ -360,7 +360,6 @@ class IdentityMapTest < Test::Unit::TestCase
           include MongoMapper::Document
           plugin MongoMapper::Plugins::IdentityMap
           
-          key :_type, String
           key :title, String
           key :parent_id, ObjectId
           

data/test/functional/test_indexing.rb

@@ -31,8 +31,8 @@ class IndexingTest < Test::Unit::TestCase
       # just checking have_index('first_name_1_last_name_-1') I'm checking
       # the values of the indexes to make sure the index creation was successful
       @document.collection.index_information.detect do |index|
-        keys = index[1]
-        keys.include?(['first_name', 1]) && keys.include?(['last_name', -1])
+        keys = index[0]
+        keys.include?('first_name_1') && keys.include?('last_name_-1')
       end.should_not be_nil
     end
 

data/test/functional/test_protected.rb

@@ -76,9 +76,7 @@ class ProtectedTest < Test::Unit::TestCase
       class ::GrandParent
         include MongoMapper::Document
 
-        key :_type, String
         key :site_id, ObjectId
-
         attr_protected :site_id
       end
       GrandParent.collection.remove

data/test/models.rb

@@ -67,7 +67,6 @@ class Message
 
   key :body, String
   key :position, Integer
-  key :_type, String
   key :room_id, ObjectId
 
   belongs_to :room
@@ -94,7 +93,6 @@ end
 class Account
   include MongoMapper::Document
   
-  key :_type, String
   key :room_id, ObjectId
   key :last_logged_in, Time
   
@@ -158,9 +156,7 @@ end
 class Media
   include MongoMapper::EmbeddedDocument
 
-  key :_type, String
   key :file, String
-  
   key :visible, Boolean
 end
 
@@ -192,7 +188,6 @@ module TrModels
   class Transport
     include MongoMapper::EmbeddedDocument
 
-    key :_type, String
     key :license_plate, String
     key :purchased_on, Date
   end

data/test/unit/test_embedded_document.rb

@@ -179,17 +179,17 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
       context "keys" do
         should "be inherited" do
-          Grandparent.keys.keys.sort.should == ['_id', 'grandparent']
-          Parent.keys.keys.sort.should == ['_id', 'grandparent', 'parent']
-          Child.keys.keys.sort.should  == ['_id', 'child', 'grandparent', 'parent']
+          Grandparent.keys.keys.sort.should == ['_id', '_type', 'grandparent']
+          Parent.keys.keys.sort.should == ['_id', '_type', 'grandparent', 'parent']
+          Child.keys.keys.sort.should  == ['_id', '_type', 'child', 'grandparent', 'parent']
         end
 
         should "propogate to descendants if key added after class definition" do
-          Grandparent.key :_type, String
+          Grandparent.key :foo, String
 
-          Grandparent.keys.keys.sort.should == ['_id', '_type', 'grandparent']
-          Parent.keys.keys.sort.should      == ['_id', '_type', 'grandparent', 'parent']
-          Child.keys.keys.sort.should       == ['_id', '_type', 'child', 'grandparent', 'parent']
+          Grandparent.keys.keys.sort.should == ['_id', '_type', 'foo', 'grandparent']
+          Parent.keys.keys.sort.should      == ['_id', '_type', 'foo', 'grandparent', 'parent']
+          Child.keys.keys.sort.should       == ['_id', '_type', 'child', 'foo', 'grandparent', 'parent']
         end
 
         should "not add anonymous objects to the ancestor tree" do
@@ -302,8 +302,8 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
           @klass.new._type.should == 'FooBar'
         end
 
-        should "not change _type if already set" do
-          @klass.new(:_type => 'Foo')._type.should == 'Foo'
+        should "ignore _type attribute and always use class" do
+          @klass.new(:_type => 'Foo')._type.should == 'FooBar'
         end
       end
 

data/test/unit/test_mongo_mapper.rb

@@ -115,41 +115,4 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.setup(config, 'development', :logger => logger, :passenger => true)
     end
   end
-  
-
-  context "use_time_zone?" do
-    should "be true if Time.zone set" do
-      Time.zone = 'Hawaii'
-      MongoMapper.use_time_zone?.should be_true
-      Time.zone = nil
-    end
-
-    should "be false if Time.zone not set" do
-      MongoMapper.use_time_zone?.should be_false
-    end
-  end
-
-  context "time_class" do
-    should "be Time.zone if using time zones" do
-      Time.zone = 'Hawaii'
-      MongoMapper.time_class.should == Time.zone
-      Time.zone = nil
-    end
-
-    should "be Time if not using time zones" do
-      MongoMapper.time_class.should == Time
-    end
-  end
-
-  context "normalize_object_id" do
-    should "turn string into object id" do
-      id = Mongo::ObjectID.new
-      MongoMapper.normalize_object_id(id.to_s).should == id
-    end
-
-    should "leave object id alone" do
-      id = Mongo::ObjectID.new
-      MongoMapper.normalize_object_id(id).should == id
-    end
-  end
 end

data/test/unit/test_rails_compatibility.rb

@@ -29,9 +29,9 @@ class TestRailsCompatibility < Test::Unit::TestCase
     end
     
     should "have column names" do
-      Item.column_names.sort.should == ['_id', 'for_all']
-      FirstItem.column_names.sort.should == ['_id', 'first_only', 'for_all']
-      SecondItem.column_names.sort.should == ['_id', 'for_all', 'second_only']
+      Item.column_names.sort.should == ['_id', '_type', 'for_all']
+      FirstItem.column_names.sort.should == ['_id', '_type', 'first_only', 'for_all']
+      SecondItem.column_names.sort.should == ['_id', '_type', 'for_all', 'second_only']
     end
     
     should "alias new to new_record?" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 19
-        - 1
-        version: 0.19.1
+        - 3
+        version: 0.19.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -160,6 +160,7 @@ files:
 - lib/mongo_mapper/plugins/modifiers.rb
 - lib/mongo_mapper/plugins/pagination.rb
 - lib/mongo_mapper/plugins/pagination/proxy.rb
+- lib/mongo_mapper/plugins/persistence.rb
 - lib/mongo_mapper/plugins/protected.rb
 - lib/mongo_mapper/plugins/rails.rb
 - lib/mongo_mapper/plugins/serialization.rb