mongomodel 0.2.5 → 0.2.6

data/Gemfile

@@ -1,11 +1,12 @@
 source "http://rubygems.org"
-# git "git://github.com/rails/rails.git"
+git "git://github.com/rails/rails.git"
 
-gem "activemodel", "= 3.0.0.beta3"
-gem "activesupport", "= 3.0.0.beta3"
+gem "activemodel", ">= 3.0.0.beta4"
+gem "activesupport", ">= 3.0.0.beta4"
+gem "tzinfo"
 
-gem "mongo", '>= 0.20.1'
-gem "bson", '>= 0.20.1'
-gem "bson_ext", '>= 0.20.1'
+gem "mongo", '>= 1.0'
+gem "bson", '>= 1.0'
+gem "bson_ext", '>= 1.0'
 
 gem "rspec"

data/Rakefile

@@ -46,10 +46,10 @@ begin
     gem.authors = ["Sam Pohlenz"]
     gem.version = MongoModel::VERSION
 
-    gem.add_dependency('activesupport', '= 3.0.0.beta3')
-    gem.add_dependency('activemodel', '= 3.0.0.beta3')
-    gem.add_dependency('mongo', '>= 0.20.1')
-    gem.add_dependency('bson', '>= 0.20.1')
+    gem.add_dependency('activesupport', '>= 3.0.0.beta4')
+    gem.add_dependency('activemodel', '>= 3.0.0.beta4')
+    gem.add_dependency('mongo', '>= 1.0')
+    gem.add_dependency('bson', '>= 1.0')
     gem.add_development_dependency('rspec', '>= 1.3.0')
   end
   

data/lib/mongomodel/attributes/dirty.rb

@@ -2,7 +2,7 @@ module MongoModel
   module Attributes
     module Dirty
       def []=(key, value)
-        attr = key.to_s
+        attr = key.to_sym
         
         # The attribute already has an unsaved change.
         if changed.include?(attr)
@@ -17,7 +17,7 @@ module MongoModel
       end
       
       def changed
-        @changed ||= {}
+        @changed ||= {}.with_indifferent_access
       end
       
     private

data/lib/mongomodel/concerns/attribute_methods/dirty.rb

@@ -11,7 +11,7 @@ module MongoModel
       
       # Returns the attributes as they were before any changes were made to the document.
       def original_attributes
-        attributes.merge(changed_attributes)
+        {}.merge(attributes).merge(changed_attributes)
       end
     
     protected

data/lib/mongomodel/concerns/callbacks.rb

@@ -192,8 +192,6 @@ module MongoModel
   # defined as methods on the model, which are called last.
   module Callbacks
     extend ActiveSupport::Concern
-    
-    include ActiveSupport::Callbacks
 
     CALLBACKS = [
       :after_initialize, :after_find, :before_validation, :after_validation,
@@ -203,50 +201,19 @@ module MongoModel
     ]
 
     included do
-      [:initialize, :valid?].each do |method|
-        alias_method_chain method, :callbacks
-      end
+      extend ActiveModel::Callbacks
       
-      define_callbacks :initialize, :find, :save, :create, :update, :destroy,
-                       :validation, :terminator => "result == false", :scope => [:kind, :name]
+      define_model_callbacks :initialize, :find, :only => :after
+      define_model_callbacks :save, :create, :update, :destroy
+      
+      define_callbacks :validation, :terminator => "result == false", :scope => [:kind, :name]
     end
     
     module ClassMethods
