mongo_mapper 0.6.8 → 0.6.9

data/lib/mongo_mapper/mongo_mapper.rb

@@ -0,0 +1,125 @@
+# if Gem is defined i'll assume you are using rubygems and lock specific versions
+# call me crazy but a plain old require will just get the latest version you have installed
+# so i want to make sure that if you are using gems you do in fact have the correct versions
+# if there is a better way to do this, please enlighten me!
+if self.class.const_defined?(:Gem)
+  gem 'activesupport', '>= 2.3'
+  gem 'mongo', '0.18.2'
+  gem 'jnunemaker-validatable', '1.8.1'
+end
+
+require 'active_support'
+require 'mongo'
+require 'validatable'
+
+module MongoMapper
+  # generic MM error
+  class MongoMapperError < StandardError; end
+  
+  # raised when key expected to exist but not found
+  class KeyNotFound < MongoMapperError; end
+  
+  # raised when document expected but not found
+  class DocumentNotFound < MongoMapperError; end
+  
+  # raised when document not valid and using !
+  class DocumentNotValid < MongoMapperError
+    def initialize(document)
+      super("Validation failed: #{document.errors.full_messages.join(", ")}")
+    end
+  end
+  
+  # @api public
+  def self.connection
+    @@connection ||= Mongo::Connection.new
+  end
+  
+  # @api public
+  def self.connection=(new_connection)
+    @@connection = new_connection
+  end
+  
+  # @api public
+  def self.logger
+    connection.logger
+  end
+  
+  # @api public
+  def self.database=(name)
+    @@database = nil
+    @@database_name = name
+  end
+  
+  # @api public
+  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
+  
+  # @api private
+  def self.ensured_indexes
+    @@ensured_indexes ||= []
+  end
+  
+  # @api private
+  def self.ensured_indexes=(value)
+    @@ensured_indexes = value
+  end
+  
+  # @api private
+  def self.ensure_index(klass, keys, options={})
+    ensured_indexes << {:klass => klass, :keys => keys, :options => options}
+  end
+  
+  # @api public
+  def self.ensure_indexes!
+    ensured_indexes.each do |index|
+      unique = index[:options].delete(:unique)
+      index[:klass].collection.create_index(index[:keys], unique)
+    end
+  end
+  
+  # @api private
+  def self.use_time_zone?
+    Time.respond_to?(:zone) && Time.zone ? true : false
+  end
+  
+  # @api private
+  def self.time_class
+    use_time_zone? ? Time.zone : Time
+  end
+  
+  # @api private
+  def self.normalize_object_id(value)
+    value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
+  end
+end
+
+require 'mongo_mapper/support'
+require 'mongo_mapper/callbacks'
+require 'mongo_mapper/finder_options'
+require 'mongo_mapper/dirty'
+require 'mongo_mapper/dynamic_finder'
+require 'mongo_mapper/key'
+require 'mongo_mapper/pagination'
+require 'mongo_mapper/serialization'
+require 'mongo_mapper/validations'
+require 'mongo_mapper/rails_compatibility/document'
+require 'mongo_mapper/rails_compatibility/embedded_document'
+require 'mongo_mapper/embedded_document'
+require 'mongo_mapper/document'
+require 'mongo_mapper/associations'
+require 'mongo_mapper/associations/base'
+require 'mongo_mapper/associations/proxy'
+require 'mongo_mapper/associations/collection'
+require 'mongo_mapper/associations/many_documents_proxy'
+require 'mongo_mapper/associations/belongs_to_proxy'
+require 'mongo_mapper/associations/belongs_to_polymorphic_proxy'
+require 'mongo_mapper/associations/many_polymorphic_proxy'
+require 'mongo_mapper/associations/many_embedded_proxy'
+require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
+require 'mongo_mapper/associations/many_documents_as_proxy'
+require 'mongo_mapper/associations/one_proxy'

data/lib/mongo_mapper/pagination.rb

@@ -1,7 +1,7 @@
 module MongoMapper
   module Pagination
     class PaginationProxy
-      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|proxy_|^object_id$)/ }
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
       
       attr_accessor :subject
       attr_reader :total_entries, :per_page, :current_page
@@ -33,7 +33,18 @@ module MongoMapper
         (current_page - 1) * per_page
       end
       alias offset skip # for will paginate support
+
+      def send(method, *args, &block)
+        if respond_to?(method)
+          super
+        else
+          subject.send(method, *args, &block)
+        end
+      end
       
+      def ===(other)
+        other === subject
+      end
       
       def method_missing(name, *args, &block)
         @subject.send(name, *args, &block)

data/lib/mongo_mapper/rails_compatibility/embedded_document.rb

@@ -10,6 +10,7 @@ module MongoMapper
 
         class << model
           alias has_many many
+          alias has_one one
         end
       end
 

data/lib/mongo_mapper/serialization.rb

@@ -1,8 +1,8 @@
 require 'active_support/json'
 
-module MongoMapper #:nodoc:
+module MongoMapper
   module Serialization
