mongodb_model 2.0.2 → 2.1.0

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project \
   name: "mongodb_model",
-  # version: '2.0.0',
+  version: '2.1.0',
   gem: true,
   summary: "Object Model for MongoDB",
 

data/lib/mongo/model/assignment.rb

@@ -23,7 +23,8 @@ module Mongo::Model::Assignment
           v = type.cast(v) if type
           send "#{n}=", v
         else
-          raise "mass assignment for :#{n} attribute not allowed!"
+          # Do nothing, just silently skip it.
+          # raise "mass assignment for :#{n} attribute not allowed!"
         end
       end
     else

data/lib/mongo/model/conversion.rb

@@ -1,10 +1,12 @@
+require 'mongo/model/support/rson'
+
 module Mongo::Model::Conversion
   def model_to_json *args, &block
-    to_hash(*args, &block).to_json
+    to_rson(*args, &block).to_json
   end
 
   def model_to_xml *args, &block
-    to_hash(*args, &block).to_xml
+    to_rson(*args, &block).to_xml
   end
 
   alias_method :to_json, :model_to_json
@@ -19,13 +21,15 @@ module Mongo::Model::Conversion
     alias_method :as_xml, :model_to_xml
   end
 
-  def to_hash options = {}
+  def to_rson options = {}
+    options = {profile: options} if options.is_a? Symbol
+
     if profile = options[:profile]
       raise "no other optins are allowed when using :profile option!" if options.size > 1
       profile_options = self.class.profiles[profile] || raise("profile :#{profile} not defined for #{self.class}!")
-      to_hash profile_options.merge(_profile: profile)
+      to_rson profile_options.merge(_profile: profile)
     else
-      options.validate_options! :only, :except, :methods, :errors, :_profile
+      options.validate_options! :only, :except, :methods, :errors, :id, :_profile
       child_options = options[:_profile] ? {profile: options[:_profile]} : {}
 
       instance_variables = self.persistent_instance_variable_names
@@ -39,15 +43,15 @@ module Mongo::Model::Conversion
       result = {}
       instance_variables.each do |iv_name|
         value = instance_variable_get iv_name
-        value = convert_model value, :to_hash, child_options
-        result[iv_name[1.. -1].to_sym] = value
+        # value = convert_object value, :to_rson, child_options
+        result[iv_name[1.. -1].to_sym] = value.to_rson child_options
       end
 
       methods = options[:methods] ? Array(options[:methods]) : []
       methods.each do |method|
         value = send method
-        value = convert_model value, :to_hash, child_options
-        result[method.to_sym] = value
+        # value = convert_object value, :to_rson, child_options
+        result[method.to_sym] = value.to_rson child_options
       end
 
       with_errors = options.include?(:errors) ? options[:errors] : true
@@ -57,24 +61,12 @@ module Mongo::Model::Conversion
         result[:errors] = errors
       end
 
+      result[:id] = _id if _id and (options[:id] != false)
+
       result
     end
   end
 
-  protected
-    def convert_model obj, method, options
-      if obj.respond_to? :collect_with_value
-        # Array or Hash.
-        obj.collect_with_value{|v| convert_model v, method, options}
-      elsif obj.respond_to? method
-        # Model.
-        obj.send method, options
-      else
-        # Simple object.
-        obj
-      end
-    end
-
   module ClassMethods
     inheritable_accessor :profiles, {}
     def profile name, options = {}

data/lib/mongo/model/db.rb

@@ -22,7 +22,19 @@ module Mongo::Model::Db
       def default_collection_name
         first_ancestor_class = ancestors.find{|a| a.is_a? Class} ||
           raise("can't evaluate default collection name for #{self}!")
-        first_ancestor_class.alias.pluralize.underscore.to_sym
+        als = first_ancestor_class.alias
+
+        unless als.respond_to? :pluralize
+          warn <<-TEXT
+WARN: It seems that there's no `String.pluralize` method, Mongo::Model needs it to automatically infer
+collection name from the model class name.
+Please specify collection name explicitly (like `collection :users`) or provide the `pluralize`
+method.
+TEXT
+          raise "collection name for #{first_ancestor_class} not defined (add it, like `collection :users`)!"
+        end
+
+        als.pluralize.underscore.to_sym
       end
   end
 end

