mongoid 2.0.1 → 2.0.2

data/lib/mongoid/serialization.rb

@@ -50,7 +50,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.6
     def serialize_relations(attributes = {}, options = {})
-      inclusions = options.delete(:include)
+      inclusions = options[:include]
       relation_names(inclusions).each do |name|
         metadata = relations[name.to_s]
         relation = send(metadata.name, false, :eager => true)

data/lib/mongoid/validations/uniqueness.rb

@@ -45,7 +45,7 @@ module Mongoid #:nodoc:
         end
 
         Array.wrap(options[:scope]).each do |item|
-          criteria = criteria.where(item => document.attributes[item])
+          criteria = criteria.where(item => document.attributes[item.to_s])
         end
         if criteria.exists?
           document.errors.add(

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -1,17 +1,9 @@
-defaults: &defaults
-  host: localhost
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
-
 development:
-  <<: *defaults
+  host: localhost
   database: <%= database_name || app_name %>_development
 
 test:
-  <<: *defaults
+  host: localhost
   database: <%= database_name || app_name %>_test
 
 # set these environment variables on your prod server
@@ -20,4 +12,9 @@ production:
   port: <%%= ENV['MONGOID_PORT'] %>
   username: <%%= ENV['MONGOID_USERNAME'] %>
   password: <%%= ENV['MONGOID_PASSWORD'] %>
-  database: <%%= ENV['MONGOID_DATABASE'] %>
+  database: <%%= ENV['MONGOID_DATABASE'] %>
+  # slaves:
+  #   - host: slave1.local
+  #     port: 27018
+  #   - host: slave2.local
+  #     port: 27019

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-05-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   prerelease: false
@@ -38,100 +31,65 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 22
         version: 0.3.22
   type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - pre
-        version: 3.0.pre
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
         version: "1.3"
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
         version: "1.3"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+        version: "2.6"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: watchr
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
         version: "0.6"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written in Ruby.
 email: 
 - durran@gmail.com
@@ -154,7 +112,7 @@ files:
 - lib/config/locales/kr.yml
 - lib/config/locales/nl.yml
 - lib/config/locales/pl.yml
-- lib/config/locales/pt-br.yml
+- lib/config/locales/pt-BR.yml
 - lib/config/locales/pt.yml
 - lib/config/locales/ro.yml
 - lib/config/locales/ru.yml
@@ -179,7 +137,6 @@ files:
 - lib/mongoid/contexts/enumerable/sort.rb
 - lib/mongoid/contexts/enumerable.rb
 - lib/mongoid/contexts/mongo.rb
-- lib/mongoid/contexts/paging.rb
 - lib/mongoid/contexts.rb
 - lib/mongoid/copyable.rb
 - lib/mongoid/criteria.rb
@@ -191,6 +148,7 @@ files:
 - lib/mongoid/criterion/inspection.rb
 - lib/mongoid/criterion/optional.rb
 - lib/mongoid/criterion/selector.rb
+- lib/mongoid/criterion/unconvertable.rb
 - lib/mongoid/cursor.rb
 - lib/mongoid/default_scope.rb
 - lib/mongoid/dirty.rb
@@ -222,11 +180,13 @@ files:
 - lib/mongoid/extensions/hash/scoping.rb
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/nil/collectionization.rb
+- lib/mongoid/extensions/object/checks.rb
 - lib/mongoid/extensions/object/conversions.rb
 - lib/mongoid/extensions/object/reflections.rb
 - lib/mongoid/extensions/object/yoda.rb
 - lib/mongoid/extensions/object_id/conversions.rb
 - lib/mongoid/extensions/proc/scoping.rb
+- lib/mongoid/extensions/range/conversions.rb
 - lib/mongoid/extensions/set/conversions.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
@@ -332,6 +292,8 @@ files:
 - lib/mongoid/relations/one.rb
 - lib/mongoid/relations/polymorphic.rb
 - lib/mongoid/relations/proxy.rb
+- lib/mongoid/relations/referenced/batch/insert.rb
+- lib/mongoid/relations/referenced/batch.rb
 - lib/mongoid/relations/referenced/in.rb
 - lib/mongoid/relations/referenced/many.rb
 - lib/mongoid/relations/referenced/many_to_many.rb
@@ -379,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -858318852006999862
+      hash: -1675372981513058867
       segments: 
       - 0
       version: "0"
@@ -388,15 +350,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: mongoid
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.

data/lib/mongoid/contexts/paging.rb

@@ -1,50 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Contexts #:nodoc:
-    module Paging
-      # Paginates the documents.
-      #
-      # Example:
-      #
-      # <tt>context.paginate(:page => 6, :per_page => 25)</tt>
-      #
-      # Returns:
-      #
-      # A collection of documents paginated.
-      # All previous <tt>limit</tt> and <tt>skip</tt> call will be ignored.
-      def paginate(pager_options={})
-        if pager_options[:per_page]
-          options[:limit] = pager_options[:per_page].to_i
-          if pager_options[:page]
-            options[:skip]  = (pager_options[:page].to_i - 1) * pager_options[:per_page].to_i
-          end
-        end
-
-        @collection ||= execute(true)
-        WillPaginate::Collection.create(page, per_page, count) do |pager|
-          pager.replace(@collection.to_a)
-        end
-      end
-
-      # Either returns the page option and removes it from the options, or
-      # returns a default value of 1.
-      #
-      # Returns:
-      #
-      # An +Integer+ page number.
-      def page
-        skips, limits = options[:skip], options[:limit]
-        (skips && limits) ? (skips + limits) / limits : 1
-      end
-
-      # Get the number of results per page or the default of 20.
-      #
-      # Returns:
-      #
-      # The +Integer+ number of documents in each page.
-      def per_page
-        (options[:limit] || 20).to_i
-      end
-    end
-  end
-end