mongo_mapper 0.7.6 → 0.8.0

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.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     def plugins
@@ -10,26 +11,5 @@ module MongoMapper
       mod.configure(self)          if mod.respond_to?(:configure)
       plugins << mod
     end
-
-    autoload :Callbacks,      'mongo_mapper/plugins/callbacks'
-    autoload :Clone,          'mongo_mapper/plugins/clone'
-    autoload :Descendants,    'mongo_mapper/plugins/descendants'
-    autoload :Dirty,          'mongo_mapper/plugins/dirty'
-    autoload :Equality,       'mongo_mapper/plugins/equality'
-    autoload :IdentityMap,    'mongo_mapper/plugins/identity_map'
-    autoload :Inspect,        'mongo_mapper/plugins/inspect'
-    autoload :Keys,           'mongo_mapper/plugins/keys'
-    autoload :Logger,         'mongo_mapper/plugins/logger'
-    autoload :Modifiers,      'mongo_mapper/plugins/modifiers'
-    autoload :Persistence,    'mongo_mapper/plugins/persistence'
-    autoload :Protected,      'mongo_mapper/plugins/protected'
-    autoload :Rails,          'mongo_mapper/plugins/rails'
-    autoload :Serialization,  'mongo_mapper/plugins/serialization'
-    autoload :Timestamps,     'mongo_mapper/plugins/timestamps'
-    autoload :Userstamps,     'mongo_mapper/plugins/userstamps'
-    autoload :Validations,    'mongo_mapper/plugins/validations'
   end
 end
-
-require 'mongo_mapper/plugins/associations'
-require 'mongo_mapper/plugins/pagination'

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.rb

@@ -1,7 +1,13 @@
+# encoding: UTF-8
 module MongoMapper
   module Plugins
     module Associations
       module ClassMethods
+        def inherited(subclass)
+          subclass.associations = associations.dup
+          super
+        end
+
         def belongs_to(association_id, options={}, &extension)
           create_association(:belongs_to, association_id, options, &extension)
         end
@@ -22,11 +28,6 @@ module MongoMapper
           @associations = hash
         end
 
-        def inherited(subclass)
-          subclass.associations = associations.dup
-          super
-        end
-
         private
           def create_association(type, name, options, &extension)
             association = Associations::Base.new(type, name, options, &extension)
@@ -67,7 +68,6 @@ module MongoMapper
           self.class.associations
         end
 
-        # @api private?
         def embedded_associations
           associations.select do |name, association|
             association.embeddable?
@@ -81,11 +81,10 @@ module MongoMapper
             proxy = association.proxy_class.new(self, association)
             self.instance_variable_set(association.ivar, proxy)
           end
-
           proxy
         end
 
-        def save_to_collection(options = {})
+        def save_to_collection(options={})
           super
           associations.each do |association_name, association|
             proxy = get_proxy(association)
@@ -93,22 +92,6 @@ module MongoMapper
           end
         end
       end
-
-      autoload :Base,                         'mongo_mapper/plugins/associations/base'
-      autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
-      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
-      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'
-      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/belongs_to_proxy'
-      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
-      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/many_polymorphic_proxy'
-      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/many_embedded_proxy'
-      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
-      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/many_documents_as_proxy'
-      autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
-      autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
-      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
   end
 end
-
-require 'mongo_mapper/plugins/associations/proxy'

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

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

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