mongomodel 0.1.5 → 0.1.6

data/.gitignore

@@ -0,0 +1 @@
+.bundle

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://gemcutter.org"
+git "git://github.com/rails/rails.git"
+
+gem "activemodel"
+gem "activesupport"
+
+gem "mongo"
+gem "bson"
+gem "bson_ext"
+
+gem "rspec"

data/Rakefile

@@ -36,9 +36,10 @@ begin
     gem.authors = ["Sam Pohlenz"]
     gem.version = MongoModel::VERSION
 
-    gem.add_dependency('activesupport', '>= 3.0.pre')
-    gem.add_dependency('activemodel', '>= 3.0.pre')
-    gem.add_dependency('mongo', '>= 0.18.3')
+    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')
   end
   
   Jeweler::GemcutterTasks.new  

data/bin/console

@@ -2,6 +2,16 @@
 
 puts "Loading MongoModel sandbox..."
 
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'irb'

data/lib/mongomodel/concerns/activemodel.rb

@@ -4,6 +4,10 @@ module MongoModel
     
     include ActiveModel::Conversion
     
+    def persisted?
+      !new_record?
+    end
+    
     module ClassMethods
       include ActiveModel::Naming
     end

data/lib/mongomodel/concerns/associations/base/definition.rb

@@ -37,6 +37,10 @@ module MongoModel
         def polymorphic?
           options[:polymorphic]
         end
+        
+        def scope_options
+          options.slice(:conditions, :select, :offset, :limit, :order)
+        end
 
         def self.properties(&block)
           block_given? ? write_inheritable_attribute(:properties, block) : read_inheritable_attribute(:properties)

data/lib/mongomodel/concerns/associations/base/proxy.rb

@@ -47,7 +47,7 @@ module MongoModel
         end
 
         def load_target
-          @target = @association.find_target unless loaded?
+          @target = association.find_target unless loaded?
           loaded!
         rescue MongoModel::DocumentNotFound
           reset

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

@@ -16,10 +16,12 @@ module MongoModel
       
       methods do |association|
         define_method(association.name) do |*args|
-          force_reload = args.first || false
+          force_reload = args.first unless args.empty?
           
-          associations[association.name].proxy.reset if force_reload
-          associations[association.name].proxy
+          proxy = associations[association.name].proxy
+          
+          proxy.reset if force_reload
+          proxy.target.nil? ? nil : proxy
         end
         
         define_method("#{association.name}=") { |obj| associations[association.name].replace(obj) }
@@ -51,16 +53,16 @@ module MongoModel
         end
         
         def replace(obj)
-          ensure_class(obj) unless polymorphic?
+          ensure_class(obj) if obj && !polymorphic?
           
-          instance[foreign_key] = obj.id
-          instance[type_key] = obj.class if polymorphic?
+          instance[foreign_key] = obj ? obj.id : nil
+          instance[type_key] = obj ? obj.class : nil if polymorphic?
           
           super
         end
         
         def find_target
-          target_class.find(target_id) unless target_id.nil? || target_class.nil?
+          target_class.find(target_id) if target_id && target_class
         end
       end
     end

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

@@ -23,7 +23,7 @@ module MongoModel
         delegate :foreign_key, :inverse_of, :to => :definition
         
         def find_target
-          klass.find(:all, :conditions => { foreign_key => instance.id }) + new_documents
+          send_to_klass_with_scope(:all) + new_documents
         end
         
         def build(*args, &block)
@@ -44,6 +44,18 @@ module MongoModel
           end
         end
         
+        def create!(*args, &block)
+          klass.create!(*args) do |doc|
+            if doc.respond_to?("#{inverse_of}=")
+              doc.send("#{inverse_of}=", instance)
+            else
+              doc[foreign_key] = instance.id
+            end
+            
+            block.call(doc) if block
+          end
+        end
+        
         def replace(array)
           ensure_class(array)
           array.each { |doc| assign(doc) }
@@ -60,13 +72,25 @@ module MongoModel
           doc.save(false) unless doc.new_record?
         end
         
+        def unset(doc)
+          if doc.respond_to?("#{inverse_of}=")
+            doc.send("#{inverse_of}=", nil) if doc.send(inverse_of) == instance
+          else
+            doc[foreign_key] = nil if doc[foreign_key] == instance.id
+          end
+          
+          doc.save(false) unless doc.new_record?
+        end
+        
         def send_to_klass_with_scope(*args, &block)
-          fk = foreign_key
-          id = instance.id
+          scope_options = definition.scope_options
+          fk_conditions = { foreign_key => instance.id }
           
           klass.instance_eval do
-            with_scope(:find => { :conditions => { fk => id } }) do
-              send(*args, &block)
+            with_scope(:find => { :conditions => fk_conditions }) do
+              with_scope(:find => scope_options) do
+                send(*args, &block)
+              end
             end
           end
         end
@@ -99,27 +123,31 @@ module MongoModel
           doc
         end
         
-        def []=(index, doc)
-          ensure_class(doc)
-          association.assign(doc)
-          super if loaded?
-          self
+        def create!(*args, &block)
+          doc = association.create!(*args, &block)
+          self << doc
+          doc
         end
         
-        def <<(doc)
+        def []=(index, doc)
           ensure_class(doc)
+          association.unset(target[index]) if target[index]
           association.assign(doc)
           super if loaded?
           self
         end
         
-        def concat(documents)
+        def <<(*documents)
+          documents.flatten!
           ensure_class(documents)
           documents.each { |doc| association.assign(doc) }
           super if loaded?
           self
         end
         
+        alias_method :push, :<<
+        alias_method :concat, :<<
+        
         def insert(index, doc)
           ensure_class(doc)
           association.assign(doc)
@@ -127,17 +155,22 @@ module MongoModel
           self
         end
         
-        def push(*documents)
+        def unshift(*documents)
           ensure_class(documents)
           documents.each { |doc| association.assign(doc) }
           super if loaded?
           self
         end
         
-        def unshift(*documents)
-          ensure_class(documents)
-          documents.each { |doc| association.assign(doc) }
-          super if loaded?
+        def delete(doc)
+          association.unset(doc)
+          super
+          self
+        end
+        
+        def delete_at(index)
+          association.unset(target[index])
+          super
           self
         end
         

data/lib/mongomodel/concerns/attributes.rb

@@ -71,7 +71,7 @@ module MongoModel
       def class_for_type(type)
         klass = type.constantize
         
-        if (subclasses + [name]).include?(type)
+        if klass.ancestors.include?(self)
           klass
         else
           raise DocumentNotFound, "Document not of the correct type (got #{type})"

data/lib/mongomodel/document/indexes.rb

@@ -79,7 +79,7 @@ module MongoModel
         args << keys.map { |k, o| [k, o == :ascending ? 1 : -1] }.sort_by { |k| k.first.to_s }
       end
         
-      args << true if unique?
+      args << { :unique => true } if unique?
       
       args
     end

data/lib/mongomodel/document/persistence.rb

@@ -51,7 +51,7 @@ module MongoModel
       end
       
       def generate_id
-        ::Mongo::ObjectID.new.to_s
+        ::BSON::ObjectID.new.to_s
       end
       
       module ClassMethods

data/lib/mongomodel/document/scopes.rb

@@ -1,6 +1,6 @@
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/metaclass'
+require 'active_support/core_ext/kernel/singleton_class'
 
 module MongoModel
   module DocumentExtensions
@@ -23,7 +23,7 @@ module MongoModel
         def named_scope(name, options={})
           named_scopes[name] = options
         
-          metaclass.instance_eval do
+          singleton_class.instance_eval do
             define_method(name) do |*args|
               scope(name).apply(*args)
             end

data/lib/mongomodel/embedded_document.rb

@@ -1,9 +1,5 @@
 module MongoModel
   class EmbeddedDocument
-    def to_param
-      id
-    end
-    
     def ==(other)
       other.is_a?(self.class) && other.attributes == attributes
     end

data/lib/mongomodel/support/core_extensions.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-
 class Boolean < TrueClass; end
 
 class Symbol
@@ -10,63 +8,3 @@ class Symbol
   define_method(:asc) { MongoModel::MongoOrder::Clause.new(self, :ascending) }
   define_method(:desc) { MongoModel::MongoOrder::Clause.new(self, :descending) }
 end
