mongoid 3.0.23 → 3.1.0

data/lib/mongoid/validations.rb

@@ -62,6 +62,8 @@ module Mongoid
         relation.do_or_do_not(:in_memory) || relation
       elsif fields[attribute].try(:localized?)
         attributes[attribute]
+      elsif respond_to?("#{attr}_before_type_cast")
+        send("#{attr}_before_type_cast")
       else
         send(attr)
       end

data/lib/mongoid/validations/queryable.rb

@@ -19,11 +19,11 @@ module Mongoid
       def with_query(document)
         klass = document.class
         begin
-          Threaded.begin("#{klass.name}-validate-with-query")
+          Threaded.begin_execution("#{klass.name}-validate-with-query")
           yield
         ensure
           klass.clear_persistence_options unless document.errors.empty?
-          Threaded.exit("#{klass.name}-validate-with-query")
+          Threaded.exit_execution("#{klass.name}-validate-with-query")
         end
       end
     end

data/lib/mongoid/validations/uniqueness.rb

@@ -267,7 +267,7 @@ module Mongoid
       # @since 2.4.10
       def validate_root(document, attribute, value)
         criteria = create_criteria(klass, document, attribute, value)
-        if criteria.with(persistence_options(criteria)).exists?
+        if criteria.with(consistency: :strong).exists?
           add_error(document, attribute, value)
         end
       end
@@ -288,23 +288,6 @@ module Mongoid
           document.send("attribute_changed?", attribute.to_s) ||
           scope_value_changed?(document)
       end
-
-      # Get the persistence options to perform to check, merging with any
-      # existing.
-      #
-      # @api private
-      #
-      # @example Get the persistence options.
-      #   validator.persistence_options(criteria)
-      #
-      # @param [ Criteria ] criteria The criteria.
-      #
-      # @return [ Hash ] The persistence options.
-      #
-      # @since 3.0.23
-      def persistence_options(criteria)
-        (criteria.klass.persistence_options || {}).merge!(consistency: :strong)
-      end
     end
   end
 end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "3.0.23"
+  VERSION = "3.1.0"
 end

data/lib/rails/generators/mongoid/model/model_generator.rb

@@ -13,6 +13,7 @@ module Mongoid
       class_option :timestamps, type: :boolean
       class_option :parent,     type: :string, desc: "The parent class for the generated model"
       class_option :versioning, type: :boolean, default: false, desc: "Enable mongoid versioning"
+      class_option :collection, type: :string, desc: "The collection for storing model's documents"
 
       def create_model_file
         template "model.rb.tt", File.join("app/models", class_path, "#{file_name}.rb")

data/lib/rails/generators/mongoid/model/templates/model.rb.tt

@@ -9,6 +9,9 @@ class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent]
 <% if options[:versioning] -%>
   include Mongoid::Versioning
 <% end -%>
+<% if options[:collection] -%>
+  store_in collection: "<%= options[:collection] %>"
+<% end -%>
 <% attributes.reject{|attr| attr.reference?}.each do |attribute| -%>
   field :<%= attribute.name %>, type: <%= attribute.type_class %>
 <% end -%>

data/lib/rails/mongoid.rb

@@ -3,20 +3,19 @@ module Rails
   module Mongoid
     extend self
 
-    # Create indexes for each model given the provided pattern and the class is
+    # Create indexes for each model given the provided globs and the class is
     # not embedded.
     #
     # @example Create all the indexes.
     #   Rails::Mongoid.create_indexes("app/models/**/*.rb")
     #
-    # @param [ String ] pattern The file matching pattern.
+    # @param [ Array<String> ] globs The file matching globs.
     #
-    # @return [ Array<String> ] The file names.
+    # @return [ Array<Class> ] The indexed models.
     #
     # @since 2.1.0
-    def create_indexes(pattern)
-      logger = Logger.new($stdout)
-      models(pattern).each do |model|
+    def create_indexes(*globs)
+      models(*globs).each do |model|
         next if model.index_options.empty?
         unless model.embedded?
           model.create_indexes
@@ -24,55 +23,76 @@ module Rails
           model.index_options.each_pair do |index, options|
             logger.info("MONGOID: Index: #{index}, Options: #{options}")
           end
+          model
         else
           logger.info("MONGOID: Index ignored on: #{model}, please define in the root model.")
+          nil
         end
-      end
+      end.compact
     end
 
-    # Remove indexes for each model given the provided pattern and the class is
+    # Remove indexes for each model given the provided globs and the class is
     # not embedded.
     #
     # @example Remove all the indexes.
     #   Rails::Mongoid.create_indexes("app/models/**/*.rb")
     #
-    # @param [ String ] pattern The file matching pattern.
+    # @param [ Array<String> ] globs The file matching globs.
     #
-    # @return [ Array<String> ] The file names.
+    # @return [ Array<Class> ] The un-indexed models.
     #
-    def remove_indexes(pattern)
-      logger = Logger.new($stdout)
-      models(pattern).each do |model|
+    def remove_indexes(*globs)
+      models(*globs).each do |model|
         next if model.embedded?
         indexes = model.collection.indexes.map{ |doc| doc["name"] }
         indexes.delete_one("_id_")
         model.remove_indexes
         logger.info("MONGOID: Removing indexes on: #{model} for: #{indexes.join(', ')}.")
-      end
+        model
+      end.compact
     end
 
-    # Return all models matching the pattern.
+    # Return all models matching the globs or, if no globs are specified, all
+    # possible models known from engines, the app, any gems, etc.
     #
-    # @example Return all models.
+    # @example Return *all* models.  Return all models under app/models/
+    #   Rails::Mongoid.models
     #   Rails::Mongoid.models("app/models/**/*.rb")
     #
-    # @param [ String ] pattern The file matching pattern.
+    # @param [ String ] glob The file matching glob.
     #
     # @return [ Array<Class> ] The models.
     #
-    def models(pattern)
-      Dir.glob(pattern).map do |file|
-        logger = Logger.new($stdout)
-        begin
-          determine_model(file, logger)
-        rescue => e
-          logger.error(%Q{MONGOID: Failed to determine model from #{file}:
-            #{e.class}:#{e.message}
-            #{e.backtrace.join("\n")}
-          })
-          nil
+    def models(*globs)
+      all_possible_models = globs.empty?
+
+      if globs.empty?
+        engines_models_paths = Rails.application.railties.engines.map{|engine| engine.paths["app/models"].expanded}
+        root_models_paths = Rails.application.paths["app/models"]
+        models_paths = engines_models_paths.push(root_models_paths).flatten
+        globs.replace(models_paths.map{|path| "#{path}/**/*.rb"})
+      end
+
+      models = []
+
+      globs.flatten.compact.each do |glob|
+        Dir.glob(glob).map do |file|
+          begin
+            model = determine_model(file, logger)
+            models.push(model)
+          rescue => e
+            logger.error(%Q{MONGOID: Failed to determine model from #{file}:
+              #{e.class}:#{e.message}
+              #{e.backtrace.join("\n")}
+            })
+            nil
+          end
         end
-      end.flatten.compact
+      end
+
+      models = (::Mongoid.models | models) if all_possible_models
+
+      models.compact.sort_by { |model| model.name || '' }
     end
 
     # Use the application configuration to get every model and require it, so
@@ -150,5 +170,9 @@ module Rails
       end
       klass if klass && klass.ancestors.include?(::Mongoid::Document)
     end
+
+    def logger
+      @logger ||= Logger.new($stdout)
+    end
   end
 end

data/lib/support/ruby_version.rb

@@ -0,0 +1,26 @@
+# Go ahead and fail if not using Ruby 1.9.3, no since in letting people
+# squarm for answers
+def raise_version_error(message)
+  puts message
+  Rails.logger.info(message) if defined?(Rails)
+  raise
+end
+
+def invalid_version?
+  RUBY_VERSION =~ /([\d]+)\.([\d]+)\.([\d]+)/
+  major, minor, revision = $1.to_i, $2.to_i, $3.to_i
+  if defined?(JRUBY_VERSION)
+    major <= 1 && minor <= 9 && revision <= 1
+  else
+    major <= 1 && minor <= 9 && revision <= 2
+  end
+end
+
+if invalid_version?
+  message = %{
+Mongoid requires MRI version 1.9.3+ or JRuby 1.6.0+ running in 1.9 mode.
+You're current Ruby version is defined as #{RUBY_VERSION}. Please see:
+http://mongoid.org/en/mongoid/docs/tips.html#ruby for details.
+  }
+  raise_version_error(message)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - lib/mongoid/atomic/paths/embedded.rb
 - lib/mongoid/atomic/paths/root.rb
 - lib/mongoid/atomic/paths.rb
+- lib/mongoid/atomic/positionable.rb
 - lib/mongoid/atomic.rb
 - lib/mongoid/attributes/processing.rb
 - lib/mongoid/attributes/readonly.rb
@@ -109,17 +110,22 @@ files:
 - lib/mongoid/contextual/command.rb
 - lib/mongoid/contextual/eager.rb
 - lib/mongoid/contextual/find_and_modify.rb
+- lib/mongoid/contextual/geo_near.rb
 - lib/mongoid/contextual/map_reduce.rb
 - lib/mongoid/contextual/memory.rb
 - lib/mongoid/contextual/mongo.rb
+- lib/mongoid/contextual/queryable.rb
 - lib/mongoid/contextual.rb
 - lib/mongoid/copyable.rb
 - lib/mongoid/criteria.rb
+- lib/mongoid/criterion/findable.rb
 - lib/mongoid/criterion/inspection.rb
 - lib/mongoid/criterion/marshalable.rb
+- lib/mongoid/criterion/modifiable.rb
 - lib/mongoid/criterion/scoping.rb
 - lib/mongoid/dirty.rb
 - lib/mongoid/document.rb
+- lib/mongoid/equality.rb
 - lib/mongoid/errors/ambiguous_relationship.rb
 - lib/mongoid/errors/callback.rb
 - lib/mongoid/errors/delete_restriction.rb
@@ -276,6 +282,7 @@ files:
 - lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/constraint.rb
 - lib/mongoid/relations/conversions.rb
+- lib/mongoid/relations/counter_cache.rb
 - lib/mongoid/relations/cyclic.rb
 - lib/mongoid/relations/embedded/batchable.rb
 - lib/mongoid/relations/embedded/in.rb
@@ -312,8 +319,11 @@ files:
 - lib/mongoid/state.rb
 - lib/mongoid/threaded/lifecycle.rb
 - lib/mongoid/threaded.rb
+- lib/mongoid/timestamps/created/short.rb
 - lib/mongoid/timestamps/created.rb
+- lib/mongoid/timestamps/short.rb
 - lib/mongoid/timestamps/timeless.rb
+- lib/mongoid/timestamps/updated/short.rb
 - lib/mongoid/timestamps/updated.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/unit_of_work.rb
@@ -339,6 +349,7 @@ files:
 - lib/rails/generators/mongoid/observer/templates/observer.rb.tt
 - lib/rails/generators/mongoid_generator.rb
 - lib/rails/mongoid.rb
+- lib/support/ruby_version.rb
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -364,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.