mongoid 2.1.6 → 2.1.7

data/lib/mongoid/relations/embedded/in.rb

@@ -26,18 +26,6 @@ module Mongoid # :nodoc:
           end
         end
 
-        # This substituable does not clone.
-        #
-        # @example Get the substitutable.
-        #   proxy.substitutable
-        #
-        # @return [ Object ] The target.
-        #
-        # @since 2.1.6
-        def substitutable
-          target
-        end
-
         # Substitutes the supplied target documents for the existing document
         # in the relation.
         #

data/lib/mongoid/relations/metadata.rb

@@ -505,7 +505,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.1.6
       def many?
-        @many ||= relation.macro =~ /many/
+        @many ||= (relation.macro.to_s =~ /many/)
       end
 
       # Returns the macro for the relation of this metadata.

data/lib/mongoid/relations/proxy.rb

@@ -45,7 +45,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.1.6
       def substitutable
-        target.clone
+        target
       end
 
       protected

data/lib/mongoid/relations/referenced/in.rb

@@ -25,18 +25,6 @@ module Mongoid # :nodoc:
           end
         end
 
-        # This substituable does not clone.
-        #
-        # @example Get the substitutable.
-        #   proxy.substitutable
-        #
-        # @return [ Object ] The target.
-        #
-        # @since 2.1.6
-        def substitutable
-          target
-        end
-
         # Substitutes the supplied target documents for the existing document
         # in the relation.
         #

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.1.6"
+  VERSION = "2.1.7"
 end

data/lib/rails/mongoid.rb

@@ -16,10 +16,13 @@ module Rails #:nodoc:
     # @since 2.1.0
     def create_indexes(pattern)
       Dir.glob(pattern).each do |file|
-        model = determine_model(file)
-        if model
-          Logger.new($stdout).info("Generating indexes for #{model}")
-          model.create_indexes
+        begin
+          model = determine_model(file)
+          if model
+            model.create_indexes
+            Logger.new($stdout).info("Generated indexes for #{model}")
+          end
+        rescue => e
         end
       end
     end
@@ -68,12 +71,9 @@ module Rails #:nodoc:
     # @since 2.1.0
     def determine_model(file)
       model_path = file[0..-4].split('/')[2..-1]
-      begin
-        klass = model_path.map { |path| path.camelize }.join('::').constantize
-        if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
-          return klass
-        end
-      rescue => e
+      klass = model_path.map { |path| path.camelize }.join('::').constantize
+      if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
+        return klass
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70184069667540 !ruby/object:Gem::Requirement
+  requirement: &70273131511360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184069667540
+  version_requirements: *70273131511360
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70184069666660 !ruby/object:Gem::Requirement
+  requirement: &70273131510360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70184069666660
+  version_requirements: *70273131510360
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70184069665680 !ruby/object:Gem::Requirement
+  requirement: &70273131509340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70184069665680
+  version_requirements: *70273131509340
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70184069664720 !ruby/object:Gem::Requirement
+  requirement: &70273131507880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70184069664720
+  version_requirements: *70273131507880
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70184069663720 !ruby/object:Gem::Requirement
+  requirement: &70273131506780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70184069663720
+  version_requirements: *70273131506780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70184069662540 !ruby/object:Gem::Requirement
+  requirement: &70273131505780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70184069662540
+  version_requirements: *70273131505780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184069661380 !ruby/object:Gem::Requirement
+  requirement: &70273131504680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70184069661380
+  version_requirements: *70273131504680
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70184069660280 !ruby/object:Gem::Requirement
+  requirement: &70273131503420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70184069660280
+  version_requirements: *70273131503420
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -379,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4360740221674892894
+      hash: 1942003466087624126
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: