mongomodel 0.2.6 → 0.2.7

data/Gemfile

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

data/Rakefile

@@ -46,10 +46,9 @@ begin
     gem.authors = ["Sam Pohlenz"]
     gem.version = MongoModel::VERSION
 
-    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_dependency('activesupport', '~> 3.0.0')
+    gem.add_dependency('activemodel', '~> 3.0.0')
+    gem.add_dependency('mongo', '~> 1.0.7')
     gem.add_development_dependency('rspec', '>= 1.3.0')
   end
   

data/lib/mongomodel/concerns/properties.rb

@@ -14,7 +14,9 @@ module MongoModel
     
     module ClassMethods
       def property(name, type, options={})
-        properties[name.to_sym] = Property.new(name, type, options)
+        properties[name.to_sym] = Property.new(name, type, options).tap do |property|
+          include type.mongomodel_accessors(property) if type.respond_to?(:mongomodel_accessors)
+        end
       end
       
       def model_properties
@@ -40,15 +42,19 @@ module MongoModel
       end
     
       def default(instance)
-        default = options[:default]
-        
-        if default.respond_to?(:call)
-          case default.arity
-          when 0 then default.call
-          else        default.call(instance)
+        if options.key?(:default)
+          default = options[:default]
+          
+          if default.respond_to?(:call)
+            case default.arity
+            when 0 then default.call
+            else        default.call(instance)
+            end
+          else
+            default.duplicable? ? default.dup : default
           end
-        else
-          default.duplicable? ? default.dup : default
+        elsif type.respond_to?(:mongomodel_default)
+          type.mongomodel_default(instance)
         end
       end
     

data/lib/mongomodel/document/optimistic_locking.rb

@@ -31,7 +31,7 @@ module MongoModel
         if locking_enabled? && _lock_version > 1
           begin
             collection.update({ '_id' => id, '_lock_version' => _lock_version-1 }, to_mongo)
-            success = database.last_status['updatedExisting']
+            success = database.get_last_error['updatedExisting']
             
             self._lock_version -= 1 unless success
             

data/lib/mongomodel/document/persistence.rb

@@ -68,10 +68,10 @@ module MongoModel
         self.class.database
       end
       
-      # Generate a new BSON::ObjectID for the record.
+      # Generate a new BSON::ObjectId for the record.
       # Override in subclasses for custom ID generation.
       def generate_id
-        ::BSON::ObjectID.new.to_s
+        ::BSON::ObjectId.new.to_s
       end
       
       module ClassMethods

data/lib/mongomodel/document/validations/uniqueness.rb

@@ -1,6 +1,70 @@
+require 'active_support/core_ext/array/wrap'
+
 module MongoModel
   module DocumentExtensions
     module Validations
+      class UniquenessValidator < ActiveModel::EachValidator
+        def initialize(options)
+          super(options.reverse_merge(:case_sensitive => true))
+        end
+        
+        def setup(klass)
+          @klass = klass
+          
+          # Enable safety checks on save
+          klass.save_safely = true
+          
+          # Create unique indexes to deal with race condition
+          attributes.each do |attr_name|
+            if options[:case_sensitive]
+              klass.index *[attr_name] + Array.wrap(options[:scope]) << { :unique => true }
+            else
+              lowercase_key = "_lowercase_#{attr_name}"
+              klass.before_save { attributes[lowercase_key] = send(attr_name).downcase }
+              klass.index *[lowercase_key] + Array.wrap(options[:scope]) << { :unique => true }
+            end
+          end
+        end
+        
+        def validate_each(record, attribute, value)
+          finder_class = find_finder_class_for(record)
+          unique_scope = finder_class.scoped
+          
+          if options[:case_sensitive] || !value.is_a?(String)
+            unique_scope = unique_scope.where(attribute => value)
+          else
+            unique_scope = unique_scope.where("_lowercase_#{attribute}" => value.downcase)
+          end
+          
+          Array.wrap(options[:scope]).each do |scope|
+            unique_scope = unique_scope.where(scope => record.send(scope))
+          end
+          
+          unique_scope = unique_scope.where(:id.ne => record.id) unless record.new_record?
+          
+          if unique_scope.any?
+            record.errors.add(attribute, :taken, :message => options[:message], :value => value)
+          end
+        end
+      
+      private
+      
+        # The check for an existing value should be run from a class that
+        # isn't abstract. This means working down from the current class
+        # (self), to the first non-abstract class. Since classes don't know
+        # their subclasses, we have to build the hierarchy between self and
+        # the record's class.
+        def find_finder_class_for(record) #:nodoc:
+          class_hierarchy = [record.class]
+
+          while class_hierarchy.first != @klass
+            class_hierarchy.insert(0, class_hierarchy.first.superclass)
+          end
+
+          class_hierarchy.detect { |klass| !klass.abstract_class? }
+        end
+      end
+      
       module ClassMethods
         # Validates whether the value of the specified attributes are unique across the system. Useful for making sure that only one user
         # can be named "davidhh".
@@ -37,42 +101,7 @@ module MongoModel
         # Note that this validation method does not have the same race condition suffered by ActiveRecord and other ORMs.
         # A unique index is added to the collection to ensure that the collection never ends up in an invalid state.
         def validates_uniqueness_of(*attr_names)
-          configuration = { :case_sensitive => true }
-          configuration.update(attr_names.extract_options!)
-          
-          # Enable safety checks on save
-          self.save_safely = true
-          
-          # Create unique indexes to deal with race condition
-          attr_names.each do |attr_name|
-            if configuration[:case_sensitive]
-              index *[attr_name] + Array(configuration[:scope]) << { :unique => true }
-            else
-              lowercase_key = "_lowercase_#{attr_name}"
-              before_save { attributes[lowercase_key] = send(attr_name).downcase }
-              index *[lowercase_key] + Array(configuration[:scope]) << { :unique => true }
-            end
-          end
-          
-          validates_each(attr_names, configuration) do |record, attr_name, value|
-            unique_scope = scoped
-            
-            if configuration[:case_sensitive] || !value.is_a?(String)
-              unique_scope = unique_scope.where(attr_name => value)
-            else
-              unique_scope = unique_scope.where("_lowercase_#{attr_name}" => value.downcase)
-            end
-            
-            Array(configuration[:scope]).each do |scope|
-              unique_scope = unique_scope.where(scope => record.send(scope))
-            end
-            
-            unique_scope = unique_scope.where(:id.ne => record.id) unless record.new_record?
-            
-            if unique_scope.any?
-              record.errors.add(attr_name, :taken, :default => configuration[:message], :value => value)
-            end
-          end
+          validates_with UniquenessValidator, _merge_attributes(attr_names)
         end
       end
     end

data/lib/mongomodel/support/map.rb

@@ -115,6 +115,10 @@ module MongoModel
       super(convert_value(value))
     end
     
+    def key(value)
+      super(convert_value(value))
+    end
+    
     def update(hash)
       hash.each_pair { |k, v| self[k] = v }
       self

data/lib/mongomodel/support/mongo_options.rb

@@ -71,7 +71,7 @@ module MongoModel
     
     def add_type_to_selector
       unless selector['_type'] || @model.superclass.abstract_class?
-        selector['_type'] = { '$in' => [@model.to_s] + @model.subclasses }
+        selector['_type'] = { '$in' => [@model.to_s] + @model.subclasses.map { |m| m.to_s } }
       end
     end
   end

data/lib/mongomodel/support/scope/query_methods.rb

@@ -31,6 +31,12 @@ module MongoModel
         CEVAL
       end
       
+      def from(value, &block)
+        new_scope = clone
+        new_scope.from_value = value.is_a?(String) ? klass.database.collection(value) : value
+        new_scope
+      end
+      
       def reverse_order
         if order_values.empty?
           order(:id.desc)

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

@@ -5,9 +5,8 @@ module MongoModel
   module Types
     class Time < Object
       def cast(value)
-        time = value.to_time.utc
-        # BSON only stores time accurate to the millisecond
-        ::Time.at((time.to_f * 1000).floor / 1000.0)
+        time = value.to_time
+        time.change(:usec => (time.usec / 1000.0).floor * 1000)
       rescue
         nil
       end

