mongo_mapper 0.8.0 → 0.8.1

data/lib/mongo_mapper.rb

@@ -65,22 +65,6 @@ module MongoMapper
       autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
       autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
-
-    module DynamicQuerying
-      autoload :DynamicFinder, 'mongo_mapper/plugins/dynamic_querying/dynamic_finder'
-    end
-
-    module Keys
-      autoload :Key, 'mongo_mapper/plugins/keys/key'
-    end
-    
-    module Querying
-      autoload :Decorator, 'mongo_mapper/plugins/querying/decorator'
-    end
-  end
-
-  module Support
-    autoload :DescendantAppends, 'mongo_mapper/support/descendant_appends'
   end
 
   extend Connection
@@ -90,5 +74,7 @@ Dir[File.join(File.dirname(__FILE__), 'mongo_mapper', 'extensions', '*.rb')].eac
   require extension
 end
 
+require 'mongo_mapper/support/descendant_appends'
+
 # FIXME: autoload with proxy is failing, need to investigate
 require 'mongo_mapper/plugins/associations/proxy'

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

@@ -3,7 +3,7 @@ module MongoMapper
   module Plugins
     module Associations
       class InArrayProxy < Collection
-        include MongoMapper::Plugins::DynamicQuerying::ClassMethods
+        include DynamicQuerying::ClassMethods
 
         def find(*args)
           query.find(*scoped_ids(args))

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

@@ -3,35 +3,8 @@ module MongoMapper
   module Plugins
     module Associations
       class ManyDocumentsProxy < Collection
-        include MongoMapper::Plugins::DynamicQuerying::ClassMethods
-
-        def find(*args)
-          query.find(*args)
-        end
-
-        def find!(*args)
-          query.find!(*args)
-        end
-
-        def paginate(options)
-          query.paginate(options)
-        end
-
-        def all(options={})
-          query(options).all
-        end
-
-        def first(options={})
-          query(options).first
-        end
-
-        def last(options={})
-          query(options).last
-        end
-
-        def count(options={})
-          query(options).count
-        end
+        include DynamicQuerying::ClassMethods
+        include Querying::PluckyMethods
 
         def replace(docs)
           load_target
@@ -93,8 +66,17 @@ module MongoMapper
           def query(options={})
             klass.
               query(association.query_options).
-              update(options).
-              update(criteria)
+              update(options).update(criteria)
+          end
+
+          def method_missing(method, *args, &block)
+            if klass.respond_to?(method)
+              result = klass.send(method, *args, &block)
+              result.is_a?(Plucky::Query) ? 
+                query.merge(result) : super
+            else
+              super
+            end
           end
 
           def criteria

data/lib/mongo_mapper/plugins/document.rb

@@ -18,7 +18,7 @@ module MongoMapper
         end
 
         def reload
-          if doc = self.class.query.find_one(:_id => id)
+          if doc = collection.find_one(:_id => id)
             tap do |instance|
               instance.class.associations.each_key do |association_name|
                 send(association_name).reset if respond_to?(association_name)

data/lib/mongo_mapper/plugins/dynamic_querying.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+require 'mongo_mapper/plugins/dynamic_querying/dynamic_finder'
+
 module MongoMapper
   module Plugins
     module DynamicQuerying

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -30,21 +30,34 @@ module MongoMapper
           @identity_map = v
         end
 
-        def find_one(options={})
-          query = query(options)
-
-          if query.simple? && identity_map.key?(query[:_id])
-            identity_map[query[:_id]]
-          else
-            super.tap do |document|
-              remove_documents_from_map(document) if query.fields?
+        module IdentityMapQueryMethods
+          def all(opts={})
+            query = clone.update(opts)
+            super.tap do |docs|
+              model.remove_documents_from_map(docs) if query.fields?
+            end
+          end
+
+          def find_one(opts={})
+            query = clone.update(opts)
+
+            if query.simple? && model.identity_map[query[:_id]]
+              model.identity_map[query[:_id]]
+            else
+              super.tap do |doc|
+                model.remove_documents_from_map(doc) if query.fields?
+              end
             end
           end
         end
 
-        def find_many(options)
-          super.tap do |documents|
-            remove_documents_from_map(documents) if query(options).fields?
+        def query(opts={})
+          super.extend(IdentityMapQueryMethods)
+        end
+
+        def remove_documents_from_map(*documents)
+          documents.flatten.compact.each do |document|
+            identity_map.delete(document['_id'])
           end
         end
 
@@ -88,12 +101,6 @@ module MongoMapper
         end
 
         private
-          def remove_documents_from_map(*documents)
-            documents.flatten.compact.each do |document|
-              identity_map.delete(document._id)
-            end
-          end
-
           def selecting_fields?(options)
             !options[:fields].nil?
           end

