mongomodel 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6303f96496ed1cb9c8c52316e02c07a7354f06e
-  data.tar.gz: 5ef0ee286e9a51dd9bb42390da710688eadde951
+  metadata.gz: 730ec72969141979066d7a38f450b9622485bb55
+  data.tar.gz: b72b388e3b6b6d041dd4f6431233d25c0aeddd8c
 SHA512:
-  metadata.gz: d11971bf1bdef7946e7e54ba0c9912566e30008d64df721d1aff9aed17dc833d436a3156d337553d33e78711da0b8048bd3004c337bc0317efb05fdf5ba64326
-  data.tar.gz: a158854ae696e4a0bf4102835e6a6def055bce660f1141716f190e5ab576a79c2ca4793c42dc21d046d9b4d21df0c1e1d4dbc743dc47f4173692dd79ec00ff49
+  metadata.gz: b954cd2ce4ed17b3dc9406572d8523092db0d249dfe9c1c61418b96b15702a91df7e740e4ed9af3581d41e5f37c8497447fceb794f7c01f661aa935007999f39
+  data.tar.gz: 0a92c9c4215cea8d312d9ecd13684c8bf9d54cfada4410e6587902506edc6093314672a39e448ce07659bf1991b82eb24e77879227f15eebce938e8f6f0dbc3c

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

@@ -21,7 +21,9 @@ module MongoModel
         end
         
         def ensure_class(value)
-          raise AssociationTypeMismatch, "expected instance of #{klass} but got #{value.class}" unless value.is_a?(klass)
+          unless value.is_a?(klass) || value.class.name.constantize <= klass.name.constantize
+            raise AssociationTypeMismatch, "#{klass} expected, got #{value.class}"
+          end
         end
       
       protected

data/lib/mongomodel/document/scopes.rb

@@ -32,13 +32,13 @@ module MongoModel
           end
           
           scopes[name] = lambda do |*args|
-            s = scope.is_a?(Proc) ? scope.call(*args) : scope
-            scoped.merge(s)
+            scope.is_a?(Proc) ? scope.call(*args) : scope
           end
           
           singleton_class.class_eval do
             define_method(name) do |*args|
-              scopes[name].call(*args)
+              s = scopes[name].call(*args)
+              scoped.merge(s)
             end
           end
         end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

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

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+module MongoModel
+  module Associations
+    module Base
+      describe Association do
+        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
+      end
+    end
+  end
+end

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

@@ -87,7 +87,7 @@ module MongoModel
         let(:non_user) { NonUser.create! }
         
         it "raises a AssociationTypeMismatch exception" do
-          lambda { subject.user = non_user }.should raise_error(AssociationTypeMismatch, "expected instance of User but got NonUser")
+          lambda { subject.user = non_user }.should raise_error(AssociationTypeMismatch, "User expected, got NonUser")
         end
       end
       

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

@@ -123,7 +123,7 @@ module MongoModel
       describe "adding a non-chapter" do
         def self.should_raise(message, &block)
           it "raises an AsssociationTypeMismatch error when #{message}" do
-            lambda { instance_eval(&block) }.should raise_error(AssociationTypeMismatch, "expected instance of Chapter but got NonChapter")
+            lambda { instance_eval(&block) }.should raise_error(AssociationTypeMismatch, "Chapter expected, got NonChapter")
           end
         end
 

data/spec/mongomodel/document/scopes_spec.rb

@@ -51,37 +51,40 @@ module MongoModel
     end
     
     describe "#scope" do
-      it "creates a method returning the scope" do
-        Post.class_eval do
-          scope :published, where(:published => true)
-        end
+      define_class(:Post, Document) do
+        scope :published, where(:published => true)
         
+        scope :latest, lambda { |num| order(:created_at.desc).limit(num) }
+        
+        scope :recent, order(:created_at.desc).limit(5)
+        scope :recently_published, recent.where(:published => true)
+      end
+      
+      define_class(:SpecialPost, :Post)
+      
+      it "creates a method returning the scope" do
         scope = Post.published
         scope.should be_an_instance_of(MongoModel::Scope)
         scope.where_values.should == [{:published => true}]
       end
       
       it "creates parameterized method returning the scope when given a lambda" do
-        Post.class_eval do
-          scope :latest, lambda { |num| order(:created_at.desc).limit(num) }
-        end
-        
         scope = Post.latest(4)
         scope.order_values.should == [:created_at.desc]
         scope.limit_value.should == 4
       end
       
       it "allows existing scopes to be built upon" do
-        Post.class_eval do
-          scope :recent, order(:created_at.desc).limit(5)
-          scope :recently_published, recent.where(:published => true)
-        end
-        
         scope = Post.recently_published
         scope.where_values.should == [{:published => true}]
         scope.order_values.should == [:created_at.desc]
         scope.limit_value.should == 5
       end
+      
+      it "merges the scope with the current scope of the class it is called upon" do
+        scope = SpecialPost.published
+        scope.klass.should == SpecialPost
+      end
     end
     
     describe "named scopes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -221,6 +221,7 @@ files:
 - mongomodel.gemspec
 - spec/mongomodel/attributes/store_spec.rb
 - spec/mongomodel/concerns/activemodel_spec.rb
+- spec/mongomodel/concerns/associations/base/association_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