mongo_mapper-unstable 2009.11.6 → 2009.11.8

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
   gem.add_development_dependency('shoulda', '2.10.2')
   gem.add_development_dependency('timecop', '0.3.1')
-  gem.add_development_dependency('mocha', '0.9.4')
+  gem.add_development_dependency('mocha', '0.9.8')
 end
 
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-2009.11.06
+2009.11.08

data/lib/mongo_mapper/associations/proxy.rb

@@ -6,7 +6,7 @@ module MongoMapper
       def initialize(owner, association)
         @owner = owner
         @association = association
-        @association.options[:extend].each { |ext| proxy_extend(ext) }
+        @association.options[:extend].each { |ext| class << self; self; end.instance_eval { include ext } }
         reset
       end
 
@@ -25,7 +25,12 @@ module MongoMapper
       end
 
       def send(method, *args)
-        return super if methods.include?(method.to_s)
+        metaclass_instance_methods = class << self; self; end.instance_methods
+        
+        if metaclass_instance_methods.any? { |m| m.to_s == method.to_s }
+          return __send__(method, *args)
+        end
+        
         load_target
         @target.send(method, *args)
       end
@@ -45,12 +50,12 @@ module MongoMapper
       end
       
       protected
-        def method_missing(method, *args)
+        def method_missing(method, *args, &block)
           if load_target
-            if block_given?
-              @target.send(method, *args)  { |*block_args| yield(*block_args) }
-            else
+            if block.nil?
               @target.send(method, *args)
+            else
+              @target.send(method, *args)  { |*block_args| block.call(*block_args) }
             end
           end
         end

data/lib/mongo_mapper/document.rb

@@ -432,12 +432,12 @@ module MongoMapper
         read_attribute('_id').blank? || using_custom_id?
       end
 
-      def save
-        valid? ? create_or_update : false
+      def save(perform_validations=true)
+        !perform_validations || valid? ? create_or_update : false
       end
 
       def save!
-        valid? ? create_or_update : raise(DocumentNotValid.new(self))
+        save || raise(DocumentNotValid.new(self))
       end
 
       def destroy

data/lib/mongo_mapper/embedded_document.rb

@@ -89,7 +89,13 @@ module MongoMapper
       
     private
       def accessors_module
-        if const_defined?('MongoMapperKeys')
+        module_defined =  if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
+                            const_defined?('MongoMapperKeys')
+                          else
+                            const_defined?('MongoMapperKeys', false)
+                          end
+
+        if module_defined
           const_get 'MongoMapperKeys'
         else
           const_set 'MongoMapperKeys', Module.new

data/lib/mongo_mapper/finder_options.rb

@@ -24,8 +24,9 @@ module MongoMapper
 
     def initialize(model, options)
       raise ArgumentError, "Options must be a hash" unless options.is_a?(Hash)
+      options = options.clone
       options.symbolize_keys!
-      
+
       @model      = model
       @options    = {}
       @conditions = options.delete(:conditions) || {}

data/lib/mongo_mapper/support.rb

@@ -1,10 +1,10 @@
 class BasicObject #:nodoc:
-  alias_method :proxy_extend, :extend
-  instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|^methods$|instance_eval|proxy_|^object_id$)/ }
+  instance_methods.each { |m| undef_method m unless m =~ /(^__|instance_eval)/ }
 end unless defined?(BasicObject)
 
 class Array
   def self.to_mongo(value)
+    value = value.respond_to?(:lines) ? value.lines : value
     value.to_a
   end
   

data/mongo_mapper.gemspec

@@ -142,7 +142,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.16"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_development_dependency(%q<timecop>, ["= 0.3.1"])

data/test/functional/test_pagination.rb

@@ -50,8 +50,16 @@ class PaginationTest < Test::Unit::TestCase
       })
       result.should == [@doc1, @doc3]
       result.first.age.should == 27
+
+      result = @document.paginate({
+        :conditions => {:last_name => 'Nunemaker'},
+        :order      => "age DESC",
+        :per_page   => 2,
+        :page       => 1} )
+      result.should == [@doc1, @doc3]
+      result.first.age.should == 27
     end
-    
+
     should "withstand rigor" do      
       result = @document.paginate({
         :per_page  => 1, 

data/test/functional/test_validations.rb

@@ -24,7 +24,24 @@ class ValidationsTest < Test::Unit::TestCase
       doc.errors.full_messages.should == ["Name can't be empty"]
     end
   end
-  
+
+  context "Skipping validations when saving" do
+    setup do
+      @document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+        key :name, String, :required => true
+      end
+      @document.collection.remove
+    end
+
+    should "insert document" do
+      doc = @document.new
+      doc.save(false)
+      @document.count.should == 1
+    end
+  end
+
   context "Saving a document that is invalid (destructive)" do
     setup do
       @document = Class.new do

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper')
 gem 'jnunemaker-matchy', '0.4.0'
 gem 'shoulda', '2.10.2'
 gem 'timecop', '0.3.1'
-gem 'mocha', '0.9.4'
+gem 'mocha', '0.9.8'
 
 require 'matchy'
 require 'shoulda'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2009.11.6
+  version: 2009.11.8
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -05:00
+date: 2009-11-08 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.8
     version: 
 description: 
 email: nunemaker@gmail.com