mongo_mapper 0.9.1 → 0.9.2

data/lib/mongo_mapper/connection.rb

@@ -44,7 +44,7 @@ module MongoMapper
 
     # @api private
     def config_for_environment(environment)
-      env = config[environment]
+      env = config[environment] || {}
       return env if env['uri'].blank?
 
       uri = URI.parse(env['uri'])
@@ -61,7 +61,13 @@ module MongoMapper
     def connect(environment, options={})
       raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
       env = config_for_environment(environment)
-      MongoMapper.connection = Mongo::Connection.new(env['host'], env['port'], options)
+
+      MongoMapper.connection = if env['hosts']
+        Mongo::ReplSetConnection.new( *env['hosts'].push(options) )
+      else
+        Mongo::Connection.new(env['host'], env['port'], options)
+      end
+
       MongoMapper.database = env['database']
       MongoMapper.database.authenticate(env['username'], env['password']) if env['username'] && env['password']
     end

data/lib/mongo_mapper/plugins/active_model.rb

@@ -4,13 +4,13 @@ module MongoMapper
     module ActiveModel
       extend ActiveSupport::Concern
 
-      include ::ActiveModel::Naming
       include ::ActiveModel::Conversion
       include ::ActiveModel::Serialization
       include ::ActiveModel::Serializers::Xml
       include ::ActiveModel::Serializers::JSON
 
       included do
+        extend ::ActiveModel::Naming
         extend ::ActiveModel::Translation
       end
     end

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -5,11 +5,6 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module InstanceMethods
-        def valid?(context = nil)
-          context ||= (new_record? ? :create : :update)
-          super(context) && errors.empty?
-        end
-
         def destroy
           run_callbacks(:destroy) { super }
         end

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -6,9 +6,8 @@ module MongoMapper
 
       included do
         extend  ::ActiveModel::Callbacks
-        include ::ActiveModel::Validations::Callbacks
 
-        define_model_callbacks :validation, :save, :create, :update, :destroy, :only => [:before, :after]
+        define_model_callbacks :save, :create, :update, :destroy, :only => [:before, :after]
       end
 
       module InstanceMethods
@@ -32,12 +31,3 @@ module MongoMapper
     end
   end
 end
-
-# Need to monkey patch ActiveModel for now since it uses the internal
-# _run_validation_callbacks, which is impossible to override due to the
-# way ActiveSupport::Callbacks is implemented.
-ActiveModel::Validations::Callbacks.class_eval do
-  def run_validations!
-    run_callbacks(:validation) { super }
-  end
-end

data/lib/mongo_mapper/plugins/inspect.rb

@@ -5,8 +5,9 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module InstanceMethods
-        def inspect
-          attributes_as_nice_string = key_names.sort.collect do |name|
+        def inspect(include_nil = false)
+          keys = include_nil ? key_names : attributes.keys
+          attributes_as_nice_string = keys.sort.collect do |name|
             "#{name}: #{self[name].inspect}"
           end.join(", ")
           "#<#{self.class} #{attributes_as_nice_string}>"

data/lib/mongo_mapper/plugins/keys.rb

@@ -193,7 +193,7 @@ module MongoMapper
 
         def attributes
           HashWithIndifferentAccess.new.tap do |attrs|
-            keys.each_pair do |name, key|
+            keys.select { |name,key| !self[key.name].nil? || key.type == ObjectId }.each do |name, key|
               value = key.set(self[key.name])
               attrs[name] = value
             end
@@ -322,3 +322,4 @@ module MongoMapper
     end
   end
 end
+

data/lib/mongo_mapper/plugins/querying.rb

@@ -140,8 +140,7 @@ module MongoMapper
       module InstanceMethods
         def save(options={})
           options.assert_valid_keys(:validate, :safe)
-          options.reverse_merge!(:validate => true)
-          !options[:validate] || valid? ? create_or_update(options) : false
+          create_or_update(options)
         end
 
         def save!(options={})

data/lib/mongo_mapper/plugins/sci.rb

@@ -4,6 +4,10 @@ module MongoMapper
     module Sci
       extend ActiveSupport::Concern
 
+      included do
+        extend ActiveSupport::DescendantsTracker
+      end
+
       module ClassMethods
         def inherited(subclass)
           key :_type, String unless key?(:_type)
@@ -18,7 +22,7 @@ module MongoMapper
 
         def query(options={})
           super.tap do |query|
-            query[:_type] = name if single_collection_inherited?
+            query[:_type] = {'$in' => [name] + descendants.map(&:name)} if single_collection_inherited?
           end
         end
       end
@@ -31,4 +35,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -102,6 +102,11 @@ module MongoMapper
       def attributes_hash
         @serializable.serializable_hash(options)
       end
+
+      def serializable_methods
+        # Methods are already included in #serializable_hash
+        []
+      end
     end
   end
 end

data/lib/mongo_mapper/plugins/userstamps.rb

@@ -5,11 +5,12 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def userstamps!
+        def userstamps!(options = {})
+          class_name = (options[:class_name] || options[:class] || 'User' ).to_s
           key :creator_id, ObjectId
           key :updater_id, ObjectId
-          belongs_to :creator, :class_name => 'User'
-          belongs_to :updater, :class_name => 'User'
+          belongs_to :creator, :class_name => class_name
+          belongs_to :updater, :class_name => class_name
         end
       end
     end

data/lib/mongo_mapper/plugins/validations.rb

@@ -5,6 +5,7 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       include ::ActiveModel::Validations
+      include ::ActiveModel::Validations::Callbacks
 
       module ClassMethods
         def validates_uniqueness_of(*attr_names)
@@ -16,6 +17,18 @@ module MongoMapper
         end
       end
 
+      module InstanceMethods
+        def save(options = {})
+          options.reverse_merge!(:validate => true)
+          !options[:validate] || valid? ? super : false
+        end
+
+        def valid?(context = nil)
+          context ||= (new_record? ? :create : :update)
+          super(context)
+        end
+      end
+
       class UniquenessValidator < ::ActiveModel::EachValidator
         def initialize(options)
           super(options.reverse_merge(:case_sensitive => true))
@@ -64,3 +77,12 @@ module MongoMapper
     end
   end
 end
+
+# Need to monkey patch ActiveModel for now since it uses the internal
+# _run_validation_callbacks, which is impossible to override due to the
+# way ActiveSupport::Callbacks is implemented.
+ActiveModel::Validations::Callbacks.class_eval do
+  def run_validations!
+    run_callbacks(:validation) { super }
+  end
+end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.9.1'
+  Version = '0.9.2'
 end

data/test/functional/test_callbacks.rb

@@ -155,4 +155,31 @@ class CallbacksTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "Running validation callbacks with conditional execution" do
+    setup do
+      @document = Doc do
+        include CallbacksSupport
+        key :message, String
+
+        before_validation :set_message, :on => 'create'
+        def set_message
+          self['message'] = 'Hi!'
+        end
+      end
+    end
+
+    should 'run callback on create' do
+      doc = @document.create
+      doc.history.should include(:before_validation)
+      doc.message.should == 'Hi!'
+    end
+
+    should 'skip callback on update' do
+      doc = @document.create
+      doc.message = 'Ho!'
+      doc.save
+      doc.message.should == 'Ho!'
+    end
+  end
 end

data/test/functional/test_sci.rb

@@ -12,6 +12,7 @@ class SciTest < Test::Unit::TestCase
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end
       class ::DocGrandSon < ::DocSon; end
+      class ::DocGrandGrandSon < ::DocGrandSon; end
 
       DocSon.many :children, :class_name => 'DocGrandSon'
 
@@ -24,6 +25,7 @@ class SciTest < Test::Unit::TestCase
       Object.send :remove_const, 'DocDaughter' if defined?(::DocDaughter)
       Object.send :remove_const, 'DocSon'      if defined?(::DocSon)
       Object.send :remove_const, 'DocGrandSon' if defined?(::DocGrandSon)
+      Object.send :remove_const, 'DocGrandGrandSon' if defined?(::DocGrandGrandSon)
     end
 
     should "automatically add _type key to store class" do
@@ -86,11 +88,19 @@ class SciTest < Test::Unit::TestCase
         steve = DocSon.create(:name => 'Steve')
         steph = DocDaughter.create(:name => 'Steph')
         carrie = DocDaughter.create(:name => 'Carrie')
+        boris = DocGrandSon.create(:name => 'Boris')
 
-        DocGrandSon.all(:order => 'name').should  == []
-        DocSon.all(:order => 'name').should       == [john, steve]
+        DocGrandGrandSon.all(:order => 'name').should  == []
+        DocGrandSon.all(:order => 'name').should  == [boris]
+        DocSon.all(:order => 'name').should       == [boris, john, steve]
         DocDaughter.all(:order => 'name').should  == [carrie, steph]
-        DocParent.all(:order => 'name').should    == [carrie, john, steph, steve]
+        DocParent.all(:order => 'name').should    == [boris, carrie, john, steph, steve]
+
+        sigmund = DocGrandGrandSon.create(:name => 'Sigmund')
+
+        DocGrandSon.all(:order => 'name').should  == [boris, sigmund]
+        DocSon.all(:order => 'name').should       == [boris, john, sigmund, steve]
+        DocParent.all(:order => 'name').should    == [boris, carrie, john, sigmund, steph, steve]
       end
 
       should "work with nested hash conditions" do
@@ -227,4 +237,4 @@ class SciTest < Test::Unit::TestCase
       Child.new(:_type => 'OtherChild')._type.should == 'Child'
     end
   end
-end
+end

data/test/functional/test_userstamps.rb

@@ -1,27 +1,44 @@
 require 'test_helper'
 
 class UserstampsTest < Test::Unit::TestCase
+  class AltUser
+    include MongoMapper::Document
+  end
+
   context "userstamping" do
     setup do
       @document = Doc do
         userstamps!
       end
+      @document_alt_user = Doc do
+        userstamps! :class_name => 'AltUser'
+      end
+      @document_alt_user_class = Doc do
+        userstamps! :class => AltUser
+      end
+      @docs = [@document, @document_alt_user, @document_alt_user_class]
     end
 
     should "add creator_id key" do
-      @document.keys.keys.should include('creator_id')
+      @docs.each{ |d| d.keys.should include('creator_id') }
     end
 
     should "add updater_id key" do
-      @document.keys.keys.should include('updater_id')
+      @docs.each{ |d| d.keys.should include('updater_id') }
     end
 
     should "add belongs_to creator" do
-      @document.associations.keys.should include(:creator)
+      @docs.each{ |d| d.associations.keys.should include(:creator) }
     end
 
     should "add belongs_to updater" do
-      @document.associations.keys.should include(:updater)
+      @docs.each{ |d| d.associations.keys.should include(:updater) }
+    end
+
+    should "properly set class names" do
+      @document.associations[:creator].class_name.should == 'User'
+      @document_alt_user.associations[:creator].class_name.should == 'AltUser'
+      @document_alt_user_class.associations[:creator].class_name.should == 'UserstampsTest::AltUser'
     end
   end
 end

data/test/models.rb

@@ -241,3 +241,7 @@ module News
     include MongoMapper::Document
   end
 end
+
+class AltUser
+  include MongoMapper::Document
+end

data/test/test_active_model_lint.rb

@@ -10,4 +10,9 @@ class ActiveModelLintTest < ActiveModel::TestCase
   def setup
     @model = Post.new
   end
+
+  def test_naming
+    Post.model_name.plural.should == 'posts'
+    Post.new.respond_to?(:model_name).should be_false
+  end
 end

data/test/test_helper.rb

@@ -1,29 +1,24 @@
 require 'rubygems'
 require 'bundler/setup'
 
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'mongo_mapper'
 require 'fileutils'
 require 'ostruct'
 
-require 'json'
-require 'log_buddy'
-require 'matchy'
-require 'shoulda'
-require 'timecop'
-require 'mocha'
-require 'ruby-debug'
+Bundler.require(:development)
 
 class Test::Unit::TestCase
   def Doc(name='Class', &block)
     klass = Class.new
     klass.class_eval do
       include MongoMapper::Document
-      set_collection_name :test
 
       if name
         class_eval "def self.name; '#{name}' end"
         class_eval "def self.to_s; '#{name}' end"
+      else
+        set_collection_name :test
       end
     end
 

data/test/unit/serializers/test_xml_serializer.rb

@@ -145,6 +145,9 @@ class XmlSerializationTest < Test::Unit::TestCase
       assert_no_match %r{awesome}, xml
       assert_no_match %r{created-at}, xml
       assert_no_match %r{preferences}, xml
+
+      # Assert only one tag is created
+      xml.scan(/favorite-quote/).size.should == 2
     end
   end
 

data/test/unit/test_document.rb

@@ -204,5 +204,46 @@ class DocumentTest < Test::Unit::TestCase
         (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be(false)
       end
     end
+
+    context "nil attributes" do
+
+      should "list all the keys and default non nil attributes" do
+       doc = @document.new
+       doc.keys.keys.sort.should == ['_id', 'age', 'name']
+       doc.attributes.keys.sort.should == ['_id']
+      end
+
+      should "list all the keys and non nil attributes" do
+       doc = @document.new(:name => "John")
+       doc.keys.keys.sort.should == ['_id', 'age', 'name']
+       doc.attributes.keys.sort.should == ['_id','name']
+      end
+
+      should "list all the keys and pickup changed nil attributes" do
+       doc = @document.new(:name => "John")
+       doc.keys.keys.sort.should == ['_id', 'age', 'name']
+       doc.attributes.keys.sort.should == ['_id','name']
+
+       doc.name = nil
+
+       doc.keys.keys.sort.should == ['_id', 'age', 'name']
+       doc.attributes.keys.sort.should == ['_id']
+      end
+
+      should "list all the keys and pickup changed nil and non-nil attributes" do
+       doc = @document.new(:name => "John")
+       doc.keys.keys.sort.should == ['_id', 'age', 'name']
+       doc.attributes.keys.sort.should == ['_id','name']
+
+       doc.name = nil
+       doc.age = 12
+
+       doc.keys.keys.sort.should == ['_id', 'age', 'name']
+       doc.attributes.keys.sort.should == ['_id','age']
+      end
+
+    end
+
   end # instance of a document
 end # DocumentTest
+

data/test/unit/test_embedded_document.rb

@@ -364,14 +364,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       context "attributes" do
         should "default to hash with all keys" do
           doc = @document.new
-          doc.attributes.keys.sort.should == ['_id', 'age', 'name']
+          doc.keys.keys.sort.should == ['_id', 'age', 'name']
+          doc.attributes.keys.sort.should == ['_id']
         end
 
         should "return all keys with values" do
           doc = @document.new(:name => 'string', :age => nil)
-          doc.attributes.keys.sort.should == ['_id', 'age', 'name']
+          doc.attributes.keys.sort.should == ['_id', 'name']
+          doc.keys.keys.sort.should == ['_id', 'age', 'name']
           doc.attributes.values.should include('string')
-          doc.attributes.values.should include(nil)
+          doc.attributes.values.should_not include(nil)
         end
 
         should "have indifferent access" do
@@ -384,14 +386,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       context "to_mongo" do
         should "default to hash with _id key" do
           doc = @document.new
-          doc.to_mongo.keys.sort.should == ['_id', 'age', 'name']
+          doc.to_mongo.keys.sort.should == ['_id']
+          doc.keys.keys.sort.should == ['_id', 'age', 'name']
         end
 
         should "return all keys" do
           doc = @document.new(:name => 'string', :age => nil)
-          doc.to_mongo.keys.sort.should == ['_id', 'age', 'name']
+          doc.keys.keys.sort.should == ['_id', 'age', 'name']
+          doc.to_mongo.keys.sort.should == ['_id','name']
           doc.to_mongo.values.should include('string')
-          doc.to_mongo.values.should include(nil)
+          doc.to_mongo.values.should_not include(nil)
         end
       end
 
@@ -675,3 +679,4 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end # instance of a embedded document
   end
 end
+

data/test/unit/test_extensions.rb

@@ -5,7 +5,7 @@ class SupportTest < Test::Unit::TestCase
     should "convert value to_a" do
       Array.to_mongo([1, 2, 3, 4]).should == [1, 2, 3, 4]
       Array.to_mongo('1').should == ['1']
-      Array.to_mongo({'1' => '2', '3' => '4'}).should == [['1', '2'], ['3', '4']]
+      Array.to_mongo({'1' => '2', '3' => '4'}).should include(['1', '2'], ['3', '4'])
     end
   end
 

data/test/unit/test_inspect.rb

@@ -6,14 +6,19 @@ class InspectTest < Test::Unit::TestCase
       @document = Doc('User') do
         key :name,  String
         key :age,   Integer
+        key :email, String
       end
 
       @doc = @document.new(:name => 'John', :age => 29)
     end
 
-    should "print out attributes in alpha sorted order" do
+    should "print out non-nil attributes in alpha sorted order" do
       @doc.inspect.should =~ /_id:.*, age: 29, name: "John"/
     end
+    
+    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
 
     should "include class name" do
       @doc.inspect.should =~ /^#<User/

data/test/unit/test_mongo_mapper.rb

@@ -96,6 +96,20 @@ class MongoMapperTest < Test::Unit::TestCase
       }
       assert_raises(MongoMapper::InvalidScheme) { MongoMapper.connect('development') }
     end
+
+    should "create a replica set connection if config contains multiple hosts" do
+      MongoMapper.config = {
+        'development' => {
+          'hosts' => [ ['127.0.0.1', 27017], ['localhost', 27017] ],
+          'database' => 'test'
+        }
+      }
+
+      Mongo::ReplSetConnection.expects(:new).with( ['127.0.0.1', 27017], ['localhost', 27017], {'read_secondary' => true} )
+      MongoMapper.expects(:database=).with('test')
+      Mongo::DB.any_instance.expects(:authenticate).never
+      MongoMapper.connect('development', 'read_secondary' => true)
+    end
   end
 
   context "setup" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,11 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -04:00
+date: 2011-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activemodel
+  type: :runtime
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +32,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  version_requirements: *id001
-  type: :runtime
-  name: activemodel
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+  type: :runtime
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +47,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  version_requirements: *id002
-  type: :runtime
-  name: activesupport
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: plucky
+  type: :runtime
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,10 +63,7 @@ dependencies:
         - 3
         - 8
         version: 0.3.8
-  prerelease: false
-  version_requirements: *id003
-  type: :runtime
-  name: plucky
+  requirement: *id003
 description: 
 email: 
 - nunemaker@gmail.com
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A Ruby Object Mapper for Mongo