From 64bbc9ede515bc72711b5b92a185b31e330ceb62 Mon Sep 17 00:00:00 2001
From: Yuichi Tateno <hotchpotch@gmail.com>
Date: Tue, 17 Jun 2014 16:57:48 +0700
Subject: [PATCH] Change changes_attributes keys symbol to string.

---
 .../lib/elasticsearch/model/indexing.rb       |  3 ++-
 .../test/unit/indexing_test.rb                | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/elasticsearch-model/lib/elasticsearch/model/indexing.rb b/elasticsearch-model/lib/elasticsearch/model/indexing.rb
index 360b8ea85..39eba2124 100644
--- a/elasticsearch-model/lib/elasticsearch/model/indexing.rb
+++ b/elasticsearch-model/lib/elasticsearch/model/indexing.rb
@@ -336,7 +336,8 @@ def delete_document(options={})
         def update_document(options={})
           if changed_attributes = self.instance_variable_get(:@__changed_attributes)
             attributes = if respond_to?(:as_indexed_json)
-              changed_attributes.select { |k,v| self.as_indexed_json.keys.include? k }
+              keys = self.as_indexed_json.keys.map(&:to_s)
+              changed_attributes.select { |k,v| keys.include? k }
             else
               changed_attributes
             end
diff --git a/elasticsearch-model/test/unit/indexing_test.rb b/elasticsearch-model/test/unit/indexing_test.rb
index 57d121d61..5f3cc6020 100644
--- a/elasticsearch-model/test/unit/indexing_test.rb
+++ b/elasticsearch-model/test/unit/indexing_test.rb
@@ -128,10 +128,10 @@ def self.before_save(&block)
           (@callbacks ||= {})[block.hash] = block
         end
 
-        def changed_attributes; [:foo]; end
+        def changed_attributes; ["foo"]; end
 
         def changes
-          {:foo => ['One', 'Two']}
+          {"foo" => ['One', 'Two']}
         end
       end
 
@@ -143,14 +143,14 @@ def self.before_save(&block)
           (@callbacks ||= {})[block.hash] = block
         end
 
-        def changed_attributes; [:foo, :bar]; end
+        def changed_attributes; ['foo', 'bar']; end
 
         def changes
-          {:foo => ['A', 'B'], :bar => ['C', 'D']}
+          {'foo' => ['A', 'B'], 'bar' => ['C', 'D']}
         end
 
         def as_indexed_json(options={})
-          { :foo => 'B' }
+          { 'foo' => 'B' }
         end
       end
 
@@ -163,7 +163,7 @@ def as_indexed_json(options={})
         instance = ::DummyIndexingModelWithCallbacks.new
         instance.expects(:instance_variable_set).with do |name, value|
           assert_equal :@__changed_attributes, name
-          assert_equal({foo: 'Two'}, value)
+          assert_equal({'foo' => 'Two'}, value)
         end
 
         ::DummyIndexingModelWithCallbacks.__send__ :include, Elasticsearch::Model::Indexing::InstanceMethods
@@ -260,13 +260,13 @@ def as_indexed_json(options={})
         instance = ::DummyIndexingModelWithCallbacks.new
 
         # Set the fake `changes` hash
-        instance.instance_variable_set(:@__changed_attributes, {foo: 'bar'})
+        instance.instance_variable_set(:@__changed_attributes, {'foo' => 'bar'})
 
         client.expects(:update).with do |payload|
           assert_equal 'foo',  payload[:index]
           assert_equal 'bar',  payload[:type]
           assert_equal '1',    payload[:id]
-          assert_equal({foo: 'bar'}, payload[:body][:doc])
+          assert_equal({'foo' => 'bar'}, payload[:body][:doc])
         end
 
         instance.expects(:client).returns(client)
@@ -282,10 +282,10 @@ def as_indexed_json(options={})
         instance = ::DummyIndexingModelWithCallbacksAndCustomAsIndexedJson.new
 
         # Set the fake `changes` hash
-        instance.instance_variable_set(:@__changed_attributes, {foo: 'B', bar: 'D' })
+        instance.instance_variable_set(:@__changed_attributes, {'foo' => 'B', 'bar' => 'D' })
 
         client.expects(:update).with do |payload|
-          assert_equal({foo: 'B'}, payload[:body][:doc])
+          assert_equal({'foo' => 'B'}, payload[:body][:doc])
         end
 
         instance.expects(:client).returns(client)