-    class Serializer #:nodoc:
+    class Serializer
       attr_reader :options
 
       def initialize(record, options={})

data/lib/mongo_mapper/serializers/json_serializer.rb

@@ -1,54 +1,10 @@
-module MongoMapper #:nodoc:
+module MongoMapper
   module Serialization
     def self.included(base)
       base.cattr_accessor :include_root_in_json, :instance_writer => false
       base.extend ClassMethods
     end
 
-    # Returns a JSON string representing the model. Some configuration is
-    # available through +options+.
-    #
-    # The option <tt>include_root_in_json</tt> controls the top-level behavior of
-    # to_json. When it is <tt>true</tt>, to_json will emit a single root node named
-    # after the object's type. For example:
-    #
-    #   konata = User.find(1)
-    #   User.include_root_in_json = true
-    #   konata.to_json
-    #   # => { "user": {"id": 1, "name": "Konata Izumi", "age": 16,
-    #                   "created_at": "2006/08/01", "awesome": true} }
-    #
-    #   User.include_root_in_json = false
-    #   konata.to_json
-    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-    #         "created_at": "2006/08/01", "awesome": true}
-    #
-    # The remainder of the examples in this section assume include_root_in_json is set to
-    # <tt>false</tt>.
-    #
-    # Without any +options+, the returned JSON string will include all
-    # the model's attributes. For example:
-    #
-    #   konata = User.find(1)
-    #   konata.to_json
-    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-    #         "created_at": "2006/08/01", "awesome": true}
-    #
-    # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the attributes
-    # included, and work similar to the +attributes+ method. For example:
-    #
-    #   konata.to_json(:only => [ :id, :name ])
-    #   # => {"id": 1, "name": "Konata Izumi"}
-    #
-    #   konata.to_json(:except => [ :id, :created_at, :age ])
-    #   # => {"name": "Konata Izumi", "awesome": true}
-    #
-    # To include any methods on the model, use <tt>:methods</tt>.
-    #
-    #   konata.to_json(:methods => :permalink)
-    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-    #         "created_at": "2006/08/01", "awesome": true,
-    #         "permalink": "1-konata-izumi"}
     def to_json(options={})
       apply_to_json_defaults(options)
 
@@ -64,7 +20,7 @@ module MongoMapper #:nodoc:
       self
     end
 
-    class JsonSerializer < MongoMapper::Serialization::Serializer #:nodoc:
+    class JsonSerializer < MongoMapper::Serialization::Serializer
       def serialize
         serializable_record.to_json
       end

data/lib/mongo_mapper/support.rb

@@ -120,7 +120,7 @@ end
 
 class ObjectId
   def self.to_mongo(value)
-    if value.nil?
+    if value.blank?
       nil
     elsif value.is_a?(Mongo::ObjectID)
       value
@@ -160,9 +160,12 @@ class Symbol
       MongoMapper::FinderOperator.new(self, "$#{operator}")
     end
   end
+  
+  def asc;  MongoMapper::OrderOperator.new(self, 'asc') end
+  def desc; MongoMapper::OrderOperator.new(self, 'desc') end
 end
 
-class Time  
+class Time
   def self.to_mongo(value)
     if value.nil? || value == ''
       nil

data/lib/mongo_mapper/validations.rb

@@ -31,9 +31,7 @@ module MongoMapper
 
       def where_conditions(instance)
         conditions = {}
-        unless case_sensitive
-          conditions.merge!({'$where' => "this.#{attribute}.toLowerCase() == '#{instance[attribute].to_s.downcase}'"})
-        end
+        conditions[attribute] = /#{instance[attribute].to_s}/i unless case_sensitive
         conditions
       end
     end

data/lib/mongo_mapper.rb

@@ -4,7 +4,7 @@
 # if there is a better way to do this, please enlighten me!
 if self.class.const_defined?(:Gem)
   gem 'activesupport', '>= 2.3'
-  gem 'mongo', '0.18.1'
+  gem 'mongo', '0.18.2'
   gem 'jnunemaker-validatable', '1.8.1'
 end
 
@@ -64,6 +64,11 @@ module MongoMapper
     @@ensured_indexes ||= []
   end
   
+  # @api private
+  def self.ensured_indexes=(value)
+    @@ensured_indexes = value
+  end
+  
   # @api private
   def self.ensure_index(klass, keys, options={})
     ensured_indexes << {:klass => klass, :keys => keys, :options => options}
@@ -99,7 +104,6 @@ require 'mongo_mapper/finder_options'
 require 'mongo_mapper/dirty'
 require 'mongo_mapper/dynamic_finder'
 require 'mongo_mapper/key'
-require 'mongo_mapper/observing'
 require 'mongo_mapper/pagination'
 require 'mongo_mapper/serialization'
 require 'mongo_mapper/validations'
@@ -118,3 +122,5 @@ require 'mongo_mapper/associations/many_polymorphic_proxy'
 require 'mongo_mapper/associations/many_embedded_proxy'
 require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
 require 'mongo_mapper/associations/many_documents_as_proxy'
+require 'mongo_mapper/associations/one_proxy'
+require 'mongo_mapper/associations/in_array_proxy'

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2010-01-01}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -30,11 +30,13 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb",
      "lib/mongo_mapper/associations/belongs_to_proxy.rb",
      "lib/mongo_mapper/associations/collection.rb",
+     "lib/mongo_mapper/associations/in_array_proxy.rb",
      "lib/mongo_mapper/associations/many_documents_as_proxy.rb",
      "lib/mongo_mapper/associations/many_documents_proxy.rb",
      "lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb",
      "lib/mongo_mapper/associations/many_embedded_proxy.rb",
      "lib/mongo_mapper/associations/many_polymorphic_proxy.rb",
+     "lib/mongo_mapper/associations/one_proxy.rb",
      "lib/mongo_mapper/associations/proxy.rb",
      "lib/mongo_mapper/callbacks.rb",
      "lib/mongo_mapper/dirty.rb",
@@ -43,7 +45,7 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/embedded_document.rb",
      "lib/mongo_mapper/finder_options.rb",
      "lib/mongo_mapper/key.rb",
-     "lib/mongo_mapper/observing.rb",
+     "lib/mongo_mapper/mongo_mapper.rb",
      "lib/mongo_mapper/pagination.rb",
      "lib/mongo_mapper/rails_compatibility/document.rb",
      "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
@@ -56,11 +58,13 @@ Gem::Specification.new do |s|
      "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",
      "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_documents_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
      "test/functional/test_callbacks.rb",
@@ -68,6 +72,7 @@ Gem::Specification.new do |s|
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
      "test/functional/test_logger.rb",
+     "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_string_id_compatibility.rb",
@@ -85,7 +90,6 @@ Gem::Specification.new do |s|
      "test/unit/test_finder_options.rb",
      "test/unit/test_key.rb",
      "test/unit/test_mongo_mapper.rb",
-     "test/unit/test_observing.rb",
      "test/unit/test_pagination.rb",
      "test/unit/test_rails_compatibility.rb",
      "test/unit/test_serializations.rb",
@@ -101,11 +105,13 @@ Gem::Specification.new do |s|
   s.test_files = [
     "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",
      "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_documents_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
      "test/functional/test_callbacks.rb",
@@ -113,6 +119,7 @@ Gem::Specification.new do |s|
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
      "test/functional/test_logger.rb",
+     "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
      "test/functional/test_string_id_compatibility.rb",
@@ -130,7 +137,6 @@ Gem::Specification.new do |s|
      "test/unit/test_finder_options.rb",
      "test/unit/test_key.rb",
      "test/unit/test_mongo_mapper.rb",
-     "test/unit/test_observing.rb",
      "test/unit/test_pagination.rb",
      "test/unit/test_rails_compatibility.rb",
      "test/unit/test_serializations.rb",
@@ -145,7 +151,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.18.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.2"])
       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"])
@@ -153,7 +159,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.18.1"])
+      s.add_dependency(%q<mongo>, ["= 0.18.2"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
@@ -162,7 +168,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18.1"])
+    s.add_dependency(%q<mongo>, ["= 0.18.2"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])

data/specs.watchr

@@ -15,11 +15,9 @@ def related_test_files(path)
   Dir['test/**/*.rb'].select { |file| file =~ /test_#{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
+watch('test/test_helper\.rb') { system('clear'); run_all_tests }
+watch('test/.*/test_.*\.rb') { |m| system('clear'); run_test_file(m[0]) }
+watch('lib/.*') { |m| related_test_files(m[0]).each { |file| system('clear'); run_test_file(file) } }
 
 # Ctrl-\
 Signal.trap('QUIT') do

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -45,4 +45,47 @@ class BelongsToProxyTest < Test::Unit::TestCase
     id = Mongo::ObjectID.new
     @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
   end
+  
+  context ":dependent" do
+    setup do
+      # FIXME: make use of already defined models
+      class ::Property
+        include MongoMapper::Document
+      end
+      Property.collection.remove
+
+      class ::Thing
+        include MongoMapper::Document
+        key :name, String
+      end
+      Thing.collection.remove
+    end
+
+    teardown do
+      Object.send :remove_const, 'Property' if defined?(::Property)
+      Object.send :remove_const, 'Thing' if defined?(::Thing)
+    end
+    
+    context "=> destroy" do
+      setup do
+        Property.key :thing_id, ObjectId
+        Property.belongs_to :thing, :dependent => :destroy
+        Thing.has_many :properties
+
+        @thing = Thing.create(:name => "Tree")
+        @property1 = Property.create
+        @property2 = Property.create
+        @property3 = Property.create
+        @thing.properties << @property1
+        @thing.properties << @property2
+        @thing.properties << @property3
+      end
+
+      should "not execute on a belongs_to association" do
+        Thing.count.should == 1
+        @property1.destroy
+        Thing.count.should == 1
+      end
+    end
+  end
 end