mongo_mapper-unstable 2010.3.8 → 2010.06.23

data/lib/mongo_mapper/embedded_document.rb

@@ -1,60 +1,31 @@
+# encoding: UTF-8
 module MongoMapper
   module EmbeddedDocument
     extend Support::DescendantAppends
 
     def self.included(model)
       model.class_eval do
-        include InstanceMethods
-        extend  ClassMethods
         extend  Plugins
 
+        plugin Plugins::EmbeddedDocument
         plugin Plugins::Associations
+        plugin Plugins::Caching
         plugin Plugins::Clone
         plugin Plugins::Descendants
         plugin Plugins::Equality
         plugin Plugins::Inspect
         plugin Plugins::Keys
         plugin Plugins::Logger
+        plugin Plugins::Persistence
+        plugin Plugins::Accessible
         plugin Plugins::Protected
         plugin Plugins::Rails
+        plugin Plugins::Sci
         plugin Plugins::Serialization
         plugin Plugins::Validations
-
-        attr_reader :_root_document, :_parent_document
+        plugin Plugins::Callbacks
       end
-
       super
     end
-
-    module ClassMethods
-      def embeddable?
-        true
-      end
-
-      def embedded_in(owner_name)
-        define_method(owner_name) { _parent_document }
-      end
-    end
-
-    module InstanceMethods
-      def save(options={})
-        if result = _root_document.try(:save, options)
-          @new = false
-        end
-        result
-      end
-
-      def save!(options={})
-        if result = _root_document.try(:save!, options)
-          @new = false
-        end
-        result
-      end
-      
-      def _parent_document=(value)
-        @_root_document   = value._root_document
-        @_parent_document = value
-      end
-    end # InstanceMethods
-  end # EmbeddedDocument
-end # MongoMapper
+  end
+end

data/lib/mongo_mapper/exceptions.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+module MongoMapper
+  # generic MM error
+  class Error < StandardError; end
+
+  # raised when key expected to exist but not found
+  class KeyNotFound < Error; end
+
+  # raised when document expected but not found
+  class DocumentNotFound < Error; end
+
+  # raised when trying to connect using uri with incorrect scheme
+  class InvalidScheme < Error; end
+
+  # raised when trying to do something not supported, mostly for edocs
+  class NotSupported < Error; end
+
+  # raised when document not valid and using !
+  class DocumentNotValid < Error
+    def initialize(document)
+      super("Validation failed: #{document.errors.full_messages.join(", ")}")
+    end
+  end
+
+  class AccessibleOrProtected < Error
+    def initialize(name)
+      super("Declare either attr_protected or attr_accessible for #{name}, but not both.")
+    end
+  end
+end

data/lib/mongo_mapper/extensions/array.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Array
+      def to_mongo(value)
+        value = value.respond_to?(:lines) ? value.lines : value
+        value.to_a
+      end
+
+      def from_mongo(value)
+        value || []
+      end
+    end
+  end
+end
+
+class Array
+  extend MongoMapper::Extensions::Array
+end

data/lib/mongo_mapper/extensions/binary.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Binary
+      def to_mongo(value)
+        if value.is_a?(::BSON::Binary)
+          value
+        else
+          value.nil? ? nil : ::BSON::Binary.new(value)
+        end
+      end
+
+      def from_mongo(value)
+        value
+      end
+    end
+  end
+end
+
+class Binary
+  extend MongoMapper::Extensions::Binary
+end

data/lib/mongo_mapper/extensions/boolean.rb

@@ -0,0 +1,44 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Boolean
+      Mapping = {
+        true    => true, 
+        'true'  => true, 
+        'TRUE'  => true, 
+        'True'  => true, 
+        't'     => true, 
+        'T'     => true, 
+        '1'     => true, 
+        1       => true, 
+        1.0     => true,
+        false   => false, 
+        'false' => false, 
+        'FALSE' => false, 
+        'False' => false, 
+        'f'     => false, 
+        'F'     => false, 
+        '0'     => false, 
+        0       => false, 
+        0.0     => false, 
+        nil     => nil
+      }
+
+      def to_mongo(value)
+        if value.is_a?(Boolean)
+          value
+        else
+          Mapping[value]
+        end
+      end
+
+      def from_mongo(value)
+        value.nil? ? nil : !!value
+      end
+    end
+  end
+end
+
+class Boolean
+  extend MongoMapper::Extensions::Boolean
+end

data/lib/mongo_mapper/extensions/date.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Date
+      def to_mongo(value)
+        if value.nil? || value == ''
+          nil
+        else
+          date = value.is_a?(::Date) || value.is_a?(::Time) ? value : ::Date.parse(value.to_s)
+          ::Time.utc(date.year, date.month, date.day)
+        end
+      rescue
+        nil
+      end
+
+      def from_mongo(value)
+        value.to_date if value.present?
+      end
+    end
+  end
+end
+
+class Date
+  extend MongoMapper::Extensions::Date
+end

data/lib/mongo_mapper/extensions/float.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Float
+      def to_mongo(value)
+        value.nil? ? nil : value.to_f
+      end
+    end
+  end
+end
+
+class Float
+  extend MongoMapper::Extensions::Float
+end

data/lib/mongo_mapper/extensions/hash.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Hash
+      def from_mongo(value)
+        HashWithIndifferentAccess.new(value || {})
+      end
+    end
+  end
+end
+
+class Hash
+  extend MongoMapper::Extensions::Hash
+end

data/lib/mongo_mapper/extensions/integer.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Integer
+      def to_mongo(value)
+        value_to_i = value.to_i
+        if value_to_i == 0 && value != value_to_i
+          value.to_s =~ /^(0x|0b)?0+/ ? 0 : nil
+        else
+          value_to_i
+        end
+      end
+    end
+  end
+end
+
+class Integer
+  extend MongoMapper::Extensions::Integer
+end

data/lib/mongo_mapper/extensions/kernel.rb

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+module Kernel
+  # Returns the object's singleton class.
+  def singleton_class
+    class << self
+      self
+    end
+  end unless respond_to?(:singleton_class) # exists in 1.9.2
+end

data/lib/mongo_mapper/extensions/nil_class.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module NilClass
+      def to_mongo(value)
+        value
+      end
+
+      def from_mongo(value)
+        value
+      end
+    end
+  end
+end
+
+class NilClass
+  include MongoMapper::Extensions::NilClass
+end

data/lib/mongo_mapper/extensions/object.rb

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Object
+      module ClassMethods
+        def to_mongo(value)
+          value
+        end
+
+        def from_mongo(value)
+          value
+        end
+      end
+
+      module InstanceMethods
+        def to_mongo
+          self.class.to_mongo(self)
+        end
+      end
+    end
+  end
+end
+
+class Object
+  extend MongoMapper::Extensions::Object::ClassMethods
+  include MongoMapper::Extensions::Object::InstanceMethods
+end

data/lib/mongo_mapper/extensions/object_id.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module ObjectId
+      def to_mongo(value)
+        Plucky.to_object_id(value)
+      end
+
+      def from_mongo(value)
+        value
+      end
+    end
+  end
+end
+
+class ObjectId
+  extend MongoMapper::Extensions::ObjectId
+end
+
+class BSON::ObjectID
+  alias_method :original_to_json, :to_json
+
+  def as_json(options=nil)
+    to_s
+  end
+
+  def to_json(options = nil)
+    as_json.to_json
+  end
+end

data/lib/mongo_mapper/extensions/set.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+require 'set'
+
+module MongoMapper
+  module Extensions
+    module Set
+      def to_mongo(value)
+        value.to_a
+      end
+
+      def from_mongo(value)
+        (value || []).to_set
+      end
+    end
+  end
+end
+
+class Set
+  extend MongoMapper::Extensions::Set
+end

data/lib/mongo_mapper/extensions/string.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module String
+      def to_mongo(value)
+        value.nil? ? nil : value.to_s
+      end
+
+      def from_mongo(value)
+        value.nil? ? nil : value.to_s
+      end
+    end
+  end
+end
+
+class String
+  extend MongoMapper::Extensions::String
+end

data/lib/mongo_mapper/extensions/time.rb

@@ -0,0 +1,29 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Time
+      def to_mongo(value)
+        if value.nil? || value == ''
+          nil
+        else
+          time_class = ::Time.try(:zone).present? ? ::Time.zone : ::Time
+          time = value.is_a?(::Time) ? value : time_class.parse(value.to_s)
+          # strip milliseconds as Ruby does micro and bson does milli and rounding rounded wrong
+          at(time.to_i).utc if time
+        end
+      end
+
+      def from_mongo(value)
+        if ::Time.try(:zone).present? && value.present?
+          value.in_time_zone(::Time.zone)
+        else
+          value
+        end
+      end
+    end
+  end
+end
+
+class Time
+  extend MongoMapper::Extensions::Time
+end

data/lib/mongo_mapper/plugins/accessible.rb

@@ -0,0 +1,44 @@
+module MongoMapper
+  module Plugins
+    module Accessible
+      module ClassMethods
+        def attr_accessible(*attrs)
+          raise AccessibleOrProtected.new(name) if try(:protected_attributes?)
+          self.write_inheritable_attribute(:attr_accessible, Set.new(attrs) + (accessible_attributes || []))
+        end
+
+        def accessible_attributes?
+          !accessible_attributes.nil?
+        end
+
+        def accessible_attributes
+          self.read_inheritable_attribute(:attr_accessible)
+        end
+      end
+
+      module InstanceMethods
+        def assign(attrs={})
+          super(filter_inaccessible_attrs(attrs))
+        end
+
+        def update_attributes(attrs={})
+          super(filter_inaccessible_attrs(attrs))
+        end
+
+        def update_attributes!(attrs={})
+          super(filter_inaccessible_attrs(attrs))
+        end
+
+        def accessible_attributes
+          self.class.accessible_attributes
+        end
+
+        protected
+          def filter_inaccessible_attrs(attrs)
+            return attrs if accessible_attributes.blank? || attrs.blank?
+            attrs.dup.delete_if { |key, val| !accessible_attributes.include?(key.to_sym) }
+          end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -16,8 +17,8 @@ module MongoMapper
 
         def class_name
           return @class_name if defined?(@class_name)
-          
-          @class_name = 
+
+          @class_name =
             if cn = options[:class_name]
               cn
             elsif many?
@@ -56,7 +57,7 @@ module MongoMapper
         end
 
         def embeddable?
-          many? && klass.embeddable?
+          (one? || many?) && klass.embeddable?
         end
 
         def type_key_name
@@ -78,8 +79,8 @@ module MongoMapper
         # hate this, need to revisit
         def proxy_class
           return @proxy_class if defined?(@proxy_class)
-          
-          @proxy_class = 
+
+          @proxy_class =
             if many?
               if klass.embeddable?
                 polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy
@@ -95,7 +96,7 @@ module MongoMapper
                 end
               end
             elsif one?
-              OneProxy
+              klass.embeddable? ? OneEmbeddedProxy : OneProxy
             else
               polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
             end

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

@@ -1,24 +1,23 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class BelongsToPolymorphicProxy < Proxy
-        undef_method :object_id
-        
         def replace(doc)
           if doc
             doc.save if doc.new?
             id, type = doc.id, doc.class.name
           end
 
-          owner[association.foreign_key] = id
-          owner[association.type_key_name] = type
+          proxy_owner[association.foreign_key] = id
+          proxy_owner[association.type_key_name] = type
           reset
         end
 
         protected
           def find_target
-            return nil if association_class.nil? || owner[association.foreign_key].nil?
-            association_class.find_by_id(owner[association.foreign_key])
+            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

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

@@ -1,23 +1,22 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       class BelongsToProxy < Proxy
-        undef_method :object_id
-        
         def replace(doc)
           if doc
             doc.save if doc.new?
             id = doc.id
           end
 
-          owner[association.foreign_key] = id
-          reset
+          proxy_owner[association.foreign_key] = id
+          reload
         end
 
         protected
           def find_target
-            return nil if owner[association.foreign_key].nil?
-            klass.find_by_id(owner[association.foreign_key])
+            return nil if proxy_owner[association.foreign_key].nil?
+            klass.find_by_id(proxy_owner[association.foreign_key])
           end
       end
     end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
@@ -31,7 +32,7 @@ module MongoMapper
 
         private
           def assign_references(*docs)
-            docs.each { |doc| doc._parent_document = owner }
+            docs.each { |doc| doc._parent_document = proxy_owner }
           end
       end
     end