mongo_mapper 0.5.0 → 0.5.1

data/.gitignore

@@ -4,4 +4,5 @@ coverage
 rdoc
 pkg
 *~
-*.gem
+*.gem
+tmp

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/mongo_mapper.rb

@@ -10,7 +10,6 @@ require 'validatable'
 
 module MongoMapper
   DocumentNotFound  = Class.new(StandardError)
-  
   DocumentNotValid  = Class.new(StandardError) do
     def initialize(document)
       @document = document
@@ -25,6 +24,10 @@ module MongoMapper
   def self.connection=(new_connection)
     @@connection = new_connection
   end
+  
+  def self.logger
+    connection.logger
+  end
 
   def self.database=(name)
     @@database = nil

data/lib/mongo_mapper/document.rb

@@ -29,12 +29,20 @@ module MongoMapper
     module ClassMethods
       def find(*args)
         options = args.extract_options!
-
         case args.first
-          when :first then find_first(options)
-          when :last  then find_last(options)
+          when :first then first(options)
+          when :last  then last(options)
           when :all   then find_every(options)
-          else             find_from_ids(args, options)
+          when Array  then find_some(args, options)
+          else
+            case args.size
+              when 0
+                raise DocumentNotFound, "Couldn't find without an ID"
+              when 1
+                find_one(args[0], options)
+              else
+                find_some(args, options)
+            end
         end
       end
 
@@ -44,7 +52,7 @@ module MongoMapper
         total_entries = count(options[:conditions] || {})
         collection    = Pagination::PaginationProxy.new(total_entries, page, per_page)
 
-        options[:limit]   = collection.limit
+        options[:limit] = collection.limit
         options[:skip]  = collection.skip
 
         collection.subject = find_every(options)
@@ -52,11 +60,18 @@ module MongoMapper
       end
 
       def first(options={})
-        find_first(options)
+        options.merge!(:limit => 1)
+        find_every(options)[0]
       end
 
       def last(options={})
-        find_last(options)
+        if options[:order].blank?
+          raise ':order option must be provided when using last'
+        end
+        
+        options.merge!(:limit => 1)
+        options[:order] = invert_order_clause(options[:order])
+        find_every(options)[0]
       end
 
       def all(options={})
@@ -176,21 +191,8 @@ module MongoMapper
           collection.find(criteria, options).to_a.map { |doc| new(doc) }
         end
 
-        def find_first(options)
-          options.merge!(:limit => 1)
-          options[:order] ||= '$natural'
-          find_every(options)[0]
-        end
-
-        def find_last(options)
-          options.merge!(:limit => 1)
-          options[:order] = invert_order_clause(options)
-          find_every(options)[0]
-        end
-
-        def invert_order_clause(options)
-          return '$natural desc' unless options[:order]
-          options[:order].split(',').map do |order_segment| 
+        def invert_order_clause(order)
+          order.split(',').map do |order_segment| 
             if order_segment =~ /\sasc/i
               order_segment.sub /\sasc/i, ' desc'
             elsif order_segment =~ /\sdesc/i
@@ -202,7 +204,9 @@ module MongoMapper
         end
 
         def find_some(ids, options={})
+          ids = ids.flatten.compact.uniq
           documents = find_every(options.deep_merge(:conditions => {'_id' => ids}))
+          
           if ids.size == documents.size
             documents
           else
@@ -218,19 +222,6 @@ module MongoMapper
           end
         end
 
-        def find_from_ids(ids, options={})
-          ids = ids.flatten.compact.uniq
-
-          case ids.size
-            when 0
-              raise(DocumentNotFound, "Couldn't find without an ID")
-            when 1
-              find_one(ids[0], options)
-            else
-              find_some(ids, options)
-          end
-        end
-
         def update_single(id, attrs)
           if id.blank? || attrs.blank? || !attrs.is_a?(Hash)
             raise ArgumentError, "Updating a single document requires an id and a hash of attributes"

data/lib/mongo_mapper/support.rb

@@ -154,4 +154,18 @@ class Time
       Time.parse(value.to_s)
     end
   end
+end
+
+# duck punch to get access to internal mongo 
+# logger instance until my patch goes thorugh
+module Mongo
+  class Connection
+    def logger
+      @options[:logger]
+    end
+  end
+  
+  class DB
+    attr_reader :logger
+  end
 end

data/mongo_mapper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/support.rb",
      "lib/mongo_mapper/validations.rb",
      "mongo_mapper.gemspec",
+     "specs.watchr",
      "test/NOTE_ON_TESTING",
      "test/custom_matchers.rb",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
@@ -66,6 +67,7 @@ Gem::Specification.new do |s|
      "test/functional/test_callbacks.rb",
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
+     "test/functional/test_logger.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_validations.rb",
@@ -107,6 +109,7 @@ Gem::Specification.new do |s|
      "test/functional/test_callbacks.rb",
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
+     "test/functional/test_logger.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_validations.rb",

data/specs.watchr

@@ -0,0 +1,32 @@
+def run(cmd)
+  puts(cmd)
+  system(cmd)
+end
+
+def run_test_file(file)
+  run "ruby -Itest #{file}"
+end
+
+def run_all_tests
+  run "rake test"
+end
+
+def related_test_files(path)
+  Dir['test/**/*.rb'].select { |file| file =~ /#{File.basename(path)}/ }
+end
+
+watch('test/test_helper\.rb') { run_all_tests }
+watch('test/.*/test_.*\.rb')  { |m| run_test_file(m[0]) }
+watch('lib/.*') do |m|
+  related_test_files(m[0]).each { |file| run_test_file(file) }
+end
+
+# Ctrl-\
+Signal.trap('QUIT') do
+  puts " --- Running all tests ---\n\n"
+  run_all_tests
+end
+
+# Ctrl-C
+Signal.trap('INT') { abort("\n") }
+

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -158,7 +158,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "work with order" do
-        comments = @post.comments.all(:order => '$natural desc')
+        comments = @post.comments.all(:order => 'body desc')
         comments.should == [@comment2, @comment1]
       end
     end

data/test/functional/associations/test_many_proxy.rb

@@ -269,7 +269,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        status = @project1.statuses.find(:last, :conditions => {:name => 'New'})
+        status = @project1.statuses.find(:last, :order => 'position', :conditions => {:name => 'New'})
         status.should == @brand_new
       end
     end
@@ -280,7 +280,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        status = @project1.statuses.last(:conditions => {:name => 'New'})
+        status = @project1.statuses.last(:order => 'position', :conditions => {:name => 'New'})
         status.should == @brand_new
       end
     end

data/test/functional/test_associations.rb

@@ -1,11 +1,7 @@
 require 'test_helper'
 require 'models'
 
-class AssociationsTest < Test::Unit::TestCase
-  def setup
-    clear_all_collections
-  end
-    
+class AssociationsTest < Test::Unit::TestCase    
   should "allow changing class names" do
     class AwesomeUser
       include MongoMapper::Document

data/test/functional/test_document.rb

@@ -289,6 +289,10 @@ class DocumentTest < Test::Unit::TestCase
         should "work as array" do
           @document.find([@doc1.id, @doc2.id]).should == [@doc1, @doc2]
         end
+        
+        should "return array if array only has one element" do
+          @document.find([@doc1.id]).should == [@doc1]
+        end
       end
 
       context "with :all" do
@@ -330,9 +334,13 @@ class DocumentTest < Test::Unit::TestCase
       context "with #last" do
         should "find last document based on criteria" do
           @document.last(:order => 'age').should == @doc2
-          @document.last(:conditions => {:age => 28}).should == @doc2
+          @document.last(:order => 'age', :conditions => {:age => 28}).should == @doc2
         end
-      end
+        
+        should "raise error if no order provided" do
+          lambda { @document.last() }.should raise_error
+        end
+      end      
 
       context "with :find_by" do
         should "find document based on argument" do

data/test/functional/test_logger.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class LoggerTest < Test::Unit::TestCase
+  context "with connection that has logger" do
+    setup do
+      @output = StringIO.new
+      @logger = Logger.new(@output)
+      MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => @logger)
+    end
+
+    should "be able to get access to that logger" do
+      MongoMapper.logger.should == @logger
+    end
+    
+    should "be able to log messages" do
+      MongoMapper.logger.debug 'testing'
+      @output.string.include?('testing').should be_true
+    end
+  end
+end

data/test/test_helper.rb

@@ -25,5 +25,6 @@ end
 DefaultDatabase = 'test' unless defined?(DefaultDatabase)
 AlternateDatabase = 'test2' unless defined?(AlternateDatabase)
 
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
+logger = Logger.new(File.expand_path(File.dirname(__FILE__) + '/../tmp/test.log'))
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
 MongoMapper.database = DefaultDatabase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -106,6 +106,7 @@ files:
 - lib/mongo_mapper/support.rb
 - lib/mongo_mapper/validations.rb
 - mongo_mapper.gemspec
+- specs.watchr
 - test/NOTE_ON_TESTING
 - test/custom_matchers.rb
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
@@ -120,6 +121,7 @@ files:
 - test/functional/test_callbacks.rb
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
+- test/functional/test_logger.rb
 - test/functional/test_pagination.rb
 - test/functional/test_rails_compatibility.rb
 - test/functional/test_validations.rb
@@ -182,6 +184,7 @@ test_files:
 - test/functional/test_callbacks.rb
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
+- test/functional/test_logger.rb
 - test/functional/test_pagination.rb
 - test/functional/test_rails_compatibility.rb
 - test/functional/test_validations.rb