mongo_odm 0.2.8 → 0.2.9

data/lib/mongo_odm/criteria.rb

@@ -5,17 +5,24 @@ module MongoODM
 
     delegate :inspect, :to_xml, :to_yaml, :to_json, :include?, :to => :to_a
 
-    def initialize(klass, selector = {}, opts = {})
-      @klass, @selector, @opts = klass, selector, opts
+    def initialize(klass, options = {})
+      @klass    = klass
+      @selector = options[:selector] || {}
+      @opts     = options[:opts]     || {}
+      @sort     = options[:sort]     || []
+      @limit    = options[:limit]    || nil
+      @skip     = options[:skip]     || nil
       _set_cursor
     end
-    attr_reader :selector, :opts, :cursor
     
     def ==(other)
       case other
       when Criteria
-        other.instance_variable_get("@selector") == @selector &&
-        other.instance_variable_get("@opts")     == @opts
+        other.instance_variable_get(:@selector) == @selector &&
+        other.instance_variable_get(:@opts)     == @opts     &&
+        other.instance_variable_get(:@sort)     == @sort    &&
+        other.instance_variable_get(:@limit)    == @limit    &&
+        other.instance_variable_get(:@skip)     == @skip
       else
         to_a == other.to_a
       end
@@ -25,13 +32,24 @@ module MongoODM
       @cursor.to_a
     end
     
+    def to_cursor
+      @cursor
+    end
+    
     def _set_cursor
       @cursor = @klass.collection.find(@selector, @opts)
+      @cursor = @cursor.sort(@sort)   unless @sort.blank?
+      @cursor = @cursor.limit(@limit) unless @limit.blank?
+      @cursor = @cursor.skip(@skip)   unless @skip.blank?
+      @cursor
     end
     
-    def _merge_criteria(selector, opts)
-      @selector.merge!(selector)
-      @opts.merge!(opts)
+    def _merge_criteria(criteria)
+      @selector.merge!(criteria.instance_variable_get(:@selector))
+      @opts.merge!(criteria.instance_variable_get(:@opts))
+      @sort  << criteria.instance_variable_get(:@sort) unless criteria.instance_variable_get(:@sort).blank?
+      @limit = criteria.instance_variable_get(:@limit) unless criteria.instance_variable_get(:@limit).blank?
+      @skip  = criteria.instance_variable_get(:@skip)  unless criteria.instance_variable_get(:@skip).blank?
       _set_cursor
       self
     end
@@ -39,7 +57,7 @@ module MongoODM
     def method_missing(method_name, *args, &block)
       if @klass.respond_to?(method_name)
         result = @klass.send(method_name, *args, &block)
-        result.is_a?(Criteria) ? _merge_criteria(result.selector, result.opts) : result
+        result.is_a?(Criteria) ? _merge_criteria(result) : result
       elsif @cursor.respond_to?(method_name)
         @cursor.send(method_name, *args, &block)
       elsif [].respond_to?(method_name)

data/lib/mongo_odm/cursor.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 module MongoODM
 
+  delegate :inspect, :to_xml, :to_yaml, :to_json, :include?, :to => :to_a
+
   class Cursor < Mongo::Cursor  
     def next_document
       doc = super

data/lib/mongo_odm/document/persistence.rb

@@ -88,18 +88,31 @@ module MongoODM
                         end
         end
         
-        def find(*args)
-          if args.size == 1 && args.first.is_a?(String)
-            MongoODM::Criteria.new(self, :_id => BSON::ObjectId.from_string(args.first))
-          elsif args.size == 1 && args.first.is_a?(BSON::ObjectId)
-            MongoODM::Criteria.new(self, :_id => args.first)
+        def find(selector = {}, opts = {})
+          if opts.blank? && selector.is_a?(String)
+            MongoODM::Criteria.new(self, :selector => {:_id => BSON::ObjectId.from_string(selector)})
+          elsif opts.blank? && selector.is_a?(BSON::ObjectId)
+            MongoODM::Criteria.new(self, :selector => {:_id => selector})
           else
-            MongoODM::Criteria.new(self, *args)
+            MongoODM::Criteria.new(self, :selector => selector, :opts => opts)
           end
         end
         
+        def sort(key_or_list, direction = nil)
+          order = key_or_list.is_a?(Array) ? key_or_list : direction.nil? ? [key_or_list, :asc] : [key_or_list, direction]
+          MongoODM::Criteria.new(self, :sort => order)
+        end
+        
+        def skip(number_to_skip = nil)
+          MongoODM::Criteria.new(self, :skip => number_to_skip)
+        end
+        
+        def limit(number_to_return = nil)
+          MongoODM::Criteria.new(self, :limit => number_to_return)
+        end
+        
         def cursor
-          @cursor ||= find.cursor
+          @cursor ||= find.to_cursor
         end
         
         def destroy_all(*args)

data/lib/mongo_odm/document/validations/uniqueness_validator.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+require 'active_support/core_ext/module/aliasing'
+
+module MongoODM
+  module Document
+    module Validations
+      # Validates whether or not a field is unique against the documents in the
+      # database.
+      #
+      # @example Define the uniqueness validator.
+      #
+      #   class Person
+      #     include MongoODM::Document
+      #     field :title
+      #
+      #     validates_uniqueness_of :title
+      #   end
+      class UniquenessValidator < ActiveModel::EachValidator
+
+        # Unfortunately, we have to tie Uniqueness validators to a class.
+        def setup(klass)
+          @klass = klass
+        end
+
+        # Validate the document for uniqueness violations.
+        #
+        # @example Validate the document.
+        #   validate_each(person, :title, "Sir")
+        #
+        # @param [ Document ] document The document to validate.
+        # @param [ Symbol ] attribute The field to validate on.
+        # @param [ Object ] value The value of the field.
+        def validate_each(document, attribute, value)
+          criteria = @klass.find(attribute => unique_search_value(value))
+          unless document.new_record?
+            criteria = criteria.find(:_id => {'$ne' => document._id})
+          end
+
+          Array.wrap(options[:scope]).each do |item|
+            criteria = criteria.find(item => document.attributes[item])
+          end
+          if criteria.first
+            document.errors.add(
+              attribute,
+              :taken,
+              options.except(:case_sensitive, :scope).merge(:value => value)
+            )
+          end
+        end
+
+        protected
+
+        # ensure :case_sensitive is true by default
+        def unique_search_value(value)
+          if options[:case_sensitive]
+            value
+          else
+            value ? Regexp.new("^#{Regexp.escape(value.to_s)}$", Regexp::IGNORECASE) : nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo_odm/document/validations.rb

@@ -6,6 +6,9 @@ module MongoODM
     module Validations
 
       extend ActiveSupport::Concern
+      extend ActiveSupport::Autoload
+      
+      autoload :UniquenessValidator
 
       included do
         include ActiveModel::Validations
@@ -38,6 +41,25 @@ module MongoODM
           errors.empty?
         end
       end
+      
+      module ClassMethods
+        # Validates whether or not a field is unique against the documents in the
+        # database.
+        #
+        # @example
+        #
+        #   class Person
+        #     include MongoODM::Document
+        #     field :title
+        #
+        #     validates_uniqueness_of :title
+        #   end
+        #
+        # @param [ Array ] *args The arguments to pass to the validator.
+        def validates_uniqueness_of(*args)
+          validates_with(UniquenessValidator, _merge_attributes(args))
+        end
+      end
 
     end
   end

data/lib/mongo_odm/version.rb

@@ -2,6 +2,6 @@
 module MongoODM
   VERSION_MAJOR = "0"
   VERSION_MINOR = "2"
-  VERSION_BUILD = "8"
+  VERSION_BUILD = "9"
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_BUILD}"
 end

metadata

@@ -2,7 +2,7 @@
 name: mongo_odm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +01:00
+date: 2011-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -270,6 +270,7 @@ files:
 - lib/mongo_odm/document/persistence.rb
 - lib/mongo_odm/document/timestamps.rb
 - lib/mongo_odm/document/validations.rb
+- lib/mongo_odm/document/validations/uniqueness_validator.rb
 - lib/mongo_odm/errors.rb
 - lib/mongo_odm/railtie.rb
 - lib/mongo_odm/version.rb