mongo_mapper 0.7.1 → 0.7.2

data/Rakefile

@@ -12,7 +12,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors     = ["John Nunemaker"]
   gem.version     = MongoMapper::Version
 
-  gem.add_dependency('activesupport', '>= 2.3')
+  gem.add_dependency('activesupport', '>= 2.3.4')
   gem.add_dependency('mongo', '0.19.1')
   gem.add_dependency('jnunemaker-validatable', '1.8.3')
 

data/lib/mongo_mapper.rb

@@ -6,7 +6,7 @@ require 'uri'
 # 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'
+  gem 'activesupport', '>= 2.3.4'
   gem 'mongo', '0.19.1'
   gem 'jnunemaker-validatable', '1.8.3'
 end

data/lib/mongo_mapper/document.rb

@@ -315,6 +315,10 @@ module MongoMapper
         self.class.delete(id) unless new?
       end
 
+      def new?
+        @new
+      end
+
       def destroyed?
         @_destroyed == true
       end

data/lib/mongo_mapper/embedded_document.rb

@@ -38,6 +38,14 @@ module MongoMapper
     end
 
     module InstanceMethods
+      def destroyed?
+        !!_root_document.try(:destroyed?)
+      end
+
+      def new?
+        _root_document.try(:new?) || @new
+      end
+
       def save(options={})
         if result = _root_document.try(:save, options)
           @new = false
@@ -51,7 +59,7 @@ module MongoMapper
         end
         result
       end
-      
+
       def _parent_document=(value)
         @_root_document   = value._root_document
         @_parent_document = value

data/lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb

@@ -11,10 +11,10 @@ module MongoMapper
 
         private
           def find_target
-            (@_values || []).map do |v|
-              child = klass.load(v)
-              assign_references(child)
-              child
+            (@_values || []).map do |attrs|
+              klass.load(attrs).tap do |child|
+                assign_references(child)
+              end
             end
           end
       end

data/lib/mongo_mapper/plugins/keys.rb

@@ -146,15 +146,9 @@ module MongoMapper
 
       module InstanceMethods
         def initialize(attrs={}, from_database=false)
-          unless attrs.nil?
-            provided_keys = attrs.keys.map { |k| k.to_s }
-            unless provided_keys.include?('_id') || provided_keys.include?('id')
-              write_key :_id, Mongo::ObjectID.new
-            end
-          end
-
-          assign_type_if_present
-
+          default_id_value(attrs)
+          assign_type
+          
           if from_database
             @new = false
             self.attributes = attrs
@@ -164,8 +158,8 @@ module MongoMapper
           end
         end
 
-        def new?
-          @new
+        def persisted?
+          !new? && !destroyed?
         end
 
         def attributes=(attrs)
@@ -175,9 +169,6 @@ module MongoMapper
             writer_method = "#{name}="
 
             if respond_to?(writer_method)
-              if writer_method == '_root_document='
-                puts "_root_document= #{value.inspect}"
-              end
               self.send(writer_method, value)
             else
               self[name.to_s] = value
@@ -238,28 +229,33 @@ module MongoMapper
           write_key(name, value)
         end
 
-        # @api public
         def keys
           self.class.keys
         end
 
-        # @api private?
         def key_names
           keys.keys
         end
 
-        # @api private?
         def non_embedded_keys
           keys.values.select { |key| !key.embeddable? }
         end
 
-        # @api private?
         def embedded_keys
           keys.values.select { |key| key.embeddable? }
         end
 
         private
-          def assign_type_if_present
+          def default_id_value(attrs)
+            unless attrs.nil?
+              provided_keys = attrs.keys.map { |k| k.to_s }
+              unless provided_keys.include?('_id') || provided_keys.include?('id')
+                write_key :_id, Mongo::ObjectID.new
+              end
+            end
+          end
+
+          def assign_type
             self._type = self.class.name if respond_to?(:_type=)
           end
 

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -81,6 +81,10 @@ module MongoMapper
         def push_uniq(hash)
           self.class.push_uniq({:_id => id}, hash)
         end
+
+        def pop(hash)
+          self.class.pop({:_id => id}, hash)
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/rails.rb

@@ -7,13 +7,17 @@ module MongoMapper
 
       module InstanceMethods
         def to_param
-          id.to_s
+          id.to_s if persisted?
         end
 
         def to_model
           self
         end
 
+        def to_key
+          [id] if persisted?
+        end
+
         def new_record?
           new?
         end

data/lib/mongo_mapper/plugins/validations.rb

@@ -37,7 +37,7 @@ module MongoMapper
 
         def where_conditions(instance)
           conditions = {}
-          conditions[attribute] = /#{instance[attribute].to_s}/i unless case_sensitive
+          conditions[attribute] = /^#{Regexp.escape(instance[attribute].to_s)}$/i unless case_sensitive
           conditions
         end
       end

data/lib/mongo_mapper/query.rb

@@ -65,8 +65,13 @@ module MongoMapper
         conditions.each_pair do |key, value|
           key = normalized_key(key)
 
-          if model.object_id_key?(key) && value.is_a?(String)
-            value = Mongo::ObjectID.from_string(value)
+          if model.object_id_key?(key)
+            case value
+              when String
+                value = Mongo::ObjectID.from_string(value)
+              when Array
+                value.map! { |id| ObjectId.to_mongo(id) }
+            end
           end
 
           if symbol_operator?(key)
@@ -102,8 +107,8 @@ module MongoMapper
 
       def normalized_value(field, value)
         case value
-          when Array
-            modifier?(field) ? value : {'$in' => value}
+          when Array, Set
+            modifier?(field) ? value.to_a : {'$in' => value.to_a}
           when Hash
             to_criteria(value, field)
           when Time

data/lib/mongo_mapper/support.rb

@@ -26,16 +26,14 @@ end
 class Boolean
   BOOLEAN_MAPPING = {
     true => true, 'true' => true, 'TRUE' => true, 'True' => true, 't' => true, 'T' => true, '1' => true, 1 => true, 1.0 => true,
-    false => false, 'false' => false, 'FALSE' => false, 'False' => false, 'f' => false, 'F' => false, '0' => false, 0 => false, 0.0 => false, nil => false
+    false => false, 'false' => false, 'FALSE' => false, 'False' => false, 'f' => false, 'F' => false, '0' => false, 0 => false, 0.0 => false, nil => nil
   }
   
   def self.to_mongo(value)
     if value.is_a?(Boolean)
       value
     else
-      v = BOOLEAN_MAPPING[value]
-      v = value.to_s.downcase == 'true' if v.nil? # Check all mixed case spellings for true
-      v
+      BOOLEAN_MAPPING[value]
     end
   end
 

data/lib/mongo_mapper/version.rb

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

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-03-26}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -120,7 +120,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jnunemaker/mongomapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Ruby Object Mapper for Mongo}
   s.test_files = [
     "test/active_model_lint_test.rb",
@@ -178,7 +178,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.19.1"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
@@ -186,7 +186,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.3"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<mongo>, ["= 0.19.1"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
@@ -195,7 +195,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, ["= 0.9.8"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.3"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<mongo>, ["= 0.19.1"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])

data/test/active_model_lint_test.rb

@@ -1,4 +1,6 @@
 require 'test_helper'
+# For testing against edge rails also.
+# $:.unshift '/Users/jnunemaker/dev/ruby/rails/activemodel/lib'
 require 'active_model'
 require 'models'
 

data/test/functional/test_document.rb

@@ -290,17 +290,25 @@ class DocumentTest < Test::Unit::TestCase
         @document.find(@doc1._id, @doc2._id).should == [@doc1, @doc2]
       end
 
+      should "work as arguments with string ids" do
+        @document.find(@doc1._id.to_s, @doc2._id.to_s).should == [@doc1, @doc2]
+      end
+
       should "work as array" do
         @document.find([@doc1._id, @doc2._id]).should == [@doc1, @doc2]
       end
 
+      should "work as array with string ids" do
+        @document.find([@doc1._id.to_s, @doc2._id.to_s]).should == [@doc1, @doc2]
+      end
+
       should "compact not found when using find" do
-        @document.find(@doc1._id, 1234).should == [@doc1]
+        @document.find(@doc1._id, Mongo::ObjectID.new.to_s).should == [@doc1]
       end
 
       should "raise error if not all found when using find!" do
         assert_raises(MongoMapper::DocumentNotFound) do
-          @document.find!(@doc1._id, 1234)
+          @document.find!(@doc1._id, Mongo::ObjectID.new.to_s)
         end
       end
 
@@ -908,6 +916,28 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
+  context "#persisted?" do
+    setup do
+      @doc = @document.new(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
+    end
+
+    should "be false if new" do
+      @doc.should_not be_persisted
+    end
+
+    should "be false if destroyed" do
+      @doc.save
+      @doc.destroy
+      @doc.should be_destroyed
+      @doc.should_not be_persisted
+    end
+
+    should "be true if not new or destroyed" do
+      @doc.save
+      @doc.should be_persisted
+    end
+  end
+
   context "Single collection inheritance" do
     setup do
       class ::DocParent

data/test/functional/test_embedded_document.rb

@@ -53,31 +53,93 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     doc1.reload.message.class.should be(Enter)
   end
 
-  context "new?" do
+  context "new? (embedded key)" do
     setup do
       @klass.key :foo, @address_class
     end
 
-    should "be new until document is saved" do
+    should "be true until document is saved" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
-      address.new?.should == true
+      address.new?.should be_true
     end
 
-    should "not be new after document is saved" do
+    should "be false after document is saved" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       doc.save
-      doc.foo.new?.should == false
+      doc.foo.new?.should be_false
     end
 
-    should "not be new when document is read back" do
+    should "be false when loaded from database" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       doc.save
 
-      doc = doc.reload
-      doc.foo.new?.should == false
+      doc.reload
+      doc.foo.new?.should be_false
+    end
+  end
+
+  context "new? (embedded association)" do
+    setup do
+      @doc = @klass.new(:pets => [{:name => 'poo bear'}])
+    end
+
+    should "be true until document is saved" do
+      @doc.should be_new
+      @doc.pets.first.should be_new
+    end
+
+    should "be false after document is saved" do
+      @doc.save
+      @doc.pets.first.should_not be_new
+    end
+
+    should "be false when loaded from database" do
+      @doc.save
+      @doc.pets.first.should_not be_new
+      @doc.reload
+      @doc.pets.first.should_not be_new
+    end
+  end
+
+  context "#destroyed?" do
+    setup do
+      @doc = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
+    end
+
+    should "be false if root document is not destroyed" do
+      @doc.should_not be_destroyed
+      @doc.pets.first.should_not be_destroyed
+    end
+
+    should "be true if root document is destroyed" do
+      @doc.destroy
+      @doc.should be_destroyed
+      @doc.pets.first.should be_destroyed
+    end
+  end
+
+  context "#persisted?" do
+    setup do
+      @doc = @klass.new(:name => 'persisted doc', :pets => [@pet_klass.new(:name => 'persisted pet')])
+    end
+
+    should_eventually "be false if new" do
+      @doc.pets.first.should_not be_persisted
+    end
+
+    should "be false if destroyed" do
+      @doc.save
+      @doc.destroy
+      @doc.pets.first.should be_destroyed
+      @doc.pets.first.should_not be_persisted
+    end
+
+    should "be true if not new or destroyed" do
+      @doc.save
+      @doc.pets.first.should be_persisted
     end
   end