mongo_mapper_ign 0.7.7 → 0.7.8

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

@@ -1,42 +1,42 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class OneEmbeddedProxy < Proxy
-        undef_method :object_id
-
-        def build(attributes={})
-          @target = klass.new(attributes)
-          assign_references(@target)
-          loaded
-          @target
-        end
-
-        def replace(doc)
-          if doc.respond_to?(:attributes)
-            @target = klass.load(doc.attributes)
-          else
-            @target = klass.load(doc)
-          end
-          assign_references(@target)
-          loaded
-          @target
-        end
-
-        protected
-
-          def find_target
-            if @value
-              klass.load(@value).tap do |child|
-                assign_references(child)
-              end
-            end
-          end
-
-          def assign_references(doc)
-            doc._parent_document = owner
-          end
-      end
-    end
-  end
-end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class OneEmbeddedProxy < Proxy
+        undef_method :object_id
+
+        def build(attributes={})
+          @target = klass.new(attributes)
+          assign_references(@target)
+          loaded
+          @target
+        end
+
+        def replace(doc)
+          if doc.respond_to?(:attributes)
+            @target = klass.load(doc.attributes)
+          else
+            @target = klass.load(doc)
+          end
+          assign_references(@target)
+          loaded
+          @target
+        end
+
+        protected
+
+          def find_target
+            if @value
+              klass.load(@value).tap do |child|
+                assign_references(child)
+              end
+            end
+          end
+
+          def assign_references(doc)
+            doc._parent_document = owner
+          end
+      end
+    end
+  end
+end

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

@@ -1,70 +1,70 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class OneProxy < Proxy
-        undef_method :object_id
-
-        def build(attrs={})
-          instantiate_target(:new, attrs)
-        end
-
-        def create(attrs={})
-          instantiate_target(:create, attrs)
-        end
-
-        def create!(attrs={})
-          instantiate_target(:create!, attrs)
-        end
-
-        def replace(doc)
-          load_target
-
-          if !target.nil? && target != doc
-            if options[:dependent] && !target.new?
-              case options[:dependent]
-                when :delete
-                  target.delete
-                when :destroy
-                  target.destroy
-                when :nullify
-                  target[foreign_key] = nil
-                  target.save
-              end
-            end
-          end
-
-          reset
-
-          unless doc.nil?
-            owner.save if owner.new?
-            doc = klass.new(doc) unless klass === doc
-            doc[foreign_key] = owner.id
-            doc.save if doc.new?
-            loaded
-            @target = doc
-          end
-        end
-
-        protected
-          def find_target
-            target_class.first(association.query_options.merge(foreign_key => owner.id))
-          end
-
-          def instantiate_target(instantiator, attrs={})
-            @target = target_class.send(instantiator, attrs.update(foreign_key => owner.id))
-            loaded
-            @target
-          end
-
-          def target_class
-            @target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
-          end
-
-          def foreign_key
-            options[:foreign_key] || owner.class.name.foreign_key
-          end
-      end
-    end
-  end
-end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class OneProxy < Proxy
+        undef_method :object_id
+
+        def build(attrs={})
+          instantiate_target(:new, attrs)
+        end
+
+        def create(attrs={})
+          instantiate_target(:create, attrs)
+        end
+
+        def create!(attrs={})
+          instantiate_target(:create!, attrs)
+        end
+
+        def replace(doc)
+          load_target
+
+          if !target.nil? && target != doc
+            if options[:dependent] && !target.new?
+              case options[:dependent]
+                when :delete
+                  target.delete
+                when :destroy
+                  target.destroy
+                when :nullify
+                  target[foreign_key] = nil
+                  target.save
+              end
+            end
+          end
+
+          reset
+
+          unless doc.nil?
+            owner.save if owner.new?
+            doc = klass.new(doc) unless klass === doc
+            doc[foreign_key] = owner.id
+            doc.save if doc.new?
+            loaded
+            @target = doc
+          end
+        end
+
+        protected
+          def find_target
+            target_class.first(association.query_options.merge(foreign_key => owner.id))
+          end
+
+          def instantiate_target(instantiator, attrs={})
+            @target = target_class.send(instantiator, attrs.update(foreign_key => owner.id))
+            loaded
+            @target
+          end
+
+          def target_class
+            @target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
+          end
+
+          def foreign_key
+            options[:foreign_key] || owner.class.name.foreign_key
+          end
+      end
+    end
+  end
+end

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