-      def after_initialize(*args, &block)
-        options = args.extract_options!
-        options[:prepend] = true
-        set_callback(:initialize, :after, *(args << options), &block)
-      end
-
-      def after_find(*args, &block)
-        options = args.extract_options!
-        options[:prepend] = true
-        set_callback(:find, :after, *(args << options), &block)
-      end
-
-      [:save, :create, :update, :destroy].each do |callback|
-        module_eval <<-CALLBACKS, __FILE__, __LINE__
-          def before_#{callback}(*args, &block)
-            set_callback(:#{callback}, :before, *args, &block)
-          end
-
-          def around_#{callback}(*args, &block)
-            set_callback(:#{callback}, :around, *args, &block)
-          end
-
-          def after_#{callback}(*args, &block)
-            options = args.extract_options!
-            options[:prepend] = true
-            options[:if] = Array(options[:if]) << "!halted && value != false"
-            set_callback(:#{callback}, :after, *(args << options), &block)
-          end
-        CALLBACKS
-      end
-
       def before_validation(*args, &block)
         options = args.extract_options!
         if options[:on]
-          options[:if] = Array(options[:if])
+          options[:if] = Array.wrap(options[:if])
           options[:if] << "@_on_validate == :#{options[:on]}"
         end
         set_callback(:validation, :before, *(args << options), &block)
@@ -254,24 +221,22 @@ module MongoModel
 
       def after_validation(*args, &block)
         options = args.extract_options!
-        options[:if] = Array(options[:if])
-        options[:if] << "!halted"
+        options[:if] = Array.wrap(options[:if])
+        options[:if] << "!halted && value != false"
         options[:if] << "@_on_validate == :#{options[:on]}" if options[:on]
         options[:prepend] = true
         set_callback(:validation, :after, *(args << options), &block)
       end
     end
     
-    def initialize_with_callbacks(*args, &block) #:nodoc:
-      initialize_without_callbacks(*args, &block)
+    def initialize(*args, &block) #:nodoc:
+      super
       run_callbacks_with_embedded(:initialize)
     end
     
-    def valid_with_callbacks? #:nodoc:
+    def valid?(*) #:nodoc:
       @_on_validate = new_record? ? :create : :update
-      run_callbacks(:validation) do
-        valid_without_callbacks?
-      end
+      run_callbacks(:validation) { super }
     end
     
     def run_callbacks_with_embedded(kind, *args, &block)

data/lib/mongomodel/concerns/serialization.rb

@@ -4,8 +4,8 @@ module MongoModel
     
     include ActiveModel::Serializers::JSON
     
-    def serializable_hash(options = nil)
-      options ||= {}
+    def serializable_hash(given_options = nil)
+      options = given_options ? given_options.dup : {}
 
       options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
       options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }

data/lib/mongomodel/concerns/validations.rb

@@ -16,10 +16,10 @@ module MongoModel
       end
     end
     
-    def valid?
+    def valid?(context=nil)
       errors.clear
       
-      @_on_validate = new_record? ? :create : :update
+      self.validation_context = new_record? ? :create : :update
       run_callbacks(:validate)
       
       errors.empty?

data/lib/mongomodel/support/configuration.rb

@@ -4,12 +4,7 @@ require 'active_support/core_ext/hash/except'
 module MongoModel
   class Configuration
     def initialize(options)
-      case options
-      when Hash
-        @options = DEFAULTS.merge(options).stringify_keys
-      when String
-        super(parse(options))
-      end
+      set_options!(options)
     end
     
     def host
@@ -48,6 +43,15 @@ module MongoModel
       @options.except('host', 'port', 'database', 'username', 'password').symbolize_keys
     end
     
+    def set_options!(options)
+      case options
+      when Hash
+        @options = DEFAULTS.merge(options).stringify_keys
+      when String
+        set_options!(parse(options))
+      end
+    end
+    
     DEFAULTS = {
       'host'      => 'localhost',
       'port'      => 27017,

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

@@ -1,8 +1,8 @@
 module MongoModel
   module Types
     class Boolean < Object
-      TRUE_VALUES = [ true, 'true', 't', 'TRUE', 'T', 'YES', 'y', '1', 1 ]
-      FALSE_VALUES = [ false, 'false', 'f', 'FALSE', 'F', 'NO', 'n', '0', 0 ]
+      TRUE_VALUES = [ true, 'true', 't', 'TRUE', 'T', 'yes', 'YES', 'Y', 'y', '1', 1 ]
+      FALSE_VALUES = [ false, 'false', 'f', 'FALSE', 'F', 'no', 'NO', 'N', 'n', '0', 0 ]
       
       def cast(value)
         if true?(value)

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

@@ -2,7 +2,11 @@ module MongoModel
   module Types
     class Float < Object
       def cast(value)
-        value.to_f if value.respond_to?(:to_f)
+        if value.nil?
+          nil
+        else
+          Kernel::Float(value) rescue nil
+        end
       end
       
       def boolean(value)

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

@@ -2,7 +2,15 @@ module MongoModel
   module Types
     class Integer < Object
       def cast(value)
-        value.to_i if value.respond_to?(:to_i)
+        if value.nil?
+          nil
+        else
+          begin
+            Kernel::Integer(value)
+          rescue ArgumentError
+            Kernel::Float(value).to_i rescue nil
+          end
+        end
       end
       
       def boolean(value)

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

@@ -2,7 +2,7 @@ module MongoModel
   module Types
     class String < Object
       def cast(value)
-        value.to_s if value.respond_to?(:to_s)
+        value.to_s if value && value.respond_to?(:to_s)
       end
     end
   end

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

@@ -2,7 +2,7 @@ module MongoModel
   module Types
     class Symbol < Object
       def cast(value)
-        value.to_sym if value.respond_to?(:to_sym)
+        value.to_sym if value && value.respond_to?(:to_sym)
       end
     end
   end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/mongomodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-06-09}
   s.default_executable = %q{console}
   s.description = %q{MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.}
   s.email = %q{sam@sampohlenz.com}
@@ -217,23 +217,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
-      s.add_runtime_dependency(%q<activemodel>, ["= 3.0.0.beta3"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0.20.1"])
-      s.add_runtime_dependency(%q<bson>, [">= 0.20.1"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta4"])
+      s.add_runtime_dependency(%q<mongo>, [">= 1.0"])
+      s.add_runtime_dependency(%q<bson>, [">= 1.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
-      s.add_dependency(%q<activemodel>, ["= 3.0.0.beta3"])
-      s.add_dependency(%q<mongo>, [">= 0.20.1"])
-      s.add_dependency(%q<bson>, [">= 0.20.1"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta4"])
+      s.add_dependency(%q<mongo>, [">= 1.0"])
+      s.add_dependency(%q<bson>, [">= 1.0"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
-    s.add_dependency(%q<activemodel>, ["= 3.0.0.beta3"])
-    s.add_dependency(%q<mongo>, [">= 0.20.1"])
-    s.add_dependency(%q<bson>, [">= 0.20.1"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta4"])
+    s.add_dependency(%q<mongo>, [">= 1.0"])
+    s.add_dependency(%q<bson>, [">= 1.0"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end

data/spec/mongomodel/attributes/store_spec.rb

@@ -47,20 +47,25 @@ module MongoModel
         :string =>
           {
             "abc" => "abc",
-            123   => "123"
+            123   => "123",
+            nil   => nil
           },
         :integer =>
           {
             123      => 123,
             55.123   => 55,
             "999"    => 999,
-            "12.123" => 12
+            "12.123" => 12,
+            "foo"    => nil,
+            nil      => nil
           },
         :float =>
           {
             55.123   => 55.123,
             123      => 123.0,
-            "12.123" => 12.123
+            "12.123" => 12.123,
+            "foo"    => nil,
+            nil      => nil
           },
         :boolean =>
           {
@@ -68,16 +73,33 @@ module MongoModel
             false   => false,
             "true"  => true,
             "false" => false,
+            "TRUE"  => true,
+            "FALSE" => false,
+            "yes"   => true,
+            "no"    => false,
+            "YES"   => true,
+            "NO"    => false,
+            "t"     => true,
+            "f"     => false,
+            "T"     => true,
+            "F"     => false,
+            "Y"     => true,
+            "N"     => false,
+            "y"     => true,
+            "n"     => false,
             1       => true,
             0       => false,
             "1"     => true,
             "0"     => false,
-            ''      => nil
+            "foo"   => nil,
+            ''      => nil,
+            nil     => nil
           },
         :symbol =>
           {
             :some_symbol  => :some_symbol,
-            "some_string" => :some_string
+            "some_string" => :some_string,
+            nil           => nil
           },
         :hash =>
           {
@@ -92,14 +114,16 @@ module MongoModel
             Date.civil(2009, 11, 15)             => Date.civil(2009, 11, 15),
             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)
+            "Sat Jan 01 20:15:01 UTC 2000"       => Date.civil(2000, 1, 1),
+            nil                                  => nil
           },
         :time =>
           {
-            Time.local(2008, 5, 14, 1, 2, 3, 4) => Time.local(2008, 5, 14, 1, 2, 3, 4, 0),
-            Date.civil(2009, 11, 15)            => Time.local(2009, 11, 15, 0, 0, 0, 0, 0),
-            "Sat Jan 01 20:15:01 UTC 2000"      => Time.utc(2000, 1, 1, 20, 15, 1, 0, 0),
-            "2009/3/4"                          => Time.utc(2009, 3, 4, 0, 0, 0, 0, 0)
+            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),
+            nil                                      => nil
           }
       }
     

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

@@ -4,23 +4,50 @@ module MongoModel
   specs_for(Document, EmbeddedDocument) do
     define_class(:TestDocument, described_class) do
       property :foo, String
+      property :boolean, Boolean
     end
     
     subject { TestDocument.new }
     
     describe "#query_attribute" do
-      it "should return true if the attribute is not blank" do
-        subject.foo = 'set foo'
-        subject.query_attribute(:foo).should be_true
-      end
+      context "string attribute" do
+        it "should return true if the attribute is not blank" do
+          subject.foo = 'set foo'
+          subject.query_attribute(:foo).should be_true
+          subject.foo?.should be_true
+        end
+      
+        it "should return false if the attribute is nil" do
+          subject.foo = nil
+          subject.query_attribute(:foo).should be_false
+          subject.foo?.should be_false
+        end
       
-      it "should return false if the attribute is blank" do
-        subject.foo = ''
-        subject.query_attribute(:foo).should be_false
+        it "should return false if the attribute is blank" do
+          subject.foo = ''
+          subject.query_attribute(:foo).should be_false
+          subject.foo?.should be_false
+        end
       end
       
-      it "should create a query method" do
-        subject.foo?.should == subject.query_attribute(:foo)
+      context "boolean attribute" do
+        it "should return true if the attribute is true" do
+          subject.boolean = true
+          subject.query_attribute(:boolean).should be_true
+          subject.boolean?.should be_true
+        end
+        
+        it "should return false if the attribute is nil" do
+          subject.boolean = nil
+          subject.query_attribute(:boolean).should be_false
+          subject.boolean?.should be_false
+        end
+      
+        it "should return false if the attribute is false" do
+          subject.boolean = false
+          subject.query_attribute(:boolean).should be_false
+          subject.boolean?.should be_false
+        end
       end
     end
   end

data/spec/mongomodel/mongomodel_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe MongoModel do
+  after(:all) do
+    MongoModel.configuration = {}
+  end
+  
   describe "setting a custom database configuration" do
     before(:each) do
       MongoModel.configuration = {
@@ -25,6 +29,18 @@ describe MongoModel do
     end
   end
   
+  describe "setting a custom database configuration as a URI string" do
+    before(:each) do
+      MongoModel.configuration = "mongodb://127.0.0.2:27019/mydb"
+    end
+    
+    it "should should merge configuration with defaults" do
+      MongoModel.configuration.host.should == '127.0.0.2'
+      MongoModel.configuration.port.should == 27019
+      MongoModel.configuration.database.should == 'mydb'
+    end
+  end
+  
   it "should have a logger accessor" do
     logger = mock('logger')
     MongoModel.logger = logger

data/spec/spec_helper.rb

@@ -25,6 +25,6 @@ Spec::Runner.configure do |config|
   end
   
   config.before(:each) do
-    MongoModel.database.collections.each { |c| c.drop }
+    MongoModel.database.collections.each { |c| c.drop rescue c.remove }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 +09:30
+date: 2010-06-09 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,15 +24,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230021
+        hash: -1848230024
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,15 +41,15 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230021
+        hash: -1848230024
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,12 +60,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 77
+        hash: 15
         segments: 
-        - 0
-        - 20
         - 1
-        version: 0.20.1
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,12 +75,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 77
+        hash: 15
         segments: 
-        - 0
-        - 20
         - 1
-        version: 0.20.1
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency