mongo_mapper-unstable 2010.2.28 → 2010.3.3

data/Rakefile

@@ -10,11 +10,11 @@ Jeweler::Tasks.new do |gem|
   gem.email       = "nunemaker@gmail.com"
   gem.homepage    = "http://github.com/jnunemaker/mongomapper"
   gem.authors     = ["John Nunemaker"]
-  
+
   gem.add_dependency('activesupport', '>= 2.3')
-  gem.add_dependency('mongo', '0.18.3')
-  gem.add_dependency('jnunemaker-validatable', '1.8.1')
-  
+  gem.add_dependency('mongo', '0.19.1')
+  gem.add_dependency('jnunemaker-validatable', '1.8.3')
+
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
   gem.add_development_dependency('shoulda', '2.10.2')
   gem.add_development_dependency('timecop', '0.3.1')
@@ -38,7 +38,7 @@ namespace :test do
     test.pattern = 'test/unit/**/test_*.rb'
     test.verbose = true
   end
-  
+
   Rake::TestTask.new(:functionals) do |test|
     test.libs << 'test'
     test.ruby_opts << '-rubygems'

data/VERSION

@@ -1 +1 @@
-2010.02.28
+2010.03.03

data/lib/mongo_mapper/document.rb

@@ -17,10 +17,13 @@ module MongoMapper
         plugin Plugins::Keys
         plugin Plugins::Dirty # for now dirty needs to be after keys
         plugin Plugins::Logger
+        plugin Plugins::Modifiers
         plugin Plugins::Pagination
         plugin Plugins::Protected
         plugin Plugins::Rails
         plugin Plugins::Serialization
+        plugin Plugins::Timestamps
+        plugin Plugins::Userstamps
         plugin Plugins::Validations
         plugin Plugins::Callbacks # for now callbacks needs to be after validations
 
@@ -143,47 +146,6 @@ module MongoMapper
         find_each(options) { |document| document.destroy }
       end
 
-      def increment(*args)
-        modifier_update('$inc', args)
-      end
-
-      def decrement(*args)
-        criteria, keys = criteria_and_keys_from_args(args)
-        values, to_decrement = keys.values, {}
-        keys.keys.each_with_index { |k, i| to_decrement[k] = -values[i].abs }
-        collection.update(criteria, {'$inc' => to_decrement}, :multi => true)
-      end
-
-      def set(*args)
-        modifier_update('$set', args)
-      end
-
-      def push(*args)
-        modifier_update('$push', args)
-      end
-
-      def push_all(*args)
-        modifier_update('$pushAll', args)
-      end
-
-      def push_uniq(*args)
-        criteria, keys = criteria_and_keys_from_args(args)
-        keys.each { |key, value | criteria[key] = {'$ne' => value} }
-        collection.update(criteria, {'$push' => keys}, :multi => true)
-      end
-
-      def pull(*args)
-        modifier_update('$pull', args)
-      end
-
-      def pull_all(*args)
-        modifier_update('$pullAll', args)
-      end
-
-      def pop(*args)
-        modifier_update('$pop', args)
-      end
-
       def embeddable?
         false
       end
@@ -225,19 +187,6 @@ module MongoMapper
         database.collection(collection_name)
       end
 
-      def timestamps!
-        key :created_at, Time
-        key :updated_at, Time
-        class_eval { before_save :update_timestamps }
-      end
-
-      def userstamps!
-        key :creator_id, ObjectId
-        key :updater_id, ObjectId
-        belongs_to :creator, :class_name => 'User'
-        belongs_to :updater, :class_name => 'User'
-      end
-
       def single_collection_inherited?
         keys.key?(:_type) && single_collection_inherited_superclass?
       end
@@ -258,18 +207,6 @@ module MongoMapper
           instances.size == 1 ? instances[0] : instances
         end
 
-        def modifier_update(modifier, args)
-          criteria, keys = criteria_and_keys_from_args(args)
-          modifiers = {modifier => keys}
-          collection.update(criteria, modifiers, :multi => true)
-        end
-
-        def criteria_and_keys_from_args(args)
-          keys     = args.pop
-          criteria = args[0].is_a?(Hash) ? args[0] : {:id => args}
-          [to_criteria(criteria), keys]
-        end
-
         def assert_no_first_last_or_all(args)
           if args[0] == :first || args[0] == :last || args[0] == :all
             raise ArgumentError, "#{self}.find(:#{args}) is no longer supported, use #{self}.#{args} instead."
@@ -417,12 +354,6 @@ module MongoMapper
         @new = false
         collection.save(to_mongo, :safe => safe)
       end
-
-      def update_timestamps
-        now = Time.now.utc
-        self[:created_at] = now if new? && !created_at?
-        self[:updated_at] = now
-      end
     end
   end # Document
 end # MongoMapper

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -13,7 +13,9 @@ module MongoMapper
             :before_validation,           :after_validation,
             :before_validation_on_create, :after_validation_on_create,
             :before_validation_on_update, :after_validation_on_update,
-            :before_destroy,              :after_destroy
+            :before_destroy,              :after_destroy,
+            :validate_on_create,          :validate_on_update,
+            :validate
           )
         end
       end
@@ -48,16 +50,25 @@ module MongoMapper
       module InstanceMethods
         def valid?
           action = new? ? 'create' : 'update'
-
           run_callbacks(:before_validation)
           run_callbacks("before_validation_on_#{action}".to_sym)
           result = super
           run_callbacks("after_validation_on_#{action}".to_sym)
           run_callbacks(:after_validation)
-
           result
         end
 
+        # Overriding validatable's valid_for_group? to integrate validation callbacks
+        def valid_for_group?(group) #:nodoc:
+          errors.clear
+          run_before_validations
+          run_callbacks(:validate)
+          new? ? run_callbacks(:validate_on_create) : run_callbacks(:validate_on_update)
+          self.class.validate_children(self, group)
+          self.validate_group(group)
+          errors.empty?
+        end
+
         def destroy
           run_callbacks(:before_destroy)
           result = super

data/lib/mongo_mapper/plugins/keys.rb

@@ -170,7 +170,7 @@ module MongoMapper
 
         def attributes=(attrs)
           return if attrs.blank?
-          
+
           attrs.each_pair do |name, value|
             writer_method = "#{name}="
 
@@ -220,7 +220,7 @@ module MongoMapper
         def id
           _id
         end
-        
+
         def id=(value)
           if self.class.using_object_id?
             value = MongoMapper.normalize_object_id(value)
@@ -262,7 +262,7 @@ module MongoMapper
           def assign_type_if_present
             self._type = self.class.name if respond_to?(:_type=)
           end
-          
+
           def ensure_key_exists(name)
             self.class.key(name) unless respond_to?("#{name}=")
           end
@@ -283,11 +283,16 @@ module MongoMapper
 
           def write_key(name, value)
             key = keys[name]
+
+            if key.embeddable? && value.is_a?(key.type)
+              value._parent_document = self
+            end
+
             instance_variable_set "@#{name}_before_typecast", value
             instance_variable_set "@#{name}", key.set(value)
           end
       end
-      
+
       class Key
         attr_accessor :name, :type, :options, :default_value
 

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -0,0 +1,87 @@
+module MongoMapper
+  module Plugins
+    module Modifiers
+      module ClassMethods
+        def increment(*args)
+          modifier_update('$inc', args)
+        end
+
+        def decrement(*args)
+          criteria, keys = criteria_and_keys_from_args(args)
+          values, to_decrement = keys.values, {}
+          keys.keys.each_with_index { |k, i| to_decrement[k] = -values[i].abs }
+          collection.update(criteria, {'$inc' => to_decrement}, :multi => true)
+        end
+
+        def set(*args)
+          modifier_update('$set', args)
+        end
+
+        def push(*args)
+          modifier_update('$push', args)
+        end
+
+        def push_all(*args)
+          modifier_update('$pushAll', args)
+        end
+
+        def push_uniq(*args)
+          criteria, keys = criteria_and_keys_from_args(args)
+          keys.each { |key, value | criteria[key] = {'$ne' => value} }
+          collection.update(criteria, {'$push' => keys}, :multi => true)
+        end
+
+        def pull(*args)
+          modifier_update('$pull', args)
+        end
+
+        def pull_all(*args)
+          modifier_update('$pullAll', args)
+        end
+
+        def pop(*args)
+          modifier_update('$pop', args)
+        end
+
+        private
+          def modifier_update(modifier, args)
+            criteria, keys = criteria_and_keys_from_args(args)
+            modifiers = {modifier => keys}
+            collection.update(criteria, modifiers, :multi => true)
+          end
+
+          def criteria_and_keys_from_args(args)
+            keys     = args.pop
+            criteria = args[0].is_a?(Hash) ? args[0] : {:id => args}
+            [to_criteria(criteria), keys]
+          end
+      end
+
+      module InstanceMethods
+        def increment(hash)
+          self.class.increment({:_id => id}, hash)
+        end
+
+        def decrement(hash)
+          self.class.decrement({:_id => id}, hash)
+        end
+
+        def set(hash)
+          self.class.set({:_id => id}, hash)
+        end
+
+        def push(hash)
+          self.class.push({:_id => id}, hash)
+        end
+
+        def pull(hash)
+          self.class.pull({:_id => id}, hash)
+        end
+
+        def push_uniq(hash)
+          self.class.push_uniq({:_id => id}, hash)
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/rails.rb