data/lib/mongomodel/version.rb

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

data/mongomodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]
-  s.date = %q{2010-06-09}
+  s.date = %q{2010-09-05}
   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,20 @@ 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.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_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<mongo>, ["~> 1.0.7"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
-      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<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
+      s.add_dependency(%q<mongo>, ["~> 1.0.7"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
-    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<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
+    s.add_dependency(%q<mongo>, ["~> 1.0.7"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end

data/spec/mongomodel/attributes/store_spec.rb

@@ -15,6 +15,7 @@ module MongoModel
       properties[:date]    = MongoModel::Properties::Property.new(:date, Date)
       properties[:time]    = MongoModel::Properties::Property.new(:time, Time)
       properties[:custom]  = MongoModel::Properties::Property.new(:custom, CustomClass)
+      properties[:custom_default] = MongoModel::Properties::Property.new(:custom_default, CustomClassWithDefault)
       properties[:default] = MongoModel::Properties::Property.new(:default, String, :default => 'Default')
       properties[:as]      = MongoModel::Properties::Property.new(:as, String, :as => '_custom_as')
       properties
@@ -28,6 +29,10 @@ module MongoModel
       subject[:default].should == 'Default'
     end
     
+    it "should set default property value using mongomodel_default if defined by class" do
+      subject[:custom_default].should == CustomClassWithDefault.new("Custom class default")
+    end
+    
     describe "setting to nil" do
       specify "all property types should be nullable" do
         properties.keys.each do |property|

data/spec/mongomodel/concerns/properties_spec.rb

@@ -52,5 +52,18 @@ module MongoModel
         factory.manager.should be_nil
       end
     end
+    
+    describe "when using a property type that defines #mongomodel_accessors" do
+      define_class(:ParentClass, described_class) do
+        property :custom, CustomClassWithAccessors
+      end
+      
+      subject { ParentClass.new }
+      
+      it "should include methods from the module" do
+        subject.should respond_to(:custom_accessor)
+        subject.custom_accessor.should == "Custom accessor method"
+      end
+    end
   end
 end

data/spec/mongomodel/support/map_spec.rb

@@ -101,8 +101,14 @@ module MongoModel
         subject.value?(456).should be_true
       end
       
-      it "should cast values on #index" do
-        subject.index(456).should == "123"
+      if Hash.method_defined?(:key)
+        it "should cast values on #key" do
+          subject.key(456).should == "123"
+        end
+      else
+        it "should cast values on #index" do
+          subject.index(456).should == "123"
+        end
       end
       
       it "should cast key/values on #replace" do
@@ -177,8 +183,14 @@ module MongoModel
         subject.value?("Another").should be_true
       end
       
-      it "should cast values on #index" do
-        subject.index("First").should == :abc
+      if Hash.method_defined?(:key)
+        it "should cast values on #key" do
+          subject.key("First").should == :abc
+        end
+      else
+        it "should cast values on #index" do
+          subject.index("First").should == :abc
+        end
       end
       
       it "should cast key/values on #replace" do

data/spec/mongomodel/support/scope_spec.rb

@@ -309,6 +309,10 @@ module MongoModel
         it "should override collection" do
           subject.from(NotAPost.collection).collection.should == NotAPost.collection
         end
+        
+        it "should allow collection to be set using string" do
+          subject.from(NotAPost.collection.name).collection.name.should == NotAPost.collection.name
+        end
       end
       
       describe "#first" do

data/spec/support/models.rb

@@ -21,3 +21,19 @@ class CustomClass
     new(value.to_s)
   end
 end
+
+class CustomClassWithDefault < CustomClass
+  def self.mongomodel_default(doc)
+    new("Custom class default")
+  end
+end
+
+class CustomClassWithAccessors < CustomClass
+  def self.mongomodel_accessors(property)
+    Module.new do
+      define_method(:custom_accessor) do
+        "Custom accessor method"
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +09:30
+date: 2010-09-05 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,15 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,15 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,34 +56,20 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 25
         segments: 
         - 1
         - 0
-        version: "1.0"
+        - 7
+        version: 1.0.7
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +81,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: sam@sampohlenz.com
 executables: