mongomodel 0.2.3 → 0.2.4

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
-git "git://github.com/rails/rails.git"
+# git "git://github.com/rails/rails.git"
 
-gem "activemodel", ">= 3.0.0.beta3"
-gem "activesupport", ">= 3.0.0.beta3"
+gem "activemodel", "= 3.0.0.beta3"
+gem "activesupport", "= 3.0.0.beta3"
 
 gem "mongo", '>= 0.20.1'
 gem "bson", '>= 0.20.1'

data/Rakefile

@@ -42,12 +42,12 @@ begin
     gem.summary = "MongoDB ORM for Ruby/Rails"
     gem.description = "MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper."
     gem.email = "sam@sampohlenz.com"
-    gem.homepage = "http://github.com/spohlenz/mongomodel"
+    gem.homepage = "http://www.mongomodel.org"
     gem.authors = ["Sam Pohlenz"]
     gem.version = MongoModel::VERSION
 
-    gem.add_dependency('activesupport', '>= 3.0.0.beta3')
-    gem.add_dependency('activemodel', '>= 3.0.0.beta3')
+    gem.add_dependency('activesupport', '= 3.0.0.beta3')
+    gem.add_dependency('activemodel', '= 3.0.0.beta3')
     gem.add_dependency('mongo', '>= 0.20.1')
     gem.add_dependency('bson', '>= 0.20.1')
     gem.add_development_dependency('rspec', '>= 1.3.0')

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec" }

data/lib/mongomodel.rb

@@ -39,6 +39,7 @@ module MongoModel
   autoload :DynamicFinder,    'mongomodel/support/dynamic_finder'
   
   autoload :Collection,       'mongomodel/support/collection'
+  autoload :Map,              'mongomodel/support/map'
   
   module AttributeMethods
     autoload :Read,           'mongomodel/concerns/attribute_methods/read'
@@ -53,6 +54,7 @@ module MongoModel
     autoload :Store,          'mongomodel/attributes/store'
     autoload :Typecasting,    'mongomodel/attributes/typecasting'
     autoload :Mongo,          'mongomodel/attributes/mongo'
+    autoload :Dirty,          'mongomodel/attributes/dirty'
   end
   
   module Associations
@@ -91,6 +93,8 @@ module MongoModel
   def self.database
     @_database ||= configuration.establish_connection
   end
+  
+  require 'mongomodel/railtie' if defined?(Rails)
 end
 
 I18n.load_path << File.dirname(__FILE__) + '/mongomodel/locale/en.yml'

data/lib/mongomodel/attributes/dirty.rb

@@ -0,0 +1,32 @@
+module MongoModel
+  module Attributes
+    module Dirty
+      def []=(key, value)
+        attr = key.to_s
+        
+        # The attribute already has an unsaved change.
+        if changed.include?(attr)
+          old = changed[attr]
+          changed.delete(attr) if value == old
+        else
+          old = clone_attribute_value(attr)
+          changed[attr] = old unless value == old
+        end
+        
+        super
+      end
+      
+      def changed
+        @changed ||= {}
+      end
+      
+    private
+      def clone_attribute_value(attribute_name)
+        value = self[attribute_name.to_sym]
+        value.duplicable? ? value.clone : value
+      rescue TypeError, NoMethodError
+        value
+      end
+    end
+  end
+end

data/lib/mongomodel/attributes/mongo.rb

@@ -16,6 +16,11 @@ module MongoModel
         end
       end
       
+      def load!(hash)
+        from_mongo!(hash)
+        changed.clear
+      end
+      
       def from_mongo!(hash)
         hash.each do |k, v|
           property = properties_as[k.to_s]

data/lib/mongomodel/attributes/store.rb

@@ -5,6 +5,7 @@ module MongoModel
     class Store < ActiveSupport::OrderedHash
       include Typecasting
       include Mongo
+      include Dirty
       
       attr_reader :instance
       delegate :properties, :to => :instance

data/lib/mongomodel/concerns/associations/belongs_to.rb

@@ -10,8 +10,8 @@ module MongoModel
       end
       
       properties do |association|
-        property association.foreign_key, Reference, :internal => true
-        property association.type_key, Reference, :internal => true if association.polymorphic?
+        property association.foreign_key, MongoModel::Reference, :internal => true
+        property association.type_key, MongoModel::Reference, :internal => true if association.polymorphic?
       end
       
       methods do |association|

data/lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb

@@ -6,7 +6,7 @@ module MongoModel
       end
       
       def inverse_of
-        options[:inverse_of] || owner.to_s.downcase.demodulize.singularize.to_sym
+        options[:inverse_of] || owner.to_s.demodulize.underscore.singularize.to_sym
       end
       
       def define!
@@ -97,7 +97,7 @@ module MongoModel
       end
       
       class Proxy < Base::Proxy
-        # Pass these methods to the association class rather than the Array target
+        # Pass these methods to the scope rather than the Array target
         OVERRIDE_METHODS = [ :find ]
         
         delegate :ensure_class, :to => :association
@@ -170,11 +170,13 @@ module MongoModel
         end
       
       private
-        def method_missing(method_id, *args, &block)
-          if target.respond_to?(method_id) && !OVERRIDE_METHODS.include?(method_id.to_sym)
-            super(method_id, *args, &block)
+        def method_missing(method, *args, &block)
+          if Array.method_defined?(method) && !OVERRIDE_METHODS.include?(method)
+            target.send(method, *args, &block)
+          elsif association.scoped.respond_to?(method)
+            association.scoped.send(method, *args, &block)
           else
-            association.scoped.send(method_id, *args, &block)
+            super(method, *args, &block)
           end
         end
       end

data/lib/mongomodel/concerns/associations/has_many_by_ids.rb

@@ -6,7 +6,7 @@ module MongoModel
       end
       
       properties do |association|
-        property association.property_name, Collection[Reference], :internal => true, :default => []
+        property association.property_name, Collection[MongoModel::Reference], :internal => true, :default => []
       end
       
       methods do |association|

data/lib/mongomodel/concerns/attribute_methods/dirty.rb

@@ -13,22 +13,10 @@ module MongoModel
       def original_attributes
         attributes.merge(changed_attributes)
       end
-      
-      # Wrap write_attribute to remember original attribute value.
-      def write_attribute(attr, value)
-        attr = attr.to_s
-          
-        # The attribute already has an unsaved change.
-        if changed_attributes.include?(attr)
-          old = changed_attributes[attr]
-          changed_attributes.delete(attr) if value == old
-        else
-          old = clone_attribute_value(attr)
-          changed_attributes[attr] = old unless value == old
-        end
-        
-        # Carry on.
-        super
+    
+    protected
+      def changed_attributes
+        attributes.changed
       end
     end
   end

data/lib/mongomodel/concerns/attributes.rb

@@ -5,7 +5,7 @@ module MongoModel
     extend ActiveSupport::Concern
     
     def initialize(attrs={})
-      self.attributes = attrs
+      self.attributes = (attrs || {})
       yield self if block_given?
     end
     
@@ -51,6 +51,10 @@ module MongoModel
         docs.concat collection.embedded_documents
       end
       
+      attributes.values.select { |attr| attr.is_a?(Map) && attr.to <= EmbeddedDocument }.each do |map|
+        docs.concat map.values
+      end
+      
       docs
     end
     
@@ -58,7 +62,7 @@ module MongoModel
       def from_mongo(hash)
         if hash
           doc = class_for_type(hash['_type']).new
-          doc.attributes.from_mongo!(hash)
+          doc.attributes.load!(hash)
           doc
         end
       end

data/lib/mongomodel/concerns/document_parent.rb

@@ -3,7 +3,14 @@ module MongoModel
     extend ActiveSupport::Concern
     
     def parent_document
-      @_parent_document.is_a?(Proc) ? @_parent_document.call(self) : @_parent_document
+      if @_parent_document.respond_to?(:call)
+        case @_parent_document.arity
+        when 0 then @_parent_document.call
+        else        @_parent_document.call(self)
+        end
+      else
+        @_parent_document
+      end
     end
     
     def parent_document=(doc)

data/lib/mongomodel/document/indexes.rb

@@ -57,7 +57,7 @@ module MongoModel
     end
     
     def keys
-      @keys ||= OrderedHash.new
+      @keys ||= ActiveSupport::OrderedHash.new
     end
     
     def unique?

data/lib/mongomodel/document/persistence.rb

@@ -5,7 +5,7 @@ module MongoModel
       
       included do
         undef_method :id if method_defined?(:id)
-        property :id, Reference, :as => '_id', :default => lambda { |doc| doc.generate_id }
+        property :id, MongoModel::Reference, :as => '_id', :default => lambda { |doc| doc.generate_id }
         
         class_inheritable_writer :collection_name
       end
@@ -16,7 +16,7 @@ module MongoModel
         reloaded = self.class.unscoped.find(id)
         
         attributes.clear
-        attributes.from_mongo!(reloaded.attributes.to_mongo)
+        attributes.load!(reloaded.attributes.to_mongo)
         
         associations.values.each do |association|
           association.proxy.reset
@@ -139,7 +139,7 @@ module MongoModel
       end
 
       def instantiate(document)
-        attributes.from_mongo!(document)
+        attributes.load!(document)
         set_new_record(false)
       end
     end

data/lib/mongomodel/embedded_document.rb

@@ -34,6 +34,10 @@ module MongoModel
     Collection = MongoModel::Collection
     extend Collection::PropertyDefaults
     
+    # Allow Map class to be used in property definitions
+    Map = MongoModel::Map
+    extend Map::PropertyDefaults
+    
     undef_method :type if method_defined?(:type)
     property :type, String, :as => '_type', :default => lambda { |doc| doc.class.name }, :protected => true
     

data/lib/mongomodel/locale/en.yml

@@ -11,19 +11,19 @@ en:
         accepted: "must be accepted"
         empty: "can't be empty"
         blank: "can't be blank"
-        too_long: "is too long (maximum is {{count}} characters)"
-        too_short: "is too short (minimum is {{count}} characters)"
-        wrong_length: "is the wrong length (should be {{count}} characters)"
+        too_long: "is too long (maximum is %{count} characters)"
+        too_short: "is too short (minimum is %{count} characters)"
+        wrong_length: "is the wrong length (should be %{count} characters)"
         taken: "has already been taken"
         not_a_number: "is not a number"
-        greater_than: "must be greater than {{count}}"
-        greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-        equal_to: "must be equal to {{count}}"
-        less_than: "must be less than {{count}}"
-        less_than_or_equal_to: "must be less than or equal to {{count}}"
+        greater_than: "must be greater than %{count}"
+        greater_than_or_equal_to: "must be greater than or equal to %{count}"
+        equal_to: "must be equal to %{count}"
+        less_than: "must be less than %{count}"
+        less_than_or_equal_to: "must be less than or equal to %{count}"
         odd: "must be odd"
         even: "must be even"
-        document_invalid: "Validation failed: {{errors}}"
+        document_invalid: "Validation failed: %{errors}"
         # Append your own errors here or at the model/attributes scope.
 
         # You can define own errors for models or model attributes.
@@ -32,7 +32,7 @@ en:
         # For example,
         #   models:
         #     user:
-        #       blank: "This is a custom blank message for {{model}}: {{attribute}}"
+        #       blank: "This is a custom blank message for %{model}: %{attribute}"
         #       attributes:
         #         login:
         #           blank: "This is a custom blank message for User login"

data/lib/mongomodel/railtie.rb

@@ -0,0 +1,22 @@
+module MongoModel
+  class Railtie < Rails::Railtie
+    initializer "mongomodel.logger" do
+      MongoModel.logger ||= ::Rails.logger
+    end
+    
+    initializer "mongomodel.rescue_responses" do
+      ActionDispatch::ShowExceptions.rescue_responses['MongoModel::DocumentNotFound'] = :not_found
+    end
+    
+    initializer "mongomodel.database_configuration" do |app|
+      require 'erb'
+      
+      config = Pathname.new(app.paths.config.to_a.first).join("mongomodel.yml")
+      
+      if File.exists?(config)
+        mongomodel_configuration = YAML::load(ERB.new(IO.read(config)).result)
+        MongoModel.configuration = mongomodel_configuration[Rails.env]
+      end
+    end
+  end
+end

data/lib/mongomodel/support/collection.rb

@@ -5,7 +5,7 @@ module MongoModel
         property = super(name, *args, &block)
         
         if property.type <= Collection
-          property.options[:default] ||= property.type.new
+          property.options[:default] ||= lambda { property.type.new }
         end
         
         property

data/lib/mongomodel/support/configuration.rb

@@ -4,7 +4,12 @@ require 'active_support/core_ext/hash/except'
 module MongoModel
   class Configuration
     def initialize(options)
-      @options = DEFAULTS.merge(options).stringify_keys
+      case options
+      when Hash
+        @options = DEFAULTS.merge(options).stringify_keys
+      when String
+        super(parse(options))
+      end
     end
     
     def host
@@ -19,9 +24,19 @@ module MongoModel
       @options['database']
     end
     
+    def username
+      @options['username']
+    end
+    
+    def password
+      @options['password']
+    end
+    
     def establish_connection
       @connection ||= Mongo::Connection.new(host, port, connection_options)
       @database = @connection.db(database)
+      @database.authenticate(username, password) if username.present?
+      @database
     end
     
     def use_database(database)
@@ -30,7 +45,7 @@ module MongoModel
     end
     
     def connection_options
-      @options.except('host', 'port', 'database').symbolize_keys
+      @options.except('host', 'port', 'database', 'username', 'password').symbolize_keys
     end
     
     DEFAULTS = {
@@ -38,11 +53,25 @@ module MongoModel
       'port'      => 27017,
       'database'  => 'mongomodel-default',
       'pool_size' => 5,
-      'timeout'   => 5
+      'timeout'   => 5,
+      'logger'    => MongoModel.logger
     }
     
     def self.defaults
       new({})
     end
+  
+  private
+    def parse(str)
+      uri = URI.parse(str)
+      
+      {
+        'host'     => uri.host,
+        'port'     => uri.port,
+        'database' => uri.path.gsub(/^\//, ''),
+        'username' => uri.user,
+        'password' => uri.password
+      }
+    end
   end
 end

data/lib/mongomodel/support/map.rb

@@ -0,0 +1,149 @@
+module MongoModel
+  class Map < Hash
+    module PropertyDefaults
+      def property(name, *args, &block) #:nodoc:
+        property = super(name, *args, &block)
+        
+        if property.type <= Map
+          property.options[:default] ||= lambda { property.type.new }
+        end
+        
+        property
+      end
+    end
+    
+    class_inheritable_accessor :from
+    self.from = String
+    
+    class_inheritable_accessor :to
+    self.to = Object
+    
+    HASH_CONVERTER = Types.converter_for(Hash)
+    
+    class << self
+      def [](mapping)
+        raise "Exactly one mapping must be specified" unless mapping.keys.size == 1
+        
+        from = mapping.keys.first
+        to   = mapping.values.first
+        
+        @map_class_cache ||= {}
+        @map_class_cache[[from, to]] ||= begin
+          map = Class.new(Map)
+          map.from = from
+          map.to   = to
+          map
+        end
+      end
+      
+      def from_mongo(hash)
+        result = new
+        hash.each_pair { |k, v| result[from_converter.from_mongo(k)] = instantiate(v) }
+        result
+      end
+      
+      def inspect
+        if self == Map
+          "Map"
+        else
+          "Map[#{from} => #{to}]"
+        end
+      end
+      
+      def from_converter
+        @from_converter ||= Types.converter_for(from)
+      end
+      
+      def to_converter
+        @to_converter ||= Types.converter_for(to)
+      end
+      
+    private
+      def instantiate(item)
+        if item.is_a?(Hash) && item['_type']
+          item['_type'].constantize.from_mongo(item)
+        else
+          to_converter.from_mongo(item)
+        end
+      end
+    end
+    
+    def initialize(hash={})
+      super()
+      update(hash)
+    end
+    
+    def to_mongo
+      HASH_CONVERTER.to_mongo(self)
+    end
+    
+    def [](key)
+      super(convert_key(key))
+    end
+    
+    def []=(key, value)
+      super(convert_key(key), convert_value(value))
+    end
+    
+    def store(key, value)
+      super(convert_key(key), convert_value(value))
+    end
+    
+    def delete(key)
+      super(convert_key(key))
+    end
+    
+    def fetch(key, *args, &block)
+      super(convert_key(key), *args, &block)
+    end
+    
+    def key?(key)
+      super(convert_key(key))
+    end
+    
+    alias_method :include?, :key?
+    alias_method :has_key?, :key?
+    alias_method :member?, :key?
+    
+    def value?(value)
+      super(convert_value(value))
+    end
+    
+    alias_method :has_value?, :value?
+    
+    def index(value)
+      super(convert_value(value))
+    end
+    
+    def update(hash)
+      hash.each_pair { |k, v| self[k] = v }
+      self
+    end
+    
+    def replace(hash)
+      clear
+      update(hash)
+    end
+    
+    def merge(hash)
+      dup.update(super(hash))
+    end
+    
+    def merge!(hash)
+      update(merge(hash))
+    end
+    
+    def values_at(*keys)
+      super(*keys.map { |k| convert_key(k) })
+    end
+  
+  private
+    def convert_key(key)
+      self.class.from_converter.cast(key)
+    end
+    
+    def convert_value(value)
+      self.class.to_converter.cast(value)
+    end
+  end
+end

data/lib/mongomodel/support/types.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 require 'mongomodel/support/types/object'
 require 'mongomodel/support/types/string'
 require 'mongomodel/support/types/integer'
@@ -8,6 +10,7 @@ require 'mongomodel/support/types/date'
 require 'mongomodel/support/types/time'
 require 'mongomodel/support/types/custom'
 require 'mongomodel/support/types/array'
+require 'mongomodel/support/types/set'
 require 'mongomodel/support/types/hash'
 
 module MongoModel
@@ -21,6 +24,7 @@ module MongoModel
       ::Date    => Types::Date.new,
       ::Time    => Types::Time.new,
       ::Array   => Types::Array.new,
+      ::Set     => Types::Set.new,
       ::Hash    => Types::Hash.new
     }
     

data/lib/mongomodel/support/types/set.rb

@@ -0,0 +1,9 @@
+module MongoModel
+  module Types
+    class Set < Array
+      def cast(obj)
+        ::Set.new(::Array.wrap(obj))
+      end
+    end
+  end
+end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/mongomodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]
-  s.date = %q{2010-04-30}
+  s.date = %q{2010-05-17}
   s.default_executable = %q{console}
   s.description = %q{MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.}
   s.email = %q{sam@sampohlenz.com}
@@ -24,8 +24,10 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.md",
      "Rakefile",
+     "autotest/discover.rb",
      "bin/console",
      "lib/mongomodel.rb",
+     "lib/mongomodel/attributes/dirty.rb",
      "lib/mongomodel/attributes/mongo.rb",
      "lib/mongomodel/attributes/store.rb",
      "lib/mongomodel/attributes/typecasting.rb",
@@ -68,11 +70,13 @@ Gem::Specification.new do |s|
      "lib/mongomodel/document/validations/uniqueness.rb",
      "lib/mongomodel/embedded_document.rb",
      "lib/mongomodel/locale/en.yml",
+     "lib/mongomodel/railtie.rb",
      "lib/mongomodel/support/collection.rb",
      "lib/mongomodel/support/configuration.rb",
      "lib/mongomodel/support/core_extensions.rb",
      "lib/mongomodel/support/dynamic_finder.rb",
      "lib/mongomodel/support/exceptions.rb",
+     "lib/mongomodel/support/map.rb",
      "lib/mongomodel/support/mongo_operator.rb",
      "lib/mongomodel/support/mongo_options.rb",
      "lib/mongomodel/support/mongo_order.rb",
@@ -91,6 +95,7 @@ Gem::Specification.new do |s|
      "lib/mongomodel/support/types/hash.rb",
      "lib/mongomodel/support/types/integer.rb",
      "lib/mongomodel/support/types/object.rb",
+     "lib/mongomodel/support/types/set.rb",
      "lib/mongomodel/support/types/string.rb",
      "lib/mongomodel/support/types/symbol.rb",
      "lib/mongomodel/support/types/time.rb",
@@ -129,6 +134,7 @@ Gem::Specification.new do |s|
      "spec/mongomodel/embedded_document_spec.rb",
      "spec/mongomodel/mongomodel_spec.rb",
      "spec/mongomodel/support/collection_spec.rb",
+     "spec/mongomodel/support/map_spec.rb",
      "spec/mongomodel/support/mongo_operator_spec.rb",
      "spec/mongomodel/support/mongo_options_spec.rb",
      "spec/mongomodel/support/mongo_order_spec.rb",
@@ -148,10 +154,10 @@ Gem::Specification.new do |s|
      "spec/support/matchers/run_callbacks.rb",
      "spec/support/models.rb"
   ]
-  s.homepage = %q{http://github.com/spohlenz/mongomodel}
+  s.homepage = %q{http://www.mongomodel.org}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{MongoDB ORM for Ruby/Rails}
   s.test_files = [
     "spec/mongomodel/attributes/store_spec.rb",
@@ -187,6 +193,7 @@ Gem::Specification.new do |s|
      "spec/mongomodel/embedded_document_spec.rb",
      "spec/mongomodel/mongomodel_spec.rb",
      "spec/mongomodel/support/collection_spec.rb",
+     "spec/mongomodel/support/map_spec.rb",
      "spec/mongomodel/support/mongo_operator_spec.rb",
      "spec/mongomodel/support/mongo_options_spec.rb",
      "spec/mongomodel/support/mongo_order_spec.rb",
@@ -209,22 +216,22 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta3"])
-      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
+      s.add_runtime_dependency(%q<activemodel>, ["= 3.0.0.beta3"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.20.1"])
       s.add_runtime_dependency(%q<bson>, [">= 0.20.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta3"])
-      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
+      s.add_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
+      s.add_dependency(%q<activemodel>, ["= 3.0.0.beta3"])
       s.add_dependency(%q<mongo>, [">= 0.20.1"])
       s.add_dependency(%q<bson>, [">= 0.20.1"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta3"])
-    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
+    s.add_dependency(%q<activesupport>, ["= 3.0.0.beta3"])
+    s.add_dependency(%q<activemodel>, ["= 3.0.0.beta3"])
     s.add_dependency(%q<mongo>, [">= 0.20.1"])
     s.add_dependency(%q<bson>, [">= 0.20.1"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])

data/spec/mongomodel/concerns/associations/has_many_by_foreign_key_spec.rb

@@ -3,12 +3,16 @@ require 'spec_helper'
 module MongoModel
   specs_for(Document) do
     describe "has_many association" do
-      define_class(:Book, Document) do
+      define_class(:MyBook, Document) do
         has_many :chapters
       end
       
       it "should default to :by => :foreign_key" do
-        Book.associations[:chapters].should be_a(Associations::HasManyByForeignKey)
+        MyBook.associations[:chapters].should be_a(Associations::HasManyByForeignKey)
+      end
+      
+      it "should set default inverse_of value" do
+        MyBook.associations[:chapters].inverse_of.should == :my_book
       end
     end
     

data/spec/mongomodel/embedded_document_spec.rb

@@ -31,6 +31,10 @@ module MongoModel
       described_class.should be_an_abstract_class
     end
     
+    it "should instantiate with nil" do
+      described_class.new(nil).should be_an_instance_of(described_class)
+    end
+    
     describe "subclasses" do
       define_class(:TestDocument, described_class)
       

data/spec/mongomodel/support/map_spec.rb

@@ -0,0 +1,255 @@
+require 'spec_helper'
+
+module MongoModel
+  describe Map do
+    subject { Map }
+    
+    define_class(:TestDocument, EmbeddedDocument) do
+      property :name, String
+      
+      def self.cast(name)
+        new(:name => name)
+      end
+    end
+    
+    let(:doc) { TestDocument.new(:name => "Foobar") }
+    
+    it { should be_a_subclass_of(Hash) }
+    
+    it "should have from type String" do
+      subject.from.should == String
+    end
+    
+    it "should have to type Object" do
+      subject.to.should == Object
+    end
+    
+    it "should not show its type when inspecting" do
+      subject.inspect.should == "Map"
+    end
+    
+    it "should allow any string->object mappings to be added" do
+      map = subject.new
+      map["hello"] = 123
+      map["foo"] = "Bonjour"
+      map["mydoc"] = doc
+      map.should == { "hello" => 123, "foo" => "Bonjour", "mydoc" => doc }
+    end
+    
+    it "should convert to mongo representation" do
+      map = subject.new({ "hello" => 123, "mydoc" => doc })
+      map.to_mongo.should == { "hello" => 123, "mydoc" => { "_type" => 'TestDocument', "name" => "Foobar" } }
+    end
+    
+    it "should load from mongo representation" do
+      map = subject.from_mongo({ "hello" => 123, "mydoc" => { "_type" => 'TestDocument', "name" => "Foobar" } })
+      map.should be_a(subject)
+      map.should == { "hello" => 123, "mydoc" => doc }
+    end
+    
+    it "should cache map types" do
+      Map[Symbol => String].should equal(Map[Symbol => String])
+      Map[String => TestDocument].should equal(Map[String => TestDocument])
+    end
+    
+    describe "map from String to String" do
+      let(:klass) { Map[String => String] }
+      subject { klass.new("123" => "456", "12.5" => "foobar") }
+      
+      it "should show its types when inspecting" do
+        klass.inspect.should == "Map[String => String]"
+      end
+      
+      it "should cast key/values when instantiating" do
+        map = klass.new(123 => 456, 12.5 => :foobar)
+        map.should == { "123" => "456", "12.5" => "foobar" }
+      end
+      
+      it "should cast keys on []" do
+        subject[123].should == "456"
+      end
+      
+      it "should cast key/values on []=" do
+        subject[12.5] = 456
+        subject["12.5"].should == "456"
+      end
+      
+      it "should cast key/values on #store" do
+        subject.store(12.5, 456)
+        subject["12.5"].should == "456"
+      end
+      
+      it "should cast keys on #delete" do
+        subject.delete(123)
+        subject["123"].should be_nil
+      end
+      
+      it "should cast keys on #fetch" do
+        subject.fetch(123).should == "456"
+        subject.fetch(999, "default").should == "default"
+      end
+      
+      it "should cast keys on #has_key?, #include?, #key?, #member?" do
+        subject.has_key?(123).should be_true
+        subject.include?(12.5).should be_true
+        subject.key?(123).should be_true
+        subject.member?(12.5).should be_true
+      end
+      
+      it "should cast values on #has_value?, #value?" do
+        subject.has_value?(456).should be_true
+        subject.value?(456).should be_true
+      end
+      
+      it "should cast values on #index" do
+        subject.index(456).should == "123"
+      end
+      
+      it "should cast key/values on #replace" do
+        subject.replace(321 => 654, 5.12 => :barbaz)
+        subject.should == { "321" => "654", "5.12" => "barbaz" }
+      end
+      
+      it "should cast key/values on #merge" do
+        map = subject.merge(321 => 654, 5.12 => :barbaz)
+        map.should == { "123" => "456", "12.5" => "foobar", "321" => "654", "5.12" => "barbaz" }
+      end
+      
+      it "should cast key/values on #merge!" do
+        subject.merge!(321 => 654, 5.12 => :barbaz)
+        subject.should == { "123" => "456", "12.5" => "foobar", "321" => "654", "5.12" => "barbaz" }
+      end
+      
+      it "should cast keys on #values_at" do
+        subject.values_at(12.5, 123).should == ["foobar", "456"]
+      end
+    end
+    
+    describe "map from Symbol to TestDocument" do
+      let(:doc1) { TestDocument.new(:name => "First") }
+      let(:doc2) { TestDocument.new(:name => "Another") }
+      
+      let(:klass) { Map[Symbol => TestDocument] }
+      subject { klass.new(:abc => doc1, :another => doc2) }
+      
+      it "should show its types when inspecting" do
+        klass.inspect.should == "Map[Symbol => TestDocument]"
+      end
+      
+      it "should cast key/values when instantiating" do
+        map = klass.new("foo" => "First", "123" => "Another")
+        map.should == { :foo => doc1, :"123" => doc2 }
+      end
+      
+      it "should cast keys on []" do
+        subject["abc"].should == doc1
+      end
+      
+      it "should cast key/values on []=" do
+        subject["def"] = "Another"
+        subject[:def].should == doc2
+      end
+      
+      it "should cast key/values on #store" do
+        subject.store("def", "Another")
+        subject[:def].should == doc2
+      end
+      
+      it "should cast keys on #delete" do
+        subject.delete("abc")
+        subject[:abc].should be_nil
+      end
+      
+      it "should cast keys on #fetch" do
+        subject.fetch("abc").should == doc1
+        subject.fetch("999", "default").should == "default"
+      end
+      
+      it "should cast keys on #has_key?, #include?, #key?, #member?" do
+        subject.has_key?("abc").should be_true
+        subject.include?("another").should be_true
+        subject.key?("abc").should be_true
+        subject.member?("another").should be_true
+      end
+      
+      it "should cast values on #has_value?, #value?" do
+        subject.has_value?("First").should be_true
+        subject.value?("Another").should be_true
+      end
+      
+      it "should cast values on #index" do
+        subject.index("First").should == :abc
+      end
+      
+      it "should cast key/values on #replace" do
+        subject.replace("321" => "Bonus", "hello" => "Another")
+        subject.should == { :"321" => TestDocument.new(:name => "Bonus"), :hello => doc2 }
+      end
+      
+      it "should cast key/values on #merge" do
+        map = subject.merge("321" => "Bonus", "hello" => "Another")
+        map.should == { :abc => doc1, :another => doc2, :"321" => TestDocument.new(:name => "Bonus"), :hello => doc2 }
+      end
+      
+      it "should cast key/values on #merge!" do
+        subject.merge!("321" => "Bonus", "hello" => "Another")
+        subject.should == { :abc => doc1, :another => doc2, :"321" => TestDocument.new(:name => "Bonus"), :hello => doc2 }
+      end
+      
+      it "should cast keys on #values_at" do
+        subject.values_at(:another, :abc).should == [doc2, doc1]
+      end
+    end
+  end
+  
+  specs_for(Document, EmbeddedDocument) do
+    define_class(:ChildDocument, EmbeddedDocument) do
+      property :name, String
+      
+      def self.cast(name)
+        new(:name => name)
+      end
+    end
+    
+    describe "defining a Map property containing EmbeddedDocument values" do
+      define_class(:TestDocument, described_class) do
+        property :test_map, Map[String => ChildDocument]
+      end
+      
+      let(:child1) { ChildDocument.new(:name => "Child 1") }
+      let(:child2) { ChildDocument.new(:name => "Child 2") }
+      
+      subject { TestDocument.new(:test_map => { "1" => child1, "2" => child2 }) }
+      
+      it "should include the map values in the embedded documents list" do
+        subject.embedded_documents.should include(child1, child2)
+      end
+    end
+    
+    describe "defining a Map property with no default value" do
+      define_class(:TestDocument, described_class) do
+        property :test_map, Map[Symbol => ChildDocument]
+      end
+
+      subject { TestDocument.new }
+      
+      it "should default to an empty map" do
+        subject.test_map.should be_an_instance_of(Map[Symbol => ChildDocument])
+        subject.test_map.should be_empty
+      end
+    end
+    
+    describe "defining a Map property with a default value" do
+      define_class(:TestDocument, described_class) do
+        property :test_map, Map[Symbol => ChildDocument], :default => { :abc => 'abc', 'def' => 'def' }
+      end
+
+      subject { TestDocument.new }
+      
+      it "should cast key/values to map type" do
+        subject.test_map[:abc].should == ChildDocument.new(:name => 'abc')
+        subject.test_map[:def].should == ChildDocument.new(:name => 'def')
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 +09:30
+date: 2010-05-17 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: -1848230021
         segments: 
         - 3
         - 0
@@ -36,9 +39,11 @@ dependencies:
   name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: -1848230021
         segments: 
         - 3
         - 0
@@ -51,9 +56,11 @@ dependencies:
   name: mongo
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 77
         segments: 
         - 0
         - 20
@@ -65,9 +72,11 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 77
         segments: 
         - 0
         - 20
@@ -79,9 +88,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -104,8 +115,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- autotest/discover.rb
 - bin/console
 - lib/mongomodel.rb
+- lib/mongomodel/attributes/dirty.rb
 - lib/mongomodel/attributes/mongo.rb
 - lib/mongomodel/attributes/store.rb
 - lib/mongomodel/attributes/typecasting.rb
@@ -148,11 +161,13 @@ files:
 - lib/mongomodel/document/validations/uniqueness.rb
 - lib/mongomodel/embedded_document.rb
 - lib/mongomodel/locale/en.yml
+- lib/mongomodel/railtie.rb
 - lib/mongomodel/support/collection.rb
 - lib/mongomodel/support/configuration.rb
 - lib/mongomodel/support/core_extensions.rb
 - lib/mongomodel/support/dynamic_finder.rb
 - lib/mongomodel/support/exceptions.rb
+- lib/mongomodel/support/map.rb
 - lib/mongomodel/support/mongo_operator.rb
 - lib/mongomodel/support/mongo_options.rb
 - lib/mongomodel/support/mongo_order.rb
@@ -171,6 +186,7 @@ files:
 - lib/mongomodel/support/types/hash.rb
 - lib/mongomodel/support/types/integer.rb
 - lib/mongomodel/support/types/object.rb
+- lib/mongomodel/support/types/set.rb
 - lib/mongomodel/support/types/string.rb
 - lib/mongomodel/support/types/symbol.rb
 - lib/mongomodel/support/types/time.rb
@@ -209,6 +225,7 @@ files:
 - spec/mongomodel/embedded_document_spec.rb
 - spec/mongomodel/mongomodel_spec.rb
 - spec/mongomodel/support/collection_spec.rb
+- spec/mongomodel/support/map_spec.rb
 - spec/mongomodel/support/mongo_operator_spec.rb
 - spec/mongomodel/support/mongo_options_spec.rb
 - spec/mongomodel/support/mongo_order_spec.rb
@@ -228,7 +245,7 @@ files:
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb
 has_rdoc: true
-homepage: http://github.com/spohlenz/mongomodel
+homepage: http://www.mongomodel.org
 licenses: []
 
 post_install_message: 
@@ -237,23 +254,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails
@@ -291,6 +312,7 @@ test_files:
 - spec/mongomodel/embedded_document_spec.rb
 - spec/mongomodel/mongomodel_spec.rb
 - spec/mongomodel/support/collection_spec.rb
+- spec/mongomodel/support/map_spec.rb
 - spec/mongomodel/support/mongo_operator_spec.rb
 - spec/mongomodel/support/mongo_options_spec.rb
 - spec/mongomodel/support/mongo_order_spec.rb