mongomodel 0.5.5 → 0.5.6

data/lib/rails/generators/mongo_model/model/model_generator.rb

@@ -6,16 +6,16 @@ module MongoModel
       source_root File.expand_path('../templates', __FILE__)
 
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      
+
       class_option :timestamps, :type => :boolean, :aliases => "-T", :default => true,  :desc => "Add timestamp fields (created_at, updated_at)"
       class_option :embedded,   :type => :boolean, :aliases => "-E", :default => false, :desc => "Inherit from EmbeddedDocument"
 
       check_class_collision
-      
+
       def create_model_file
         template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
       end
-      
+
       hook_for :test_framework
     end
   end

data/mongomodel.gemspec

@@ -14,14 +14,15 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "mongomodel"
-  
+
   s.add_dependency "activesupport", ">= 3.1"
   s.add_dependency "activemodel",   ">= 3.1"
   s.add_dependency "mongo",         "~> 1.8"
 
-  s.add_development_dependency "bundler",  ">= 1.0"
-  s.add_development_dependency "rspec",    "~> 2.8"
-  s.add_development_dependency "minitest", ">= 4.2"
+  s.add_development_dependency "bundler",   ">= 1.0"
+  s.add_development_dependency "rspec",     "~> 3.5"
+  s.add_development_dependency "rspec-its", "~> 1.2"
+  s.add_development_dependency "minitest",  ">= 4.2"
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'

data/spec/mongomodel/attributes/store_spec.rb

@@ -28,18 +28,18 @@ module MongoModel
       properties
     end
     let(:instance) { double('instance', :properties => properties) }
-    
+
     subject { Attributes::Store.new(instance) }
-    
+
     it "sets default property values" do
       subject.keys.should == properties.keys
       subject[:default].should == 'Default'
     end
-    
+
     it "sets default property value using mongomodel_default if defined by class" do
       subject[:custom_default].should == CustomClassWithDefault.new("Custom class default")
     end
-    
+
     describe "setting to nil" do
       specify "all property types should be nullable" do
         properties.keys.each do |property|
@@ -48,12 +48,12 @@ module MongoModel
         end
       end
     end
-        
+
     it "sets attributes that aren't properties" do
       subject[:non_property] = "Hello World"
       subject[:non_property].should == "Hello World"
     end
-        
+
     describe "type-casting" do
       TypeCastExamples = {
         :string =>
@@ -163,14 +163,14 @@ module MongoModel
             { :mykey => "Hello world" } => OpenStruct.new(:mykey => "Hello world")
           }
       }
-    
+
       TypeCastExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |assigned, expected|
             if expected.is_a?(Proc)
               it "casts #{assigned.inspect} to match proc" do
                 subject[type] = assigned
-                expected.call(subject[type]).should be_true
+                expected.call(subject[type]).should be true
               end
             else
               it "casts #{assigned.inspect} to #{expected.inspect}" do
@@ -181,24 +181,24 @@ module MongoModel
           end
         end
       end
-    
+
       context "assigning to custom property" do
         before(:each) do
           @custom = CustomClass.new('instance name')
         end
-      
+
         it "does not alter instances of CustomClass" do
           subject[:custom] = @custom
           subject[:custom].should == @custom
         end
-      
+
         it "casts strings to CustomClass" do
           subject[:custom] = "foobar"
           subject[:custom].should == CustomClass.new('foobar')
         end
       end
     end
-        
+
     describe "#before_type_cast" do
       BeforeTypeCastExamples = {
         :string => [ "abc", 123 ],
@@ -213,7 +213,7 @@ module MongoModel
         :date => [ Date.civil(2009, 11, 15), Time.local(2008, 12, 3, 0, 0, 0, 0), "2009/3/4", "Sat Jan 01 20:15:01 UTC 2000" ],
         :time => [ Time.local(2008, 5, 14, 1, 2, 3, 4), Date.civil(2009, 11, 15), "Sat Jan 01 20:15:01 UTC 2000", "2009/3/4" ]
       }
-    
+
       BeforeTypeCastExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
@@ -225,7 +225,7 @@ module MongoModel
         end
       end
     end
-        
+
     describe "#has?" do
       TrueExamples = {
         :string => [ 'abc', '1' ],
@@ -241,7 +241,7 @@ module MongoModel
         :openstruct => [ {} ],
         :custom => [ CustomClass.new('foobar'), 'baz' ]
       }
-    
+
       FalseExamples = {
         :string => [ nil, '' ],
         :integer => [ nil, 0 ],
@@ -256,7 +256,7 @@ module MongoModel
         :openstruct => [ nil ],
         :custom => [ nil ]
       }
-    
+
       TrueExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
@@ -267,7 +267,7 @@ module MongoModel
           end
         end
       end
-    
+
       FalseExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
@@ -279,7 +279,7 @@ module MongoModel
         end
       end
     end
-        
+
     describe "serialization" do
       it "converts to mongo representation" do
         subject[:string] = 'string'
@@ -298,7 +298,7 @@ module MongoModel
         subject[:as] = "As property"
         subject[:non_property] = "Hello World"
         subject[:custom_non_property] = CustomClass.new('custom non property')
-        
+
         subject.to_mongo.should include({
           'string' => 'string',
           'integer' => 42,
@@ -318,7 +318,7 @@ module MongoModel
           'custom_non_property' => { :name => 'custom non property' },
         })
       end
-    
+
       it "loads from mongo representation" do
         subject.from_mongo!({
           'string' => 'string',
@@ -337,7 +337,7 @@ module MongoModel
           '_custom_as' => "As property",
           'custom_non_property' => { :name => 'custom non property' }
         })
-      
+
         subject[:string].should == 'string'
         subject[:integer].should == 42
         subject[:float].should == 123.45

data/spec/mongomodel/concerns/activemodel_spec.rb

@@ -8,9 +8,9 @@ module MongoModel
       rescue LoadError
         require 'minitest/unit'
       end
-      
+
       include Minitest::Assertions
-      
+
       attr_accessor :assertions
       before(:all) { self.assertions = 0 }
 
@@ -24,10 +24,10 @@ module MongoModel
 
       let(:model) { subject }
     end
-    
+
     define_class(:TestModel, described_class)
     subject { TestModel.new }
-        
+
     it_should_behave_like "ActiveModel"
   end
 end

data/spec/mongomodel/concerns/associations/base/association_spec.rb

@@ -7,47 +7,47 @@ module MongoModel
         define_class(:Chapter, MongoModel::Document)
         define_class(:IllustratedChapter, :Chapter)
         define_class(:NonChapter, MongoModel::Document)
-        
+
         let(:klass) { Chapter }
         let(:definition) { double(:klass => klass) }
         let(:instance) { double }
-        
+
         subject! { Association.new(definition, instance) }
-    
+
         describe "#ensure_class" do
           it "accepts instances of the definition class" do
             subject.ensure_class(Chapter.new)
           end
-          
+
           it "accepts instances of a subclass of the definition class" do
             subject.ensure_class(IllustratedChapter.new)
           end
-          
+
           it "raises an error if passed an object that is not an instance of the definition class" do
             lambda {
               subject.ensure_class(NonChapter.new)
             }.should raise_error(MongoModel::AssociationTypeMismatch)
           end
-          
+
           it "accepts instances of the definition class that have been reloaded" do
             # Ensure Chapter class name is cached on the original class
             Chapter.name
-            
+
             Object.send(:remove_const, :Chapter)
             Object.const_set(:Chapter, Class.new(MongoModel::Document))
-            
+
             subject.ensure_class(Chapter.new)
           end
-          
+
           it "accepts stale instances of a class that has been reloaded" do
             chapter = Chapter.new
-            
+
             Object.send(:remove_const, :Chapter)
             Object.const_set(:Chapter, Class.new(MongoModel::Document))
-            
+
             definition = double(:klass => Chapter)
             association = Association.new(definition, instance)
-            
+
             association.ensure_class(chapter)
           end
         end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module MongoModel  
+module MongoModel
   specs_for(Document, EmbeddedDocument) do
     shared_examples_for "assigning correct class to belongs_to association" do
       define_class(:User, Document)
@@ -71,36 +71,36 @@ module MongoModel
         end
       end
     end
-    
+
     describe "belongs_to association" do
       define_class(:Article, described_class) do
         belongs_to :user
       end
-      
+
       subject { Article.new }
-      
+
       it_should_behave_like "assigning correct class to belongs_to association"
-      
+
       describe "setting a different class type" do
         define_class(:NonUser, Document)
-        
+
         let(:non_user) { NonUser.create! }
-        
+
         it "raises a AssociationTypeMismatch exception" do
           lambda { subject.user = non_user }.should raise_error(AssociationTypeMismatch, "User expected, got NonUser")
         end
       end
-      
+
       describe "#build_user" do
         let(:user) { subject.build_user(:id => '123') }
