mongomodel 0.3.1 → 0.3.2

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
 gemspec
-gem "bson_ext", '~> 1.2.0'
+
+gem "bson_ext", '~> 1.3.0'
+gem "SystemTimer"

data/lib/mongomodel/concerns/properties.rb

@@ -29,7 +29,7 @@ module MongoModel
     end
   
     class Property
-      delegate :cast, :boolean, :to_mongo, :from_mongo, :to => :type_converter
+      delegate :cast, :boolean, :to_mongo, :from_mongo, :to_query, :to => :type_converter
       
       attr_reader :name, :type, :options
     

data/lib/mongomodel/support/mongo_options.rb

@@ -36,9 +36,9 @@ module MongoModel
           key = property.as
           
           if k.is_a?(MongoOperator)
-            value = k.to_mongo_selector(v.is_a?(Array) ? v.map { |i| property.to_mongo(property.cast(i)) } : property.to_mongo(property.cast(v)))
+            value = k.to_mongo_selector(v.is_a?(Array) ? v.map { |i| property.to_query(i) } : property.to_query(v))
           else
-            value = property.to_mongo(property.cast(v))
+            value = property.to_query(v)
           end
         else
           converter = Types.converter_for(value.class)

data/lib/mongomodel/support/reference.rb

@@ -10,6 +10,8 @@ module MongoModel
       id.to_s
     end
     
+    alias :to_str :to_s
+    
     def hash
       id.hash
     end

data/lib/mongomodel/support/scope.rb

@@ -110,6 +110,8 @@ module MongoModel
     def reset
       @loaded = nil
       @documents = []
+      @finder_options = nil
+      @options_for_create = nil
       self
     end
     

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

@@ -6,6 +6,10 @@ module MongoModel
           Types.converter_for(i.class).to_mongo(i)
         } if array
       end
+      
+      def to_query(value)
+        Types.converter_for(value.class).to_mongo(value)
+      end
     end
   end
 end

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

@@ -16,6 +16,10 @@ module MongoModel
       def from_mongo(value)
         value
       end
+      
+      def to_query(value)
+        to_mongo(cast(value))
+      end
     end
   end
 end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/mongomodel.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   
   s.add_dependency "activesupport", "~> 3.0.3"
   s.add_dependency "activemodel",   "~> 3.0.3"
-  s.add_dependency "mongo",         "~> 1.1.2"
+  s.add_dependency "mongo",         "~> 1.3.0"
   s.add_dependency "will_paginate", "~> 2.3.15"
 
   s.add_development_dependency "bundler", ">= 1.0.0"

data/spec/mongomodel/support/scope_spec.rb

@@ -183,6 +183,16 @@ module MongoModel
             subject.reload
             subject.should be_loaded
           end
+          
+          it "should reset its finder options" do
+            old_finder_options = subject.finder_options
+            subject.reload.finder_options.should_not equal(old_finder_options)
+          end
+
+          it "should reset its options for create" do
+            old_options_for_create = subject.options_for_create
+            subject.reload.options_for_create.should_not equal(old_options_for_create)
+          end
         end
       end
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +10:30
+date: 2011-04-19 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 1
-        - 1
-        - 2
-        version: 1.1.2
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomodel
-rubygems_version: 1.4.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails