mongoid 2.4.0 → 2.4.12

data/lib/mongoid/versioning.rb

@@ -40,7 +40,16 @@ module Mongoid #:nodoc:
           previous.versioned_attributes, :without_protection => true
         ).attributes.delete("_id")
         if version_max.present? && versions.length > version_max
-          versions.delete(versions.first)
+          deleted = versions.first
+          if deleted.paranoid?
+            versions.delete_one(deleted)
+            collection.update(
+              atomic_selector,
+              { "$pull" => { "versions" => { "version" => deleted.version }}}
+            )
+          else
+            versions.delete(deleted)
+          end
         end
         self.version = (version || 1 ) + 1
       end
@@ -69,7 +78,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.1.0
     def versioned_changes
-      only_versioned_attributes(changes)
+      only_versioned_attributes(changes.except("updated_at"))
     end
 
     # Filters the results of +attributes+ by removing any fields that should
@@ -122,7 +131,7 @@ module Mongoid #:nodoc:
     # @since 2.0.0
     def previous_revision
       _loading_revision do
-        self.class.
+        self.class.unscoped.
           where(:_id => id).
           any_of({ :version => version }, { :version => nil }).first
       end

data/lib/mongoid.rb

@@ -73,6 +73,7 @@ require "mongoid/sharding"
 require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/validations"
+require "mongoid/version"
 require "mongoid/versioning"
 require "mongoid/components"
 require "mongoid/paranoia"

data/lib/rails/mongoid.rb

@@ -15,22 +15,21 @@ module Rails #:nodoc:
     #
     # @since 2.1.0
     def create_indexes(pattern)
-      logger = Logger.new($stdout)
       Dir.glob(pattern).each do |file|
         logger = Logger.new($stdout)
         begin
-          model = determine_model(file)
-          if model
-            model.create_indexes
-            logger.info("Generated indexes for #{model}")
-          else
-            logger.info("Not a Mongoid parent model: #{file}")
-          end
+          model = determine_model(file, logger)
         rescue => e
-          logger.error %Q{Failed to create indexes for #{model}:
+          logger.error(%Q{Failed to determine model from #{file}:
             #{e.class}:#{e.message}
             #{e.backtrace.join("\n")}
-          }
+          })
+        end
+        if model
+          model.create_indexes
+          logger.info("Generated indexes for #{model}")
+        else
+          logger.info("Not a Mongoid parent model: #{file}")
         end
       end
     end
@@ -84,10 +83,17 @@ module Rails #:nodoc:
     # @return [ Class ] The model.
     #
     # @since 2.1.0
-    def determine_model(file)
+    def determine_model(file, logger)
       if file =~ /app\/models\/(.*).rb$/
         model_path = $1.split('/')
-        klass = model_path.map { |path| path.camelize }.join('::').constantize
+        begin
+          parts = model_path.map { |path| path.camelize }
+          name = parts.join("::")
+          klass = name.constantize
+        rescue NameError, LoadError => e
+          logger.info("Attempted to constantize #{name}, trying without namespacing.")
+          klass = parts.last.constantize
+        end
         if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
           return klass
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70168048476500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70168048476500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70168048475740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +37,31 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70168048475740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.22
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70168048474680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70168048474680
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70168048473620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *70168048473620
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70168048473140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,51 +69,60 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70168048473140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70168048472640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.11'
   type: :development
   prerelease: false
-  version_requirements: *70168048472640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70168048472160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *70168048472160
-- !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: &70168048471300 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: *70168048471300
+        version: '2.10'
 - !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: &70168048470800 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70168048470800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -229,6 +242,7 @@ files:
 - lib/mongoid/fields/internal/boolean.rb
 - lib/mongoid/fields/internal/date.rb
 - lib/mongoid/fields/internal/date_time.rb
+- lib/mongoid/fields/internal/false_class.rb
 - lib/mongoid/fields/internal/fixnum.rb
 - lib/mongoid/fields/internal/float.rb
 - lib/mongoid/fields/internal/foreign_keys/array.rb
@@ -246,6 +260,7 @@ files:
 - lib/mongoid/fields/internal/time.rb
 - lib/mongoid/fields/internal/time_with_zone.rb
 - lib/mongoid/fields/internal/timekeeping.rb
+- lib/mongoid/fields/internal/true_class.rb
 - lib/mongoid/fields/mappings.rb
 - lib/mongoid/fields/serializable.rb
 - lib/mongoid/fields.rb
@@ -332,7 +347,6 @@ files:
 - lib/mongoid/relations/cascading/delete.rb
 - lib/mongoid/relations/cascading/destroy.rb
 - lib/mongoid/relations/cascading/nullify.rb
-- lib/mongoid/relations/cascading/strategy.rb
 - lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/constraint.rb
 - lib/mongoid/relations/conversions.rb
@@ -378,6 +392,9 @@ files:
 - lib/mongoid/timestamps/updated.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
+- lib/mongoid/validations/format.rb
+- lib/mongoid/validations/length.rb
+- lib/mongoid/validations/localizable.rb
 - lib/mongoid/validations/presence.rb
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
@@ -412,7 +429,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3374480126099241138
+      hash: 1387804886696110534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -421,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.

data/lib/mongoid/relations/cascading/strategy.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Cascading #:nodoc:
-      class Strategy
-
-        attr_accessor :document, :relation, :metadata
-
-        # Initialize the new cascade strategy, which will set up the relation
-        # and the metadata.
-        #
-        # @example Instantiate the strategy
-        #   Strategy.new(document, metadata)
-        #
-        # @param [ Document ] document The document to cascade from.
-        # @param [ Metadata ] metadata The relation's metadata.
-        #
-        # @return [ Strategy ] The new strategy.
-        def initialize(document, metadata)
-          @document, @metadata = document, metadata
-          @relation = document.send(metadata.name)
-        end
-      end
-    end
-  end
-end