data/lib/mongo/model/identity_map.rb

@@ -0,0 +1,38 @@
+module Mongo::Model::IdentityMap
+  inherited do
+    Mongo::Model::IdentityMap.models.add self
+  end
+
+  def original
+    unless _cache[:original_cached]
+      _cache[:original_cached] = true
+      _cache[:original] = _id && self.class.get_from_identity_map(_id)
+    end
+    _cache[:original]
+  end
+
+  module ClassMethods
+    def identity_map
+      @identity_map ||= {}
+    end
+
+    def get_from_identity_map id
+      doc = identity_map[id]
+      from_mongo doc if doc
+    end
+
+    def from_mongo doc
+      model = super doc
+      model.class.identity_map[model._id] = doc if model._id
+      model
+    end
+  end
+
+  class << self
+    def models
+      @models ||= Set.new
+    end
+
+    def clear; models.collect(&:identity_map).every.clear end
+  end
+end

data/lib/mongo/model/integration/rad/tasks.rb

@@ -0,0 +1,10 @@
+require 'mongo/migration/tasks'
+
+namespace :db do
+  desc "Internal task to prepare migration environment"
+  task migration_evnironment: :environment do
+    require 'mongo/migration'
+
+    Dir["#{rad.runtime_path}/db/**/*.rb"].each{|f| require f.sub(/\.rb$/, '')}
+  end
+end

data/lib/mongo/model/integration/rad.rb

@@ -0,0 +1,41 @@
+# Registering it as component.
+
+class Mongo::Model::Component
+  attr_accessor :db
+  attr_required :db
+
+  attr_accessor :fs
+  attr_required :fs
+end
+
+rad.register :models do
+  Mongo::Model::Component.new
+end
+
+# Using DB connection setting defined in component's config file.
+Mongo.metaclass_eval do
+  def db name
+    config = rad.models.db[name.to_s] || raise("no database config for #{name} alias!")
+    host, port, options = config['host'], config['port'], (config['options'] || {})
+    connection = self.connection host, port, options
+    db_name = config['name'] || raise("no database name for #{name} alias!")
+    connection.db db_name
+  end
+  cache_method_with_params :db
+
+  def connection host, port, options
+    options[:logger] = rad.logger unless options.include? :logger
+    Mongo::Connection.new host, port, options
+  end
+  cache_method_with_params :connection
+end
+
+# Localization
+
+Mongo::Model::Misc.class_eval do
+  def t *args; rad.locale.t *args end
+end
+
+Mongo::Model::Misc::ClassMethods.class_eval do
+  def t *args; rad.locale.t *args end
+end

data/lib/mongo/model/integration/rails.rb

@@ -20,6 +20,8 @@ module Mongo::Model::Rails
     persisted? ? [_id] : nil
   end
 
+  def new_record?; new? end
+
   module ClassMethods
     def model_name
       @_model_name ||= begin

data/lib/mongo/model/load.rb

@@ -1,17 +1,14 @@
-require 'mongo/object'
 require 'ruby_ext'
 
 module Mongo::Model; end
 
 %w(
-  support
-
   db
   conversion
   assignment
   callbacks
-  validation
   crud
+  validation
   query
   query_mixin
   scope
@@ -20,17 +17,18 @@ module Mongo::Model; end
   model
 ).each{|f| require "mongo/model/#{f}"}
 
+# Assembling model.
 module Mongo
   module Model
-    autoload :FileModel, 'mongo/model/integration/file_model'
+    autoload :IdentityMap, 'mongo/model/identity_map'
 
     inherit \
       Db,
       Conversion,
       Assignment,
       Callbacks,
-      Validation,
       Crud,
+      Validation,
       QueryMixin,
       Scope,
       AttributeConvertors,
@@ -45,15 +43,19 @@ Mongo.defaults.merge! \
   safe:                         true,
   generate_id:                  true
 
-# Integration with Rails.
+# Integrations.
+
 unless $dont_use_rails
   require 'mongo/model/integration/rails' if defined? Rails
 end
 
-# Integration with Validatable2
 unless $dont_use_validatable
   require 'validatable'
   require 'mongo/model/integration/validatable'
   require 'mongo/model/integration/validatable/uniqueness_validator'
   Mongo::Model.inherit Validatable::Model
+end
+
+unless $dont_use_file_model
+  Mongo::Model.autoload :FileModel, 'mongo/model/integration/file_model'
 end

data/lib/mongo/model/misc.rb

@@ -8,7 +8,6 @@ module Mongo::Model::Misc
     self.updated_at = now
   end
 
-
   def _cache
     @_cache ||= {}
   end
@@ -32,7 +31,11 @@ module Mongo::Model::Misc
   end
 
   def original
-    @_original ||= _id? ? self.class.by_id(self._id) : nil
+    unless _cache[:original_cached]
+      _cache[:original_cached] = true
+      _cache[:original] = _id && self.class.by_id(_id)
+    end
+    _cache[:original]
   end
 
   module ClassMethods
@@ -41,5 +44,9 @@ module Mongo::Model::Misc
       before_create :update_created_at
       before_save :update_updated_at
     end
+
+    def create_index *args
+      collection.create_index *args
+    end
   end
 end

data/lib/mongo/model/model.rb

@@ -70,5 +70,17 @@ module Mongo::Model
       list.collect!{|n| :"@#{n}"}
       if list.empty? then _embedded else _embedded.push(*list) end
     end
+
+    def from_mongo doc
+      model = ::Mongo::Object.from_mongo doc
+      model.run_after_callbacks :build, :build
+      model
+    end
+  end
+
+  class << self
+    def originals
+      @originals ||= {}
+    end
   end
 end

data/lib/mongo/model/scope.rb

@@ -87,9 +87,21 @@ module Mongo::Model::Scope
       list = list.collect{|item| item.is_a?(Array) ? item : [item, 1]}
       query({}, sort: list)
     end
+    alias_method :sort_by, :sort
     def snapshot; query({}, snapshot: true) end
 
-    def paginate page, per_page
+    PER_PAGE, MAX_PER_PAGE = 25, 100
+    def paginate *args
+      args.size.must.be_in 1..2
+      if args.size == 2
+        page, per_page = *args
+      else
+        options = args.first
+        page, per_page = options[:page], options[:per_page]
+      end
+      page ||= 1
+      per_page ||= PER_PAGE
+      per_page = MAX_PER_PAGE if per_page > MAX_PER_PAGE
       skip((page - 1) * per_page).limit(per_page)
     end
 

data/lib/mongo/model/spec.rb

@@ -5,6 +5,12 @@ rspec do
   class << self
     def with_mongo_model
       with_mongo
+      before{Mongo::Model::IdentityMap.clear}
+    end
+
+    def with_models *args
+      ::Models
+      with_mongo_model *args
     end
   end
 end

data/lib/mongo/model/support/rson.rb

@@ -0,0 +1,68 @@
+class Object
+  def rson?
+    false
+  end
+end
+
+[
+  Time,
+  FalseClass,
+  TrueClass,
+  Numeric,
+  Symbol,
+  String,
+  NilClass,
+].each do |klass|
+  klass.class_eval do
+    def to_rson options = {}
+      self
+    end
+
+    def rson?
+      true
+    end
+  end
+end
+
+# [
+#   String
+# ].each do |klass|
+#   klass.class_eval do
+#     def to_rson options = {}
+#       self.to_sym
+#     end
+#
+#     def rson?
+#       false
+#     end
+#   end
+# end
+
+Array.class_eval do
+  def to_rson options = {}
+    collect{|v| v.to_rson(options)}
+  end
+
+  def rson?
+    all?{|v| v.rson?}
+  end
+end
+
+[Hash, OpenObject].each do |klass|
+  klass.class_eval do
+    def to_rson options = {}
+      r = self.class.new
+      each do |k, v|
+        r[k.to_sym] = v.to_rson(options)
+      end
+      r
+    end
+
+    def rson?
+      each do |k, v|
+        return false unless k.rson? and v.rson?
+      end
+      true
+    end
+  end
+end

data/lib/mongo/model/validation.rb

@@ -5,7 +5,38 @@ module Mongo::Model::Validation
   end
   def invalid?(options = {}); !valid?(options) end
 
+  # Catching erros during CRUD and adding it to errors, like unique index.
+
+  def create_object *args
+    with_exceptions_as_errors do
+      super
+    end
+  end
+
+  def update_object *args
+    with_exceptions_as_errors do
+      super
+    end
+  end
+
+  def delete_object *args
+    with_exceptions_as_errors do
+      super
+    end
+  end
+
   protected
+    def with_exceptions_as_errors &block
+      block.call
+    rescue Mongo::OperationFailure => e
+      if [11000, 11001].include? e.error_code
+        errors.add :base, "not unique value!"
+        false
+      else
+        raise e
+      end
+    end
+
     def run_validations options = {}
       with_model_callbacks [:validate], options, [self] do
         # Validating main model.

data/lib/mongo/model.rb

@@ -1,5 +1,7 @@
 require 'mongodb_model/gems'
 
+require 'mongo/object'
+
 module Mongo
   autoload :Model, 'mongo/model/load'
 end

data/lib/mongodb_model/gems.rb

@@ -1,8 +1,5 @@
-# gem 'i18n', '~> 0.5'
-
 if respond_to? :fake_gem
   fake_gem 'mongodb'
-  # fake_gem 'file_model'
   fake_gem 'validatable2'
   fake_gem 'ruby_ext'
 end

data/spec/assignment_spec.rb

@@ -38,9 +38,12 @@ describe 'Attribute assignment' do
 
     u = User.new
     u.set name: 'Alex', has_mail: '1', age: '31', position: [11, 34]
-    -> {u.set name: 'Alex', banned: false}.should raise_error(/not allowed/)
     [u.name, u.has_mail, u.age, u.position, u.banned].should == ['Alex', true, 31, [11, 34], nil]
 
+    # Should skip not allowed attributes.
+    u.set banned: false
+    u.banned.should be_nil
+
     # should allow to forcefully cast and update any attribute
     u.set! banned: '0'
     u.banned.should == false

data/spec/attribute_convertors_spec.rb

@@ -67,6 +67,7 @@ describe "Attribute convertors" do
 
     # Protection.
     o.protected_tags = []
-    -> {o.set protected_tags_as_string: 'Java, Ruby'}.should raise_error(/not allowed/)
+    o.set protected_tags_as_string: 'Java, Ruby'
+    o.protected_tags = []
   end
 end

data/spec/callbacks_spec.rb

@@ -155,7 +155,7 @@ describe 'Callbacks' do
         instance.should_receive(:after_build)
       end
       EmbeddedObject.after_instantiate do |instance|
-        instance.should_receive(:after_build)
+        instance.should_not_receive(:after_build)
       end
       db.objects.first
     end

data/spec/conversion_spec.rb

@@ -40,7 +40,7 @@ describe 'Conversion' do
 
   it "should work without arguments" do
     post = build_post_with_comment
-    post.to_hash.should == {
+    post.to_rson.should == {
       text:     'StarCraft releasing soon!',
       token:    'secret',
       comments: [
@@ -51,14 +51,14 @@ describe 'Conversion' do
 
   it "should accept :only, :except and :methods options" do
     post = build_post_with_comment
-    post.to_hash(only: :text).should == {text: 'StarCraft releasing soon!'}
-    post.to_hash(except: :token).should == {
+    post.to_rson(only: :text).should == {text: 'StarCraft releasing soon!'}
+    post.to_rson(except: :token).should == {
       text:     'StarCraft releasing soon!',
       comments: [
         {text: 'Cool!'}
       ]
     }
-    post.to_hash(only: [], methods: :teaser).should == {teaser: 'StarCraft r'}
+    post.to_rson(only: [], methods: :teaser).should == {teaser: 'StarCraft r'}
   end
 
   it "should use conversion profiles" do
@@ -68,13 +68,21 @@ describe 'Conversion' do
 
     post = build_post_with_comment
 
-    -> {post.to_hash(profile: :public)}.should raise_error(/profile :public not defined for Comment/)
+    -> {post.to_rson(profile: :public)}.should raise_error(/profile :public not defined for Comment/)
 
     Comment.class_eval do
       profile :public
     end
 
-    post.to_hash(profile: :public).should == {
+    post.to_rson(profile: :public).should == {
+      text:     'StarCraft releasing soon!',
+      teaser:   'StarCraft r',
+      comments: [
+        {text: 'Cool!'}
+      ]
+    }
+
+    post.to_rson(:public).should == {
       text:     'StarCraft releasing soon!',
       teaser:   'StarCraft r',
       comments: [
@@ -91,29 +99,29 @@ describe 'Conversion' do
     post = Post.new text: 'StarCraft releasing soon!'
     post.valid?.should be_false
 
-    post.to_hash.should == {
+    post.to_rson.should == {
       text:   'StarCraft releasing soon!',
       errors: {token: ["can't be empty"]}
     }
 
-    post.to_hash(errors: false).should == {
+    post.to_rson(errors: false).should == {
       text: 'StarCraft releasing soon!'
     }
   end
 
   it "should convert to to_json" do
     post = build_post_with_comment
-    rson = mock
-    rson.should_receive(:to_json).and_return(:ok)
-    post.should_receive(:to_hash).with(only: :text).and_return(rson)
+    hash = mock
+    hash.should_receive(:to_json).and_return(:ok)
+    post.should_receive(:to_rson).with(only: :text).and_return(hash)
     post.to_json(only: :text).should == :ok
   end
 
   it "should convert to to_xml" do
     post = build_post_with_comment
-    rson = mock
-    rson.should_receive(:to_xml).and_return(:ok)
-    post.should_receive(:to_hash).with(only: :text).and_return(rson)
+    hash = mock
+    hash.should_receive(:to_xml).and_return(:ok)
+    post.should_receive(:to_rson).with(only: :text).and_return(hash)
     post.to_xml(only: :text).should == :ok
   end
 end

data/spec/crud_spec.rb

@@ -20,6 +20,25 @@ describe "Model CRUD" do
     end
     after{remove_constants :Unit}
 
+    it 'save should return true or false' do
+      # Successfull create and update.
+      unit = Unit.new
+      unit.save.class.should == TrueClass
+      unit.name = 'Another'
+      unit.save.class.should == TrueClass
+
+      # Invalid create.
+      unit = Unit.new
+      unit.stub!(:valid?).and_return false
+      unit.save.class.should == FalseClass
+
+      # Invalid update.
+      unit = Unit.new
+      unit.save.should be_true
+      unit.stub!(:valid?).and_return false
+      unit.save.class.should == FalseClass
+    end
+
     it 'should perform CRUD' do
       # Read.
       Unit.count.should == 0
@@ -77,10 +96,7 @@ describe "Model CRUD" do
 
     it 'should create model' do
       u = Unit.create(name: 'Zeratul')
-      u.new_record?.should be_false
-
-      u = Unit.create!(name: 'Zeratul')
-      u.new_record?.should be_false
+      u.new?.should be_false
     end
 
     it 'should delete all models' do

data/spec/misc_spec.rb

@@ -11,10 +11,10 @@ describe 'Miscellaneous' do
       attr_accessor :name
     end
   end
-  after{remove_constants :Unit3, :User}
+  after{remove_constants :Unit, :User}
 
   it "should create timestamps" do
-    class Unit3
+    class Unit
       inherit Mongo::Model
       collection :units
 
@@ -23,10 +23,10 @@ describe 'Miscellaneous' do
       timestamps!
     end
 
-    unit = Unit3.build name: 'Zeratul'
+    unit = Unit.build name: 'Zeratul'
     unit.save!
 
-    unit = Unit3.first
+    unit = Unit.first
     unit.created_at.should_not be_nil
     unit.updated_at.should_not be_nil
     created_at,updated_at = unit.created_at, unit.updated_at
@@ -37,10 +37,10 @@ describe 'Miscellaneous' do
   end
 
   it 'should have cache' do
-    class Unit3
+    class Unit
       inherit Mongo::Model
     end
-    u = Unit3.new
+    u = Unit.new
     u._cache.should == {}
   end
 
@@ -64,4 +64,45 @@ describe 'Miscellaneous' do
     u.reload
     u.name.should == 'Zeratul'
   end
+
+  describe 'original' do
+    before do
+      class Unit
+        inherit Mongo::Model
+        collection :units
+
+        attr_accessor :name
+      end
+
+      @unit = Unit.new.tap{|u| u.name = "Zeratul"}
+    end
+    after{remove_constants :Unit}
+
+    it "should query original from database" do
+      @unit.original.should be_nil
+      @unit.save!
+
+      unit = Unit.first
+      unit.name = "Tassadar"
+
+      Unit.should_receive(:first).with(_id: unit._id).and_return{db.units.first(_id: unit._id)}
+      unit.original.name.should == "Zeratul"
+    end
+
+    it "should use identity map if provided" do
+      Unit.inherit Mongo::Model::IdentityMap
+
+      @unit.original.should be_nil
+      @unit.save!
+
+      Unit.identity_map.size.should == 0
+      unit = Unit.first
+      Unit.identity_map.size.should == 1
+
+      unit.name = "Tassadar"
+
+      Unit.should_not_receive :first
+      unit.original.name.should == "Zeratul"
+    end
+  end
 end

data/spec/query_spec.rb

@@ -74,7 +74,9 @@ describe "Query" do
       end
     end
 
-    -> {SpecialUnit.query(name: 'Zeratul').build age: 500, status: 'active'}.should raise_error(/not allowed/)
+    u = SpecialUnit.query(name: 'Zeratul').build status: 'active'
+    u.status.should be_nil
+
     u = SpecialUnit.query(name: 'Zeratul', status: 'active').build age: 500
     u.status.should == 'active'
   end

data/spec/validation_spec.rb

@@ -142,4 +142,26 @@ describe "Validation" do
       unit.should be_valid
     end
   end
+
+  context "database exceptions" do
+    before do
+      class Unit
+        inherit Mongo::Model
+        collection :units
+
+        attr_accessor :name
+      end
+    end
+    after{remove_constants :Unit}
+
+    it "should convert unique index exception to errors" do
+      db.units.create_index [["name", 1]], unique: true
+
+      Unit.create name: 'Zeratul'
+
+      unit = Unit.new name: 'Zeratul'
+      unit.save.should be_false
+      unit.errors[:base].should == ["not unique value!"]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2848930 !ruby/object:Gem::Requirement
+  requirement: &70169713604240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2848930
+  version_requirements: *70169713604240
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2848690 !ruby/object:Gem::Requirement
+  requirement: &70169713603760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2848690
+  version_requirements: *70169713603760
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2848450 !ruby/object:Gem::Requirement
+  requirement: &70169713603260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2848450
+  version_requirements: *70169713603260
 description: 
 email: 
 executables: []
@@ -58,7 +58,10 @@ files:
 - lib/mongo/model/conversion.rb
 - lib/mongo/model/crud.rb
 - lib/mongo/model/db.rb
+- lib/mongo/model/identity_map.rb
 - lib/mongo/model/integration/file_model.rb
+- lib/mongo/model/integration/rad/tasks.rb
+- lib/mongo/model/integration/rad.rb
 - lib/mongo/model/integration/rails.rb
 - lib/mongo/model/integration/validatable/uniqueness_validator.rb
 - lib/mongo/model/integration/validatable.rb
@@ -70,7 +73,7 @@ files:
 - lib/mongo/model/scope.rb
 - lib/mongo/model/spec.rb
 - lib/mongo/model/support/conversions.rb
-- lib/mongo/model/support.rb
+- lib/mongo/model/support/rson.rb
 - lib/mongo/model/validation.rb
 - lib/mongo/model.rb
 - lib/mongodb_model/gems.rb
@@ -109,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Object Model for MongoDB

data/lib/mongo/model/support.rb

@@ -1,10 +0,0 @@
-Array.class_eval do
-  alias_method :each_value, :each
-  alias_method :collect_with_value, :collect
-end
-
-Hash.class_eval do
-  def collect_with_value &block
-    {}.tap{|h| self.each{|k, v| h[k] = block.call v}}
-  end
-end