es 0.0.5 → 0.0.6

data/lib/es/client.rb

@@ -10,7 +10,7 @@ module ES
 
     def bulk(requests, path = nil)
       serialized = requests.map do |r|
-        @dumper.dump(r) + "\n"
+        serialize(r) + "\n"
       end.join('')
 
       response = @client.bulk(serialized, path)
@@ -24,25 +24,25 @@ module ES
     end
 
     def index(path, data)
-      serialized = @dumper.dump(data)
+      serialized = serialize(data)
       response = @client.index(path, serialized)
       @dumper.load(response)
     end
 
     def search(path, data)
-      serialized = @dumper.dump(data)
+      serialized = serialize(data)
       response = @client.search(path, serialized)
       @dumper.load(response)
     end
 
     def update(path, data)
-      serialized = @dumper.dump(data)
+      serialized = serialize(data)
       response = @client.update(path, serialized)
       @dumper.load(response)
     end
 
     def create_index(path, data)
-      serialized = @dumper.dump(data)
+      serialized = serialize(data)
       response = @client.create_index(path, serialized)
       @dumper.load(response)
     end
@@ -51,5 +51,10 @@ module ES
       response = @client.delete_index(path)
       @dumper.load(response)
     end
+
+    private
+    def serialize(data)
+      @dumper.dump(data, mode: :compat)
+    end
   end
 end

data/lib/es/version.rb

@@ -1,3 +1,3 @@
 module ES
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/es/client_spec.rb

@@ -7,11 +7,13 @@ describe ES::Client do
   subject { described_class.new(client: client) }
   let(:raw_response) { '{}' }
   let(:response) { {} }
+  let(:raw_data) { '{"a":1}' }
+  let(:data) { {a: 1} }
 
   it 'serializes data for .create_index' do
-    client.should_receive(:create_index).with('index/1', '[1,2,3]').and_return(raw_response)
+    client.should_receive(:create_index).with('index/1', raw_data).and_return(raw_response)
 
-    subject.create_index('index/1', [1,2,3]).should == response
+    subject.create_index('index/1', data).should == response
   end
 
   it 'serializes data for .delete_index' do
@@ -21,16 +23,16 @@ describe ES::Client do
   end
 
   it 'serializes data for .bulk' do
-    requests = [1, 2, 3]
-    client.should_receive(:bulk).with("1\n2\n3\n", 'an_index').and_return(raw_response)
+    requests = [{a: 1}, 2, 3]
+    client.should_receive(:bulk).with("{\"a\":1}\n2\n3\n", 'an_index').and_return(raw_response)
 
     subject.bulk(requests, 'an_index').should == response
   end
 
   it 'serializes data for .index' do
-    client.should_receive(:index).with('index/1', '[1,2,3]').and_return(raw_response)
+    client.should_receive(:index).with('index/1', raw_data).and_return(raw_response)
 
-    subject.index('index/1', [1,2,3]).should == response
+    subject.index('index/1', data).should == response
   end
 
   it 'serializes data for .get' do
@@ -40,14 +42,14 @@ describe ES::Client do
   end
 
   it 'serializes data for .search' do
-    client.should_receive(:search).with('index/1', '[1,2,3]').and_return(raw_response)
+    client.should_receive(:search).with('index/1', raw_data).and_return(raw_response)
 
-    subject.search('index/1', [1,2,3]).should == response
+    subject.search('index/1', data).should == response
   end
 
   it 'serializes data for .update' do
-    client.should_receive(:update).with('index/1', '[1,2,3]').and_return(raw_response)
+    client.should_receive(:update).with('index/1', raw_data).and_return(raw_response)
 
-    subject.update('index/1', [1,2,3]).should == response
+    subject.update('index/1', data).should == response
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: es
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jan Suchal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj