[MODEL] Fixes for the change id/type for Response::Result in elastic#90

* Removed the code which returned id based on _source in `method_missing`
* Reorganized and renamed some tests
* Added a test for demonstrating difference between `result.type` and `result._source.type` (same with `id`)

Related: elastic#90

Author: karmi

elasticsearch-model/lib/elasticsearch/model/response/result.rb

@@ -17,13 +17,13 @@ def initialize(attributes={})
           @result = Hashie::Mash.new(attributes)
         end
 
-        # Alias `id` to `_id`
+        # Return document `_id` as `id`
         #
         def id
           @result['_id']
         end
 
-        # Alias `type` to `_type`
+        # Return document `_type` as `_type`
         #
         def type
           @result['_type']
@@ -35,12 +35,6 @@ def method_missing(name, *arguments)
           case
           when name.to_s.end_with?('?')
             @result.__send__(name, *arguments) || ( @result._source && @result._source.__send__(name, *arguments) )
-          when name.to_s == "id"
-            if @result._source && @result._source.respond_to?(name)
-              @result._source.__send__ name, *arguments
-            else
-              super
-            end
           when @result.respond_to?(name)
             @result.__send__ name, *arguments
           when @result._source && @result._source.respond_to?(name)

elasticsearch-model/test/integration/active_record_basic_test.rb

@@ -72,11 +72,11 @@ class ::Article < ActiveRecord::Base
           assert_equal [1, 2],     response.records.map(&:id)
         end
 
-        should "iterate aliased id and type over results" do
+        should "return _id and _type as #id and #type" do
           response = Article.search('title:test')
 
-          assert_equal ['1', '2'],             response.results.map(&:id)
-          assert_equal ['article', 'article'], response.results.map(&:type)
+          assert_equal '1',       response.results.first.id
+          assert_equal 'article', response.results.first.type
         end
 
         should "access results from records" do

elasticsearch-model/test/unit/response_result_test.rb

@@ -15,6 +15,20 @@ class Elasticsearch::Model::ResultTest < Test::Unit::TestCase
       assert_raise(NoMethodError) { result.xoxo }
     end
 
+    should "return _id as #id" do
+      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _id: 42, _source: { id: 12 }
+
+      assert_equal 42, result.id
+      assert_equal 12, result._source.id
+    end
+
+    should "return _type as #type" do
+      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _type: 'baz', _source: { type: 'BAM' }
+
+      assert_equal 'baz', result.type
+      assert_equal 'BAM', result._source.type
+    end
+
     should "delegate method calls to `_source` when available" do
       result = Elasticsearch::Model::Response::Result.new foo: 'bar', _source: { bar: 'baz' }
 
@@ -72,17 +86,5 @@ class Elasticsearch::Model::ResultTest < Test::Unit::TestCase
       result.instance_variable_get(:@result).expects(:as_json)
       result.as_json(except: 'foo')
     end
-
-    should "map the _id column to id" do
-      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _id: 42
-
-      assert_equal 42, result.id
-    end
-
-    should "map the _type column to type" do
-      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _type: 'baz'
-
-      assert_equal 'baz', result.type
-    end
   end
 end