mongoid 2.0.0.beta.15 → 2.0.0.beta.16

data/lib/mongoid/railties/document.rb

@@ -0,0 +1,12 @@
+module Mongoid
+  module Document
+    # Used in conjunction with fields_for to build a form element for the
+    # destruction of this association. Always returns false because Mongoid
+    # only supports immediate deletion of associations.
+    #
+    # See ActionView::Helpers::FormHelper::fields_for for more info.
+    def _destroy
+      false
+    end
+  end
+end

data/lib/mongoid/safe.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Safe #:nodoc:
+    # Determine based on configuration if we are persisting in safe mode or
+    # not.
+    #
+    # The query option will always override the global configuration.
+    def safe_mode?(options)
+      safe = options[:safe]
+      safe.nil? ? Mongoid.persist_in_safe_mode : safe
+    end
+  end
+end

data/lib/mongoid/safety.rb

@@ -70,6 +70,18 @@ module Mongoid #:nodoc:
         @target.send(name, attributes.merge(:safe => true))
       end
 
+      # Increment the field by the provided value, else if it doesn't exists set
+      # it to that value.
+      #
+      # Options:
+      #
+      # field: The field to increment.
+      # value: The value to increment by.
+      # options: Options to pass through to the driver.
+      def inc(field, value, options = {})
+        @target.inc(field, value, :safe => true)
+      end
+
       # Update the +Document+ attributes in the datbase.
       #
       # Example:

data/lib/mongoid/validations.rb

@@ -2,10 +2,6 @@
 require "mongoid/validations/associated"
 require "mongoid/validations/uniqueness"
 
-I18n.load_path << File.join(
-  File.dirname(__FILE__), "validations", "locale", "en.yml"
-)
-
 module Mongoid #:nodoc:
   # This module provides additional validations that ActiveModel does not
   # provide: validates_associated and validates_uniqueness_of

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -5,19 +5,29 @@ module Mongoid #:nodoc:
   # with all the versions contained in it.
   module Versioning
     extend ActiveSupport::Concern
+
     included do
       field :version, :type => Integer, :default => 1
       embeds_many :versions, :class_name => self.name
       set_callback :save, :before, :revise
     end
 
+    module ClassMethods #:nodoc:
+      attr_accessor :version_max
+      def max_versions(number)
+        self.version_max = number.to_i
+      end
+    end
+
     # Create a new version of the +Document+. This will load the previous
     # document from the database and set it as the next version before saving
-    # the current document. It then increments the version number.
+    # the current document. It then increments the version number. If a #max_versions
+    # limit is set in the model and it's exceeded, the oldest version gets discarded.
     def revise
       last_version = self.class.first(:conditions => { :_id => id, :version => version })
       if last_version
         self.versions << last_version.clone
+        self.versions.shift if self.class.version_max.present? && self.versions.length > self.class.version_max
         self.version = version + 1
         @modifications["versions"] = [ nil, @attributes["versions"] ] if @modifications
       end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196477
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 15
-  version: 2.0.0.beta.15
+  - 16
+  version: 2.0.0.beta.16
 platform: ruby
 authors: 
 - Durran Jordan
@@ -17,18 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -04:00
+date: 2010-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712042
         segments: 
         - 3
         - 0
@@ -36,112 +33,105 @@ dependencies:
         - rc
         version: 3.0.0.rc
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 3
         - 22
         version: 0.3.22
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 961915916
         segments: 
         - 3
         - 0
         - pre
         version: 3.0.pre
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 0
-        - 6
-        version: 1.0.6
+        - 7
+        version: 1.0.7
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bson
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
         - 4
         version: 1.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
         - 4
         version: 1.0.4
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
   type: :development
+  prerelease: false
   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: 62196421
         segments: 
         - 2
         - 0
@@ -150,22 +140,37 @@ dependencies:
         - 19
         version: 2.0.0.beta.19
   type: :development
+  prerelease: false
   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
+  prerelease: false
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug-wrapper
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :development
+  prerelease: false
+  version_requirements: *id010
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written in Ruby.
 email: 
 - durran@gmail.com
