djsun-mongomapper 0.3.1.1 → 0.3.3

data/lib/mongomapper/document.rb

@@ -11,18 +11,15 @@ module MongoMapper
         include SaveWithValidation
         include RailsCompatibility::Document
         extend ClassMethods
-        
-        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!
@@ -35,16 +32,15 @@ module MongoMapper
         end
       end
 
-      def paginate(options)        
+      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
+        collection    = Pagination::PaginationProxy.new(total_entries, page, per_page)
+
+        options[:limit]   = collection.limit
         options[:offset]  = collection.offset
-        
+
         collection.subject = find_every(options)
         collection
       end
@@ -67,11 +63,11 @@ module MongoMapper
           new(doc)
         end
       end
-      
+
       def count(conditions={})
         collection.count(FinderOptions.to_mongo_criteria(conditions))
       end
-      
+
       def create(*docs)
         instances = []
         docs = [{}] if docs.blank?
@@ -81,7 +77,7 @@ module MongoMapper
         end
         instances.size == 1 ? instances[0] : instances
       end
-      
+
       # For updating single document
       #   Person.update(1, {:foo => 'bar'})
       #
@@ -96,25 +92,25 @@ module MongoMapper
           update_single(id, attributes)
         end
       end
-      
+
       def delete(*ids)
         criteria = FinderOptions.to_mongo_criteria(:_id => ids.flatten)
         collection.remove(criteria)
       end
-      
+
       def delete_all(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
@@ -123,7 +119,7 @@ module MongoMapper
         end
         @connection
       end
-      
+
       def database(name=nil)
         if name.nil?
           @database ||= MongoMapper.database
@@ -132,7 +128,7 @@ module MongoMapper
         end
         @database
       end
-      
+
       def collection(name=nil)
         if name.nil?
           @collection ||= database.collection(self.to_s.demodulize.tableize)
@@ -142,95 +138,158 @@ module MongoMapper
         @collection
       end
       
+      def timestamps!
+        key :created_at, Time
+        key :updated_at, Time
+        
+        class_eval { before_save :update_timestamps }
+      end
+      
       def validates_uniqueness_of(*args)
         add_validations(args, MongoMapper::Validations::ValidatesUniquenessOf)
       end
-      
+
       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        
-        collection.find(criteria, options).to_a.map { |doc| new(doc) }
-      end
-      
-      def find_first(options)
-        options.merge!(:limit => 1)
-        find_every({:order => '$natural asc'}.merge(options))[0]
-      end
-      
-      def find_last(options)
-        find_every(options.merge(:limit => 1, :order => '$natural desc'))[0]
-      end
-      
-      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}"
+      protected
+        def method_missing(method, *args)
+          finder = DynamicFinder.new(self, method)
+          
+          if finder.valid?
+            meta_def(finder.options[:method]) do |*args|
+              find_with_args(args, finder.options)
+            end
+            
+            send(finder.options[:method], *args)
+          else
+            super
+          end
         end
-      end
-      
-      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}"
+
+      private
+        def find_every(options)
+          criteria, options = FinderOptions.new(options).to_a
+          collection.find(criteria, options).to_a.map { |doc| new(doc) }
         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_one(ids[0], options)
+
+        def find_first(options)
+          options.merge!(:limit => 1)
+          find_every({:order => '$natural asc'}.merge(options))[0]
+        end
+
+        def find_last(options)
+          options.merge!(:limit => 1)
+          options[:order] = invert_order_clause(options)
+          find_every(options)[0]
+          #find_every({:order => '$natural desc'}.merge(invert_order_clause(options)))[0]
+        end
+
+        def invert_order_clause(options)
+          return '$natural desc' unless options[:order]
+          options[:order].split(',').map do |order_segment| 
+            if order_segment =~ /\sasc/i
+              order_segment.sub /\sasc/i, ' desc'
+            elsif order_segment =~ /\sdesc/i
+              order_segment.sub /\sdesc/i, ' asc'
+            else
+              "#{order_segment.strip} desc"
+            end
+          end.join(',')
+        end
+
+        def find_some(ids, options={})
+          documents = find_every(options.deep_merge(:conditions => {'_id' => ids}))
+          if ids.size == documents.size
+            documents
           else
