djsun-mongomapper 0.3.5.5 → 0.4.1.2

data/README.rdoc

@@ -1,39 +1,39 @@
-= MongoMapper
-
-Awesome gem for modeling your domain and storing it in mongo.
-
-Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
-
-* rake gemspec
-* gem build mongomapper.gemspec
-* gem install the gem that was built
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Dependencies
-
-* ActiveSupport (activesupport)
-* Mongo Ruby Driver (mongodb-mongo)
-* My fork of the validatable gem (jnunemaker-validatable)
-
-== Documentation
-
-http://rdoc.info/projects/jnunemaker/mongomapper
-
-== More Info
-
-You can learn more about mongo here:
-http://www.mongodb.org/
-
-You can learn more about the mongo ruby driver here:
-http://github.com/mongodb/mongo-ruby-driver/tree/master
-
-== Copyright
-
+= MongoMapper
+
+Awesome gem for modeling your domain and storing it in mongo.
+
+Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
+
+* rake gemspec
+* gem build mongomapper.gemspec
+* gem install the gem that was built
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Dependencies
+
+* ActiveSupport (activesupport)
+* Mongo Ruby Driver (mongo)
+* My fork of the validatable gem (jnunemaker-validatable)
+
+== Documentation
+
+http://rdoc.info/projects/jnunemaker/mongomapper
+
+== More Info
+
+You can learn more about mongo here:
+http://www.mongodb.org/
+
+You can learn more about the mongo ruby driver here:
+http://github.com/mongodb/mongo-ruby-driver/tree/master
+
+== Copyright
+
 Copyright (c) 2009 John Nunemaker. See LICENSE for details.

data/Rakefile

@@ -1,73 +1,87 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mongomapper"
-    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')
-    gem.add_dependency('mongodb-mongo', '0.14.1')
-    gem.add_dependency('jnunemaker-validatable', '1.7.2')
-    
-    gem.add_development_dependency('mocha', '0.9.4')
-    gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
-  end
-  
-  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"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/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
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "djsun-mongomapper"
+    gem.summary = %Q{Map your domain to MongoDB}
+    gem.email = "djames@sunlightfoundation.com"
+    gem.homepage = "http://github.com/djsun/mongomapper"
+    gem.authors = ["John Nunemaker", "David James"]
+    # gem.rubyforge_project = "djsun-mongomapper"
+    
+    gem.add_dependency('activesupport')
+    gem.add_dependency('mongo', '0.15')
+    gem.add_dependency('jnunemaker-validatable', '1.7.2')
+    
+    gem.add_development_dependency('mocha', '0.9.4')
+    gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
+  end
+  
+  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"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+namespace :test do
+  Rake::TestTask.new(:units) do |test|
+    test.libs << 'lib' << 'test'
+    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.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

data/VERSION

@@ -1 +1 @@
-0.3.5.5
+0.4.1.2

data/lib/mongomapper.rb

@@ -1,71 +1,67 @@
-require 'pathname'
-require 'rubygems'
-
-gem 'activesupport'
-gem 'mongodb-mongo', '0.14.1'
-gem 'jnunemaker-validatable', '1.7.2'
-
-# require 'activesupport'
-require 'mongo'
-require 'validatable'
-
-dir = Pathname(__FILE__).dirname.expand_path + 'mongomapper'
-
-require dir + 'support'
-
-require dir + 'associations'
-require dir + 'associations/base'
-
-require dir + 'associations/proxy'
-require dir + 'associations/many_documents_proxy'
-
-require dir + 'associations/belongs_to_proxy'
-require dir + 'associations/belongs_to_polymorphic_proxy'
-require dir + 'associations/many_proxy'
-require dir + 'associations/many_polymorphic_proxy'
-require dir + 'associations/many_embedded_proxy'
-require dir + 'associations/many_embedded_polymorphic_proxy'
-require dir + 'associations/many_documents_as_proxy'
-
-require dir + 'callbacks'
-require dir + 'finder_options'
-require dir + 'dynamic_finder'
-require dir + 'key'
-require dir + 'observing'
-require dir + 'pagination'
-require dir + 'save_with_validation'
-require dir + 'serialization'
-require dir + 'validations'
-
-require dir + 'rails_compatibility/document'
-require dir + 'rails_compatibility/embedded_document'
-
-require dir + 'embedded_document'
-require dir + 'document'
-
-module MongoMapper
-  DocumentNotFound  = Class.new(StandardError)
-  
-  DocumentNotValid  = Class.new(StandardError) do
-    def initialize(document)
-      @document = document
-      super("Validation failed: #{@document.errors.full_messages.join(", ")}")
-    end
-  end
-  
-  def self.connection
-    @@connection ||= Mongo::Connection.new
-  end
-
-  def self.connection=(new_connection)
-    @@connection = new_connection
-  end
-
-  def self.database=(name)
-    @@database = MongoMapper.connection.db(name)
-  end
-
-  def self.database
-    @@database
-  end
-end
+require 'rubygems'
+
+gem 'activesupport'
+gem 'mongo', '0.15'
+gem 'jnunemaker-validatable', '1.7.2'
+
+require 'activesupport'
+require 'mongo'
+require 'validatable'
+
+require 'mongomapper/support'
+require 'mongomapper/associations'
+require 'mongomapper/associations/base'
+require 'mongomapper/associations/proxy'
+require 'mongomapper/associations/many_documents_proxy'
+require 'mongomapper/associations/belongs_to_proxy'
+require 'mongomapper/associations/belongs_to_polymorphic_proxy'
+require 'mongomapper/associations/many_proxy'
+require 'mongomapper/associations/many_polymorphic_proxy'
+require 'mongomapper/associations/many_embedded_proxy'
+require 'mongomapper/associations/many_embedded_polymorphic_proxy'
+require 'mongomapper/associations/many_documents_as_proxy'
+require 'mongomapper/callbacks'
+require 'mongomapper/finder_options'
+require 'mongomapper/dynamic_finder'
+require 'mongomapper/key'
+require 'mongomapper/observing'
+require 'mongomapper/pagination'
+require 'mongomapper/save_with_validation'
+require 'mongomapper/serialization'
+require 'mongomapper/validations'
+require 'mongomapper/rails_compatibility/document'
+require 'mongomapper/rails_compatibility/embedded_document'
+require 'mongomapper/embedded_document'
+require 'mongomapper/document'
+
+module MongoMapper
+  DocumentNotFound  = Class.new(StandardError)
+  
+  DocumentNotValid  = Class.new(StandardError) do
+    def initialize(document)
+      @document = document
+      super("Validation failed: #{@document.errors.full_messages.join(", ")}")
+    end
+  end
+  
+  def self.connection
+    @@connection ||= Mongo::Connection.new
+  end
+
+  def self.connection=(new_connection)
+    @@connection = new_connection
+  end
+
+  def self.database=(name)
+    @@database = nil
+    @@database_name = name
+  end
+
+  def self.database
+    if @@database_name.blank?
+      raise 'You forgot to set the default database name: MongoMapper.database = "foobar"'
+    end
+    
+    @@database ||= MongoMapper.connection.db(@@database_name)
+  end
+end