-
-class Class
-  # Rubinius
-  if defined?(Class.__subclasses__)
-    def descendents
-      subclasses = []
-      __subclasses__.each {|k| subclasses << k; subclasses.concat k.descendents }
-      subclasses
-    end
-  else
-    # MRI
-    begin
-      ObjectSpace.each_object(Class.new) {}
-
-      def descendents
-        subclasses = []
-        ObjectSpace.each_object(class << self; self; end) do |k|
-          subclasses << k unless k == self
-        end
-        subclasses
-      end
-    # JRuby
-    rescue StandardError
-      def descendents
-        subclasses = []
-        ObjectSpace.each_object(Class) do |k|
-          subclasses << k if k < self
-        end
-        subclasses.uniq!
-        subclasses
-      end
-    end
-  end
-  
-  def reachable?
-    eval("defined?(::#{self}) && ::#{self}.equal?(self)")
-  end
-  
-  def subclasses
-    Object.subclasses_of(self).map { |o| o.to_s }
-  end
-end
-
-class Object
-    def remove_subclasses_of(*superclasses) #:nodoc:
-      Class.remove_class(*subclasses_of(*superclasses))
-    end
-  
-  # Exclude this class unless it's a subclass of our supers and is defined.
-  # We check defined? in case we find a removed class that has yet to be
-  # garbage collected. This also fails for anonymous classes -- please
-  # submit a patch if you have a workaround.
-  def subclasses_of(*superclasses) #:nodoc:
-    subclasses = []
-    superclasses.each do |klass|
-      subclasses.concat klass.descendents.select {|k| k.name.blank? || k.reachable?}
-    end
-    subclasses
-  end
-end

data/lib/mongomodel/support/mongo_options.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/subclasses'
+
 module MongoModel
   class MongoOptions
     ValidKeys = [ :conditions, :select, :offset, :limit, :order ]

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/mongomodel.gemspec

@@ -0,0 +1,213 @@
+# Generated by jeweler
+# 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{mongomodel}
+  s.version = "0.1.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sam Pohlenz"]
+  s.date = %q{2010-04-16}
+  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}
+  s.executables = ["console"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "bin/console",
+     "lib/mongomodel.rb",
+     "lib/mongomodel/attributes/mongo.rb",
+     "lib/mongomodel/attributes/store.rb",
+     "lib/mongomodel/attributes/typecasting.rb",
+     "lib/mongomodel/concerns/abstract_class.rb",
+     "lib/mongomodel/concerns/activemodel.rb",
+     "lib/mongomodel/concerns/associations.rb",
+     "lib/mongomodel/concerns/associations/base/association.rb",
+     "lib/mongomodel/concerns/associations/base/definition.rb",
+     "lib/mongomodel/concerns/associations/base/proxy.rb",
+     "lib/mongomodel/concerns/associations/belongs_to.rb",
+     "lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb",
+     "lib/mongomodel/concerns/associations/has_many_by_ids.rb",
+     "lib/mongomodel/concerns/attribute_methods.rb",
+     "lib/mongomodel/concerns/attribute_methods/before_type_cast.rb",
+     "lib/mongomodel/concerns/attribute_methods/dirty.rb",
+     "lib/mongomodel/concerns/attribute_methods/protected.rb",
+     "lib/mongomodel/concerns/attribute_methods/query.rb",
+     "lib/mongomodel/concerns/attribute_methods/read.rb",
+     "lib/mongomodel/concerns/attribute_methods/write.rb",
+     "lib/mongomodel/concerns/attributes.rb",
+     "lib/mongomodel/concerns/callbacks.rb",
+     "lib/mongomodel/concerns/logging.rb",
+     "lib/mongomodel/concerns/pretty_inspect.rb",
+     "lib/mongomodel/concerns/properties.rb",
+     "lib/mongomodel/concerns/record_status.rb",
+     "lib/mongomodel/concerns/serialization.rb",
+     "lib/mongomodel/concerns/timestamps.rb",
+     "lib/mongomodel/concerns/translation.rb",
+     "lib/mongomodel/concerns/validations.rb",
+     "lib/mongomodel/concerns/validations/associated.rb",
+     "lib/mongomodel/document.rb",
+     "lib/mongomodel/document/callbacks.rb",
+     "lib/mongomodel/document/dynamic_finders.rb",
+     "lib/mongomodel/document/finders.rb",
+     "lib/mongomodel/document/indexes.rb",
+     "lib/mongomodel/document/optimistic_locking.rb",
+     "lib/mongomodel/document/persistence.rb",
+     "lib/mongomodel/document/scopes.rb",
+     "lib/mongomodel/document/validations.rb",
+     "lib/mongomodel/document/validations/uniqueness.rb",
+     "lib/mongomodel/embedded_document.rb",
+     "lib/mongomodel/locale/en.yml",
+     "lib/mongomodel/support/collection.rb",
+     "lib/mongomodel/support/configuration.rb",
+     "lib/mongomodel/support/core_extensions.rb",
+     "lib/mongomodel/support/exceptions.rb",
+     "lib/mongomodel/support/mongo_options.rb",
+     "lib/mongomodel/support/types.rb",
+     "lib/mongomodel/support/types/array.rb",
+     "lib/mongomodel/support/types/boolean.rb",
+     "lib/mongomodel/support/types/custom.rb",
+     "lib/mongomodel/support/types/date.rb",
+     "lib/mongomodel/support/types/float.rb",
+     "lib/mongomodel/support/types/hash.rb",
+     "lib/mongomodel/support/types/integer.rb",
+     "lib/mongomodel/support/types/object.rb",
+     "lib/mongomodel/support/types/string.rb",
+     "lib/mongomodel/support/types/symbol.rb",
+     "lib/mongomodel/support/types/time.rb",
+     "lib/mongomodel/version.rb",
+     "mongomodel.gemspec",
+     "spec/mongomodel/attributes/store_spec.rb",
+     "spec/mongomodel/concerns/activemodel_spec.rb",
+     "spec/mongomodel/concerns/associations/belongs_to_spec.rb",
+     "spec/mongomodel/concerns/associations/has_many_by_foreign_key_spec.rb",
+     "spec/mongomodel/concerns/associations/has_many_by_ids_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/before_type_cast_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/dirty_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/protected_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/query_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/read_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/write_spec.rb",
+     "spec/mongomodel/concerns/attributes_spec.rb",
+     "spec/mongomodel/concerns/callbacks_spec.rb",
+     "spec/mongomodel/concerns/logging_spec.rb",
+     "spec/mongomodel/concerns/pretty_inspect_spec.rb",
+     "spec/mongomodel/concerns/properties_spec.rb",
+     "spec/mongomodel/concerns/serialization/json_serialization_spec.rb",
+     "spec/mongomodel/concerns/timestamps_spec.rb",
+     "spec/mongomodel/concerns/translation_spec.rb",
+     "spec/mongomodel/concerns/validations_spec.rb",
+     "spec/mongomodel/document/callbacks_spec.rb",
+     "spec/mongomodel/document/dynamic_finders_spec.rb",
+     "spec/mongomodel/document/finders_spec.rb",
+     "spec/mongomodel/document/indexes_spec.rb",
+     "spec/mongomodel/document/optimistic_locking_spec.rb",
+     "spec/mongomodel/document/persistence_spec.rb",
+     "spec/mongomodel/document/scopes_spec.rb",
+     "spec/mongomodel/document/validations/uniqueness_spec.rb",
+     "spec/mongomodel/document/validations_spec.rb",
+     "spec/mongomodel/document_spec.rb",
+     "spec/mongomodel/embedded_document_spec.rb",
+     "spec/mongomodel/mongomodel_spec.rb",
+     "spec/mongomodel/support/collection_spec.rb",
+     "spec/mongomodel/support/mongo_options_spec.rb",
+     "spec/mongomodel/support/property_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/specdoc.opts",
+     "spec/support/callbacks.rb",
+     "spec/support/helpers/define_class.rb",
+     "spec/support/helpers/specs_for.rb",
+     "spec/support/matchers/be_a_subclass_of.rb",
+     "spec/support/matchers/be_truthy.rb",
+     "spec/support/matchers/respond_to_boolean.rb",
+     "spec/support/matchers/run_callbacks.rb",
+     "spec/support/models.rb",
+     "spec/support/time.rb"
+  ]
+  s.homepage = %q{http://github.com/spohlenz/mongomodel}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{MongoDB ORM for Ruby/Rails}
+  s.test_files = [
+    "spec/mongomodel/attributes/store_spec.rb",
+     "spec/mongomodel/concerns/activemodel_spec.rb",
+     "spec/mongomodel/concerns/associations/belongs_to_spec.rb",
+     "spec/mongomodel/concerns/associations/has_many_by_foreign_key_spec.rb",
+     "spec/mongomodel/concerns/associations/has_many_by_ids_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/before_type_cast_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/dirty_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/protected_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/query_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/read_spec.rb",
+     "spec/mongomodel/concerns/attribute_methods/write_spec.rb",
+     "spec/mongomodel/concerns/attributes_spec.rb",
+     "spec/mongomodel/concerns/callbacks_spec.rb",
+     "spec/mongomodel/concerns/logging_spec.rb",
+     "spec/mongomodel/concerns/pretty_inspect_spec.rb",
+     "spec/mongomodel/concerns/properties_spec.rb",
+     "spec/mongomodel/concerns/serialization/json_serialization_spec.rb",
+     "spec/mongomodel/concerns/timestamps_spec.rb",
+     "spec/mongomodel/concerns/translation_spec.rb",
+     "spec/mongomodel/concerns/validations_spec.rb",
+     "spec/mongomodel/document/callbacks_spec.rb",
+     "spec/mongomodel/document/dynamic_finders_spec.rb",
+     "spec/mongomodel/document/finders_spec.rb",
+     "spec/mongomodel/document/indexes_spec.rb",
+     "spec/mongomodel/document/optimistic_locking_spec.rb",
+     "spec/mongomodel/document/persistence_spec.rb",
+     "spec/mongomodel/document/scopes_spec.rb",
+     "spec/mongomodel/document/validations/uniqueness_spec.rb",
+     "spec/mongomodel/document/validations_spec.rb",
+     "spec/mongomodel/document_spec.rb",
+     "spec/mongomodel/embedded_document_spec.rb",
+     "spec/mongomodel/mongomodel_spec.rb",
+     "spec/mongomodel/support/collection_spec.rb",
+     "spec/mongomodel/support/mongo_options_spec.rb",
+     "spec/mongomodel/support/property_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/support/callbacks.rb",
+     "spec/support/helpers/define_class.rb",
+     "spec/support/helpers/specs_for.rb",
+     "spec/support/matchers/be_a_subclass_of.rb",
+     "spec/support/matchers/be_truthy.rb",
+     "spec/support/matchers/respond_to_boolean.rb",
+     "spec/support/matchers/run_callbacks.rb",
+     "spec/support/models.rb",
+     "spec/support/time.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    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"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.20.1"])
+      s.add_runtime_dependency(%q<bson>, [">= 0.20.1"])
+    else
+      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"])
+    end
+  else
+    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"])
+  end
+end
+

data/spec/mongomodel/concerns/activemodel_spec.rb

@@ -1,33 +1,97 @@
 require 'spec_helper'
 
 # Specs ported from ActiveModel::Lint::Tests
+#
+# These tests do not attempt to determine the semantic correctness of the
+# returned values. For instance, you could implement valid? to always
+# return true, and the tests would pass. It is up to you to ensure that
+# the values are semantically meaningful.
+#
+# Objects you pass in are expected to return a compliant object from a
+# call to to_model. It is perfectly fine for to_model to return self.
 module MongoModel
   specs_for(Document, EmbeddedDocument) do
     define_class(:TestModel, described_class)
     
     subject { TestModel.new.to_model }
     
-    # valid?
-    # ------
+    # == Responds to <tt>to_key</tt>
     #
-    # Returns a boolean that specifies whether the object is in a valid or invalid
-    # state.
-    it { should respond_to_boolean(:valid?) }
-
-    # new_record?
-    # -----------
+    # Returns an Enumerable of all (primary) key attributes
+    # or nil if model.persisted? is false
+    it { should respond_to(:to_key) }
+    
+    specify "to_key should return nil if subject.persisted? is false" do
+      subject.stub!(:persisted?).and_return(false)
+      subject.to_key.should be_nil
+    end
+    
+    # == Responds to <tt>to_param</tt>
+    #
+    # Returns a string representing the object's key suitable for use in URLs
+    # or nil if model.persisted? is false.
+    #
+    # Implementers can decide to either raise an exception or provide a default
+    # in case the record uses a composite primary key. There are no tests for this
+    # behavior in lint because it doesn't make sense to force any of the possible
+    # implementation strategies on the implementer. However, if the resource is
+    # not persisted?, then to_param should always return nil.
+    it { should respond_to(:to_param) }
+    
+    specify "to_param should return nil if subject.persisted? is false" do
+      subject.stub!(:persisted?).and_return(false)
+      subject.to_param.should be_nil
+    end
+    
+    # == Responds to <tt>persisted?</tt>
     #
     # Returns a boolean that specifies whether the object has been persisted yet.
     # This is used when calculating the URL for an object. If the object is
     # not persisted, a form for that object, for instance, will be POSTed to the
     # collection. If it is persisted, a form for the object will put PUTed to the
     # URL for the object.
-    it { should respond_to_boolean(:new_record?) }
-    it { should respond_to_boolean(:destroyed?) }
+    it { should respond_to_boolean(:persisted?) }
     
-    # errors
-    # ------
+    # == Naming
     #
+    # Model.model_name must returns a string with some convenience methods as
+    # :human and :partial_path. Check ActiveModel::Naming for more information.
+    #
+    specify "the model class should respond to model_name" do
+      subject.class.should respond_to(:model_name)
+    end
+    
+    it "should return strings for model_name" do
+      model_name = subject.class.model_name
+      model_name.should be_a_kind_of(String)
+      model_name.human.should be_a_kind_of(String)
+      model_name.partial_path.should be_a_kind_of(String)
+      model_name.singular.should be_a_kind_of(String)
+      model_name.plural.should be_a_kind_of(String)
+    end
+    
+    # ## Old
+    # 
+    # # valid?
+    # # ------
+    # #
+    # # Returns a boolean that specifies whether the object is in a valid or invalid
+    # # state.
+    # it { should respond_to_boolean(:valid?) }
+    # 
+    # # new_record?
+    # # -----------
+    # #
+    # # Returns a boolean that specifies whether the object has been persisted yet.
+    # # This is used when calculating the URL for an object. If the object is
+    # # not persisted, a form for that object, for instance, will be POSTed to the
+    # # collection. If it is persisted, a form for the object will put PUTed to the
+    # # URL for the object.
+    # it { should respond_to_boolean(:new_record?) }
+    # it { should respond_to_boolean(:destroyed?) }
+    
+    # == Errors Testing
+    # 
     # Returns an object that has :[] and :full_messages defined on it. See below
     # for more details.
     describe "errors" do
@@ -51,11 +115,5 @@ module MongoModel
         end
       end
     end
-    
-    describe "#model_name" do
-      it "should return an ActiveModel::Name object" do
-        TestModel.model_name.should == ActiveModel::Name.new(mock('TestModel class', :name => 'TestModel'))
-      end
-    end
   end
 end

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

@@ -20,6 +20,10 @@ module MongoModel
         subject.user.should == user
       end
       
+      it "should not be truthy" do
+        subject.user.should_not be_truthy
+      end
+      
       describe "setting a subclass type" do
         it "should set successfully" do
           subject.user = special_user
@@ -47,12 +51,16 @@ module MongoModel
         reloaded.user.should == user
       end
       
+      it "should be truthy" do
+        subject.user.should be_truthy
+      end
+      
       it "should allow the user to be reloaded" do
-        reloaded.user.inspect
-        reloaded.user.loaded?.should be_true
+        user = reloaded.user.target
         
-        reloaded.user(true)
-        reloaded.user.loaded?.should be_false
+        user.should equal(reloaded.user.target)
+        user.should equal(reloaded.user.target)
+        user.should_not equal(reloaded.user(true).target)
       end
       
       describe "setting a subclass type" do

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

@@ -18,7 +18,7 @@ module MongoModel
       end
       define_class(:IllustratedChapter, :Chapter)
       define_class(:Book, Document) do
-        has_many :chapters, :by => :foreign_key
+        has_many :chapters, :by => :foreign_key, :limit => 5
       end
       define_class(:NonChapter, Document)
       
@@ -56,6 +56,13 @@ module MongoModel
           chapter3.book.should == subject
         end
         
+        it "should replace chapters with []=" do
+          subject.chapters[1] = chapter3
+          subject.chapters.should include(chapter1, chapter3)
+          subject.chapters.should_not include(chapter2)
+          #chapter2.book.should be_nil
+        end
+        
         it "should add chapters with concat" do
           subject.chapters.concat([chapter3])
           subject.chapters.should include(chapter1, chapter2, chapter3)
@@ -89,21 +96,21 @@ module MongoModel
         # it "should clear chapters" do
         #   subject.chapters.clear
         #   subject.chapters.should be_empty
-        #   subject.chapter_ids.should be_empty
-        # end
-        # 
-        # it "should remove chapters with delete" do
-        #   subject.chapters.delete(chapter1)
-        #   subject.chapters.should == [chapter2]
-        #   subject.chapter_ids.should == [chapter2.id]
+        #   [chapter1, chapter2].each { |c| c.book.should be_nil }
         # end
-        # 
-        # it "should remove chapters with delete_at" do
-        #   subject.chapters.delete_at(0)
-        #   subject.chapters.should == [chapter2]
-        #   subject.chapter_ids.should == [chapter2.id]
-        # end
-        # 
+        
+        it "should remove chapters with delete" do
+          subject.chapters.delete(chapter1)
+          subject.chapters.should == [chapter2]
+          chapter1.book.should be_nil
+        end
+        
+        it "should remove chapters with delete_at" do
+          subject.chapters.delete_at(0)
+          subject.chapters.should == [chapter2]
+          #chapter1.book.should be_nil
+        end
+        
         # it "should remove chapters with delete_if" do
         #   subject.chapters.delete_if { |c| c.id == chapter1.id }
         #   subject.chapters.should == [chapter2]
@@ -138,9 +145,16 @@ module MongoModel
           result = subject.chapters.find(:all, :order => :id.desc)
           result.should == [chapter2, chapter1]
         end
+        
+        it "should find chapters with association options" do
+          # Create bogus chapters
+          10.times { subject.chapters.create! }
+          
+          subject.chapters.all.size.should == 5 # limit clause
+        end
       end
       
-      context "with chapters set" do
+      context "new instance with chapters set" do
         subject { Book.new(:chapters => [chapter1, chapter2]) }
         it_should_behave_like "accessing and manipulating a has_many :by => :foreign_key association"
       end

data/spec/mongomodel/document/indexes_spec.rb

@@ -45,7 +45,7 @@ module MongoModel
       
         it "should create indexes on the collection" do
           Article.collection.should_receive(:create_index).with(:_type)
-          Article.collection.should_receive(:create_index).with(:title, true)
+          Article.collection.should_receive(:create_index).with(:title, :unique => true)
           Article.collection.should_receive(:create_index).with([[:age, Mongo::DESCENDING]])
           Article.ensure_indexes!
         end
@@ -93,7 +93,7 @@ module MongoModel
     end
     
     it "should convert index with unique option to arguments for Mongo::Collection#create_index" do
-      Index.new(:title, :unique => true).to_args.should == [:title, true]
+      Index.new(:title, :unique => true).to_args.should == [:title, { :unique => true }]
     end
     
     it "should convert index with descending key to arguments for Mongo::Collection#create_index" do

data/spec/mongomodel/document/validations/uniqueness_spec.rb

@@ -58,6 +58,12 @@ module MongoModel
           subject.should be_valid
         end
         
+        it "should generate correct error message" do
+          Article.create!(:title => 'Test')
+          subject.valid?
+          subject.errors[:title].should include('has already been taken')
+        end
+        
         describe "beating the race condition" do
           before(:each) { Article.create!(:title => 'Test') }
           it_should_behave_like "beating the race condition"

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
-require 'rubygems'
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
 require 'spec'
 
 # Require MongoModel library

data/spec/support/matchers/be_truthy.rb

@@ -0,0 +1,5 @@
+Spec::Matchers.define(:be_truthy) do
+  match do |object|
+    !!object
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -9,39 +14,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +10:30
+date: 2010-04-16 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.pre
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.pre
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 20
+        - 1
+        version: 0.20.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bson
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.3
-    version: 
+        segments: 
+        - 0
+        - 20
+        - 1
+        version: 0.20.1
+  type: :runtime
+  version_requirements: *id004
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: sam@sampohlenz.com
 executables: 
@@ -52,6 +85,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -117,6 +152,7 @@ files:
 - lib/mongomodel/support/types/symbol.rb
 - lib/mongomodel/support/types/time.rb
 - lib/mongomodel/version.rb
+- mongomodel.gemspec
 - spec/mongomodel/attributes/store_spec.rb
 - spec/mongomodel/concerns/activemodel_spec.rb
 - spec/mongomodel/concerns/associations/belongs_to_spec.rb
@@ -159,6 +195,7 @@ files:
 - spec/support/helpers/define_class.rb
 - spec/support/helpers/specs_for.rb
 - spec/support/matchers/be_a_subclass_of.rb
+- spec/support/matchers/be_truthy.rb
 - spec/support/matchers/respond_to_boolean.rb
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb
@@ -176,18 +213,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails
@@ -232,6 +271,7 @@ test_files:
 - spec/support/helpers/define_class.rb
 - spec/support/helpers/specs_for.rb
 - spec/support/matchers/be_a_subclass_of.rb
+- spec/support/matchers/be_truthy.rb
 - spec/support/matchers/respond_to_boolean.rb
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb