Refactor error names (again)

lib/ork/errors.rb

@@ -3,8 +3,10 @@ class Error < StandardError; end
   class IndexNotFound < RuntimeError; end
   class UniqueIndexViolation < RuntimeError; end
 
+  class NotOrkObject < StandardError; end
+
   # Document
-  class NotOrkDocument < StandardError; end
+  class InvalidClass < RuntimeError; end
 
   # Embedded
   class NotEmbeddable < StandardError; end

lib/ork/model.rb

@@ -68,5 +68,16 @@ def new_embedded(model, attributes)
 
       model.new attributes
     end
+
+    def assert_valid_class(object, model)
+      raise Ork::NotOrkObject.new(object) unless object.class.include? Ork::Document
+      raise Ork::InvalidClass.new(object) if object.class.name != model.to_s
+    end
+
+    def assert_embeddable(object)
+      unless object.respond_to?(:embeddable?) && object.embeddable?
+        raise Ork::NotEmbeddable.new(object)
+      end
+    end
   end
 end

lib/ork/model/associations.rb

@@ -47,7 +47,8 @@ def reference(name, model)
       end
 
       define_method(:"#{name}=") do |object|
-        raise Ork::NotOrkDocument.new(object) if object.class.name != model.to_s
+        assert_valid_class object, model
+
         send(writer, object ? object.id : nil)
         @_memo[name] = object
       end
@@ -145,14 +146,14 @@ def collection(name, model, reference = to_reference)
       end
 
       define_method(:"#{name}_add") do |object|
-        raise Ork::NotOrkDocument.new(object) if object.class.name != model.to_s
+        assert_valid_class object, model
 
         @attributes[reader] = Array(@attributes[reader]) << object.id
         @_memo[name] << object if @_memo[name]
       end
 
       define_method(:"#{name}_remove") do |object|
-        raise Ork::NotOrkDocument.new(object) if object.class.name != model.to_s
+        assert_valid_class object, model
 
         @_memo[name].delete(object) if @_memo[name]
         @attributes[reader].delete(object.id) and object if @attributes[reader]
@@ -197,9 +198,7 @@ def embed(name, model)
       end
 
       define_method(:"#{name}=") do |object|
-        unless object.respond_to?(:embeddable?) && object.embeddable?
-          raise Ork::NotEmbeddable.new(object)
-        end
+        assert_embeddable object
 
         @embedding[name] = object.attributes
         object.__parent = self
@@ -248,19 +247,15 @@ def embed_collection(name, model)
       end
 
       define_method(:"#{name}_add") do |object|
-        unless object.respond_to?(:embeddable?) && object.embeddable?
-          raise Ork::NotEmbeddable.new(object)
-        end
+        assert_embeddable object
 
         object.__parent = self
         @_memo[name] << object if @_memo[name]
         @embedding[name] = Array(@embedding[name]) << object.attributes
       end
 
       define_method(:"#{name}_remove") do |object|
-        unless object.respond_to?(:embeddable?) && object.embeddable?
-          raise Ork::NotEmbeddable.new(object)
-        end
+        assert_embeddable object
 
         object.__parent = nil
         @_memo[name].delete(object) if @_memo[name]

test/associations/collection_test.rb

@@ -46,7 +46,7 @@ class Comment
   end
 
   test 'raise an exception assigning an object of the wrong type' do
-    assert_raise(Ork::NotOrkDocument) do
+    assert_raise(Ork::NotOrkObject) do
       Post.new.comments_add 'Not a comment'
     end
   end
@@ -125,7 +125,7 @@ class Comment
     end
 
     test 'raise an exception removing an object of the wrong type' do
-      assert_raise(Ork::NotOrkDocument) do
+      assert_raise(Ork::NotOrkObject) do
         Post.new.comments_remove 'Not a comment'
       end
     end

test/associations/reference_test.rb

@@ -26,7 +26,7 @@ class Comment
   end
 
   should 'raise an exception assigning an object of the wrong type' do
-    assert_raise(Ork::NotOrkDocument) do
+    assert_raise(Ork::NotOrkObject) do
       Comment.new post: 'Not a post'
     end
   end