djsun-mongo_mapper 0.5.5.3 → 0.5.6.1

data/README.rdoc

@@ -35,7 +35,10 @@ You can also just declare the source:
 
 == Documentation
 
+Documentation is lacking right now because if you can't look through the code right now and feel comfortable, this is probably too young for you to use. Wait til it stabilizes a bit more.
+
 http://rdoc.info/projects/jnunemaker/mongomapper
+http://groups.google.com/group/mongomapper
 
 == More Info
 

data/Rakefile

@@ -1,89 +1,50 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "djsun-mongo_mapper"
-    gem.summary = %Q{Awesome gem for modeling your domain and storing it in mongo}
-    gem.email = "nunemaker@gmail.com"
-    gem.homepage = "http://github.com/jnunemaker/mongomapper"
-    gem.authors = ["John Nunemaker"]
-    gem.rubyforge_project = "mongomapper"
-    
-    gem.add_dependency('activesupport', '>= 2.3')
-    gem.add_dependency('mongo', '0.15.1')
-    gem.add_dependency('jnunemaker-validatable', '1.7.4')
-    
-    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')
-  end
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name        = "djsun-mongo_mapper"
+  gem.summary     = %Q{Awesome gem for modeling your domain and storing it in mongo}
+  gem.description = %Q{Awesome gem for modeling your domain and storing it in mongo}
+  gem.email       = "nunemaker@gmail.com"
+  gem.homepage    = "http://github.com/jnunemaker/mongomapper"
+  gem.authors     = ["John Nunemaker"]
   
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  gem.add_dependency('activesupport', '>= 2.3')
+  gem.add_dependency('mongo', '0.15.1')
+  gem.add_dependency('jnunemaker-validatable', '1.8.0')
+  
+  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')
 end
 
+Jeweler::GemcutterTasks.new
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
+  test.ruby_opts << '-rubygems'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
 namespace :test do
   Rake::TestTask.new(:units) do |test|
-    test.libs << 'lib' << 'test'
+    test.libs << 'test'
+    test.ruby_opts << '-rubygems'
     test.pattern = 'test/unit/**/test_*.rb'
     test.verbose = true
   end
   
   Rake::TestTask.new(:functionals) do |test|
-    test.libs << 'lib' << 'test'
-    test.pattern = 'test/functional/**/test_*.rb'
-    test.verbose = true
-  end
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
+    test.ruby_opts << '-rubygems'
+    test.pattern = 'test/functional/**/test_*.rb'
     test.verbose = true
   end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "MongoMapper #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default  => :test
+task :test     => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.5.5.3
+0.5.6.1

data/djsun-mongo_mapper.gemspec

@@ -1,16 +1,17 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{djsun-mongo_mapper}
-  s.version = "0.5.5.3"
+  s.version = "0.5.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-19}
+  s.date = %q{2009-10-26}
   s.default_executable = %q{mmconsole}
+  s.description = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
   s.extra_rdoc_files = [
@@ -96,7 +97,6 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jnunemaker/mongomapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{mongomapper}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
@@ -146,7 +146,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.15.1"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
       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"])
@@ -154,7 +154,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
       s.add_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_dependency(%q<timecop>, ["= 0.3.1"])
@@ -163,10 +163,11 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
     s.add_dependency(%q<mongo>, ["= 0.15.1"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])
     s.add_dependency(%q<timecop>, ["= 0.3.1"])
     s.add_dependency(%q<mocha>, ["= 0.9.4"])
   end
 end
+

data/lib/mongo_mapper.rb

@@ -1,10 +1,4 @@
-require 'rubygems'
-
-gem 'activesupport', '>= 2.3'
-gem 'mongo', '0.15.1'
-gem 'jnunemaker-validatable', '1.7.4'
-
-require 'activesupport'
+require 'active_support'
 require 'mongo'
 require 'validatable'
 
@@ -60,13 +54,12 @@ module MongoMapper
   module Finders
     def dynamic_find(finder, args)
       attributes = {}
-      find_options = args.extract_options!.deep_merge(:conditions => attributes)
-
       finder.attributes.each_with_index do |attr, index|
         attributes[attr] = args[index]
       end
-
-      result = find(finder.finder, find_options)
+      
+      options = args.extract_options!.merge(attributes)
+      result  = find(finder.finder, options)
 
       if result.nil?
         if finder.bang

data/lib/mongo_mapper/associations.rb

@@ -42,8 +42,6 @@ module MongoMapper
           if association.options[:dependent]
             if association.many?
               define_dependent_callback_for_many(association)
-            elsif association.belongs_to?
-              define_dependent_callback_for_belongs_to(association)
             end
           end
         end
@@ -63,14 +61,6 @@ module MongoMapper
           end
         end
 
-        def define_dependent_callback_for_belongs_to(association)
-          after_destroy do |doc|
-            case association.options[:dependent]
-            when :destroy
-              doc.get_proxy(association).destroy
-            end
-          end
-        end
     end
 
     module InstanceMethods

data/lib/mongo_mapper/associations/many_documents_proxy.rb

@@ -4,7 +4,7 @@ module MongoMapper
       delegate :klass, :to => :@association
       delegate :collection, :to => :klass
       
-      include MongoMapper::Finders
+      include ::MongoMapper::Finders
       
       def find(*args)
         options = args.extract_options!
@@ -27,8 +27,8 @@ module MongoMapper
         find(:last, scoped_options(options))
       end
 
-      def count(conditions={})
-        klass.count(conditions.deep_merge(scoped_conditions))
+      def count(options={})
+        klass.count(options.merge(scoped_conditions))
       end
 
       def replace(docs)
@@ -57,20 +57,20 @@ module MongoMapper
         doc
       end
 
-      def destroy_all(conditions={})
-        all(:conditions => conditions).map(&:destroy)
+      def destroy_all(options={})
+        all(options).map(&:destroy)
         reset
       end
 
-      def delete_all(conditions={})
-        klass.delete_all(conditions.deep_merge(scoped_conditions))
+      def delete_all(options={})
+        klass.delete_all(options.merge(scoped_conditions))
         reset
       end
       
       def nullify
-        criteria = FinderOptions.to_mongo_criteria(scoped_conditions)
+        criteria = FinderOptions.new(klass, scoped_conditions).criteria
         all(criteria).each do |doc|
-          doc.update_attributes self.foreign_key => nil
+          doc.update_attributes(self.foreign_key => nil)
         end
         reset
       end
@@ -91,7 +91,7 @@ module MongoMapper
         end
 
         def scoped_options(options)
-          options.deep_merge({:conditions => scoped_conditions})
+          options.merge(scoped_conditions)
         end
 
         def find_target

data/lib/mongo_mapper/document.rb

@@ -55,7 +55,7 @@ module MongoMapper
               when 0
                 raise DocumentNotFound, "Couldn't find without an ID"
               when 1
-                find_one(args[0], options)
+                find_one!(options.merge({:_id => args[0]}))
               else
                 find_some(args, options)
             end
@@ -63,31 +63,23 @@ module MongoMapper
       end
 
       def paginate(options)
-        per_page      = options.delete(:per_page) ||  self.per_page
+        per_page      = options.delete(:per_page) || self.per_page
         page          = options.delete(:page)
-        total_entries = count(options[:conditions] || {})
-        collection    = Pagination::PaginationProxy.new(total_entries, page, per_page)
+        total_entries = count(options)
+        pagination    = Pagination::PaginationProxy.new(total_entries, page, per_page)
 
-        options[:limit] = collection.limit
-        options[:skip]  = collection.skip
-
-        collection.subject = find_every(options)
-        collection
+        options.merge!(:limit => pagination.limit, :skip => pagination.skip)
+        pagination.subject = find_every(options)
+        pagination
       end
 
       def first(options={})
-        options.merge!(:limit => 1)
-        find_every(options)[0]
+        find_one(options)
       end
 
       def 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]
+        raise ':order option must be provided when using last' if options[:order].blank?
+        find_one(options.merge(:order => invert_order_clause(options[:order])))
       end
 
       def all(options={})
@@ -95,18 +87,15 @@ module MongoMapper
       end
 
       def find_by_id(id)
-        criteria = FinderOptions.to_mongo_criteria(:_id => id)
-        if doc = collection.find_one(criteria)
-          new(doc)
-        end
+        find_one(:_id => id)
       end
 
-      def count(conditions={})
-        collection.find(FinderOptions.to_mongo_criteria(conditions)).count
+      def count(options={})
+        collection.find(to_criteria(options)).count
       end
 
-      def exists?(conditions={})
-        !count(conditions).zero?
+      def exists?(options={})
+        !count(options).zero?
       end
 
       def create(*docs)
@@ -123,8 +112,7 @@ module MongoMapper
       # For updating multiple documents at once:
       #   Person.update({'1' => {:foo => 'bar'}, '2' => {:baz => 'wick'}})
       def update(*args)
-        updating_multiple = args.length == 1
-        if updating_multiple
+        if args.length == 1
           update_multiple(args[0])
         else
           id, attributes = args
