mongo_mapper_ign 0.7.7 → 0.7.8

data/lib/mongo_mapper/plugins/persistence.rb

@@ -1,97 +1,97 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Persistence
-      module ClassMethods
-        class Unsupported < MongoMapperError; end
-
-        def connection(mongo_connection=nil)
-          not_supported_by_embedded
-          if mongo_connection.nil?
-            @connection ||= MongoMapper.connection
-          else
-            @connection = mongo_connection
-          end
-          @connection
-        end
-
-        def slave_connection
-          not_supported_by_embedded
-          raise "Slave connections have not been configured" if MongoMapper.slave_connections.empty?
-          @slave_idx ||= 0
-          conn = MongoMapper.slave_connections[@slave_idx]
-          increment_slave_idx
-          conn
-        end
-        
-        def set_database_name(name)
-          not_supported_by_embedded
-          @database_name = name
-        end
-
-        def database_name
-          not_supported_by_embedded
-          @database_name
-        end
-
-        def database
-          not_supported_by_embedded
-          if database_name.nil?
-            MongoMapper.database
-          else
-            connection.db(database_name)
-          end
-        end
-        
-        def slave_database
-          not_supported_by_embedded
-          conn = slave_connection
-          if database_name.nil?
-            conn.db(MongoMapper.database.name)
-          else
-            conn.db(database_name)
-          end
-        end
-
-        def set_collection_name(name)
-          not_supported_by_embedded
-          @collection_name = name
-        end
-
-        def collection_name
-          not_supported_by_embedded
-          @collection_name ||= self.to_s.tableize.gsub(/\//, '.')
-        end
-
-        def collection
-          not_supported_by_embedded
-          database.collection(collection_name)
-        end
-        
-        def slave_collection
-          not_supported_by_embedded
-          slave_database.collection(collection_name)
-        end
-
-        private
-          def not_supported_by_embedded
-            raise Unsupported.new('This is not supported for embeddable documents at this time.') if embeddable?
-          end
-          
-          def increment_slave_idx
-            @slave_idx = @slave_idx + 1 <= MongoMapper.slave_connections.length-1 ? @slave_idx + 1 : 0
-          end
-      end
-
-      module InstanceMethods
-        def collection
-          _root_document.class.collection
-        end
-
-        def database
-          _root_document.class.database
-        end
-      end
-    end
-  end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Persistence
+      module ClassMethods
+        class Unsupported < MongoMapperError; end
+
+        def connection(mongo_connection=nil)
+          not_supported_by_embedded
+          if mongo_connection.nil?
+            @connection ||= MongoMapper.connection
+          else
+            @connection = mongo_connection
+          end
+          @connection
+        end
+
+        def slave_connection
+          not_supported_by_embedded
+          raise "Slave connections have not been configured" if MongoMapper.slave_connections.empty?
+          @slave_idx ||= 0
+          conn = MongoMapper.slave_connections[@slave_idx]
+          increment_slave_idx
+          conn
+        end
+        
+        def set_database_name(name)
+          not_supported_by_embedded
+          @database_name = name
+        end
+
+        def database_name
+          not_supported_by_embedded
+          @database_name
+        end
+
+        def database
+          not_supported_by_embedded
+          if database_name.nil?
+            MongoMapper.database
+          else
+            connection.db(database_name)
+          end
+        end
+        
+        def slave_database
+          not_supported_by_embedded
+          conn = slave_connection
+          if database_name.nil?
+            conn.db(MongoMapper.database.name)
+          else
+            conn.db(database_name)
+          end
+        end
+
+        def set_collection_name(name)
+          not_supported_by_embedded
+          @collection_name = name
+        end
+
+        def collection_name
+          not_supported_by_embedded
+          @collection_name ||= self.to_s.tableize.gsub(/\//, '.')
+        end
+
+        def collection
+          not_supported_by_embedded
+          database.collection(collection_name)
+        end
+        
+        def slave_collection
+          not_supported_by_embedded
+          slave_database.collection(collection_name)
+        end
+
+        private
+          def not_supported_by_embedded
+            raise Unsupported.new('This is not supported for embeddable documents at this time.') if embeddable?
+          end
+          
+          def increment_slave_idx
+            @slave_idx = @slave_idx + 1 <= MongoMapper.slave_connections.length-1 ? @slave_idx + 1 : 0
+          end
+      end
+
+      module InstanceMethods
+        def collection
+          _root_document.class.collection
+        end
+
+        def database
+          _root_document.class.database
+        end
+      end
+    end
+  end
 end

data/lib/mongo_mapper/plugins/protected.rb

@@ -1,46 +1,46 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Protected
-      module ClassMethods
-        def attr_protected(*attrs)
-          self.write_inheritable_attribute(:attr_protected, Set.new(attrs) + (protected_attributes || []))
-        end
-
-        def protected_attributes
-          self.read_inheritable_attribute(:attr_protected)
-        end
-
-        def key(*args)
-          key = super
-          attr_protected key.name.to_sym if key.options[:protected]
-          key
-        end
-      end
-
-      module InstanceMethods
-        def assign(attrs={})
-          super(filter_protected_attrs(attrs))
-        end
-
-        def update_attributes(attrs={})
-          super(filter_protected_attrs(attrs))
-        end
-
-        def update_attributes!(attrs={})
-          super(filter_protected_attrs(attrs))
-        end
-
-        def protected_attributes
-          self.class.protected_attributes
-        end
-
-        protected
-          def filter_protected_attrs(attrs)
-            return attrs if protected_attributes.blank? || attrs.blank?
-            attrs.dup.delete_if { |key, val| protected_attributes.include?(key.to_sym) }
-          end
-      end
-    end
-  end
-end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Protected
+      module ClassMethods
+        def attr_protected(*attrs)
+          self.write_inheritable_attribute(:attr_protected, Set.new(attrs) + (protected_attributes || []))
+        end
+
+        def protected_attributes
+          self.read_inheritable_attribute(:attr_protected)
+        end
+
+        def key(*args)
+          key = super
+          attr_protected key.name.to_sym if key.options[:protected]
+          key
+        end
+      end
+
+      module InstanceMethods
+        def assign(attrs={})
+          super(filter_protected_attrs(attrs))
+        end
+
+        def update_attributes(attrs={})
+          super(filter_protected_attrs(attrs))
+        end
+
+        def update_attributes!(attrs={})
+          super(filter_protected_attrs(attrs))
+        end
+
+        def protected_attributes
+          self.class.protected_attributes
+        end
+
+        protected
+          def filter_protected_attrs(attrs)
+            return attrs if protected_attributes.blank? || attrs.blank?
+            attrs.dup.delete_if { |key, val| protected_attributes.include?(key.to_sym) }
+          end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/rails.rb

@@ -1,58 +1,58 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Rails
-      def self.configure(model)
-        model.extend ActiveModel::Naming if defined?(ActiveModel)
-      end
-
-      module InstanceMethods
-        def to_param
-          id.to_s if persisted?
-        end
-
-        def to_model
-          self
-        end
-
-        def to_key
-          [id] if persisted?
-        end
-
-        def new_record?
-          new?
-        end
-
-        def read_attribute(name)
-          self[name]
-        end
-
-        def read_attribute_before_typecast(name)
-          read_key_before_typecast(name)
-        end
-
-        def write_attribute(name, value)
-          self[name] = value
-        end
-      end
-
-      module ClassMethods
-        def has_one(*args)
-          one(*args)
-        end
-
-        def has_many(*args)
-          many(*args)
-        end
-
-        def column_names
-          keys.keys
-        end
-
-        def human_name
-          self.name.demodulize.titleize
-        end
-      end
-    end
-  end
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Rails
+      def self.configure(model)
+        model.extend ActiveModel::Naming if defined?(ActiveModel)
+      end
+
+      module InstanceMethods
+        def to_param
+          id.to_s if persisted?
+        end
+
+        def to_model
+          self
+        end
+
+        def to_key
+          [id] if persisted?
+        end
+
+        def new_record?
+          new?
+        end
+
+        def read_attribute(name)
+          self[name]
+        end
+
+        def read_attribute_before_typecast(name)
+          read_key_before_typecast(name)
+        end
+
+        def write_attribute(name, value)
+          self[name] = value
+        end
+      end
+
+      module ClassMethods
+        def has_one(*args)
+          one(*args)
+        end
+
+        def has_many(*args)
+          many(*args)
+        end
+
+        def column_names
+          keys.keys
+        end
+
+        def human_name
+          self.name.demodulize.titleize
+        end
+      end
+    end
+  end
 end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -1,92 +1,92 @@
-# encoding: UTF-8
-require 'active_support/json'
-
-module MongoMapper
-  module Plugins
-    module Serialization
-      def self.configure(model)
-        model.class_eval { cattr_accessor :include_root_in_json, :instance_writer => true }
-      end
-
-      module InstanceMethods
-        def to_xml(options = {}, &block)
-          options[:dasherize] = false unless options.has_key?(:dasherize)
-          serializer = Serialization::XmlSerializer.new(self, options)
-          block_given? ? serializer.to_s(&block) : serializer.to_s
-        end
-        
-        def as_json options={}
-          options ||= {}
-          unless options[:only]
-            methods = [options.delete(:methods)].flatten.compact
-            methods << :id
-            options[:methods] = methods.uniq
-          end
-
-          except = [options.delete(:except)].flatten.compact
-          except << :_id
-          options[:except] = except
-
-          # Direct rip from Rails 3 ActiveModel Serialization (#serializable_hash)
-          hash = begin
-            options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
-            options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
-
-            attribute_names = attributes.keys.sort
-            if options[:only].any?
-              attribute_names &= options[:only]
-            elsif options[:except].any?
-              attribute_names -= options[:except]
-            end
-
-            method_names = Array.wrap(options[:methods]).inject([]) do |methods, name|
-              methods << name if respond_to?(name.to_s)
-              methods
-            end
-
-            (attribute_names + method_names).inject({}) { |hash, name|
-              hash[name] = send(name)
-              hash
-            }
-          end
-          # End rip
-
-          options.delete(:only) if options[:only].nil? or options[:only].empty?
-
-          hash.each do |key, value|
-            if value.is_a?(Array)
-              hash[key] = value.map do |item|
-                item.respond_to?(:as_json) ? item.as_json(options) : item
-              end
-            elsif value.is_a? BSON::ObjectID
-              hash[key] = value.to_s
-            elsif value.respond_to?(:as_json)
-              hash[key] = value.as_json(options)
-            end
-          end
-
-          # Replicate Rails 3 naming - and also bin anytihng after : for use in our dynamic classes from unit tests
-          hash = { ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).gsub(/:.*/,'') => hash } if include_root_in_json
-          hash
-        end
-      end
-
-      module ClassMethods
-        def from_json(json)
-          self.new(ActiveSupport::JSON.decode(json))
-        end
-        
-        def from_xml(xml)
-          # instance = self.new
-          # instance.attributes = self.new
-          # instance
-          instance.attributes = self.new(Hash.from_xml(xml).values.first)
-        end        
-      end
-
-    end
-  end
-end
-
-require 'mongo_mapper/plugins/serialization/xml_serializer'
-require 'mongo_mapper/plugins/serialization/array'
+# encoding: UTF-8
+require 'active_support/json'
+
+module MongoMapper
+  module Plugins
+    module Serialization
+      def self.configure(model)
+        model.class_eval { cattr_accessor :include_root_in_json, :instance_writer => true }
+      end
+
+      module InstanceMethods
+        def to_xml(options = {}, &block)
+          options[:dasherize] = false unless options.has_key?(:dasherize)
+          serializer = Serialization::XmlSerializer.new(self, options)
+          block_given? ? serializer.to_s(&block) : serializer.to_s
+        end
+        
+        def as_json options={}
+          options ||= {}
+          unless options[:only]
+            methods = [options.delete(:methods)].flatten.compact
+            methods << :id
+            options[:methods] = methods.uniq
+          end
+
+          except = [options.delete(:except)].flatten.compact
+          except << :_id
+          options[:except] = except
+
+          # Direct rip from Rails 3 ActiveModel Serialization (#serializable_hash)
+          hash = begin
+            options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
+            options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
+
+            attribute_names = attributes.keys.sort
+            if options[:only].any?
+              attribute_names &= options[:only]
+            elsif options[:except].any?
+              attribute_names -= options[:except]
+            end
+
+            method_names = Array.wrap(options[:methods]).inject([]) do |methods, name|
+              methods << name if respond_to?(name.to_s)
+              methods
+            end
+
+            (attribute_names + method_names).inject({}) { |hash, name|
+              hash[name] = send(name)
+              hash
+            }
+          end
+          # End rip
+
+          options.delete(:only) if options[:only].nil? or options[:only].empty?
+
+          hash.each do |key, value|
+            if value.is_a?(Array)
+              hash[key] = value.map do |item|
+                item.respond_to?(:as_json) ? item.as_json(options) : item
+              end
+            elsif value.is_a? BSON::ObjectID
+              hash[key] = value.to_s
+            elsif value.respond_to?(:as_json)
+              hash[key] = value.as_json(options)
+            end
+          end
+
+          # Replicate Rails 3 naming - and also bin anytihng after : for use in our dynamic classes from unit tests
+          hash = { ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).gsub(/:.*/,'') => hash } if include_root_in_json
+          hash
+        end
+      end
+
+      module ClassMethods
+        def from_json(json)
+          self.new(ActiveSupport::JSON.decode(json))
+        end
+        
+        def from_xml(xml)
+          # instance = self.new
+          # instance.attributes = self.new
+          # instance
+          instance.attributes = self.new(Hash.from_xml(xml).values.first)
+        end        
+      end
+
+    end
+  end
+end
+
+require 'mongo_mapper/plugins/serialization/xml_serializer'
+require 'mongo_mapper/plugins/serialization/array'