mongo_mapper 0.11.1 → 0.11.2

data/README.rdoc

@@ -6,7 +6,7 @@ A Ruby Object Mapper for Mongo.
 
     $ gem install mongo_mapper
 
-== Note on Patches/Pull Requests
+== Contributing
 
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -30,4 +30,4 @@ irc://chat.freenode.net/#mongomapper
 
 == Copyright
 
-See LICENSE for details.
+See LICENSE for details.

data/lib/mongo_mapper/exceptions.rb

@@ -14,7 +14,10 @@ module MongoMapper
 
   # raised when document not valid and using !
   class DocumentNotValid < Error
+    attr_reader :document
+  
     def initialize(document)
+      @document = document
       super("Validation failed: #{document.errors.full_messages.join(", ")}")
     end
   end

data/lib/mongo_mapper/plugins/accessible.rb

@@ -4,13 +4,21 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :accessible_attributes
+        class_attribute :_accessible_attributes
       end
 
       module ClassMethods
         def attr_accessible(*attrs)
           raise AccessibleOrProtected.new(name) if try(:protected_attributes?)
-          self.accessible_attributes = Set.new(attrs) + (accessible_attributes || [])
+          self._accessible_attributes = Set.new(attrs) + (_accessible_attributes || [])
+        end
+
+        def accessible_attributes(*)
+          _accessible_attributes
+        end
+
+        def accessible_attributes?
+          _accessible_attributes?
         end
       end
 
@@ -26,6 +34,14 @@ module MongoMapper
         super(filter_inaccessible_attrs(attrs))
       end
 
+      def accessible_attributes(*args)
+        self.class.accessible_attributes(*args)
+      end
+
+      def accessible_attributes?
+        self.class.accessible_attributes?
+      end
+
       protected
         def filter_inaccessible_attrs(attrs)
           return attrs if !accessible_attributes? || attrs.blank?

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

@@ -17,6 +17,7 @@ module MongoMapper
 
         def setup(model)
           model.key foreign_key, ObjectId unless model.key?(foreign_key)
+          model.key type_key_name, String unless model.key?(type_key_name) if polymorphic?
           super
           add_touch_callbacks if touch?
         end

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

@@ -4,7 +4,8 @@ module MongoMapper
     module Associations
       class ManyDocumentsProxy < Collection
         include DynamicQuerying::ClassMethods
-        include Querying::PluckyMethods
+
+        def_delegators :query, *(Querying::Methods - [:to_a, :size, :empty?])
 
         def replace(docs)
           load_target

data/lib/mongo_mapper/plugins/keys.rb

@@ -121,7 +121,11 @@ module MongoMapper
             attribute = key.name.to_sym
 
             if key.options[:required]
-              validates_presence_of(attribute)
+              if key.type == Boolean
+                validates_inclusion_of attribute, :in => [true, false]
+              else
+                validates_presence_of(attribute)
+              end
             end
 
             if key.options[:unique]

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -21,20 +21,22 @@ module MongoMapper
           updates.each do |key, value|
             updates[key] = keys[key.to_s].set(value) if key?(key)
           end
-          collection.update(criteria, {'$set' => updates}, :multi => true)
+          modifier_update('$set', [criteria, updates, options])
         end
 
         def unset(*args)
           if args[0].is_a?(Hash)
             criteria, keys = args.shift, args
+            options = keys.last.is_a?(Hash) ? keys.pop : {}
           else
             keys, ids = args.partition { |arg| arg.is_a?(Symbol) }
+            options = ids.last.is_a?(Hash) ? ids.pop : {}
             criteria = {:id => ids}
           end
 
-          criteria  = criteria_hash(criteria).to_hash
-          modifiers = keys.inject({}) { |hash, key| hash[key] = 1; hash }
-          collection.update(criteria, {'$unset' => modifiers}, :multi => true)
+          criteria = criteria_hash(criteria).to_hash
+          updates = keys.inject({}) { |hash, key| hash[key] = 1; hash }
+          modifier_update('$unset', [criteria, updates, options])
         end
 
         def push(*args)
@@ -87,8 +89,8 @@ module MongoMapper
           end
       end
 
-      def unset(*keys)
-        self.class.unset(id, *keys)
+      def unset(*args)
+        self.class.unset(id, *args)
       end
 
       def increment(hash, options=nil)

data/lib/mongo_mapper/plugins/querying.rb

@@ -1,6 +1,5 @@
 # encoding: UTF-8
 require 'mongo_mapper/plugins/querying/decorator'
-require 'mongo_mapper/plugins/querying/plucky_methods'
 
 module MongoMapper
   module Plugins
