Fixing model_type_value issue

Author: samlown

history.md

@@ -1,5 +1,9 @@
 # CouchRest Model Change History
 
+## 2.0.2 - pending
+
+  * Fix for model_type_value, not being used correctly from database.
+
 ## 2.0.1 - 2013-12-03
 
   * nil keys in view requests are now sent to server, avoiding returning first document issue. (Thanks to @svoboda-jan for pointer.)

lib/couchrest/model/persistence.rb

@@ -120,7 +120,7 @@ module ClassMethods
         #
         def build_from_database(doc = {}, options = {}, &block)
           src = doc[model_type_key]
-          base = (src.blank? || src == self.to_s) ? self : src.constantize
+          base = (src.blank? || src == model_type_value) ? self : src.constantize
           base.new(doc, options.merge(:directly_set_attributes => true), &block)
         end
 

spec/unit/persistence_spec.rb

@@ -19,13 +19,14 @@
       doc.class.should eql(Article)
     end
 
-    it "should instantialize document of different type" do
+    it "should instantiate document of different type" do
       doc = Article.build_from_database({'_id' => 'testitem2', '_rev' => 123, Article.model_type_key => 'WithTemplateAndUniqueID', 'name' => 'my test'})
       doc.class.should eql(WithTemplateAndUniqueID)
     end
 
   end
 
+
   describe "basic saving and retrieving" do
     it "should work fine" do
       @obj.name = "should be easily saved and retrieved"
@@ -482,6 +483,32 @@
     it "should always return string value of class" do
       Article.model_type_value.should eql('Article')
     end
+
+    describe "usage" do
+      let :klass do
+        Class.new(CouchRest::Model::Base) do
+          property :name, String
+          def self.model_type_value
+            'something_else'
+          end
+        end
+      end
+      it "should use the model type value if overridden" do
+        obj = klass.build_from_database(
+          '_id' => '1234', 'type' => 'something_else', 'name' => 'Test'
+        )
+        obj['type'].should eql('something_else')
+        obj.name.should eql('Test')
+      end
+      it "should fail if different model type value provided" do
+        expect {
+          obj = klass.build_from_database(
+            '_id' => '1234', 'type' => 'something', 'name' => 'Test'
+          )
+        }.to raise_error(NameError)
+      end
+
+    end
   end
 
 end