-        
+
         it "returns a new unsaved user with the given attributes" do
           user.should be_an_instance_of(User)
           user.should be_a_new_record
           user.id.should == '123'
         end
       end
-      
+
       describe "#create_user" do
         it "returns a new saved user with the given attributes" do
           user = subject.create_user(:id => '123')
@@ -110,45 +110,58 @@ module MongoModel
         end
       end
     end
-    
+
+    describe "belongs_to association with custom foreign_key" do
+      define_class(:Article, described_class) do
+        belongs_to :user, :foreign_key => :author_id
+      end
+
+      subject { Article.new }
+
+      it "uses the foreign key as the reference property" do
+        user = subject.build_user(:id => '123')
+        subject.author_id.should == '123'
+      end
+    end
+
     describe "polymorphic belongs_to association" do
       define_class(:Article, described_class) do
         belongs_to :user, :polymorphic => true
       end
-      
+
       subject { Article.new }
-      
+
       define_class(:NonUser, Document)
-      
+
       let(:non_user) { NonUser.create! }
-      
+
       it_should_behave_like "assigning correct class to belongs_to association"
-      
+
       describe "setting a different class type" do
         it "sets successfully" do
           subject.user = non_user
           subject.user.should == non_user
         end
       end
-      
+
       context "when loading from database" do
         subject { Article.new(:user => user) }
-        
+
         if specing?(EmbeddedDocument)
           define_class(:ArticleParent, Document) do
             property :article, Article
           end
-          
+
           let(:parent) { ArticleParent.create!(:article => subject) }
           let(:reloaded) { ArticleParent.find(parent.id).article }
         else
           before(:each) { subject.save! }
           let(:reloaded) { Article.find(subject.id) }
         end
-        
+
         describe "setting a different class type" do
           subject { Article.new(:user => non_user) }
-          
+
           it "loads successfully" do
             reloaded.user.should == non_user
           end

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

@@ -6,16 +6,16 @@ module MongoModel
       define_class(:MyBook, Document) do
         has_many :chapters
       end
-      
+
       it "defaults to :by => :foreign_key" do
         MyBook.associations[:chapters].should be_a(Associations::HasManyByForeignKey)
       end
-      
+
       it "sets default inverse_of value" do
         MyBook.associations[:chapters].inverse_of.should == :my_book
       end
     end
-    
+
     describe "has_many :by => :foreign_key association" do
       define_class(:Chapter, Document) do
         belongs_to :book
@@ -25,218 +25,218 @@ module MongoModel
         has_many :chapters, :by => :foreign_key, :limit => 5, :order => :id.asc
       end
       define_class(:NonChapter, Document)
-      
+
       let(:chapter1) { Chapter.create!(:id => '1') }
       let(:chapter2) { IllustratedChapter.create!(:id => '2') }
       let(:chapter3) { Chapter.create!(:id => '3') }
       let(:nonchapter) { NonChapter.create! }
-      
+
       context "when uninitialized" do
         subject { Book.new }
-        
+
         it "is empty" do
           subject.chapters.should be_empty
         end
       end
-      
+
       shared_examples_for "accessing and manipulating a has_many :by => :foreign_key association" do
         it "accesses chapters" do
           subject.chapters.should include(chapter1, chapter2)
         end
-        
+
         it "accesses chapter ids through association" do
           subject.chapters.ids.should include(chapter1.id, chapter2.id)
         end
-        
+
         it "adds chapters with <<" do
           subject.chapters << chapter3
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
-        
+
         it "adds/change chapters with []=" do
           subject.chapters[2] = chapter3
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
-        
+
         it "replaces 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 "adds chapters with concat" do
           subject.chapters.concat([chapter3])
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
-        
+
         it "inserts chapters" do
           subject.chapters.insert(1, chapter3)
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
-        
+
         # it "should replace chapters" do
         #   subject.chapters.replace([chapter2, chapter3])
         #   subject.chapters.should == [chapter2, chapter3]
         #   subject.chapter_ids.should == [chapter2.id, chapter3.id]
         # end
-        
+
         it "adds chapters with push" do
           subject.chapters.push(chapter3)
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
-        
+
         it "adds chapters with unshift" do
           subject.chapters.unshift(chapter3)
           subject.chapters.should include(chapter3, chapter1, chapter2)
           chapter3.book.should == subject
         end
-        
+
         # it "should clear chapters" do
         #   subject.chapters.clear
         #   subject.chapters.should be_empty
         #   [chapter1, chapter2].each { |c| c.book.should be_nil }
         # end
-        
+
         it "removes chapters with delete" do
           subject.chapters.delete(chapter1)
           subject.chapters.should == [chapter2]
           chapter1.book.should be_nil
         end
-        
+
         it "removes 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]
         #   subject.chapter_ids.should == [chapter2.id]
         # end
-        
+
         it "builds a chapter" do
           chapter4 = subject.chapters.build(:id => '4')
           subject.chapters.should include(chapter1, chapter2, chapter4)
-          
+
           chapter4.should be_a_new_record
           chapter4.id.should == '4'
           chapter4.book.should == subject
           chapter4.book_id.should == subject.id
         end
-        
+
         it "creates a chapter" do
           chapter4 = subject.chapters.create(:id => '4')
           subject.chapters.should == [chapter1, chapter2, chapter4]
-          
+
           chapter4.should_not be_a_new_record
           chapter4.id.should == '4'
           chapter4.book.should == subject
           chapter4.book_id.should == subject.id
         end
-        
+
         it "finds chapters" do
           # Create bogus chapters
           Chapter.create!(:id => '999')
           Chapter.create!(:id => '998')
-          
+
           result = subject.chapters.order(:id.desc)
           result.should == [chapter2, chapter1]
         end
-        
+
         it "finds chapters with association options" do
           # Create bogus chapters
           10.times { subject.chapters.create! }
-          
+
           subject.chapters.all.size.should == 5 # limit clause
         end
-        
+
         it "supports scope select method" do
           subject.chapters.select(:id, :_type, :book_id).should == [chapter1, chapter2]
         end
-        
+
         it "supports array select method" do
           subject.chapters.select { |c| c.is_a?(IllustratedChapter) }.should == [chapter2]
         end
       end
-      
+
       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
-      
+
       context "when loaded from database" do
         let(:book) { Book.create!(:chapters => [chapter1, chapter2]) }
         subject { Book.find(book.id) }
         it_should_behave_like "accessing and manipulating a has_many :by => :foreign_key association"
       end
-      
+
       describe "with :dependent => :destroy option" do
         define_class(:Book, Document) do
           has_many :chapters, :by => :foreign_key, :dependent => :destroy
         end
-        
+
         subject { Book.create!(:chapters => [chapter1, chapter2, chapter3]) }
-        
+
         context "when the parent object is destroyed" do
           it "calls destroy on the child objects" do
             chapter1.should_receive(:destroy)
             chapter2.should_receive(:destroy)
             chapter3.should_receive(:destroy)
-            
+
             subject.destroy
           end
-          
+
           it "removes the child objects from their collection" do
             subject.destroy
-            
-            Chapter.exists?(chapter1.id).should be_false
-            Chapter.exists?(chapter2.id).should be_false
-            Chapter.exists?(chapter3.id).should be_false
+
+            Chapter.exists?(chapter1.id).should be false
+            Chapter.exists?(chapter2.id).should be false
+            Chapter.exists?(chapter3.id).should be false
           end
         end
       end
-      
+
       describe "with :dependent => :delete option" do
         define_class(:Book, Document) do
           has_many :chapters, :by => :foreign_key, :dependent => :delete
         end
-        
+
         subject { Book.create!(:chapters => [chapter1, chapter2, chapter3]) }
-        
+
         context "when the parent object is destroyed" do
           it "does not call destroy on the child objects" do
             chapter1.should_not_receive(:destroy)
             chapter2.should_not_receive(:destroy)
             chapter3.should_not_receive(:destroy)
-            
+
             subject.destroy
           end
-          
+
           it "removes the child objects from their collection" do
             subject.destroy
-            
-            Chapter.exists?(chapter1.id).should be_false
-            Chapter.exists?(chapter2.id).should be_false
-            Chapter.exists?(chapter3.id).should be_false
+
+            Chapter.exists?(chapter1.id).should be false
+            Chapter.exists?(chapter2.id).should be false
+            Chapter.exists?(chapter3.id).should be false
           end
         end
       end
     end
   end
-  
+
   specs_for(EmbeddedDocument) do
     describe "defining a has_many :by => :foreign_key association" do
       define_class(:Book, EmbeddedDocument)
-      
+
       it "raises an exception" do
-        lambda { Book.has_many :chapters, :by => :foreign_key }.should raise_error
+        lambda { Book.has_many :chapters, :by => :foreign_key }.should raise_error(RuntimeError)
       end
     end
   end