mongo_mapper 0.13.0.beta2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c064a0c4fc8a69754fd97b1d4d111b47533c5a9f
-  data.tar.gz: 93299ab0ef2f65d42de3a218315c4575ea6569a9
+  metadata.gz: cd7ff4dfcd2b6bce162c7b55ba45e8c00e38a461
+  data.tar.gz: 673686bd40a1c139e2045b5397802239cd5d894c
 SHA512:
-  metadata.gz: 2552482a4e28cdc65871040dc6425ddf1a6030e9a1896ddb1b4bdd0442ca11c3fd0a01edf3838768fde2102376ddb957af2ce7ae563d07b92ab623ab71d6c2fc
-  data.tar.gz: e9a796fbf22d16874f9f862ff030e2aa29eb53fadc373cba5affdfd8fafee02fef0a04d33805520dac387fc6c4c9b935689cbf65ade1633152eacc4ffc085432
+  metadata.gz: 36943d83bc3ddff1cd8c82d8bddfdde2fa3dfae12800f4c93260480185925e1f34e5a8622b7682b176a318579ee723339286a5c5b99678e9731301e475fb183b
+  data.tar.gz: 039605ede2145f91ef107e39dc91d43db57906be355737198fe0a1cff97a2eeb821a9a9460fa977f1a2cc520cdf07c1177994db5ad623e298203e50e6f5838a4

data/README.rdoc

@@ -1,7 +1,7 @@
 = MongoMapper
 
 {<img src="https://badge.fury.io/rb/mongo_mapper.png" alt="RubyGem" />}[https://rubygems.org/gems/mongo_mapper]
-{<img src="https://travis-ci.org/jnunemaker/mongomapper.png?branch=master" alt="Build Status" />}[https://travis-ci.org/jnunemaker/mongomapper]
+{<img src="https://travis-ci.org/mongomapper/mongomapper.png?branch=master" alt="Build Status" />}[https://travis-ci.org/mongomapper/mongomapper]
 {<img src="https://coveralls.io/repos/jnunemaker/mongomapper/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/jnunemaker/mongomapper]
 
 A Ruby Object Mapper for Mongo.
@@ -23,7 +23,7 @@ MongoMapper is tested against:
 * MRI 1.8.7
 * MRI 1.9.3
 * MRI 2.0.0
-* JRuby (1.9)
+* JRuby (Versions with 1.9 compatibility)
 
 Additionally, MongoMapper is tested against:
 
@@ -32,6 +32,10 @@ Additionally, MongoMapper is tested against:
 * Rails 3.2.x
 * Rails 4.0.x
 
+NOTE: Rails 4 support is only in the v0.13.0 beta, which is not currently the default in RubyGems.  Use the following line in your gemfile to use the beta:
+
+    gem 'mongo_mapper', :git => "git://github.com/mongomapper/mongomapper.git", :tag => "v0.13.0.beta2"
+
 == Contributing & Development
 
     $ git clone https://github.com/jnunemaker/mongomapper && cd mongomapper

data/examples/keys.rb

@@ -24,7 +24,7 @@ john = User.create({
   :age        => 28,
   :skills     => ['ruby', 'mongo', 'javascript'],
   :links      => {"Google" => "http://www.google.com"}
-}) 
+})
 
 steve = User.create({
   :first_name => 'Steve',
@@ -37,4 +37,4 @@ john.friend_ids << steve.id.to_s # will get typecast to ObjectId
 john.links["Ruby on Rails"] = "http://www.rubyonrails.com"
 john.save
 
-pp john
+pp john

data/examples/modifiers/set.rb

@@ -6,7 +6,7 @@ MongoMapper.database = 'testing'
 
 class User
   include MongoMapper::Document
-  
+
   key :name, String
   key :tags, Array
 end

data/examples/querying.rb

@@ -6,7 +6,7 @@ MongoMapper.database = 'testing'
 
 class User
   include MongoMapper::Document
-  
+
   key :name, String
   key :tags, Array
 end
@@ -32,4 +32,4 @@ User.create(:name => 'Steve', :tags => %w[html5 css3], :age => 27)
 ].each do |result|
   pp result
   puts
-end
+end

data/lib/mongo_mapper/plugins/associations/one_as_proxy.rb

@@ -7,16 +7,16 @@ module MongoMapper
           def criteria
             {type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
           end
-        
+
         private
           def type_key_name
             "#{options[:as]}_type"
           end
-        
+
           def id_key_name
             "#{options[:as]}_id"
           end
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -7,7 +7,7 @@ module MongoMapper
       def destroy
         run_callbacks(:destroy) { super }
       end
-      
+
       def touch(*)
         run_callbacks(:touch) { super }
       end

data/lib/mongo_mapper/plugins/indexes.rb

@@ -5,8 +5,36 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
-        extend Forwardable
-        def_delegators :collection, :ensure_index, :create_index, :drop_index, :drop_indexes
+        def ensure_index(spec, options = {})
+          collection.ensure_index dealias_options(spec), options
+        end
+
+        def create_index(spec, options = {})
+          collection.create_index dealias_options(spec), options
+        end
+
+        def drop_index(name)
+          collection.drop_index name
+        end
+
+        def drop_indexes
+          collection.drop_indexes
+        end
+
+        private
+
+        def dealias_options(options)
+          case options
+          when Symbol, String
+             abbr(options)
+          when Hash
+            dealias_keys(options)
+          when Array
+            options.map {|o| dealias_options(o) }
+          else
+            options
+          end
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/keys.rb

@@ -35,6 +35,24 @@ module MongoMapper
           @unaliased_keys ||= Hash[*keys.select {|k, v| k == v.name }.flatten(1)]
         end
 
+        def dealias_keys(hash)
+          out = {}
+          hash.each do |k, v|
+            key = keys[k.to_s]
+            name = key && key.abbr || k
+            out[name] = k.to_s.match(/^\$/) && v.is_a?(Hash) ? dealias_keys(v) : v
+          end
+          out
+        end
+
+        def dealias_key(name)
+          key = keys[name.to_s]
+          key && key.abbr || k
+        end
+
+        alias_method :dealias, :dealias_keys
+        alias_method :unalias, :dealias_keys
+
         def key(*args)
           Key.new(*args).tap do |key|
             keys[key.name] = key
@@ -47,8 +65,26 @@ module MongoMapper
           end
         end
 
+        def remove_key(name)
+          if key = keys[name.to_s]
+            keys.delete key.name
+            keys.delete key.abbr
+            remove_method key.name if respond_to? "#{key.name}"
+            remove_method "#{key.name}=" if respond_to? "#{key.name}="
+            remove_method "#{key.name}?" if respond_to? "#{key.name}?"
+            remove_method "#{key.name}_before_type_cast" if respond_to? "#{key.name}_before_type_cast"
+            remove_key_in_descendants key.name
+            remove_validations_for key.name
+            @dynamic_keys = @defined_keys = @unaliased_keys = @object_id_keys = nil
+          end
+        end
+
         def persisted_name(name)
-          keys[name.to_s].persisted_name
+          if key = keys[name.to_s]
+            key.persisted_name
+          else
+            name
+          end
         end
         alias_method :abbr, :persisted_name
 
@@ -149,6 +185,10 @@ module MongoMapper
             descendants.each { |descendant| descendant.key(*args) }
           end
 
+          def remove_key_in_descendants(name)
+            descendants.each { |descendant| descendant.remove_key(name) }
+          end
+
           def create_indexes_for(key)
             if key.options[:index] && !key.embeddable?
               warn "[DEPRECATION] :index option when defining key #{key.name.inspect} is deprecated. Put indexes in `db/indexes.rb`"
@@ -200,6 +240,14 @@ module MongoMapper
               validates_length_of(attribute, length_options)
             end
           end
+
+          def remove_validations_for(name)
+            name = name.to_sym
+            a_name = [name]
+
+            _validators.reject!{ |key, _| key == name }
+            _validate_callbacks.reject! {|callback| callback.raw_filter.attributes == a_name }
+          end
       end
 
       def initialize(attrs={})
@@ -389,6 +437,7 @@ module MongoMapper
             @_dynamic_attributes[key.name.to_sym] = as_typecast
           end
           @attributes = nil
+          value
         end
 
         def dynamic_key(name)

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -62,7 +62,7 @@ module MongoMapper
 
           if @typecast
             klass = typecast_class  # Don't make this lookup on every call
-            type.from_mongo(value).map! { |v| klass.from_mongo(v) }
+            type.from_mongo(value).map { |v| klass.from_mongo(v) }
           else
             type.from_mongo(value)
           end
@@ -71,8 +71,11 @@ module MongoMapper
         def set(value)
           # Avoid tap here so we don't have to create a block binding.
           values = type.to_mongo(value)
-          values.map! { |v| typecast_class.to_mongo(v) } if @typecast
-          values
+          if @typecast
+            values.map { |v| typecast_class.to_mongo(v) }
+          else
+            values
+          end
         end
 
         def default_value

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -64,6 +64,18 @@ module MongoMapper
           modifier_update('$pop', args)
         end
 
+        def find_and_modify(args)
+          args[:query]  = dealias_keys(args[:query])  if args.key? :query
+          args[:update] = dealias_keys(args[:update]) if args.key? :update
+          collection.find_and_modify(args)
+        end
+
+        def upsert(selector, updates, args = {})
+          criteria = dealias_keys(selector)
+          updates  = dealias_keys(updates)
+          collection.update(criteria, updates, args)
+        end
+
         private
           def modifier_update(modifier, args)
             criteria, updates, options = criteria_and_keys_from_args(args)
@@ -84,6 +96,7 @@ module MongoMapper
               criteria = { :id => criteria }
             end
             upgrade_legacy_safe_usage!(options)
+            updates = dealias_keys updates
 
             [criteria_hash(criteria).to_hash, updates, options]
           end

data/lib/mongo_mapper/plugins/querying/decorated_plucky_query.rb

@@ -29,6 +29,24 @@ module MongoMapper
           self
         end
 
+        def criteria_hash
+          @model.dealias_keys super
+        end
+
+        def options_hash
+          super.tap do |options|
+            case options[:fields]
+            when Hash
+              options[:fields] = @model.dealias options[:fields]
+            when Array
+              options[:fields] = options[:fields].map do |field|
+                key = keys[field.to_s]
+                key && key.abbr || field
+              end
+            end
+          end
+        end
+
         def find!(*ids)
           ids = Array(ids).flatten.uniq
           raise DocumentNotFound, "Couldn't find without an ID" if ids.size == 0
@@ -40,7 +58,8 @@ module MongoMapper
           end
         end
 
-        private
+        protected
+
           def method_missing(method, *args, &block)
             return super unless model.respond_to?(method)
             result = model.send(method, *args, &block)

data/lib/mongo_mapper/plugins/sci.rb

@@ -10,11 +10,13 @@ module MongoMapper
 
       module ClassMethods
         def inherited(subclass)
-          key :_type, String unless key?(:_type)
           super
           if @collection_name == subclass.instance_variable_get("@collection_name")
+            key :_type, String unless key?(:_type)
             subclass.single_collection_parent = self
             subclass.instance_variable_set("@single_collection_inherited", true)
+          else
+            remove_key :_type
           end
         end
 
@@ -40,6 +42,7 @@ module MongoMapper
 
         def set_collection_name(name)
           if single_collection_inherited?
+            single_collection_parent.remove_key :_type
             single_collection_parent = nil
             @single_collection_inherited = false
           end

data/lib/mongo_mapper/plugins/touch.rb

@@ -3,7 +3,7 @@ module MongoMapper
     module Touch
       extend ActiveSupport::Concern
 
-      def touch(key = :updated_at) 
+      def touch(key = :updated_at)
         raise ArgumentError, "Invalid key named #{key}" unless self.key_names.include?(key.to_s)
         if self.class.embeddable?
           self.write_attribute(key, Time.now.utc)

data/lib/mongo_mapper/plugins/validations.rb

@@ -29,11 +29,16 @@ module MongoMapper
 
       class UniquenessValidator < ::ActiveModel::EachValidator
         def initialize(options)
+          @klass = options[:class] #only provided in ActiveModel 4.1 and higher
           super(options.reverse_merge(:case_sensitive => true))
         end
 
-        def setup(klass)
-          @klass = klass
+        if ::ActiveModel::VERSION::MAJOR < 4 ||
+          (::ActiveModel::VERSION::MAJOR == 4 && ::ActiveModel::VERSION::MINOR == 0) 
+
+          def setup(klass)
+            @klass = klass
+          end
         end
 
         def validate_each(record, attribute, value)

data/lib/mongo_mapper/railtie.rb

@@ -2,12 +2,32 @@ require "mongo_mapper"
 require "rails"
 require "active_model/railtie"
 
+# Need the action_dispatch railtie to have action_dispatch.rescu_responses initialized correctly
+require "action_dispatch/railtie"
+
 module MongoMapper
   # = MongoMapper Railtie
   class Railtie < Rails::Railtie
 
     config.mongo_mapper = ActiveSupport::OrderedOptions.new
 
+    # Rescue responses similar to ActiveRecord.
+    # For rails 3.0 and 3.1
+    if Rails.version < "3.2"
+      ActionDispatch::ShowExceptions.rescue_responses['MongoMapper::DocumentNotFound']  = :not_found,
+      ActionDispatch::ShowExceptions.rescue_responses['MongoMapper::InvalidKey']        = :unprocessable_entity,
+      ActionDispatch::ShowExceptions.rescue_responses['MongoMapper::InvalidScheme']     = :unprocessable_entity,
+      ActionDispatch::ShowExceptions.rescue_responses['MongoMapper::NotSupported']      = :unprocessable_entity
+    else
+      # For rails 3.2 and 4.0
+      config.action_dispatch.rescue_responses.merge!(
+          'MongoMapper::DocumentNotFound'  => :not_found,
+          'MongoMapper::InvalidKey'        => :unprocessable_entity,
+          'MongoMapper::InvalidScheme'     => :unprocessable_entity,
+          'MongoMapper::NotSupported'      => :unprocessable_entity
+        )
+    end
+
     rake_tasks do
       load "mongo_mapper/railtie/database.rake"
     end

data/lib/mongo_mapper/railtie/database.rake

@@ -2,7 +2,7 @@ namespace :db do
   unless Rake::Task.task_defined?("db:drop")
     desc 'Drops all the collections for the database for the current Rails.env'
     task :drop => :environment do
-      MongoMapper.database.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+      MongoMapper.database.collections.select {|c| c.name !~ /\Asystem\./ }.each(&:drop)
     end
   end
 

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.13.0.beta2'
+  Version = '0.13.0'
 end

data/spec/functional/embedded_document_spec.rb

@@ -307,7 +307,7 @@ describe "EmbeddedDocument" do
 
      it "should update attributes with symbol keys" do
        person = @klass.create(:pets => [@pet_klass.new(:name => 'Rasmus', :flag => true)])
-       person.update_attributes!({pets: [:name => "sparky", :flag => "false"]})
+       person.update_attributes!({:pets => [:name => "sparky", :flag => "false"]})
        person.reload
        person.pets.first.name.should == "sparky"
        person.pets.first.flag.should be_false

data/spec/functional/indexes_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Indexing" do
   before do
     @document = Doc do
-      key :first_name, String
+      key :first_name, String, :alias => :fn
       key :last_name, String
       key :age, Integer
       key :date, Date
@@ -11,22 +11,46 @@ describe "Indexing" do
   end
   after { drop_indexes(@document) }
 
-  [:create_index, :ensure_index, :drop_index, :drop_indexes].each do |method|
-    it "should delegate #{method} to collection" do
+  context "against a known collection" do
+    before do
       @document.stub(:collection).and_return(double(:name => :foo))
-      @document.collection.should_receive(method).with(:arg)
-      @document.send(method, :arg)
+    end
+    [:create_index, :ensure_index].each do |method|
+      it "should delegate #{method} to collection" do
+        @document.collection.should_receive(method).with(:arg, {})
+        @document.send(method, :arg)
+      end
+    end
+
+    it "should delegate drop_index to collection" do
+      @document.collection.should_receive(:drop_index).with(:arg)
+      @document.drop_index(:arg)
+    end
+
+    it "should delegate drop_indexes to collection" do
+      @document.collection.should_receive(:drop_indexes)
+      @document.drop_indexes
     end
   end
 
-  it "should allow creating index for a key" do
+  it "should allow creating index for an aliased key" do
     @document.ensure_index :first_name
-    @document.should have_index('first_name_1')
+    @document.should have_index('fn_1')
+  end
+
+  it "should allow creating index for an aliased key without using the alias" do
+    @document.ensure_index :fn
+    @document.should have_index('fn_1')
+  end
+
+  it "should allow creating index for an unaliased key" do
+    @document.ensure_index :last_name
+    @document.should have_index('last_name_1')
   end
 
   it "should allow creating unique index for a key" do
     @document.ensure_index :first_name, :unique => true
-    @document.should have_index('first_name_1')
+    @document.should have_index('fn_1')
   end
 
   it "should allow creating index on multiple keys" do
@@ -37,7 +61,7 @@ describe "Indexing" do
     # the values of the indexes to make sure the index creation was successful
     @document.collection.index_information.detect do |index|
       keys = index[0]
-      keys.include?('first_name_1') && keys.include?('last_name_-1')
+      keys.include?('fn_1') && keys.include?('last_name_-1')
     end.should_not be_nil
   end
 

data/spec/functional/keys_spec.rb

@@ -24,6 +24,41 @@ describe "Keys" do
     instance.get_foo.should == instance.foo
   end
 
+  it "should return the value when set using send with the writer method" do
+    doc = Doc do
+      key :foo, String
+    end
+
+    instance = doc.new(:foo => 'bar')
+    instance.send("foo=", 'baz').should == 'baz'
+    instance.foo.should == 'baz'
+  end
+
+  context "when persisting an typecasted array" do
+    TypecastedKeyModel = Doc do
+      key :people, Array, :typecast => "Person"
+    end
+
+    Person = Struct.new(:name) do
+      def self.to_mongo(value)
+        value.name
+      end
+
+      def self.from_mongo(value)
+        Person.new value
+      end
+    end
+
+    it "should not mutate the model's state" do
+      person = Person.new "Bob"
+      doc = TypecastedKeyModel.new(:people => [person])
+
+      doc.save
+
+      doc.people.should == [person]
+    end
+  end
+
   it "should not bomb if a key is written before Keys#initialize gets to get called" do
     doc = Class.new do
       include MongoMapper::Document
@@ -159,8 +194,35 @@ describe "Keys" do
         end
       end
 
-      it "should permit querying via aliases" do
-        AliasedKeyModel.where(AliasedKeyModel.abbr(:f) => "whee!").first.foo.should == "whee!"
+      it "should permit querying via direct field names" do
+        AliasedKeyModel.where(AliasedKeyModel.abbr(:foo) => "whee!").first.foo.should == "whee!"
+      end
+
+      it "should permit querying via direct field names" do
+        AliasedKeyModel.where(:foo => "whee!").criteria_hash.keys.should == ["f"]
+        AliasedKeyModel.where(:foo => "whee!").first.foo.should == "whee!"
+      end
+
+      it "should permit filtering via aliases" do
+        AliasedKeyModel.where(:foo => "whee!").fields(:foo).first.foo.should == "whee!"
+      end
+
+      it "should permit dealiasing of atomic operations" do
+        m = AliasedKeyModel.first
+        m.set(:foo => 1)
+        AliasedKeyModel.collection.find_one["f"].should == 1
+        AliasedKeyModel.collection.find_one["foo"].should be_nil
+      end
+
+      it "should permit dealiasing of update operations" do
+        m = AliasedKeyModel.first
+        m.update_attributes(:foo => 1)
+        AliasedKeyModel.collection.find_one["f"].should == 1
+        AliasedKeyModel.collection.find_one["foo"].should be_nil
+      end
+
+      it "should not break when unaliasing non-keys" do
+        AliasedKeyModel.where(:badkey => "whee!").criteria_hash.keys.should == [:badkey]
       end
 
       it "should serialize to JSON with full keys" do

data/spec/functional/sci_spec.rb

@@ -88,12 +88,47 @@ describe "Single collection inheritance (document)" do
       DocDaughter.collection.name.should == DocParent.collection.name
     end
 
-    it "should negate SCI if the subclass changes its collection" do
-      klass = Class.new(DocParent) do
-        set_collection_name "foobars"
+    context "if the subclass changes its collection" do
+      before do
+        class ::DocSCIOrphan < ::DocParent
+          set_collection_name "foobars"
+        end
+      end
+
+      after do
+        Object.send :remove_const, 'DocSCIOrphan'       if defined?(::DocSCIOrphan)
+      end
+
+      it "should negate SCI" do
+        DocSCIOrphan.collection.name.should == "foobars"
+        DocSCIOrphan.should_not be_single_collection_inherited
+      end
+
+      it "should remove the _type key" do
+        DocParent.keys.should_not have_key "_type"
+        DocSCIOrphan.keys.should_not have_key "_type"
+      end
+
+      context "and then is subclassed again" do
+        before do
+          class ::DocSCIOrphanChild < ::DocSCIOrphan
+          end
+        end
+
+        after do
+          Object.send :remove_const, 'DocSCIOrphanChild'  if defined?(::DocSCIOrphanChild)
+        end
+
+        it "should reinstate SCI" do
+          DocSCIOrphan.should_not be_single_collection_inherited
+          DocSCIOrphanChild.should be_single_collection_inherited
+        end
+
+        it "should have the _type key" do
+          DocSCIOrphan.keys.should have_key "_type"
+          DocSCIOrphanChild.keys.should have_key "_type"
+        end
       end
-      klass.collection.name.should == "foobars"
-      klass.should_not be_single_collection_inherited
     end
 
     it "should know single_collection_parent" do

data/spec/functional/touch_spec.rb

@@ -16,7 +16,7 @@ describe "Touch" do
         end
 
         doc.reload
-        doc.updated_at.should_not == old_updated_at      
+        doc.updated_at.should_not == old_updated_at
       end
     end
 
@@ -79,7 +79,7 @@ describe "Touch" do
 
           @post.reload.updated_at.should_not == orig_updated_at
         end
-        
+
         it "should when the child is updated" do
           @comment.save
           old_updated_at = @post.updated_at
@@ -88,7 +88,7 @@ describe "Touch" do
           end
           @post.reload.updated_at.should_not == old_updated_at
         end
-        
+
         it "should when the child is touched" do
           @comment.save
           old_updated_at = @post.updated_at
@@ -117,9 +117,9 @@ describe "Touch" do
         Timecop.freeze(Time.now + 1.day) do
           comment.save
         end
-      
+
         post.reload.updated_at.should == post.created_at
       end
     end
   end
-end
+end

data/spec/unit/inspect_spec.rb

@@ -15,7 +15,7 @@ describe "Inspect" do
     it "should print out non-nil attributes in alpha sorted order" do
       @doc.inspect.should =~ /_id:.*, age: 29, name: "John"/
     end
-    
+
     it "should print out all attributes when (optional) include_super argument is true" do
       @doc.inspect(true).should =~ /_id:.*, age: 29, email: nil, name: "John"/
     end
@@ -23,7 +23,7 @@ describe "Inspect" do
     it "should include class name" do
       @doc.inspect.should =~ /^#<User/
     end
-    
+
     it "should include embedded documents" do
       klass = Doc()
       pets = EDoc()
@@ -33,7 +33,7 @@ describe "Inspect" do
       doc = klass.new(:pets => [{:name => "Kitten"}])
       doc.inspect.should =~ /_id:.*, pets: \[.*_id.*, name: "Kitten".*\]/
     end
-    
+
     it "should include embedded document" do
       klass = Doc()
       pet = EDoc()
@@ -44,4 +44,4 @@ describe "Inspect" do
       doc.inspect.should =~ /_id:.*, pet: .*_id.*, name: "Kitten".*/
     end
   end
-end
+end

data/spec/unit/model_generator_spec.rb

@@ -12,10 +12,8 @@ describe MongoMapper::Generators::ModelGenerator do
   end
 
   it 'help shows MongoMapper options' do
-    pending "Rails 4 breaks Kernel#capture on JRuby", :if => (Rails::VERSION::MAJOR >= 4 && RUBY_PLATFORM == "java") do
-      content = run_generator ['--help']
-      assert_match(/rails generate mongo_mapper:model/, content)
-    end
+    content = run_generator ['--help']
+    assert_match(/rails generate mongo_mapper:model/, content)
   end
 
   it 'model are properly created' do

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta2
+  version: 0.13.0
 platform: ruby
 authors:
 - John Nunemaker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: plucky
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+  prerelease: false
+  type: :runtime
 description: MongoMapper is a Object-Document Mapper for Ruby and Rails
 email:
 - nunemaker@gmail.com
@@ -74,189 +74,191 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.rdoc
+- UPGRADES
 - bin/mmconsole
-- examples/identity_map.rb
+- examples/attr_accessible.rb
+- examples/attr_protected.rb
+- examples/cache_key.rb
 - examples/custom_types.rb
-- examples/modifiers/set.rb
+- examples/identity_map.rb
+- examples/identity_map/automatic.rb
 - examples/keys.rb
-- examples/cache_key.rb
-- examples/scopes.rb
+- examples/modifiers/set.rb
 - examples/plugins.rb
-- examples/attr_protected.rb
 - examples/querying.rb
-- examples/identity_map/automatic.rb
-- examples/validating/embedded_docs.rb
 - examples/safe.rb
-- examples/attr_accessible.rb
+- examples/scopes.rb
+- examples/validating/embedded_docs.rb
 - lib/mongo_mapper.rb
-- lib/rails/generators/mongo_mapper/model/model_generator.rb
-- lib/rails/generators/mongo_mapper/model/templates/model.rb
-- lib/rails/generators/mongo_mapper/config/config_generator.rb
-- lib/rails/generators/mongo_mapper/config/templates/mongo.yml
-- lib/mongo_mapper/railtie.rb
-- lib/mongo_mapper/embedded_document.rb
 - lib/mongo_mapper/connection.rb
-- lib/mongo_mapper/utils.rb
-- lib/mongo_mapper/plugins/identity_map.rb
-- lib/mongo_mapper/plugins/touch.rb
-- lib/mongo_mapper/plugins/rails.rb
-- lib/mongo_mapper/plugins/modifiers.rb
-- lib/mongo_mapper/plugins/embedded_document.rb
-- lib/mongo_mapper/plugins/inspect.rb
-- lib/mongo_mapper/plugins/keys.rb
-- lib/mongo_mapper/plugins/protected.rb
-- lib/mongo_mapper/plugins/persistence.rb
-- lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb
+- lib/mongo_mapper/connections/10gen.rb
+- lib/mongo_mapper/connections/moped.rb
+- lib/mongo_mapper/document.rb
+- lib/mongo_mapper/embedded_document.rb
+- lib/mongo_mapper/exceptions.rb
+- lib/mongo_mapper/extensions/array.rb
+- lib/mongo_mapper/extensions/binary.rb
+- lib/mongo_mapper/extensions/boolean.rb
+- lib/mongo_mapper/extensions/date.rb
+- lib/mongo_mapper/extensions/float.rb
+- lib/mongo_mapper/extensions/hash.rb
+- lib/mongo_mapper/extensions/integer.rb
+- lib/mongo_mapper/extensions/kernel.rb
+- lib/mongo_mapper/extensions/nil_class.rb
+- lib/mongo_mapper/extensions/object.rb
+- lib/mongo_mapper/extensions/object_id.rb
+- lib/mongo_mapper/extensions/ordered_hash.rb
+- lib/mongo_mapper/extensions/set.rb
+- lib/mongo_mapper/extensions/string.rb
+- lib/mongo_mapper/extensions/time.rb
+- lib/mongo_mapper/locale/en.yml
+- lib/mongo_mapper/middleware/identity_map.rb
+- lib/mongo_mapper/plugins.rb
+- lib/mongo_mapper/plugins/accessible.rb
+- lib/mongo_mapper/plugins/active_model.rb
+- lib/mongo_mapper/plugins/associations.rb
+- lib/mongo_mapper/plugins/associations/base.rb
+- lib/mongo_mapper/plugins/associations/belongs_to_association.rb
 - lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/proxy.rb
-- lib/mongo_mapper/plugins/associations/many_association.rb
-- lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_as_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_documents_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb
+- lib/mongo_mapper/plugins/associations/collection.rb
 - lib/mongo_mapper/plugins/associations/embedded_collection.rb
-- lib/mongo_mapper/plugins/associations/base.rb
 - lib/mongo_mapper/plugins/associations/in_array_proxy.rb
-- lib/mongo_mapper/plugins/associations/single_association.rb
-- lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/collection.rb
-- lib/mongo_mapper/plugins/associations/belongs_to_association.rb
+- lib/mongo_mapper/plugins/associations/many_association.rb
 - lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb
-- lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_documents_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/one_as_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_association.rb
 - lib/mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/one_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy.rb
+- lib/mongo_mapper/plugins/associations/single_association.rb
+- lib/mongo_mapper/plugins/caching.rb
+- lib/mongo_mapper/plugins/callbacks.rb
+- lib/mongo_mapper/plugins/clone.rb
+- lib/mongo_mapper/plugins/dirty.rb
+- lib/mongo_mapper/plugins/document.rb
+- lib/mongo_mapper/plugins/dumpable.rb
 - lib/mongo_mapper/plugins/dynamic_querying.rb
+- lib/mongo_mapper/plugins/dynamic_querying/dynamic_finder.rb
+- lib/mongo_mapper/plugins/embedded_callbacks.rb
+- lib/mongo_mapper/plugins/embedded_document.rb
 - lib/mongo_mapper/plugins/equality.rb
+- lib/mongo_mapper/plugins/identity_map.rb
 - lib/mongo_mapper/plugins/indexes.rb
-- lib/mongo_mapper/plugins/dumpable.rb
-- lib/mongo_mapper/plugins/scopes.rb
+- lib/mongo_mapper/plugins/inspect.rb
+- lib/mongo_mapper/plugins/keys.rb
+- lib/mongo_mapper/plugins/keys/key.rb
 - lib/mongo_mapper/plugins/logger.rb
+- lib/mongo_mapper/plugins/modifiers.rb
+- lib/mongo_mapper/plugins/pagination.rb
+- lib/mongo_mapper/plugins/persistence.rb
+- lib/mongo_mapper/plugins/protected.rb
+- lib/mongo_mapper/plugins/querying.rb
 - lib/mongo_mapper/plugins/querying/decorated_plucky_query.rb
-- lib/mongo_mapper/plugins/userstamps.rb
-- lib/mongo_mapper/plugins/accessible.rb
-- lib/mongo_mapper/plugins/sci.rb
-- lib/mongo_mapper/plugins/dynamic_querying/dynamic_finder.rb
-- lib/mongo_mapper/plugins/clone.rb
-- lib/mongo_mapper/plugins/embedded_callbacks.rb
+- lib/mongo_mapper/plugins/rails.rb
 - lib/mongo_mapper/plugins/rails/active_record_association_adapter.rb
-- lib/mongo_mapper/plugins/keys/key.rb
-- lib/mongo_mapper/plugins/querying.rb
-- lib/mongo_mapper/plugins/serialization.rb
-- lib/mongo_mapper/plugins/dirty.rb
-- lib/mongo_mapper/plugins/associations.rb
-- lib/mongo_mapper/plugins/callbacks.rb
-- lib/mongo_mapper/plugins/pagination.rb
-- lib/mongo_mapper/plugins/document.rb
-- lib/mongo_mapper/plugins/validations.rb
 - lib/mongo_mapper/plugins/safe.rb
+- lib/mongo_mapper/plugins/sci.rb
+- lib/mongo_mapper/plugins/scopes.rb
+- lib/mongo_mapper/plugins/serialization.rb
 - lib/mongo_mapper/plugins/timestamps.rb
-- lib/mongo_mapper/plugins/active_model.rb
-- lib/mongo_mapper/plugins/caching.rb
-- lib/mongo_mapper/extensions/object_id.rb
-- lib/mongo_mapper/extensions/object.rb
-- lib/mongo_mapper/extensions/integer.rb
-- lib/mongo_mapper/extensions/time.rb
-- lib/mongo_mapper/extensions/hash.rb
-- lib/mongo_mapper/extensions/boolean.rb
-- lib/mongo_mapper/extensions/array.rb
-- lib/mongo_mapper/extensions/nil_class.rb
-- lib/mongo_mapper/extensions/ordered_hash.rb
-- lib/mongo_mapper/extensions/kernel.rb
-- lib/mongo_mapper/extensions/string.rb
-- lib/mongo_mapper/extensions/set.rb
-- lib/mongo_mapper/extensions/float.rb
-- lib/mongo_mapper/extensions/binary.rb
-- lib/mongo_mapper/extensions/date.rb
-- lib/mongo_mapper/version.rb
-- lib/mongo_mapper/plugins.rb
-- lib/mongo_mapper/middleware/identity_map.rb
+- lib/mongo_mapper/plugins/touch.rb
+- lib/mongo_mapper/plugins/userstamps.rb
+- lib/mongo_mapper/plugins/validations.rb
+- lib/mongo_mapper/railtie.rb
 - lib/mongo_mapper/railtie/database.rake
-- lib/mongo_mapper/exceptions.rb
-- lib/mongo_mapper/locale/en.yml
-- lib/mongo_mapper/document.rb
 - lib/mongo_mapper/translation.rb
-- spec/functional/caching_spec.rb
-- spec/functional/rails_spec.rb
-- spec/functional/dirty_spec.rb
-- spec/functional/sci_spec.rb
-- spec/functional/associations/in_array_proxy_spec.rb
-- spec/functional/associations/many_polymorphic_proxy_spec.rb
-- spec/functional/associations/one_as_proxy_spec.rb
+- lib/mongo_mapper/utils.rb
+- lib/mongo_mapper/version.rb
+- lib/rails/generators/mongo_mapper/config/config_generator.rb
+- lib/rails/generators/mongo_mapper/config/templates/mongo.yml
+- lib/rails/generators/mongo_mapper/model/model_generator.rb
+- lib/rails/generators/mongo_mapper/model/templates/model.rb
+- spec/functional/accessible_spec.rb
+- spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb
 - spec/functional/associations/belongs_to_proxy_spec.rb
+- spec/functional/associations/in_array_proxy_spec.rb
 - spec/functional/associations/many_documents_as_proxy_spec.rb
-- spec/functional/associations/many_embedded_proxy_spec.rb
 - spec/functional/associations/many_documents_proxy_spec.rb
-- spec/functional/associations/one_proxy_spec.rb
-- spec/functional/associations/one_embedded_proxy_spec.rb
 - spec/functional/associations/many_embedded_polymorphic_proxy_spec.rb
-- spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb
+- spec/functional/associations/many_embedded_proxy_spec.rb
+- spec/functional/associations/many_polymorphic_proxy_spec.rb
+- spec/functional/associations/one_as_proxy_spec.rb
 - spec/functional/associations/one_embedded_polymorphic_proxy_spec.rb
-- spec/functional/indexes_spec.rb
-- spec/functional/userstamps_spec.rb
-- spec/functional/touch_spec.rb
+- spec/functional/associations/one_embedded_proxy_spec.rb
+- spec/functional/associations/one_proxy_spec.rb
+- spec/functional/associations_spec.rb
+- spec/functional/binary_spec.rb
+- spec/functional/caching_spec.rb
+- spec/functional/callbacks_spec.rb
+- spec/functional/dirty_spec.rb
+- spec/functional/document_spec.rb
 - spec/functional/dumpable_spec.rb
-- spec/functional/protected_spec.rb
-- spec/functional/modifiers_spec.rb
-- spec/functional/pagination_spec.rb
-- spec/functional/validations_spec.rb
 - spec/functional/dynamic_querying_spec.rb
+- spec/functional/embedded_document_spec.rb
 - spec/functional/equality_spec.rb
-- spec/functional/callbacks_spec.rb
 - spec/functional/extensions_spec.rb
+- spec/functional/identity_map_spec.rb
+- spec/functional/indexes_spec.rb
+- spec/functional/keys_spec.rb
+- spec/functional/logger_spec.rb
+- spec/functional/modifiers_spec.rb
+- spec/functional/pagination_spec.rb
+- spec/functional/protected_spec.rb
 - spec/functional/querying_spec.rb
+- spec/functional/rails_spec.rb
+- spec/functional/safe_spec.rb
+- spec/functional/sci_spec.rb
 - spec/functional/scopes_spec.rb
-- spec/functional/logger_spec.rb
-- spec/functional/document_spec.rb
 - spec/functional/timestamps_spec.rb
-- spec/functional/embedded_document_spec.rb
-- spec/functional/binary_spec.rb
-- spec/functional/keys_spec.rb
-- spec/functional/associations_spec.rb
-- spec/functional/accessible_spec.rb
-- spec/functional/identity_map_spec.rb
-- spec/functional/safe_spec.rb
-- spec/unit/rails_compatibility_spec.rb
-- spec/unit/rails_spec.rb
-- spec/unit/key_spec.rb
-- spec/unit/clone_spec.rb
-- spec/unit/associations/many_association_spec.rb
-- spec/unit/associations/one_association_spec.rb
+- spec/functional/touch_spec.rb
+- spec/functional/userstamps_spec.rb
+- spec/functional/validations_spec.rb
+- spec/spec_helper.rb
+- spec/support/matchers.rb
+- spec/support/models.rb
 - spec/unit/associations/base_spec.rb
 - spec/unit/associations/belongs_to_association_spec.rb
+- spec/unit/associations/many_association_spec.rb
+- spec/unit/associations/one_association_spec.rb
 - spec/unit/associations/proxy_spec.rb
-- spec/unit/model_generator_spec.rb
-- spec/unit/serialization_spec.rb
-- spec/unit/plugins_spec.rb
-- spec/unit/pagination_spec.rb
-- spec/unit/validations_spec.rb
-- spec/unit/equality_spec.rb
+- spec/unit/clone_spec.rb
 - spec/unit/config_generator_spec.rb
-- spec/unit/extensions_spec.rb
-- spec/unit/rails_reflect_on_association_spec.rb
-- spec/unit/exceptions_spec.rb
-- spec/unit/identity_map_middleware_spec.rb
-- spec/unit/translation_spec.rb
-- spec/unit/time_zones_spec.rb
 - spec/unit/document_spec.rb
-- spec/unit/mongo_mapper_spec.rb
+- spec/unit/dynamic_finder_spec.rb
 - spec/unit/embedded_document_spec.rb
+- spec/unit/equality_spec.rb
+- spec/unit/exceptions_spec.rb
+- spec/unit/extensions_spec.rb
+- spec/unit/identity_map_middleware_spec.rb
 - spec/unit/inspect_spec.rb
+- spec/unit/key_spec.rb
 - spec/unit/keys_spec.rb
+- spec/unit/model_generator_spec.rb
+- spec/unit/mongo_mapper_spec.rb
+- spec/unit/pagination_spec.rb
+- spec/unit/plugins_spec.rb
+- spec/unit/rails_compatibility_spec.rb
+- spec/unit/rails_reflect_on_association_spec.rb
+- spec/unit/rails_spec.rb
+- spec/unit/serialization_spec.rb
 - spec/unit/serializers/json_serializer_spec.rb
 - spec/unit/serializers/xml_serializer_spec.rb
-- spec/unit/dynamic_finder_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers.rb
-- spec/support/models.rb
-- LICENSE
-- UPGRADES
-- README.rdoc
+- spec/unit/time_zones_spec.rb
+- spec/unit/translation_spec.rb
+- spec/unit/validations_spec.rb
 homepage: http://mongomapper.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -267,13 +269,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.4
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.2.2
+signing_key:
 specification_version: 4
 summary: A Ruby Object Mapper for Mongo
 test_files: []