@@ -1,41 +1,49 @@
 module MongoMapper
   module Plugins
     module Rails
+      def self.configure(model)
+        model.extend ActiveModel::Naming if defined?(ActiveModel)
+      end
+
       module InstanceMethods
         def to_param
           id.to_s
         end
-        
+
+        def to_model
+          self
+        end
+
         def new_record?
           new?
         end
-        
+
         def read_attribute(name)
           self[name]
         end
-        
+
         def read_attribute_before_typecast(name)
           read_key_before_typecast(name)
         end
-        
+
         def write_attribute(name, value)
           self[name] = value
         end
       end
-      
+
       module ClassMethods
         def has_one(*args)
           one(*args)
         end
-        
+
         def has_many(*args)
           many(*args)
         end
-        
+
         def column_names
           keys.keys
         end
-        
+
         def human_name
           self.name.demodulize.titleize
         end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -4,102 +4,72 @@ module MongoMapper
   module Plugins
     module Serialization
       def self.configure(model)
-        model.class_eval { include Json }
+        model.class_eval { cattr_accessor :include_root_in_json, :instance_writer => true }
       end
       
-      class Serializer
-        attr_reader :options
-
-        def initialize(record, options={})
-          @record, @options = record, options.dup
-        end
-
-        def serializable_key_names
-          key_names = @record.attributes.keys
-
-          if options[:only]
-            options.delete(:except)
-            key_names = key_names & Array(options[:only]).collect { |n| n.to_s }
-          else
-            options[:except] = Array(options[:except])
-            key_names = key_names - options[:except].collect { |n| n.to_s }
-          end
-
-          key_names
-        end
-
-        def serializable_method_names
-          Array(options[:methods]).inject([]) do |method_attributes, name|
-            method_attributes << name if @record.respond_to?(name.to_s)
-            method_attributes
+      module InstanceMethods
+        def as_json options={}
+          options ||= {}
+          unless options[:only]
+            methods = [options.delete(:methods)].flatten.compact
+            methods << :id
+            options[:methods] = methods.uniq
           end
-        end
 
-        def serializable_names
-          serializable_key_names + serializable_method_names
-        end
+          except = [options.delete(:except)].flatten.compact
+          except << :_id
+          options[:except] = except
 
-        def serializable_record
-          returning(serializable_record = {}) do
-            serializable_names.each { |name| serializable_record[name] = @record.send(name) }
-          end
-        end
+          # Direct rip from Rails 3 ActiveModel Serialization (#serializable_hash)
+          hash = begin
+            options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
+            options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
 
-        def serialize
-          # overwrite to implement
-        end
+            attribute_names = attributes.keys.sort
+            if options[:only].any?
+              attribute_names &= options[:only]
+            elsif options[:except].any?
+              attribute_names -= options[:except]
+            end
 
-        def to_s(&block)
-          serialize(&block)
-        end
-      end
-      
-      module Json
-        def self.included(base)
-          base.cattr_accessor :include_root_in_json, :instance_writer => false
-          base.extend ClassMethods
-        end
+            method_names = Array.wrap(options[:methods]).inject([]) do |methods, name|
+              methods << name if respond_to?(name.to_s)
+              methods
+            end
 