@@ -176,6 +181,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/config/locales/en.yml
+- lib/config/locales/es.yml
+- lib/config/locales/fr.yml
+- lib/config/locales/it.yml
+- lib/config/locales/pl.yml
+- lib/config/locales/pt.yml
+- lib/config/locales/sv.yml
 - lib/mongoid/associations/embedded_in.rb
 - lib/mongoid/associations/embeds_many.rb
 - lib/mongoid/associations/embeds_one.rb
@@ -199,6 +211,7 @@ files:
 - lib/mongoid/collections.rb
 - lib/mongoid/components.rb
 - lib/mongoid/config.rb
+- lib/mongoid/contexts/enumerable/sort.rb
 - lib/mongoid/contexts/enumerable.rb
 - lib/mongoid/contexts/ids.rb
 - lib/mongoid/contexts/mongo.rb
@@ -209,10 +222,21 @@ files:
 - lib/mongoid/criterion/exclusion.rb
 - lib/mongoid/criterion/inclusion.rb
 - lib/mongoid/criterion/optional.rb
+- lib/mongoid/criterion/selector.rb
 - lib/mongoid/cursor.rb
 - lib/mongoid/deprecation.rb
 - lib/mongoid/dirty.rb
 - lib/mongoid/document.rb
+- lib/mongoid/errors/document_not_found.rb
+- lib/mongoid/errors/invalid_collection.rb
+- lib/mongoid/errors/invalid_database.rb
+- lib/mongoid/errors/invalid_field.rb
+- lib/mongoid/errors/invalid_options.rb
+- lib/mongoid/errors/invalid_type.rb
+- lib/mongoid/errors/mongoid_error.rb
+- lib/mongoid/errors/too_many_nested_attribute_records.rb
+- lib/mongoid/errors/unsupported_version.rb
+- lib/mongoid/errors/validations.rb
 - lib/mongoid/errors.rb
 - lib/mongoid/extensions/array/accessors.rb
 - lib/mongoid/extensions/array/assimilation.rb
@@ -269,6 +293,9 @@ files:
 - lib/mongoid/matchers/size.rb
 - lib/mongoid/matchers.rb
 - lib/mongoid/memoization.rb
+- lib/mongoid/modifiers/command.rb
+- lib/mongoid/modifiers/inc.rb
+- lib/mongoid/modifiers.rb
 - lib/mongoid/named_scope.rb
 - lib/mongoid/paranoia.rb
 - lib/mongoid/paths.rb
@@ -282,12 +309,13 @@ files:
 - lib/mongoid/persistence.rb
 - lib/mongoid/railtie.rb
 - lib/mongoid/railties/database.rake
+- lib/mongoid/railties/document.rb
+- lib/mongoid/safe.rb
 - lib/mongoid/safety.rb
 - lib/mongoid/scope.rb
 - lib/mongoid/state.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
-- lib/mongoid/validations/locale/en.yml
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
 - lib/mongoid/version.rb
@@ -305,7 +333,7 @@ has_rdoc: true
 homepage: http://mongoid.org
 licenses: []
 
-post_install_message: "   _________________________________\n  |:::::::::::::::::::::::::::::::::| \"I find your lack of faith disturbing.\"\n  |:::::::::::::;;::::::::::::::::::|\n  |:::::::::::'~||~~~``:::::::::::::| Mongoid 2 introduces\n  |::::::::'   .':     o`:::::::::::| a different way of defining how\n  |:::::::' oo | |o  o    ::::::::::| ids are stored on documents, as\n  |::::::: 8  .'.'    8 o  :::::::::| well as how foreign key fields\n  |::::::: 8  | |     8    :::::::::| and indexes are stored.\n  |::::::: _._| |_,...8    :::::::::|\n  |::::::'~--.   .--. `.   `::::::::| If you were using String\n  |:::::'     =8     ~  \\ o ::::::::| representations of BSON::ObjectIDs\n  |::::'       8._ 88.   \\ o::::::::| as your document ids, all of your\n  |:::'   __. ,.ooo~~.    \\ o`::::::| documents will now need to tell\n  |:::   . -. 88`78o/:     \\  `:::::| Mongoid to use Strings like so:\n  |::'     /. o o \\ ::      \\88`::::|\n  |:;     o|| 8 8 |d.        `8 `:::| class User\n  |:.       - ^ ^ -'           `-`::|   include Mongoid::Document\n  |::.                          .:::|   identity :type => String\n  |:::::.....           ::'     ``::| end\n  |::::::::-'`-        88          `|\n  |:::::-'.          -       ::     | All ids will default to\n  |:-~. . .                   :     | BSON:ObjectIDs from now on, and\n  | .. .   ..:   o:8      88o       | Config#use_object_ids has been\n  |. .     :::   8:P     d888. . .  | removed.\n  |.   .   :88   88      888'  . .  |\n  |   o8  d88P . 88   ' d88P   ..   | Foreign key fields for relational\n  |  88P  888   d8P   ' 888         | associations no longer index by\n  |   8  d88P.'d:8  .- dP~ o8       | default - you will need to pass\n  |      888   888    d~ o888    LS | :index => true to the association\n  |_________________________________| definition to have the field indexed\n\n  or create the index manually, which is the preferred method. Note that\n  if you were using String ids and now want to use object ids instead you\n  will have to migrate your database manually - Mongoid cannot perform\n  this for you automatically. If you were using custom composite keys,\n  these will need to be defined as Strings since they cannot be converted.\n\n  Please see the following gist for assistance in migrating the database\n  via the Ruby driver (thanks to Kyle Banker):\n\n  http://gist.github.com/489098\n\n"
+post_install_message: "   _________________________________\n  |:::::::::::::::::::::::::::::::::| \"I find your lack of faith disturbing.\"\n  |:::::::::::::;;::::::::::::::::::|\n  |:::::::::::'~||~~~``:::::::::::::| Mongoid 2 introduces\n  |::::::::'   .':     o`:::::::::::| a different way of defining how\n  |:::::::' oo | |o  o    ::::::::::| ids are stored on documents, as\n  |::::::: 8  .'.'    8 o  :::::::::| well as how foreign key fields\n  |::::::: 8  | |     8    :::::::::| and indexes are stored.\n  |::::::: _._| |_,...8    :::::::::|\n  |::::::'~--.   .--. `.   `::::::::| If you were using String\n  |:::::'     =8     ~  \\ o ::::::::| representations of BSON::ObjectIDs\n  |::::'       8._ 88.   \\ o::::::::| as your document ids, all of your\n  |:::'   __. ,.ooo~~.    \\ o`::::::| documents will now need to tell\n  |:::   . -. 88`78o/:     \\  `:::::| Mongoid to use Strings like so:\n  |::'     /. o o \\ ::      \\88`::::|\n  |:;     o|| 8 8 |d.        `8 `:::| class User\n  |:.       - ^ ^ -'           `-`::|   include Mongoid::Document\n  |::.                          .:::|   identity :type => String\n  |:::::.....           ::'     ``::| end\n  |::::::::-'`-        88          `|\n  |:::::-'.          -       ::     | All ids will default to\n  |:-~. . .                   :     | BSON:ObjectIDs from now on, and\n  | .. .   ..:   o:8      88o       | Config#use_object_ids has been\n  |. .     :::   8:P     d888. . .  | removed.\n  |.   .   :88   88      888'  . .  |\n  |   o8  d88P . 88   ' d88P   ..   | Foreign key fields for relational\n  |  88P  888   d8P   ' 888         | associations no longer index by\n  |   8  d88P.'d:8  .- dP~ o8       | default - you will need to pass\n  |      888   888    d~ o888    LS | :index => true to the association\n  |_________________________________| definition to have the field indexed\n\n  or create the index manually, which is the preferred method. Note that\n  if you were using String ids and now want to use object ids instead you\n  will have to migrate your database manually - Mongoid cannot perform\n  this for you automatically. If you were using custom composite keys,\n  these will need to be defined as Strings since they cannot be converted.\n\n  You can run a rake task to convert all your string object ids to ObjectID (thanks to Kyle Banker):\n\n  rake db:mongoid:objectid_convert\n\n  Your old collections will be backed up to their original names appended with \"_old\".\n  If you verify your site is still working good with the ObjectIDs, you can clean them up using:\n\n  rake db:mongoid:cleanup_old_collections\n\n"
 rdoc_options: []
 
 require_paths: 
@@ -315,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2440289374354549879
       segments: 
       - 0
       version: "0"
@@ -324,7 +352,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3

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

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