mongomodel 0.4.0 → 0.4.1

data/Gemfile

@@ -4,3 +4,4 @@ gemspec
 
 gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.4"
+gem "tzinfo"

data/gemfiles/rails-3.0.gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.4"
+gem "tzinfo"
 gem "activesupport", "3.0.10"
 gem "activemodel", "3.0.10"
 

data/gemfiles/rails-3.0.gemfile.lock

@@ -58,6 +58,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     term-ansicolor (1.0.5)
+    tzinfo (0.3.29)
     will_paginate (2.3.16)
 
 PLATFORMS
@@ -71,3 +72,4 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   mongomodel!
   rspec (~> 2.6.0)
+  tzinfo

data/gemfiles/rails-3.1.gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.4"
+gem "tzinfo"
 gem "activesupport", "3.1.0"
 gem "activemodel", "3.1.0"
 

data/gemfiles/rails-3.1.gemfile.lock

@@ -38,6 +38,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    tzinfo (0.3.29)
     will_paginate (2.3.16)
 
 PLATFORMS
@@ -51,3 +52,4 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   mongomodel!
   rspec (~> 2.6.0)
+  tzinfo

data/gemfiles/rails-edge.gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.4"
+gem "tzinfo"
 gem "activesupport", :git=>"https://github.com/rails/rails.git"
 gem "activemodel", :git=>"https://github.com/rails/rails.git"
 

data/gemfiles/rails-edge.gemfile.lock

@@ -44,6 +44,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    tzinfo (0.3.29)
     will_paginate (2.3.16)
 
 PLATFORMS
@@ -57,3 +58,4 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   mongomodel!
   rspec (~> 2.6.0)
+  tzinfo

data/lib/mongomodel/support/types.rb

@@ -9,6 +9,7 @@ require 'mongomodel/support/types/boolean'
 require 'mongomodel/support/types/symbol'
 require 'mongomodel/support/types/date'
 require 'mongomodel/support/types/time'
+require 'mongomodel/support/types/date_time'
 require 'mongomodel/support/types/custom'
 require 'mongomodel/support/types/array'
 require 'mongomodel/support/types/set'
@@ -25,6 +26,7 @@ module MongoModel
       ::Symbol   => Types::Symbol.new,
       ::Date     => Types::Date.new,
       ::Time     => Types::Time.new,
+      ::DateTime => Types::DateTime.new,
       ::Array    => Types::Array.new,
       ::Set      => Types::Set.new,
       ::Hash     => Types::Hash.new,

data/lib/mongomodel/support/types/date_time.rb

@@ -0,0 +1,39 @@
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/string/conversions'
+
+module MongoModel
+  module Types
+    class DateTime < Object
+      def cast(value)
+        case value
+        when ::Array
+          ::DateTime.civil(*value)
+        when ::Hash
+          cast("#{value[:date]} #{value[:time]}")
+        when ::String
+          cast(::DateTime.parse(value))
+        else
+          value.to_datetime.change(:usec => 0)
+        end
+      rescue
+        nil
+      end
+      
+      def to_mongo(value)
+        to_time(value.utc) if value
+      end
+      
+      def from_mongo(value)
+        time = value.respond_to?(:in_time_zone) ? value.in_time_zone : value
+        time.to_datetime
+      end
+    
+    private
+      # Define our own to_time method as DateTime.to_time in ActiveSupport may return
+      # the DateTime object unchanged, whereas BSON expects an actual Time object.
+      def to_time(dt)
+        ::Time.utc_time(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec)
+      end
+    end
+  end
+end

data/lib/mongomodel/support/types/time.rb

@@ -9,6 +9,10 @@ module MongoModel
         when ::Array
           base = ::Time.zone ? ::Time.zone : ::Time
           base.local(*value)
+        when ::Hash
+          cast("#{value[:date]} #{value[:time]}")
+        when ::String
+          cast(::Time.parse(value))
         else
           time = value.to_time
           time.change(:usec => (time.usec / 1000.0).floor * 1000)

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 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[:datetime] = MongoModel::Properties::Property.new(:datetime, DateTime)
       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)
@@ -121,6 +122,7 @@ module MongoModel
             Time.local(2008, 12, 3, 0, 0, 0, 0)  => Date.civil(2008, 12, 3),
             "2009/3/4"                           => Date.civil(2009, 3, 4),
             "Sat Jan 01 20:15:01 UTC 2000"       => Date.civil(2000, 1, 1),
+            "2004-05-12"                         => Date.civil(2004, 5, 12),
             nil                                  => nil
           },
         :time =>
@@ -128,7 +130,21 @@ module MongoModel
             Time.local(2008, 5, 14, 1, 2, 3, 123456) => Time.local(2008, 5, 14, 1, 2, 3, 123000),
             Date.civil(2009, 11, 15)                 => Time.local(2009, 11, 15, 0, 0, 0, 0),
             "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),
+            "2009/3/4"                               => Time.local(2009, 3, 4, 0, 0, 0, 0),
+            "09:34"                                  => lambda { |t| t.hour == 9 && t.min == 34 },
+            "5:21pm"                                 => lambda { |t| t.hour == 17 && t.min == 21 },
+            { :date => "2005-11-04", :time => "4:55pm" } => Time.local(2005, 11, 4, 16, 55, 0),
+            nil                                      => nil
+          },
+        :datetime =>
+          {
+            Time.local(2008, 5, 14, 1, 2, 3, 123456) => Time.local(2008, 5, 14, 1, 2, 3, 0).to_datetime,
+            Date.civil(2009, 11, 15)                 => DateTime.civil(2009, 11, 15, 0, 0, 0, 0),
+            "Sat Jan 01 20:15:01.123456 UTC 2000"    => DateTime.civil(2000, 1, 1, 20, 15, 1, 0),
+            "2009/3/4"                               => DateTime.civil(2009, 3, 4, 0, 0, 0, 0),
+            "09:34"                                  => lambda { |t| t.hour == 9 && t.min == 34 },
+            "5:21pm"                                 => lambda { |t| t.hour == 17 && t.min == 21 },
+            { :date => "2005-11-04", :time => "4:55pm" } => DateTime.civil(2005, 11, 4, 16, 55, 0),
             nil                                      => nil
           },
         :rational =>
@@ -141,9 +157,16 @@ module MongoModel
       TypeCastExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |assigned, expected|
-            it "should cast #{assigned.inspect} to #{expected.inspect}" do
-              subject[type] = assigned
-              subject[type].should == expected
+            if expected.is_a?(Proc)
+              it "should cast #{assigned.inspect} to match proc" do
+                subject[type] = assigned
+                expected.call(subject[type]).should be_true
+              end
+            else
+              it "should cast #{assigned.inspect} to #{expected.inspect}" do
+                subject[type] = assigned
+                subject[type].should == expected
+              end
             end
           end
         end

data/spec/mongomodel/concerns/attribute_methods/multi_parameter_assignment_spec.rb

@@ -5,12 +5,13 @@ module MongoModel
     define_class(:TestDocument, described_class) do
       property :timestamp, Time
       property :datestamp, Date
+      property :datetime,  DateTime
     end
     
     subject { TestDocument.new }
     
-    describe "multiparameter assignment" do
-      context "setting a timestamp" do
+    describe "multiparameter assignment from select" do
+      context "setting a Time" do
         it "should combine and assign parameters as Time" do
           subject.attributes = {
             "timestamp(1i)" => "2009",
@@ -24,7 +25,7 @@ module MongoModel
         end
       end
       
-      context "setting a datestamp" do
+      context "setting a Date" do
         it "should combine and assign parameters as Date" do
           subject.attributes = {
             "datestamp(1i)" => "2008",
@@ -35,6 +36,20 @@ module MongoModel
           subject.datestamp.should == Date.new(2008, 4, 9)
         end
       end
+      
+      context "setting a DateTime" do
+        it "should combine and assign parameters as DateTime" do
+          subject.attributes = {
+            "datetime(1i)" => "2009",
+            "datetime(2i)" => "10",
+            "datetime(3i)" => "5",
+            "datetime(4i)" => "14",
+            "datetime(5i)" => "35"
+          }
+          
+          subject.datetime.should == DateTime.civil(2009, 10, 5, 14, 35)
+        end
+      end
     end
   end
 end

data/spec/mongomodel/concerns/attributes_spec.rb

@@ -12,6 +12,7 @@ module MongoModel
     Hash => { :rabbit => 'hat', 'hello' => 12345 }.with_indifferent_access,
     Date => Date.today,
     Time => Types::Time.new.cast(Time.now),
+    DateTime => Types::DateTime.new.cast(DateTime.now),
     CustomClass => CustomClass.new('hello')
   }
   

data/spec/spec_helper.rb

@@ -18,5 +18,6 @@ RSpec.configure do |config|
   
   config.before(:each) do
     MongoModel.database.collections.each { |c| c.drop rescue c.remove }
+    Time.zone = "Australia/Adelaide"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154652940 !ruby/object:Gem::Requirement
+  requirement: &2156338320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154652940
+  version_requirements: *2156338320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2154652440 !ruby/object:Gem::Requirement
+  requirement: &2156336540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154652440
+  version_requirements: *2156336540
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2154641960 !ruby/object:Gem::Requirement
+  requirement: &2156334360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2154641960
+  version_requirements: *2156334360
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2154641460 !ruby/object:Gem::Requirement
+  requirement: &2156331960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *2154641460
+  version_requirements: *2156331960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154640860 !ruby/object:Gem::Requirement
+  requirement: &2156329880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154640860
+  version_requirements: *2156329880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154640200 !ruby/object:Gem::Requirement
+  requirement: &2156294220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2154640200
+  version_requirements: *2156294220
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and
   DataMapper.
 email:
@@ -175,6 +175,7 @@ files:
 - lib/mongomodel/support/types/boolean.rb
 - lib/mongomodel/support/types/custom.rb
 - lib/mongomodel/support/types/date.rb
+- lib/mongomodel/support/types/date_time.rb
 - lib/mongomodel/support/types/float.rb
 - lib/mongomodel/support/types/hash.rb
 - lib/mongomodel/support/types/integer.rb
@@ -259,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4407793988902722039
+      hash: 1437842966940713292
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: