[STORE] Changed that the Store methods reflect that klass returns a Ruby class, not a string

Author: karmi

elasticsearch-persistence/lib/elasticsearch/persistence/repository/store.rb

@@ -6,18 +6,18 @@ module Store
         def save(document, options={})
           serialized = serialize(document)
           id   = __get_id_from_document(serialized)
-          type = klass || __get_type_from_class(document.class)
+          type = __get_type_from_class(klass || document.class)
           client.index( { index: index_name, type: type, id: id, body: serialized }.merge(options) )
         end
 
         def delete(document, options={})
           if document.is_a?(String) || document.is_a?(Integer)
             id   = document
-            type = klass
+            type = __get_type_from_class(klass)
           else
             serialized = serialize(document)
             id   = __get_id_from_document(serialized)
-            type = klass || __get_type_from_class(document.class)
+            type = __get_type_from_class(klass || document.class)
           end
           client.delete( { index: index_name, type: type, id: id }.merge(options) )
         end

elasticsearch-persistence/test/unit/repository_store_test.rb

@@ -12,12 +12,13 @@ class MyDocument; end
     context "save" do
       should "serialize the document, get type from klass and index it" do
         subject.expects(:serialize).returns({foo: 'bar'})
-        subject.expects(:klass).returns('foo_type')
+        subject.expects(:klass).at_least_once.returns(MyDocument)
+        subject.expects(:__get_type_from_class).with(MyDocument).at_least_once.returns('my_document')
         subject.expects(:__get_id_from_document).returns('1')
 
         client = mock
         client.expects(:index).with do |arguments|
-          assert_equal 'foo_type', arguments[:type]
+          assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
           assert_equal({foo: 'bar'}, arguments[:body])
         end
@@ -28,7 +29,7 @@ class MyDocument; end
 
       should "serialize the document, get type from document class and index it" do
         subject.expects(:serialize).returns({foo: 'bar'})
-        subject.expects(:klass).returns(nil)
+        subject.expects(:klass).at_least_once.returns(nil)
         subject.expects(:__get_type_from_class).with(MyDocument).returns('my_document')
         subject.expects(:__get_id_from_document).returns('1')
 
@@ -45,7 +46,8 @@ class MyDocument; end
 
       should "pass the options to the client" do
         subject.expects(:serialize).returns({foo: 'bar'})
-        subject.expects(:klass).returns('foo')
+        subject.expects(:klass).at_least_once.returns(MyDocument)
+        subject.expects(:__get_type_from_class).with(MyDocument).returns('my_document')
         subject.expects(:__get_id_from_document).returns('1')
 
         client = mock
@@ -62,12 +64,13 @@ class MyDocument; end
     context "delete" do
       should "get type from klass when passed only ID" do
         subject.expects(:serialize).never
-        subject.expects(:klass).returns('foo_type')
+        subject.expects(:klass).at_least_once.returns(MyDocument)
+        subject.expects(:__get_type_from_class).with(MyDocument).returns('my_document')
         subject.expects(:__get_id_from_document).never
 
         client = mock
         client.expects(:delete).with do |arguments|
-          assert_equal 'foo_type', arguments[:type]
+          assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
         end
         subject.expects(:client).returns(client)
@@ -77,12 +80,13 @@ class MyDocument; end
 
       should "get ID from document and type from klass when passed a document" do
         subject.expects(:serialize).returns({id: '1', foo: 'bar'})
-        subject.expects(:klass).returns('foo_type')
+        subject.expects(:klass).at_least_once.returns(MyDocument)
+        subject.expects(:__get_type_from_class).with(MyDocument).returns('my_document')
         subject.expects(:__get_id_from_document).with({id: '1', foo: 'bar'}).returns('1')
 
         client = mock
         client.expects(:delete).with do |arguments|
-          assert_equal 'foo_type', arguments[:type]
+          assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
         end
         subject.expects(:client).returns(client)
@@ -92,9 +96,9 @@ class MyDocument; end
 
       should "get ID and type from document when passed a document" do
         subject.expects(:serialize).returns({id: '1', foo: 'bar'})
-        subject.expects(:klass).returns(nil)
-        subject.expects(:__get_id_from_document).with({id: '1', foo: 'bar'}).returns('1')
+        subject.expects(:klass).at_least_once.returns(nil)
         subject.expects(:__get_type_from_class).with(MyDocument).returns('my_document')
+        subject.expects(:__get_id_from_document).with({id: '1', foo: 'bar'}).returns('1')
 
         client = mock
         client.expects(:delete).with do |arguments|
@@ -107,7 +111,8 @@ class MyDocument; end
       end
 
       should "pass the options to the client" do
-        subject.expects(:klass).returns('foo')
+        subject.expects(:klass).at_least_once.returns(MyDocument)
+        subject.expects(:__get_type_from_class).returns('my_document')
 
         client = mock
         client.expects(:delete).with do |arguments|