data/lib/mongomapper/associations.rb

@@ -1,84 +1,86 @@
-module MongoMapper
-  module Associations
-    module ClassMethods
-      def belongs_to(association_id, options = {})
-        create_association(:belongs_to, association_id, options)
-        self
-      end
-
-      def many(association_id, options = {})
-        create_association(:many, association_id, options)
-        self
-      end
-
-      def associations
-        @associations ||= HashWithIndifferentAccess.new
-      end
-
-      private
-        def create_association(type, name, options)
-          association = Associations::Base.new(type, name, options)
-          associations[association.name] = association
-          define_association_methods(association)
-          define_dependent_callback(association)
-          association
-        end
-
-        def define_association_methods(association)
-          define_method(association.name) do
-            get_proxy(association)
-          end
-
-          define_method("#{association.name}=") do |value|
-            get_proxy(association).replace(value)
-            value
-          end
-        end
-
-        def define_dependent_callback(association)
-          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
-
-        def define_dependent_callback_for_many(association)
-          return if association.embeddable?
-
-          after_destroy do |doc|
-            case association.options[:dependent]
-            when :destroy
-              doc.get_proxy(association).destroy_all
-            when :delete_all
-              doc.get_proxy(association).delete_all
-            when :nullify
-              doc.get_proxy(association).nullify
-            end
-          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
-      def get_proxy(association)
-        unless proxy = self.instance_variable_get(association.ivar)
-          proxy = association.proxy_class.new(self, association)
-          self.instance_variable_set(association.ivar, proxy) if !frozen?
-        end
-
-        proxy
-      end
-    end
-  end
-end
+module MongoMapper
+  module Associations
+    module ClassMethods
+      def belongs_to(association_id, options = {})
+        create_association(:belongs_to, association_id, options)
+        self
+      end
+
+      def many(association_id, options = {})
+        create_association(:many, association_id, options)
+        self
+      end
+
+      def associations
+        @associations ||= self.superclass.respond_to?(:associations) ? 
+                            self.superclass.associations : 
+                            HashWithIndifferentAccess.new
+      end
+
+      private
+        def create_association(type, name, options)
+          association = Associations::Base.new(type, name, options)
+          associations[association.name] = association
+          define_association_methods(association)
+          define_dependent_callback(association)
+          association
+        end
+
+        def define_association_methods(association)
+          define_method(association.name) do
+            get_proxy(association)
+          end
+
+          define_method("#{association.name}=") do |value|
+            get_proxy(association).replace(value)
+            value
+          end
+        end
+
+        def define_dependent_callback(association)
+          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
+
+        def define_dependent_callback_for_many(association)
+          return if association.embeddable?
+
+          after_destroy do |doc|
+            case association.options[:dependent]
+            when :destroy
+              doc.get_proxy(association).destroy_all
+            when :delete_all
+              doc.get_proxy(association).delete_all
+            when :nullify
+              doc.get_proxy(association).nullify
+            end
+          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
+      def get_proxy(association)
+        unless proxy = self.instance_variable_get(association.ivar)
+          proxy = association.proxy_class.new(self, association)
+          self.instance_variable_set(association.ivar, proxy) if !frozen?
+        end
+
+        proxy
+      end
+    end
+  end
+end