@@ -9,13 +8,8 @@ module MongoMapper
 
       module ClassMethods
         extend Forwardable
-        include PluckyMethods
 
-        def_delegators :query,  :to_a, :size, :empty?
-
-        def find_each(opts={})
-          super(opts).each { |doc| yield(doc) }
-        end
+        def_delegators :query, *Querying::Methods
 
         def find_by_id(id)
           find_one(:_id => id)

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

@@ -2,6 +2,8 @@
 module MongoMapper
   module Plugins
     module Querying
+      Methods = Plucky::Methods + [:find!]
+
       module Decorator
         include DynamicQuerying::ClassMethods
 

data/lib/mongo_mapper/version.rb

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

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -13,7 +13,9 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
 
   should "add type and id key to polymorphic class base" do
     PostComment.keys.keys.should include('commentable_type')
+    PostComment.keys['commentable_type'].type.should == String
     PostComment.keys.keys.should include('commentable_id')
+    PostComment.keys['commentable_id'].type.should == ObjectId
   end
 
   should "allow adding to association like it was an array" do
@@ -226,4 +228,4 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/functional/test_modifiers.rb

@@ -43,6 +43,33 @@ class ModifierTest < Test::Unit::TestCase
         assert_keys_removed @page, :title, :tags
         assert_keys_removed @page2, :title, :tags
       end
+
+      context "additional options (upsert & safe)" do
+        should "be able to pass upsert option" do
+          new_key_value = DateTime.now.to_s
+          @page_class.unset({:title => new_key_value, :tags => %w(foo bar)}, :tags, {:upsert => true})
+          @page_class.count(:title => new_key_value).should == 1
+          @page_class.first(:title => new_key_value).tags.should == []
+        end
+
+        should "be able to pass safe option" do
+          @page_class.create(:title => "Better Be Safe than Sorry")
+
+          Mongo::Collection.any_instance.expects(:update).with(
+            {:title => "Better Be Safe than Sorry"},
+            {'$unset' => {:tags => 1}},
+            {:safe => true, :multi => true}
+          )
+          @page_class.unset({:title => "Better Be Safe than Sorry"}, :tags, {:safe => true})
+        end
+
+        should "be able to pass both safe and upsert options" do
+          new_key_value = DateTime.now.to_s
+          @page_class.unset({:title => new_key_value, :tags => %w(foo bar)}, :tags, {:upsert => true, :safe => true})
+          @page_class.count(:title => new_key_value).should == 1
+          @page_class.first(:title => new_key_value).tags.should == []
+        end
+      end
     end
     
     context "increment" do
@@ -141,6 +168,33 @@ class ModifierTest < Test::Unit::TestCase
         @page.reload
         @page[:colors].should == %w[red green]
       end
+
+      context "additional options (upsert & safe)" do
+        should "be able to pass upsert option" do
+          new_key_value = DateTime.now.to_s
+          @page_class.set({:title => new_key_value}, {:day_count => 1}, {:upsert => true})
+          @page_class.count(:title => new_key_value).should == 1
+          @page_class.first(:title => new_key_value).day_count.should == 1
+        end
+
+        should "be able to pass safe option" do
+          @page_class.create(:title => "Better Be Safe than Sorry")
+
+          Mongo::Collection.any_instance.expects(:update).with(
+            {:title => "Better Be Safe than Sorry"},
+            {'$set' => {:title => "I like safety."}},
+            {:safe => true, :multi => true}
+          )
+          @page_class.set({:title => "Better Be Safe than Sorry"}, {:title => "I like safety."}, {:safe => true})
+        end
+
+        should "be able to pass both safe and upsert options" do
+          new_key_value = DateTime.now.to_s
+          @page_class.set({:title => new_key_value}, {:day_count => 1}, {:upsert => true, :safe => true})
+          @page_class.count(:title => new_key_value).should == 1
+          @page_class.first(:title => new_key_value).day_count.should == 1
+        end
+      end
     end
     
     context "push" do

data/test/functional/test_validations.rb

@@ -33,6 +33,15 @@ class ValidationsTest < Test::Unit::TestCase
       doc = @document.new
       lambda { doc.save! }.should raise_error(MongoMapper::DocumentNotValid)
     end
+
+    should "set document on exception" do
+      doc = @document.new
+      begin
+        doc.save!
+      rescue MongoMapper::DocumentNotValid => e
+        e.document.should == doc
+      end
+    end
   end
 
   context "Creating a document that is invalid (destructive)" do

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require 'mongo_mapper'
 require 'fileutils'
 require 'ostruct'
 
-Bundler.require(:development)
+Bundler.require(:default, :test)
 
 class Test::Unit::TestCase
   def Doc(name='Class', &block)
@@ -88,7 +88,6 @@ log_dir = File.expand_path('../../log', __FILE__)
 FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
 logger = Logger.new(log_dir + '/test.log')
 
-LogBuddy.init(:logger => logger)
 MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
 MongoMapper.database = "test"
 MongoMapper.database.collections.each { |c| c.drop_indexes }

data/test/unit/test_exceptions.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class ExtensionsTest < Test::Unit::TestCase
+  context "DocumentNotValid" do
+    should "have document reader method" do
+      doc_class = Doc()
+      instance  = doc_class.new
+      exception = MongoMapper::DocumentNotValid.new(instance)
+      exception.document.should == instance
+    end
+  end
+end

data/test/unit/test_railtie.rb

@@ -13,6 +13,11 @@ class TestRailtie < Test::Unit::TestCase
     initializer = mod.initializers.detect do |i|
       i.name == name
     end
+
+    if initializer.nil?
+      raise 'Initializer not found'
+    end
+
     initializer.block.arity == -1 ? initializer.run : initializer.run(FakeRails)
     # mongo_mapper.prepare_dispatcher takes a Rails app as its one arg,
     # set_clear_dependencies_hook takes no args

data/test/unit/test_validations.rb

@@ -245,6 +245,19 @@ class ValidationsTest < Test::Unit::TestCase
           doc.should_not have_error_on(:action)
         end
 
+        should "work with :required shortcut on Boolean type" do
+          @document.key :flag, Boolean, :required => true
+
+          doc = @document.new
+          doc.should have_error_on(:flag, 'is not included in the list')
+
+          doc.flag = true
+          doc.should_not have_error_on(:action)
+
+          doc.flag = false
+          doc.should_not have_error_on(:action)
+        end
+
         should "not have error if allow nil is true and value is nil" do
           @document.key :action, String
           @document.validates_inclusion_of :action, :in => %w(kick run), :allow_nil => true

metadata

@@ -1,78 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo_mapper
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.11.2
   prerelease: 
-  segments: 
-  - 0
-  - 11
-  - 1
-  version: 0.11.1
 platform: ruby
-authors: 
+authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  prerelease: false
-  requirement: *id001
+date: 2012-07-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70319139905420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
-  requirement: *id002
+  version_requirements: *70319139905420
+- !ruby/object:Gem::Dependency
   name: activesupport
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70319139904940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
-  requirement: *id003
+  version_requirements: *70319139904940
+- !ruby/object:Gem::Dependency
   name: plucky
+  requirement: &70319139904480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
+  prerelease: false
+  version_requirements: *70319139904480
 description: 
-email: 
+email:
 - nunemaker@gmail.com
-executables: 
+executables:
 - mmconsole
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/mmconsole
 - examples/attr_accessible.rb
 - examples/attr_protected.rb
@@ -151,7 +130,6 @@ files:
 - lib/mongo_mapper/plugins/persistence.rb
 - lib/mongo_mapper/plugins/protected.rb
 - lib/mongo_mapper/plugins/querying/decorator.rb
-- lib/mongo_mapper/plugins/querying/plucky_methods.rb
 - lib/mongo_mapper/plugins/querying.rb
 - lib/mongo_mapper/plugins/rails/active_record_association_adapter.rb
 - lib/mongo_mapper/plugins/rails.rb
@@ -229,6 +207,7 @@ files:
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb
 - test/unit/test_equality.rb
+- test/unit/test_exceptions.rb
 - test/unit/test_extensions.rb
 - test/unit/test_identity_map_middleware.rb
 - test/unit/test_inspect.rb
@@ -250,36 +229,32 @@ files:
 - README.rdoc
 homepage: http://github.com/jnunemaker/mongomapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1944766579498551313
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1944766579498551313
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby Object Mapper for Mongo
 test_files: []
-

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

@@ -1,21 +0,0 @@
-# encoding: UTF-8
-require 'forwardable'
-
-module MongoMapper
-  module Plugins
-    module Querying
-      module PluckyMethods
-        extend Forwardable
-        def_delegators :query,  :where, :filter,
-                                :fields, :ignore, :only,
-                                :limit, :paginate, :per_page, :skip, :offset,
-                                :sort, :order, :reverse,
-                                :count,
-                                :distinct,
-                                :last, :first, :find_one, :all, :find_each,
-                                :find, :find!,
-                                :exists?, :exist?
-      end
-    end
-  end
-end