-        module ClassMethods
-          def json_class_name
-            @json_class_name ||= name.demodulize.underscore.inspect
+            (attribute_names + method_names).inject({}) { |hash, name|
+              hash[name] = send(name)
+              hash
+            }
           end
-        end
-
-        def to_json(options={})
-          apply_to_json_defaults(options)
-
-          if include_root_in_json
-            "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
-          else
-            JsonSerializer.new(self, options).to_s
+          # End rip
+          
+          options.delete(:only) if options[:only].nil? or options[:only].empty?
+
+          hash.each do |key, value|
+            if value.is_a?(Array)
+              hash[key] = value.map do |item|
+                item.respond_to?(:as_json) ? item.as_json(options) : item
+              end
+            elsif value.is_a? Mongo::ObjectID
+              hash[key] = value.to_s
+            elsif value.respond_to?(:as_json)
+              hash[key] = value.as_json(options)
+            end
           end
+          
+          # Replicate Rails 3 naming - and also bin anytihng after : for use in our dynamic classes from unit tests
+          hash = { ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).gsub(/:.*/,'') => hash } if include_root_in_json
+          hash
         end
+      end
 
+      module ClassMethods
         def from_json(json)
-          self.attributes = ActiveSupport::JSON.decode(json)
-          self
+          self.new(ActiveSupport::JSON.decode(json))
         end
-
-        class JsonSerializer < Serializer
-          def serialize
-            serializable_record.to_json
-          end
-        end
-
-        private
-          def apply_to_json_defaults(options)
-            unless options[:only]
-              methods = [options.delete(:methods)].flatten.compact
-              methods << :id
-              options[:methods] = methods.uniq
-            end
-
-            except = [options.delete(:except)].flatten.compact
-            except << :_id
-            options[:except] = except
-          end
       end
+
     end
   end
 end

data/lib/mongo_mapper/plugins/timestamps.rb

@@ -0,0 +1,21 @@
+module MongoMapper
+  module Plugins
+    module Timestamps
+      module ClassMethods
+        def timestamps!
+          key :created_at, Time
+          key :updated_at, Time
+          class_eval { before_save :update_timestamps }
+        end
+      end
+      
+      module InstanceMethods
+        def update_timestamps
+          now = Time.now.utc
+          self[:created_at] = now if new? && !created_at?
+          self[:updated_at] = now
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/userstamps.rb

@@ -0,0 +1,14 @@
+module MongoMapper
+  module Plugins
+    module Userstamps
+      module ClassMethods
+        def userstamps!
+          key :creator_id, ObjectId
+          key :updater_id, ObjectId
+          belongs_to :creator, :class_name => 'User'
+          belongs_to :updater, :class_name => 'User'
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins.rb

@@ -20,9 +20,12 @@ module MongoMapper
     autoload :Inspect,        'mongo_mapper/plugins/inspect'
     autoload :Keys,           'mongo_mapper/plugins/keys'
     autoload :Logger,         'mongo_mapper/plugins/logger'
+    autoload :Modifiers,      'mongo_mapper/plugins/modifiers'
     autoload :Protected,      'mongo_mapper/plugins/protected'
     autoload :Rails,          'mongo_mapper/plugins/rails'
     autoload :Serialization,  'mongo_mapper/plugins/serialization'
+    autoload :Timestamps,     'mongo_mapper/plugins/timestamps'
+    autoload :Userstamps,     'mongo_mapper/plugins/userstamps'
     autoload :Validations,    'mongo_mapper/plugins/validations'
   end
 end

data/lib/mongo_mapper.rb

@@ -7,8 +7,8 @@ require 'uri'
 # if there is a better way to do this, please enlighten me!
 if self.class.const_defined?(:Gem)
   gem 'activesupport', '>= 2.3'
-  gem 'mongo', '0.18.3'
-  gem 'jnunemaker-validatable', '1.8.1'
+  gem 'mongo', '0.19.1'
+  gem 'jnunemaker-validatable', '1.8.3'
 end
 
 require 'active_support/all'

data/test/active_model_lint_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+require 'active_model'
+require 'models'
+
+class ActiveModelLintTest < ActiveModel::TestCase
+  include ActiveModel::Lint::Tests
+  
+  def setup
+    @model = Post.new
+  end
+end