mongo_mapper 0.13.1 → 0.14.0.rc1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3e78985587a63e18283384630db3c316ee260b20
-  data.tar.gz: 5f2d55cbe5df4c2f8322088cb9f0edfaa84a69e9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDZhYzcyYjE1YmNiYTY4NTVlOGFiZjRlNjk1MTVjOWRkZWViODE3YQ==
+  data.tar.gz: !binary |-
+    YjUxMmRlMTUyOTM5ZjgwMTBlM2JlMzFjNWIxNTVjYWY4NDU3NTYxMA==
 SHA512:
-  metadata.gz: cf19d01f18a16676486f87db3e0db2c6894c6542f8492ed63b72cd9dbb24ae4dd90f26c5ec226a98fdc1636539a5a9a410c813bffba5923fa95a06fcc873bc4b
-  data.tar.gz: 0b915ec964c1bafa1c3432061d91800029f291ce7799945830129d5c4109b1c2c21902ed8eb31ebb6c5648cb46c4775fe692d46614078ba001dabc95606ca3d0
+  metadata.gz: !binary |-
+    N2ZhNWM1NmZlOTE3NDYwYjExZTZhODcxMTM1YzM3Yzg4NTY4ZjFlOTk4NDA1
+    NGJkNDc3YTdhZWRiY2JlOWZjNWZjNDZjYjkzMzZlMmNkY2MxNWNjZTE4M2Q3
+    OWYzYjBjNjcxNTVkODg4OTliODY5NTZjYWE1NzBjZGE1ZGU0NDA=
+  data.tar.gz: !binary |-
+    OWMyYjNmNTY5ZGNhOTM1MGNkNTg0MGFkNzkwMjg3Yjc5Y2M0MzM2ZjUwNTZm
+    YjU1MjAxODYzOTllYzM4NzBjZjNmYmI2NGUzYWFiODQwMjNmN2E4MDAxYWYz
+    MjQyNGQ4ZmU1OTcwMmRmOGZlMWQ4NDI1ZTJjYjU4ODViMjM4OWQ=

data/README.rdoc

@@ -14,7 +14,7 @@ A Ruby Object Mapper for Mongo.
 
 http://mongomapper.com/documentation/
 
-http://rdoc.info/github/jnunemaker/mongomapper
+http://rdoc.info/github/mongomapper/mongomapper
 
 == Compatibility
 
@@ -23,6 +23,7 @@ MongoMapper is tested against:
 * MRI 1.8.7
 * MRI 1.9.3
 * MRI 2.0.0
+* MRI 2.1.1
 * JRuby (Versions with 1.9 compatibility)
 
 Additionally, MongoMapper is tested against:
@@ -32,13 +33,9 @@ Additionally, MongoMapper is tested against:
 * Rails 3.2.x
 * Rails 4.0.x
 
-NOTE: Rails 4 support is only in the v0.13.0 beta, which is not currently the default in RubyGems.  Use the following line in your gemfile to use the beta:
-
-    gem 'mongo_mapper', :git => "git://github.com/mongomapper/mongomapper.git", :tag => "v0.13.0.beta2"
-
 == Contributing & Development
 
-    $ git clone https://github.com/jnunemaker/mongomapper && cd mongomapper
+    $ git clone https://github.com/mongomapper/mongomapper && cd mongomapper
     $ bundle install
     $ bundle exec rake
 

data/lib/mongo_mapper.rb

@@ -51,6 +51,7 @@ module MongoMapper
     autoload :Logger,             'mongo_mapper/plugins/logger'
     autoload :Modifiers,          'mongo_mapper/plugins/modifiers'
     autoload :Pagination,         'mongo_mapper/plugins/pagination'
+    autoload :PartialUpdates,     'mongo_mapper/plugins/partial_updates'
     autoload :Persistence,        'mongo_mapper/plugins/persistence'
     autoload :Protected,          'mongo_mapper/plugins/protected'
     autoload :Querying,           'mongo_mapper/plugins/querying'

data/lib/mongo_mapper/document.rb

@@ -16,6 +16,7 @@ module MongoMapper
     include Plugins::Inspect
     include Plugins::Indexes
     include Plugins::Keys
+    include Plugins::Keys::Static
     include Plugins::Dirty # for now dirty needs to be after keys
     include Plugins::Logger
     include Plugins::Modifiers
@@ -35,6 +36,7 @@ module MongoMapper
     include Plugins::Validations
     include Plugins::EmbeddedCallbacks
     include Plugins::Callbacks # for now callbacks needs to be after validations
+    include Plugins::PartialUpdates
     include Plugins::IdentityMap
     include Plugins::CounterCache
 

data/lib/mongo_mapper/extensions/array.rb

@@ -2,18 +2,26 @@
 module MongoMapper
   module Extensions
     module Array
-      def to_mongo(value)
-        value = value.respond_to?(:lines) ? value.lines : value
-        value.to_a
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def to_mongo(value)
+          value = value.respond_to?(:lines) ? value.lines : value
+          value.to_a
+        end
+
+        def from_mongo(value)
+          value || []
+        end
       end
 
-      def from_mongo(value)
-        value || []
+      def _mongo_mapper_deep_copy_
+        map { |value| value._mongo_mapper_deep_copy_ }
       end
     end
   end
 end
 
 class Array
-  extend MongoMapper::Extensions::Array
+  include MongoMapper::Extensions::Array
 end

data/lib/mongo_mapper/extensions/hash.rb

@@ -2,13 +2,25 @@
 module MongoMapper
   module Extensions
     module Hash
-      def from_mongo(value)
-        HashWithIndifferentAccess.new(value || {})
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def from_mongo(value)
+          HashWithIndifferentAccess.new(value || {})
+        end
+      end
+
+      def _mongo_mapper_deep_copy_
+        self.class.new.tap do |new_hash|
+          each do |key, value|
+            new_hash[key._mongo_mapper_deep_copy_] = value._mongo_mapper_deep_copy_
+          end
+        end
       end
     end
   end
 end
 
 class Hash
-  extend MongoMapper::Extensions::Hash
+  include MongoMapper::Extensions::Hash
 end

data/lib/mongo_mapper/extensions/object.rb

@@ -17,6 +17,10 @@ module MongoMapper
       def to_mongo
         self.class.to_mongo(self)
       end
+
+      def _mongo_mapper_deep_copy_
+        self
+      end
     end
   end
 end

data/lib/mongo_mapper/extensions/string.rb

@@ -2,17 +2,25 @@
 module MongoMapper
   module Extensions
     module String
-      def to_mongo(value)
-        value && value.to_s
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def to_mongo(value)
+          value && value.to_s
+        end
+
+        def from_mongo(value)
+          value && value.to_s
+        end
       end
 
-      def from_mongo(value)
-        value && value.to_s
+      def _mongo_mapper_deep_copy_
+        self.dup
       end
     end
   end
 end
 
 class String
-  extend MongoMapper::Extensions::String
+  include MongoMapper::Extensions::String
 end

data/lib/mongo_mapper/plugins/accessible.rb

@@ -42,20 +42,21 @@ module MongoMapper
         self.class.accessible_attributes?
       end
 
-      protected
-        def filter_inaccessible_attrs(attrs)
-          return attrs if !accessible_attributes? || attrs.blank?
-          attrs.dup.delete_if { |key, val| attribute_inaccessible?(key.to_sym) }
-        end
+    protected
+
+      def filter_inaccessible_attrs(attrs)
+        return attrs if !accessible_attributes? || attrs.blank?
+        attrs.dup.delete_if { |key, val| attribute_inaccessible?(key.to_sym) }
+      end
 
-        def attribute_inaccessible?(attribute)
-          unless accessible_attributes.include?(attribute)
-            message = "Can't mass-assign protected attribute: #{attribute}"
-            MongoMapper.logger ? MongoMapper.logger.warn(message) : puts(message)
+      def attribute_inaccessible?(attribute)
+        unless accessible_attributes.include?(attribute)
+          message = "Can't mass-assign protected attribute: #{attribute}"
+          MongoMapper.logger ? MongoMapper.logger.warn(message) : puts(message)
 
-            return true
-          end
+          return true
         end
+      end
     end
   end
 end

data/lib/mongo_mapper/plugins/associations.rb

@@ -56,12 +56,13 @@ module MongoMapper
           end
         end
 
-        private
-          def create_association(association)
-            @embedded_associations = nil
-            associations[association.name] = association
-            association.setup(self)
-          end
+      private
+
+        def create_association(association)
+          @embedded_associations = nil
+          associations[association.name] = association
+          association.setup(self)
+        end
       end
 
       def associations

data/lib/mongo_mapper/plugins/associations/base.rb

@@ -76,22 +76,23 @@ module MongoMapper
         def setup(model)
         end
 
-        private
-          def separate_options_and_conditions
-            @original_options.each_pair do |key, value|
-              if AssociationOptions.include?(key)
-                @options[key] = value
-              else
-                @query_options[key] = value
-              end
+      private
+
+        def separate_options_and_conditions
+          @original_options.each_pair do |key, value|
+            if AssociationOptions.include?(key)
+              @options[key] = value
+            else
+              @query_options[key] = value
             end
           end
+        end
 
-          def modularized_extensions(*extensions)
-            extensions.flatten.compact.map do |extension|
-              Proc === extension ? Module.new(&extension) : extension
-            end
+        def modularized_extensions(*extensions)
+          extensions.flatten.compact.map do |extension|
+            Proc === extension ? Module.new(&extension) : extension
           end
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb

@@ -19,15 +19,16 @@ module MongoMapper
           @target
         end
 
-        protected
-          def find_target
-            return nil if association_class.nil? || proxy_owner[association.foreign_key].nil?
-            association_class.find_by_id(proxy_owner[association.foreign_key])
-          end
+      protected
 
-          def association_class
-            proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
-          end
+        def find_target
+          return nil if association_class.nil? || proxy_owner[association.foreign_key].nil?
+          association_class.find_by_id(proxy_owner[association.foreign_key])
+        end
+
+        def association_class
+          proxy_owner[association.type_key_name] ? proxy_owner[association.type_key_name].constantize : nil
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb

@@ -34,18 +34,19 @@ module MongoMapper
           @target.save(options) if @target
         end
 
-        protected
-          def find_target
-            return nil if proxy_owner[association.foreign_key].nil?
-            klass.find_by_id(proxy_owner[association.foreign_key])
-          end
+      protected
 
-          def instantiate_target(instantiator, attrs={}, &block)
-            @target = klass.send(instantiator, attrs, &block)
-            proxy_owner[association.foreign_key] = @target.id
-            loaded
-            @target
-          end
+        def find_target
+          return nil if proxy_owner[association.foreign_key].nil?
+          klass.find_by_id(proxy_owner[association.foreign_key])
+        end
+
+        def instantiate_target(instantiator, attrs={}, &block)
+          @target = klass.send(instantiator, attrs, &block)
+          proxy_owner[association.foreign_key] = @target.id
+          loaded
+          @target
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/associations/embedded_collection.rb

@@ -34,10 +34,10 @@ module MongoMapper
           @target.each { |doc| doc.persist(options) } if @target
         end
 
-        private
-          def assign_references(*docs)
-            docs.each { |doc| doc._parent_document = proxy_owner }
-          end
+      private
+        def assign_references(*docs)
+          docs.each { |doc| doc._parent_document = proxy_owner }
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/associations/in_array_proxy.rb

@@ -99,34 +99,35 @@ module MongoMapper
           reset
         end
 
-        private
-          def query(options={})
-            klass.
-              query(association.query_options).
-              amend(options).
-              amend(criteria)
-          end
+      private
 
-          def criteria
-            {:_id => ids}
-          end
+        def query(options={})
+          klass.
+            query(association.query_options).
+            amend(options).
+            amend(criteria)
+        end
 
-          def scoped_ids(args)
-            valid = args.flatten.select do |id|
-              id = ObjectId.to_mongo(id) if klass.using_object_id?
-              ids.include?(id)
-            end
-            valid.empty? ? nil : valid
-          end
+        def criteria
+          {:_id => ids}
+        end
 
-          def find_target
-            return [] if ids.blank?
-            all
+        def scoped_ids(args)
+          valid = args.flatten.select do |id|
+            id = ObjectId.to_mongo(id) if klass.using_object_id?
+            ids.include?(id)
           end
+          valid.empty? ? nil : valid
+        end
 
-          def ids
-            proxy_owner[options[:in]]
-          end
+        def find_target
+          return [] if ids.blank?
+          all
+        end
+
+        def ids
+          proxy_owner[options[:in]]
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb

@@ -3,25 +3,27 @@ module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsAsProxy < ManyDocumentsProxy
-        protected
-          def criteria
-            {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
-          end
+      protected
 
-          def apply_scope(doc)
-            ensure_owner_saved
-            criteria.each { |key, value| doc[key] = value }
-            doc
-          end
+        def criteria
+          {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
+        end
 
-        private
-          def type_key_name
-            "#{options[:as]}_type"
-          end
+        def apply_scope(doc)
+          ensure_owner_saved
+          criteria.each { |key, value| doc[key] = value }
+          doc
+        end
 
-          def id_key_name
-            "#{options[:as]}_id"
-          end
+      private
+
+        def type_key_name
+          "#{options[:as]}_type"
+        end
+
+        def id_key_name
+          "#{options[:as]}_id"
+        end
       end
     end
   end