@@ -1,125 +1,125 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class Proxy
-        alias :proxy_respond_to? :respond_to?
-        alias :proxy_extend :extend
-
-        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
-
-        attr_reader :owner, :association, :target
-
-        alias :proxy_owner :owner
-        alias :proxy_target :target
-        alias :proxy_association :association
-
-        delegate :klass, :to => :proxy_association
-        delegate :options, :to => :proxy_association
-        delegate :collection, :to => :klass
-
-        def initialize(owner, association)
-          @owner, @association, @loaded = owner, association, false
-          Array(association.options[:extend]).each { |ext| proxy_extend(ext) }
-          reset
-        end
-
-        def inspect
-          load_target
-          target.inspect
-        end
-
-        def loaded?
-          @loaded
-        end
-
-        def loaded
-          @loaded = true
-        end
-
-        def nil?
-          load_target
-          target.nil?
-        end
-
-        def blank?
-          load_target
-          target.blank?
-        end
-
-        def present?
-          load_target
-          target.present?
-        end
-
-        def reload
-          reset
-          load_target
-          self unless target.nil?
-        end
-
-        def replace(v)
-          raise NotImplementedError
-        end
-
-        def reset
-          @loaded = false
-          @target = nil
-        end
-
-        def respond_to?(*args)
-          proxy_respond_to?(*args) || (load_target && target.respond_to?(*args))
-        end
-
-        def send(method, *args)
-          if proxy_respond_to?(method)
-            super
-          else
-            load_target
-            target.send(method, *args)
-          end
-        end
-
-        def ===(other)
-          load_target
-          other === target
-        end
-
-        protected
-          def method_missing(method, *args, &block)
-            if load_target
-              if block_given?
-                target.send(method, *args)  { |*block_args| block.call(*block_args) }
-              else
-                target.send(method, *args)
-              end
-            end
-          end
-
-          def load_target
-            unless loaded?
-              if @target.is_a?(Array) && @target.any?
-                @target = find_target + @target.find_all { |record| record.new? }
-              else
-                @target = find_target
-              end
-              loaded
-            end
-            @target
-          rescue MongoMapper::DocumentNotFound
-            reset
-          end
-
-          def find_target
-            raise NotImplementedError
-          end
-
-          def flatten_deeper(array)
-            array.collect do |element|
-              (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element
-            end.flatten
-          end
-      end
-    end
-  end
-end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class Proxy
+        alias :proxy_respond_to? :respond_to?
+        alias :proxy_extend :extend
+
+        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
+
+        attr_reader :owner, :association, :target
+
+        alias :proxy_owner :owner
+        alias :proxy_target :target
+        alias :proxy_association :association
+
+        delegate :klass, :to => :proxy_association
+        delegate :options, :to => :proxy_association
+        delegate :collection, :to => :klass
+
+        def initialize(owner, association)
+          @owner, @association, @loaded = owner, association, false
+          Array(association.options[:extend]).each { |ext| proxy_extend(ext) }
+          reset
+        end
+
+        def inspect
+          load_target
+          target.inspect
+        end
+
+        def loaded?
+          @loaded
+        end
+
+        def loaded
+          @loaded = true
+        end
+
+        def nil?
+          load_target
+          target.nil?
+        end
+
+        def blank?
+          load_target
+          target.blank?
+        end
+
+        def present?
+          load_target
+          target.present?
+        end
+
+        def reload
+          reset
+          load_target
+          self unless target.nil?
+        end
+
+        def replace(v)
+          raise NotImplementedError
+        end
+
+        def reset
+          @loaded = false
+          @target = nil
+        end
+
+        def respond_to?(*args)
+          proxy_respond_to?(*args) || (load_target && target.respond_to?(*args))
+        end
+
+        def send(method, *args)
+          if proxy_respond_to?(method)
+            super
+          else
+            load_target
+            target.send(method, *args)
+          end
+        end
+
+        def ===(other)
+          load_target
+          other === target
+        end
+
+        protected
+          def method_missing(method, *args, &block)
+            if load_target
+              if block_given?
+                target.send(method, *args)  { |*block_args| block.call(*block_args) }
+              else
+                target.send(method, *args)
+              end
+            end
+          end
+
+          def load_target
+            unless loaded?
+              if @target.is_a?(Array) && @target.any?
+                @target = find_target + @target.find_all { |record| record.new? }
+              else
+                @target = find_target
+              end
+              loaded
+            end
+            @target
+          rescue MongoMapper::DocumentNotFound
+            reset
+          end
+
+          def find_target
+            raise NotImplementedError
+          end
+
+          def flatten_deeper(array)
+            array.collect do |element|
+              (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element
+            end.flatten
+          end
+      end
+    end
+  end
+end