[MODEL] Minor improvements and retouches to the query methods (result.foo?) implementation and tests

Closes #elastic#70

Related: elastic#41, elastic#64

Author: karmi

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

@@ -19,14 +19,14 @@ def initialize(attributes={})
 
         # Delegate methods to `@result` or `@result._source`
         #
-        def method_missing(method_name, *arguments)
+        def method_missing(name, *arguments)
           case
-          when method_name.to_s.end_with?('?')
-            delegate_to_source(method_name, *arguments)
-          when @result.respond_to?(method_name)
-            @result.__send__ method_name, *arguments
-          when @result._source && @result._source.respond_to?(method_name)
-            delegate_to_source(method_name, *arguments)
+          when name.to_s.end_with?('?')
+            @result.__send__(name, *arguments) || ( @result._source && @result._source.__send__(name, *arguments) )
+          when @result.respond_to?(name)
+            @result.__send__ name, *arguments
+          when @result._source && @result._source.respond_to?(name)
+            @result._source.__send__ name, *arguments
           else
             super
           end
@@ -45,13 +45,6 @@ def as_json(options={})
         end
 
         # TODO: #to_s, #inspect, with support for Pry
-
-        private
-
-        def delegate_to_source(method, *args)
-          @result._source.__send__ method, *args
-        end
-
       end
     end
   end

elasticsearch-model/test/integration/active_record_basic_test.rb

@@ -52,6 +52,19 @@ class ::Article < ActiveRecord::Base
           assert_equal 'Test', response.records.first.title
         end
 
+        should "provide access to result" do
+          response = Article.search query: { match: { title: 'test' } }, highlight: { fields: { title: {} } }
+
+          assert_equal 'Test', response.results.first.title
+
+          assert_equal true,  response.results.first.title?
+          assert_equal false, response.results.first.boo?
+
+          assert_equal true,  response.results.first.highlight?
+          assert_equal true,  response.results.first.highlight.title?
+          assert_equal false, response.results.first.highlight.boo?
+        end
+
         should "iterate over results" do
           response = Article.search('title:test')
 

elasticsearch-model/test/unit/response_result_test.rb

@@ -28,32 +28,43 @@ class Elasticsearch::Model::ResultTest < Test::Unit::TestCase
     end
 
     should "delegate existence method calls to `_source`" do
-      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _source: { bar: {baz: 'blargh'} }
+      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _source: { bar: { bam: 'baz' } }
 
-      assert_respond_to result, :bar?
       assert_respond_to result._source, :bar?
+      assert_respond_to result, :bar?
 
-      assert_equal true, result._source.bar?
-      assert_equal true, result.bar?
-      assert_equal false, result.baz?
+      assert_equal true,  result._source.bar?
+      assert_equal true,  result.bar?
+      assert_equal false, result.boo?
 
-      assert_equal true, result.bar.baz?
+      assert_equal true,  result.bar.bam?
       assert_equal false, result.bar.boo?
     end
 
     should "delegate methods to @result" do
       result = Elasticsearch::Model::Response::Result.new foo: 'bar'
 
-      assert_equal 'bar', result.foo
-      assert_equal 'bar', result.fetch('foo')
-      assert_equal 'moo', result.fetch('NOT_EXIST', 'moo')
+      assert_equal 'bar',   result.foo
+      assert_equal 'bar',   result.fetch('foo')
+      assert_equal 'moo',   result.fetch('NOT_EXIST', 'moo')
+      assert_equal ['foo'], result.keys
 
       assert_respond_to result, :to_hash
       assert_equal({'foo' => 'bar'}, result.to_hash)
 
       assert_raise(NoMethodError) { result.does_not_exist }
     end
 
+    should "delegate existence method calls to @result" do
+      result = Elasticsearch::Model::Response::Result.new foo: 'bar', _source: { bar: 'bam' }
+      assert_respond_to result, :foo?
+
+      assert_equal true,  result.foo?
+      assert_equal false, result.boo?
+      assert_equal false, result._source.foo?
+      assert_equal false, result._source.boo?
+    end
+
     should "delegate as_json to @result even when ActiveSupport changed half of Ruby" do
       require 'active_support/json/encoding'
       result = Elasticsearch::Model::Response::Result.new foo: 'bar'