data/lib/mongo_mapper/plugins/keys.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+require 'mongo_mapper/plugins/keys/key'
+
 module MongoMapper
   module Plugins
     module Keys

data/lib/mongo_mapper/plugins/querying.rb

@@ -1,61 +1,21 @@
 # encoding: UTF-8
+require 'mongo_mapper/plugins/querying/decorator'
+require 'mongo_mapper/plugins/querying/plucky_methods'
+
 module MongoMapper
   module Plugins
     module Querying
       module ClassMethods
-        def find(*args)
-          options = args.extract_options!
-          return nil if args.size == 0
-
-          if args.first.is_a?(Array) || args.size > 1
-            find_some(args, options)
-          else
-            find_one(options.merge(:_id => args[0]))
-          end
-        end
-
-        def find!(*args)
-          options = args.extract_options!
-          raise DocumentNotFound, "Couldn't find without an ID" if args.size == 0
+        include PluckyMethods
 
-          if args.first.is_a?(Array) || args.size > 1
-            find_some!(args, options)
-          else
-            find_one(options.merge(:_id => args[0])) ||
-              raise(DocumentNotFound, "Document match #{options.inspect} does not exist
-                                        in #{collection.name} collection")
-          end
-        end
-
-        def find_each(options={})
-          query(options).find_each.each { |doc| yield load(doc) }
+        def find_each(opts={})
+          super(opts).each { |doc| yield load(doc) }
         end
 
         def find_by_id(id)
           find_one(:_id => id)
         end
 
-        def first(options={})
-          find_one(options)
-        end
-
-        # All bets are off an actual order if you provide none.
-        def last(options={})
-          find_one(query(options).reverse.to_hash)
-        end
-
-        def all(options={})
-          find_many(options)
-        end
-
-        def count(options={})
-          query(options).count
-        end
-
-        def exists?(options={})
-          !count(options).zero?
-        end
-
         def first_or_create(args)
           first(args) || create(args.reject { |key, value| !key?(key) })
         end
@@ -97,30 +57,10 @@ module MongoMapper
           find_each(options) { |document| document.destroy }
         end
 
-        def where(options={})
-          query.where(options)
-        end
-
-        def fields(*args)
-          query.fields(*args)
-        end
-
-        def limit(*args)
-          query.limit(*args)
-        end
-
-        def skip(*args)
-          query.skip(*args)
-        end
-
-        def sort(*args)
-          query.sort(*args)
-        end
-
         # @api private for now
         def query(options={})
           Plucky::Query.new(collection).tap do |query|
-            query.extend(MongoMapper::Plugins::Querying::Decorator)
+            query.extend(Decorator)
             query.object_ids(object_id_keys)
             query.update(options)
             query.model(self)

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

@@ -3,7 +3,7 @@ module MongoMapper
   module Plugins
     module Querying
       module Decorator
-        include MongoMapper::Plugins::DynamicQuerying::ClassMethods
+        include DynamicQuerying::ClassMethods
 
         def model(model=nil)
           return @model if model.nil?

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

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+require 'forwardable'
+
+module MongoMapper
+  module Plugins
+    module Querying
+      module PluckyMethods
+        extend Forwardable
+        def_delegators :query,  :where, :fields, :limit, :skip, :sort,
+                                :count, :last, :first, :all, :paginate,
+                                :find, :find!, :exists?, :exist?, :find_each
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/validations.rb

@@ -5,13 +5,13 @@ module MongoMapper
       def self.configure(model)
         model.class_eval do
           include Validatable
-          extend Plugins::Validations::DocumentMacros
+          extend Validations::DocumentMacros
         end
       end
 
       module DocumentMacros
         def validates_uniqueness_of(*args)
-          add_validations(args, MongoMapper::Plugins::Validations::ValidatesUniquenessOf)
+          add_validations(args, Validations::ValidatesUniquenessOf)
         end
       end
 

data/lib/mongo_mapper/version.rb

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

data/test/functional/associations/test_many_documents_proxy.rb

@@ -345,6 +345,45 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       end
     end
 
+    context "sexy querying" do
+      should "work with where" do
+        @project1.statuses.where(:name => 'New').all.should == [@brand_new]
+      end
+
+      should "work with sort" do
+        @project1.statuses.sort(:name).all.should == [@complete, @brand_new]
+      end
+
+      should "work with limit" do
+        @project1.statuses.sort(:name).limit(1).all.should == [@complete]
+      end
+
+      should "work with skip" do
+        @project1.statuses.sort(:name).skip(1).all.should == [@brand_new]
+      end
+
+      should "work with fields" do
+        @project1.statuses.fields(:position).all.each do |status|
+          status.position.should_not be_nil
+          status.name.should be_nil
+        end
+      end
+
+      should "work with scopes" do
+        @project1.statuses.complete.all.should == [@complete]
+      end
+
+      should "work with methods on class that return query" do
+        @project1.statuses.by_position(1).first.should == @brand_new
+      end
+
+      should "not work with methods on class that do not return query" do
+        Status.class_eval { def self.foo; 'foo' end }
+        lambda { @project1.statuses.foo }.
+          should raise_error(NoMethodError)
+      end
+    end
+
     context "all" do
       should "work" do
         @project1.statuses.all(:order => "position asc").should == [@brand_new, @complete]

data/test/functional/test_identity_map.rb

@@ -327,7 +327,7 @@ class IdentityMapTest < Test::Unit::TestCase
 
       should "return nil for document id not found in collection" do
         assert_in_map(@person)
-        @person_class.find_by_id(1234).should be_nil
+        @person_class.find_by_id(BSON::ObjectID.new).should be_nil
       end
     end
 
@@ -342,13 +342,13 @@ class IdentityMapTest < Test::Unit::TestCase
         @person_class.first(:_id => @person.id, :select => 'name').should == @person
         @person_class.first(:_id => @person.id, 'fields' => ['name']).should == @person
         @person_class.last(:_id => @person.id, :select => 'name', :order => 'name').should == @person
-        @person_class.find(@person.id, :select => 'name').should == @person
+        @person_class.fields(:name).find(@person.id).should == @person
         @person_class.all(:_id => @person.id, :select => 'name').should == [@person]
         assert_not_in_map(@person)
       end
 
       should "return nil if not found" do
-        @person_class.find(1234, :select => 'name').should be_nil
+        @person_class.fields(:name).find(BSON::ObjectID.new).should be_nil
       end
     end
 

data/test/models.rb

@@ -143,6 +143,12 @@ end
 class Status
   include MongoMapper::Document
 
+  scope :complete, where(:name => 'Complete')
+
+  def self.by_position(position)
+    where(:position => position)
+  end
+
   key :project_id, ObjectId
   key :target_id, ObjectId
   key :target_type, String

data/test/test_helper.rb

@@ -1,19 +1,23 @@
-require File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper')
-require 'fileutils'
-
-gem 'jnunemaker-matchy', '0.4.0'
-gem 'shoulda',           '2.10.2'
-gem 'json',              '>= 1.2.3'
-gem 'timecop',           '0.3.1'
-gem 'mocha',             '0.9.8'
+require 'rubygems'
+gem 'activesupport',     ENV['ACTIVE_SUPPORT_VERSION']
+gem 'json',              '~> 1.2.3'
+gem 'jnunemaker-matchy', '~> 0.4.0'
+gem 'shoulda',           '~> 2.10.2'
+gem 'timecop',           '~> 0.3.1'
+gem 'mocha',             '~> 0.9.8'
 
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'mongo_mapper'
+require 'fileutils'
 require 'ostruct'
+require 'pp'
+
+require 'active_support/version'
+require 'json'
+require 'matchy'
 require 'shoulda'
 require 'timecop'
-require 'matchy'
 require 'mocha'
-require 'json'
-require 'pp'
 
 class Test::Unit::TestCase
   def Doc(name=nil, &block)
@@ -96,3 +100,5 @@ logger = Logger.new(log_dir + '/test.log')
 MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
 MongoMapper.database = "mm-test-#{RUBY_VERSION.gsub('.', '-')}"
 MongoMapper.database.collections.each { |c| c.drop_indexes }
+
+puts "\n--- Active Support Version: #{ActiveSupport::VERSION::STRING} ---\n"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -78,7 +78,7 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -92,7 +92,7 @@ dependencies:
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
@@ -106,7 +106,7 @@ dependencies:
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -120,7 +120,7 @@ dependencies:
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -199,6 +199,7 @@ 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.rb
 - lib/mongo_mapper/plugins/safe.rb
@@ -212,7 +213,7 @@ files:
 - lib/mongo_mapper/support/descendant_appends.rb
 - lib/mongo_mapper/version.rb
 - lib/mongo_mapper.rb
-- test/active_model_lint_test.rb
+- test/_NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_in_array_proxy.rb
@@ -247,7 +248,7 @@ files:
 - test/functional/test_userstamps.rb
 - test/functional/test_validations.rb
 - test/models.rb
-- test/NOTE_ON_TESTING
+- test/test_active_model_lint.rb
 - test/test_helper.rb
 - test/unit/associations/test_base.rb
 - test/unit/associations/test_proxy.rb