jnunemaker-mongomapper 0.2.0 → 0.3.0

data/lib/mongomapper/associations/many_embedded_polymorphic_proxy.rb

@@ -0,0 +1,34 @@
+module MongoMapper
+  module Associations
+    class ManyEmbeddedPolymorphicProxy < ArrayProxy      
+      def replace(v)
+        @_values = v.map do |doc_or_hash|
+          if doc_or_hash.kind_of?(EmbeddedDocument)
+            doc = doc_or_hash
+            {@association.type_key_name => doc.class.name}.merge(doc.attributes)
+          else
+            doc_or_hash
+          end
+        end
+        
+        @target = nil
+        reload_target
+      end
+
+      protected
+        def find_target
+          (@_values || []).map do |hash|
+            polymorphic_class(hash).new(hash)
+          end
+        end
+        
+        def polymorphic_class(doc)
+          if class_name = doc[@association.type_key_name]
+            class_name.constantize
+          else
+            @association.klass
+          end
+        end
+    end
+  end
+end

data/lib/mongomapper/associations/{has_many_embedded_proxy.rb → many_embedded_proxy.rb}

@@ -1,6 +1,6 @@
 module MongoMapper
   module Associations
-    class HasManyEmbeddedProxy < ArrayProxy
+    class ManyEmbeddedProxy < ArrayProxy
       def replace(v)
         @_values = v.map { |e| e.kind_of?(EmbeddedDocument) ? e.attributes : e }
         @target = nil
@@ -9,11 +9,11 @@ module MongoMapper
       end
 
       protected
-      def find_target
-        (@_values || []).map do |e|
-          @association.klass.new(e)
+        def find_target
+          (@_values || []).map do |e|
+            @association.klass.new(e)
+          end
         end
-      end
     end
   end
 end

data/lib/mongomapper/associations/many_proxy.rb

@@ -0,0 +1,55 @@
+module MongoMapper
+  module Associations
+    class ManyProxy < ArrayProxy
+      delegate :klass, :to => :@association
+      
+      def find(*args)
+        options = args.extract_options!
+        klass.find(*args << scoped_options(options))
+      end
+      
+      def paginate(options)
+        klass.paginate(scoped_options(options))
+      end
+      
+      def all(options={})
+        find(:all, scoped_options(options))
+      end
+      
+      def first(options={})
+        find(:first, scoped_options(options))
+      end
+      
+      def last(options={})
+        find(:last, scoped_options(options))
+      end
+      
+      def replace(docs)
+        if load_target
+          @target.map(&:destroy)
+        end
+
+        docs.each do |doc|
+          @owner.save if @owner.new?
+          doc.send(:write_attribute, self.foreign_key, @owner.id)
+          doc.save
+        end
+        
+        reload_target
+      end
+
+      protected
+        def scoped_options(options)
+          options.dup.deep_merge({:conditions => {self.foreign_key => @owner.id}})
+        end
+        
+        def find_target
+          find(:all)
+        end
+
+        def foreign_key
+          @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
+        end
+    end
+  end
+end

data/lib/mongomapper/associations/proxy.rb

@@ -10,7 +10,6 @@ module MongoMapper
       def initialize(owner, association)
         @owner= owner
         @association = association
-
         reset
       end
 
@@ -38,23 +37,31 @@ module MongoMapper
       end
 
       protected
-      def method_missing(method, *args)
-        if load_target
-          if block_given?
-            @target.send(method, *args)  { |*block_args| yield(*block_args) }
-          else
-            @target.send(method, *args)
+        def method_missing(method, *args)
+          if load_target
+            if block_given?
+              @target.send(method, *args)  { |*block_args| yield(*block_args) }
+            else
+              @target.send(method, *args)
+            end
           end
         end
-      end
 
-      def load_target
-        @target ||= find_target
-      end
+        def load_target
+          @target ||= find_target
+        end
 
-      def find_target
-        raise NotImplementedError
-      end
+        def find_target
+          raise NotImplementedError
+        end
+        
+        # Array#flatten has problems with recursive arrays. Going one level
+        # deeper solves the majority of the problems.
+        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

data/lib/mongomapper/callbacks.rb

@@ -90,7 +90,7 @@ module MongoMapper
       def callback(method)
         result = run_callbacks(method) { |result, object| false == result }
         
-        if result != false && respond_to_without_attributes?(method)
+        if result != false && respond_to?(method)
           result = send(method)
         end
         

data/lib/mongomapper/document.rb

@@ -9,21 +9,21 @@ module MongoMapper
         include Observing
         include Callbacks
         include SaveWithValidation
-        include RailsCompatibility
+        include RailsCompatibility::Document
         extend ClassMethods
-
-        key :_id, String
+        
+        key :_id, MongoID
         key :created_at, Time
         key :updated_at, Time
       end
-
+      
       descendants << model
     end
 
     def self.descendants
       @descendants ||= Set.new
     end
- 
+    
     module ClassMethods
       def find(*args)
         options = args.extract_options!
@@ -32,10 +32,24 @@ module MongoMapper
           when :first then find_first(options)
           when :last  then find_last(options)
           when :all   then find_every(options)
-          else             find_from_ids(args)
+          else             find_from_ids(args, options)
         end
       end
 
+      def paginate(options)        
+        per_page      = options.delete(:per_page)
+        page          = options.delete(:page)
+        total_entries = count(options[:conditions] || {})
+        
+        collection = Pagination::PaginationProxy.new(total_entries, page, per_page)
+        
+        options[:limit] = collection.limit
+        options[:offset]  = collection.offset
+        
+        collection.subject = find_every(options)
+        collection
+      end
+
       def first(options={})
         find_first(options)
       end
@@ -49,25 +63,26 @@ module MongoMapper
       end
 
       def find_by_id(id)
-        if doc = collection.find_first({:_id => id})
+        criteria = FinderOptions.to_mongo_criteria(:_id => id)
+        if doc = collection.find_first(criteria)
           new(doc)
         end
       end
-
-      # TODO: remove the rescuing when ruby driver works correctly
+      
       def count(conditions={})
         collection.count(FinderOptions.to_mongo_criteria(conditions))
       end
-
+      
       def create(*docs)
         instances = []
+        docs = [{}] if docs.blank?
         docs.flatten.each do |attrs|
           doc = new(attrs); doc.save
           instances << doc
         end
         instances.size == 1 ? instances[0] : instances
       end
-
+      
       # For updating single document
       #   Person.update(1, {:foo => 'bar'})
       #
@@ -82,23 +97,25 @@ module MongoMapper
           update_single(id, attributes)
         end
       end
-
+      
       def delete(*ids)
-        collection.remove(:_id => {'$in' => ids.flatten})
+        criteria = FinderOptions.to_mongo_criteria(:_id => ids.flatten)
+        collection.remove(criteria)
       end
-
+      
       def delete_all(conditions={})
-        collection.remove(FinderOptions.to_mongo_criteria(conditions))
+        criteria = FinderOptions.to_mongo_criteria(conditions)
+        collection.remove(criteria)
       end
-
+      
       def destroy(*ids)
         find_some(ids.flatten).each(&:destroy)
       end
-
+      
       def destroy_all(conditions={})
         find(:all, :conditions => conditions).each(&:destroy)
       end
-
+      
       def connection(mongo_connection=nil)
         if mongo_connection.nil?
           @connection ||= MongoMapper.connection
@@ -107,7 +124,7 @@ module MongoMapper
         end
         @connection
       end
-
+      
       def database(name=nil)
         if name.nil?
           @database ||= MongoMapper.database
@@ -116,7 +133,7 @@ module MongoMapper
         end
         @database
       end
-
+      
       def collection(name=nil)
         if name.nil?
           @collection ||= database.collection(self.to_s.demodulize.tableize)
@@ -125,7 +142,7 @@ module MongoMapper
         end
         @collection
       end
-
+      
       def validates_uniqueness_of(*args)
         add_validations(args, MongoMapper::Validations::ValidatesUniquenessOf)
       end
@@ -133,74 +150,83 @@ module MongoMapper
       def validates_exclusion_of(*args)
         add_validations(args, MongoMapper::Validations::ValidatesExclusionOf)
       end
-
+      
       def validates_inclusion_of(*args)
         add_validations(args, MongoMapper::Validations::ValidatesInclusionOf)
       end
-
+      
     private
       def find_every(options)
-        criteria, options = FinderOptions.new(options).to_a
+        criteria, options = FinderOptions.new(options).to_a        
         collection.find(criteria, options).to_a.map { |doc| new(doc) }
       end
-
+      
       def find_first(options)
-        find_every(options.merge(:limit => 1, :order => 'created_at')).first
+        find_every(options.merge(:limit => 1, :order => '$natural asc'))[0]
       end
-
+      
       def find_last(options)
-        find_every(options.merge(:limit => 1, :order => 'created_at desc')).first
+        find_every(options.merge(:limit => 1, :order => '$natural desc'))[0]
       end
-
-      def find_some(ids)
-        documents = find_every(:conditions => {'_id' => ids})
+      
+      def find_some(ids, options={})
+        documents = find_every(options.deep_merge(:conditions => {'_id' => ids}))
         if ids.size == documents.size
           documents
         else
           raise DocumentNotFound, "Couldn't find all of the ids (#{ids.to_sentence}). Found #{documents.size}, but was expecting #{ids.size}"
         end
       end
-
-      def find_from_ids(*ids)
+      
+      def find_one(id, options={})
+        if doc = find_every(options.deep_merge(:conditions => {:_id => id})).first
+          doc
+        else
+          raise DocumentNotFound, "Document with id of #{id} does not exist in collection named #{collection.name}"
+        end
+      end
+      
+      def find_from_ids(ids, options={})
         ids = ids.flatten.compact.uniq
-
+        
         case ids.size
           when 0
             raise(DocumentNotFound, "Couldn't find without an ID")
           when 1
-            find_by_id(ids[0]) || raise(DocumentNotFound, "Document with id of #{ids[0]} does not exist in collection named #{collection.name}")
+            find_one(ids[0], options)
           else
-            find_some(ids)
+            find_some(ids, options)
         end
       end
-
+      
       def update_single(id, attrs)
         if id.blank? || attrs.blank? || !attrs.is_a?(Hash)
           raise ArgumentError, "Updating a single document requires an id and a hash of attributes"
         end
-
+        
         find(id).update_attributes(attrs)
       end
-
+      
       def update_multiple(docs)
         unless docs.is_a?(Hash)
           raise ArgumentError, "Updating multiple documents takes 1 argument and it must be hash"
         end
+        
         instances = []
         docs.each_pair { |id, attrs| instances << update(id, attrs) }
         instances
       end
     end
-
+    
     module InstanceMethods
       def collection
         self.class.collection
       end
-
+      
       def new?
-        read_attribute('_id').blank? || self.class.find_by_id(id).blank?
+        read_attribute('_id').blank?
       end
-
+      
       def save
         create_or_update
       end
@@ -214,20 +240,21 @@ module MongoMapper
         save
         self
       end
-
+      
       def destroy
-        collection.remove(:_id => id) unless new?
+        criteria = FinderOptions.to_mongo_criteria(:_id => id)
+        collection.remove(criteria) unless new?
         freeze
       end
-
+      
       def ==(other)
         other.is_a?(self.class) && id == other.id
       end
- 
+      
       def id
-        read_attribute('_id')
+        read_attribute('_id').to_s
       end
-
+      
     private
       def create_or_update
         result = new? ? create : update
@@ -235,28 +262,24 @@ module MongoMapper
       end
       
       def create
-        write_attribute('_id', generate_id) if read_attribute('_id').blank?
         update_timestamps
-        save_to_collection
+        write_attribute :_id, save_to_collection
       end
-
+      
       def update
         update_timestamps
         save_to_collection
       end
-
+      
+      # collection.save returns mongoid
       def save_to_collection
-        collection.save(attributes.merge!(embedded_association_attributes))
+        collection.save(attributes)
       end
-
+      
       def update_timestamps
         write_attribute('created_at', Time.now.utc) if new?
         write_attribute('updated_at', Time.now.utc)
       end
-
-      def generate_id
-        XGen::Mongo::Driver::ObjectID.new
-      end
     end
   end # Document
 end # MongoMapper