hashrocket-mongomapper 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/mongomapper/document.rb

@@ -320,7 +320,7 @@ module MongoMapper
       # collection.save returns mongoid
       def save_to_collection
         clear_custom_id_flag
-        collection.save(attributes)
+        collection.save(mongodb_attributes)
       end
 
       def update_timestamps

data/lib/mongomapper/embedded_document.rb

@@ -199,6 +199,27 @@ module MongoMapper
         attrs.merge!(embedded_association_attributes)
       end
 
+      def mongodb_attributes
+        attrs = HashWithIndifferentAccess.new
+        self.class.keys.each_pair do |name, key|
+          value = 
+            if key.native?
+              if key.type == Date and date = instance_variable_get("@#{key.name}")
+                key.normalize_date(date)
+              else
+                read_attribute(key.name)
+              end
+            else
+              if embedded_document = read_attribute(key.name)
+                embedded_document.mongodb_attributes
+              end
+            end
+          
+          attrs[name] = value unless value.nil?
+        end
+        attrs.merge!(embedded_association_attributes)
+      end
+      
       def [](name)
         read_attribute(name)
       end

data/lib/mongomapper/key.rb

@@ -1,7 +1,7 @@
 module MongoMapper
   class Key
     # DateTime and Date are currently not supported by mongo's bson so just use Time
-    NativeTypes = [String, Float, Time, Integer, Boolean, Array, Hash]
+    NativeTypes = [String, Float, Time, Date, Integer, Boolean, Array, Hash]
 
     attr_accessor :name, :type, :options, :default_value
     
@@ -34,11 +34,20 @@ module MongoMapper
         value || []
       elsif type == Hash
         HashWithIndifferentAccess.new(value || {})
+      elsif type == Date && value
+        value.send(:to_date)
       else
         value
       end
     end
 
+    def normalize_date(value)
+      date = Date.parse(value.to_s)
+      Time.utc(date.year, date.month, date.day)
+    rescue
+      nil
+    end
+    
     private
       def typecast(value)
         return value if type.nil?
@@ -50,6 +59,7 @@ module MongoMapper
           elsif type == Float     then value.to_f
           elsif type == Array     then value.to_a
           elsif type == Time      then Time.parse(value.to_s).utc
+          elsif type == Date      then normalize_date(value)
           elsif type == Boolean   then Boolean.mm_typecast(value)
           elsif type == Integer
             # ganked from datamapper

data/mongomapper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
@@ -84,7 +84,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mongomapper}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",

data/test/functional/test_document.rb

@@ -10,6 +10,7 @@ class DocumentTest < Test::Unit::TestCase
       key :first_name, String
       key :last_name, String
       key :age, Integer
+      key :date, Date
     end
 
     @document.collection.clear
@@ -773,6 +774,17 @@ class DocumentTest < Test::Unit::TestCase
       from_db = RealPerson.find(person.id)
       from_db.name.should == "David"
     end
+    
+    context "Saving documents with Date key set" do
+      setup do
+        @doc = @document.new(:first_name => 'John', :age => '27', :date => "12/01/2009")
+      end
+    
+      should "save the Date value as a Time object" do
+        @doc.save
+        @doc.date.should == Date.new(2009, 12, 1)
+      end
+    end
   end
 
   context "Saving an existing document" do

data/test/unit/test_key.rb

@@ -14,7 +14,7 @@ class KeyTest < Test::Unit::TestCase
 
   context "The Key Class" do
     should "have the native types defined" do
-      Key::NativeTypes.should == [String, Float, Time, Integer, Boolean, Array, Hash]
+      Key::NativeTypes.should == [String, Float, Time, Date, Integer, Boolean, Array, Hash]
     end
   end
 
@@ -141,6 +141,36 @@ class KeyTest < Test::Unit::TestCase
       key = Key.new(:foo, Time)
       key.set('2000-01-01 01:01:01.123456').zone.should == "UTC"
     end
+    
+    context "Dates" do
+      should "correctly typecast String to Date" do
+        key = Key.new(:foo, Date)
+        value = key.set('12/01/1974')
+        value.day.should == 1
+        value.month.should == 12
+        value.year.should == 1974
+      end
+      
+      should "correctly typecast bogus String to nil" do
+        key = Key.new(:foo, Date)
+        value = key.set('jdsafop874')
+        value.should == nil
+      end
+      
+      should "correctly typecast empty String to nil" do
+        key = Key.new(:foo, Date)
+        value = key.set('')
+        value.should == nil
+      end
+      
+      should "correctly preserve Date" do
+        key = Key.new(:foo, Date)
+        value = key.set(Date.parse('12/01/1974'))
+        value.day.should == 1
+        value.month.should == 12
+        value.year.should == 1974
+      end
+    end
 
     should "correctly typecast Boolean" do
       key = Key.new(:foo, Boolean)
@@ -206,6 +236,22 @@ class KeyTest < Test::Unit::TestCase
       end
     end
 
+    context "for a Date" do
+      should "correctly typecast Dates" do
+        key = Key.new(:foo, Date)
+        value = key.get(Time.utc(1974, 12, 1))
+        value.class.should == Date
+        value.day.should == 1
+        value.month.should == 12
+        value.year.should == 1974
+      end
+      
+      should "correctly return nil" do
+        key = Key.new(:foo, Date)
+        key.get(nil).should == nil
+      end
+    end
+    
     context "for an array" do
       should "return array" do
         key = Key.new(:foo, Array)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hashrocket-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - John Nunemaker