@@ -133,21 +121,19 @@ module MongoMapper
       end
 
       def delete(*ids)
-        criteria = FinderOptions.to_mongo_criteria(:_id => ids.flatten)
-        collection.remove(criteria)
+        collection.remove(to_criteria(:_id => ids.flatten))
       end
 
-      def delete_all(conditions={})
-        criteria = FinderOptions.to_mongo_criteria(conditions)
-        collection.remove(criteria)
+      def delete_all(options={})
+        collection.remove(to_criteria(options))
       end
 
       def destroy(*ids)
         find_some(ids.flatten).each(&:destroy)
       end
 
-      def destroy_all(conditions={})
-        find(:all, :conditions => conditions).each(&:destroy)
+      def destroy_all(options={})
+        all(options).each(&:destroy)
       end
 
       def connection(mongo_connection=nil)
@@ -187,10 +173,17 @@ module MongoMapper
       def timestamps!
         key :created_at, Time
         key :updated_at, Time
-        
         class_eval { before_save :update_timestamps }
       end
       
+      def single_collection_inherited?
+        keys.has_key?('_type') && single_collection_inherited_superclass?
+      end
+      
+      def single_collection_inherited_superclass?
+        superclass.respond_to?(:keys) && superclass.keys.has_key?('_type')
+      end
+            
       protected
         def method_missing(method, *args)
           finder = DynamicFinder.new(method)
@@ -204,33 +197,58 @@ module MongoMapper
         end
 
       private
-        # Initializes each document and yields each initialized document
+        def create_indexes_for(key)
+          ensure_index key.name if key.options[:index]
+        end
+        
         def initialize_each(*docs)
           instances = []
           docs = [{}] if docs.blank?
           docs.flatten.each do |attrs|
-            doc = new(attrs)
+            doc = initialize_doc(attrs)
             yield(doc)
             instances << doc
           end
           instances.size == 1 ? instances[0] : instances
         end
-
-        def create_indexes_for(key)
-          ensure_index key.name if key.options[:index]
+        
+        def initialize_doc(doc)
+          begin
+            klass = doc['_type'].present? ? doc['_type'].constantize : self
+            klass.new(doc)
+          rescue NameError
+            new(doc)
+          end
         end
         
         def find_every(options)
-          criteria, options = FinderOptions.new(options).to_a
+          criteria, options = to_finder_options(options)
           collection.find(criteria, options).to_a.map do |doc|
-            begin
-              klass = doc['_type'].present? ? doc['_type'].constantize : self
-              klass.new(doc)
-            rescue NameError
-              new(doc)
-            end
+            initialize_doc(doc)
+          end
+        end
+        
+        def find_some(ids, options={})
+          ids       = ids.flatten.compact.uniq
+          documents = find_every(options.merge(:_id => ids))
+          
+          if ids.size == documents.size
+            documents
+          else
+            raise DocumentNotFound, "Couldn't find all of the ids (#{ids.to_sentence}). Found #{documents.size}, but was expecting #{ids.size}"
           end
         end
+        
+        def find_one(options={})
+          criteria, options = to_finder_options(options)
+          if doc = collection.find_one(criteria, options)
+            initialize_doc(doc)
+          end
+        end
+        
+        def find_one!(options={})
+          find_one(options) || raise(DocumentNotFound, "Document match #{options.inspect} does not exist in #{collection.name} collection")
+        end
 
         def invert_order_clause(order)
           order.split(',').map do |order_segment| 
@@ -244,25 +262,6 @@ module MongoMapper
           end.join(',')
         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
-            raise DocumentNotFound, "Couldn't find all of the ids (#{ids.to_sentence}). Found #{documents.size}, but was expecting #{ids.size}"
-          end
-        end
-
-        def find_one(id, options={})
-          if doc = find_every(options.deep_merge(:conditions => {:_id => id})).first
-            doc
-          else
-            raise DocumentNotFound, "Document with id of #{id} does not exist in collection named #{collection.name}"
-          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"
@@ -282,6 +281,14 @@ module MongoMapper
           docs.each_pair { |id, attrs| instances << update(id, attrs) }
           instances
         end
+        
+        def to_criteria(options={})
+          FinderOptions.new(self, options).criteria
+        end
+        
+        def to_finder_options(options={})
+          FinderOptions.new(self, options).to_a
+        end
     end
 
     module InstanceMethods      
@@ -303,9 +310,7 @@ module MongoMapper
 
       def destroy
         return false if frozen?
-
-        criteria = FinderOptions.to_mongo_criteria(:_id => id)
-        collection.remove(criteria) unless new?
+        self.class.delete(id) unless new?
         freeze
       end