mongoid 2.0.0.beta.9 → 2.0.0.beta.10

data/lib/mongoid/railties/database.rake

@@ -18,7 +18,7 @@ namespace :db do
 
   if not Rake::Task.task_defined?("db:setup")
     desc 'Create the database, and initialize with the seed data'
-    task :setup => [ 'db:create', 'db:seed' ]
+    task :setup => [ 'db:create', 'db:create_indexes', 'db:seed' ]
   end
 
   if not Rake::Task.task_defined?("db:reseed")
@@ -46,6 +46,24 @@ namespace :db do
     end
   end
 
+  if not Rake::Task.task_defined?("db:test:prepare")
+    namespace :test do
+      task :prepare do
+        # noop
+      end
+    end
+  end
+
+  if not Rake::Task.task_defined?("db:create_indexes")
+    desc 'Create the indexes defined on your mongoid models'
+    task :create_indexes => :environment do
+      Mongoid::Document.descendents.each do |model|
+        model.create_indexes
+      end
+    end
+  end
+
+
   ########
   # TODO: lots more useful db tasks can be added here. stuff like copyDatabase, etc
   ########

data/lib/mongoid/validations/associated.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
       def validate_each(document, attribute, value)
         values = value.is_a?(Array) ? value : [ value ]
         return if values.collect { |doc| doc.nil? || doc.valid? }.all?
-        document.errors.add(attribute, :invalid, :default => options[:message], :value => value)
+        document.errors.add(attribute, :invalid, options.merge!(:value => value))
       end
     end
   end

data/lib/mongoid/validations/locale/en.yml

@@ -1,4 +1,5 @@
 en:
-  errors:
-    messages:
-      taken: "is already taken"
+  activemodel:
+    errors:
+      messages:
+        taken: "is already taken"

data/lib/mongoid/validations/uniqueness.rb

@@ -17,18 +17,29 @@ module Mongoid #:nodoc:
       def setup(klass)
         @klass = klass
       end
-      
+
       def validate_each(document, attribute, value)
-        criteria = @klass.where(attribute => value)
-        
+        if document.embedded?
+          return if document._parent.nil?
+
+          criteria = document._parent.send(document.association_name)
+
+          # If the parent document embeds_one, no need to validate uniqueness
+          return if criteria.is_a?(Mongoid::Document)
+
+          criteria = criteria.where(attribute => value, :_id => {'$ne' => document._id})
+        else
+          criteria = @klass.where(attribute => value)
+
+          unless document.new_record?
+            criteria = criteria.where(:_id => {'$ne' => document._id})
+          end
+        end
+
         Array.wrap(options[:scope]).each do |item|
           criteria = criteria.where(item => document.attributes[item])
         end
-        
-        unless document.new_record?
-          criteria = criteria.where(:_id => {'$ne' => document._id})
-        end
-        
+
         if criteria.exists?
           document.errors.add(attribute, :taken, :default => options[:message], :value => value)
         end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.beta.9"
+  VERSION = "2.0.0.beta.10"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196465
+  hash: 62196471
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 9
-  version: 2.0.0.beta.9
+  - 10
+  version: 2.0.0.beta.10
 platform: ruby
 authors: 
 - Durran Jordan
@@ -77,12 +77,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,30 +93,28 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 31
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bson_ext
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196475
+        hash: 31
         segments: 
-        - 2
-        - 0
+        - 1
         - 0
-        - beta
-        - 12
-        version: 2.0.0.beta.12
+        - 4
+        version: 1.0.4
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -135,6 +133,39 @@ dependencies:
         version: 0.9.8
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196419
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 16
+        version: 2.0.0.beta.16
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: watchr
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  type: :development
+  version_requirements: *id009
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written in Ruby.
 email: 
 - durran@gmail.com
@@ -184,7 +215,6 @@ files:
 - lib/mongoid/document.rb
 - lib/mongoid/errors.rb
 - lib/mongoid/extensions/array/accessors.rb
-- lib/mongoid/extensions/array/aliasing.rb
 - lib/mongoid/extensions/array/assimilation.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/array/parentization.rb
@@ -208,6 +238,7 @@ files:
 - lib/mongoid/extensions/set/conversions.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
+- lib/mongoid/extensions/symbol/conversions.rb
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time_conversions.rb
 - lib/mongoid/extensions/true_class/equality.rb
@@ -222,6 +253,7 @@ files:
 - lib/mongoid/indexes.rb
 - lib/mongoid/javascript/functions.yml
 - lib/mongoid/javascript.rb
+- lib/mongoid/logger.rb
 - lib/mongoid/matchers/all.rb
 - lib/mongoid/matchers/default.rb
 - lib/mongoid/matchers/exists.rb

data/lib/mongoid/extensions/array/aliasing.rb

@@ -1,4 +0,0 @@
-# encoding: utf-8
-class Array
-  alias :count :size
-end