-            find_some(ids, options)
+            raise DocumentNotFound, "Couldn't find all of the ids (#{ids.to_sentence}). Found #{documents.size}, but was expecting #{ids.size}"
+          end
         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"
+
+        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
-        
-        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"
+
+        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_one(ids[0], options)
+            else
+              find_some(ids, options)
+          end
         end
         
-        instances = []
-        docs.each_pair { |id, attrs| instances << update(id, attrs) }
-        instances
-      end
+        def find_with_args(args, options)
+          attributes,  = {}
+          find_options = args.extract_options!.deep_merge(:conditions => attributes)
+          
+          options[:attribute_names].each_with_index do |attr, index|
+            attributes[attr] = args[index]
+          end
+
+          result = find(options[:finder], find_options)
+          
+          if result.nil?
+            if options[:bang]
+              raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
+            end
+            
+            if options[:instantiator]
+              self.send(options[:instantiator], attributes)
+            end
+          else
+            result
+          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
+
+          doc = find(id)
+          doc.update_attributes(attrs)
+          doc
+        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?
+        read_attribute('_id').blank? || using_custom_id?
       end
-      
+
       def save
         create_or_update
       end
-      
+
       def save!
         create_or_update || raise(DocumentNotValid.new(self))
       end
@@ -238,40 +297,51 @@ module MongoMapper
       def update_attributes(attrs={})
         self.attributes = attrs
         save
-        self
       end
-      
+
       def destroy
+        return false if frozen?
+
         criteria = FinderOptions.to_mongo_criteria(:_id => id)
         collection.remove(criteria) unless new?
         freeze
       end
-      
+
     private
       def create_or_update
         result = new? ? create : update
         result != false
       end
-      
+
       def create
-        update_timestamps
-        write_attribute :_id, save_to_collection
+        assign_id
+        save_to_collection
       end
       
+      def assign_id
+        if read_attribute(:_id).blank?
+          write_attribute(:_id, XGen::Mongo::Driver::ObjectID.new.to_s)
+        end
+      end
+
       def update
-        update_timestamps
         save_to_collection
       end
-      
+
       # collection.save returns mongoid
       def save_to_collection
+        clear_custom_id_flag
         collection.save(attributes)
       end
-      
+
       def update_timestamps
-        t = Time.now.utc
-        write_attribute('created_at', t) if new?
-        write_attribute('updated_at', t)
+        now = Time.now.utc
+        write_attribute('created_at', now) if new?
+        write_attribute('updated_at', now)
+      end
+      
+      def clear_custom_id_flag
+        @using_custom_id = nil
       end
     end
   end # Document

data/lib/mongomapper/dynamic_finder.rb

@@ -0,0 +1,38 @@
+module MongoMapper
+  class DynamicFinder
+    attr_reader :options
+
+    def initialize(model, method)
+      @model = model
+      @options = {}
+      @options[:method] = method
+      match
+    end
+
+    def valid?
+      @options[:finder].present?
+    end
+
+    protected
+      def match
+        @options[:finder] = :first
+        
+        case @options[:method].to_s
+          when /^find_(all_by|last_by|by)_([_a-zA-Z]\w*)$/
+            @options[:finder] = :last if $1 == 'last_by'
+            @options[:finder] = :all if $1 == 'all_by'
+            names = $2
+          when /^find_by_([_a-zA-Z]\w*)\!$/
+            @options[:bang] = true
+            names = $1
+          when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
+            @options[:instantiator] = $1 == 'initialize' ? :new : :create
+            names = $2
+          else
+            @options[:finder] = nil
+        end
+        
+        @options[:attribute_names] = names && names.split('_and_')
+      end
+  end
+end