es 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aedff15c022fdb35b354b4c66acc8df3bf23b5b3
+  data.tar.gz: 3f0ef61e76cc3c95dcf3b10cc9d5cdfa87d2d5a0
+SHA512:
+  metadata.gz: 5565291652fdc30e7feb9c1d98592740dd22e4949af5d51cf6ca2a5710a52fd2c9b9769066d6ccb0854d4abe090c5d08fffc23c5866bab58ee3a0b7984424053
+  data.tar.gz: aeed8c939fe7e0ffbc29677cd11f4cafda4b5d02423608af7567e726e5eba551a1b0a8350acf941559b3a17b1338c9e6ce795b4ea3a54970118e3506e2cc5740

data/lib/es.rb

@@ -1,10 +1,11 @@
-require 'es/version'
-require 'es/connection'
-require 'es/raw_client'
-require 'es/client'
-
 module ES
   def self.new(*args) # faux constructor
     Client.new(*args)
   end
 end
+
+require 'es/version'
+require 'es/connection'
+require 'es/raw_client'
+require 'es/client'
+require 'es/utils'

data/lib/es/client.rb

@@ -29,9 +29,14 @@ module ES
       @dumper.load(response)
     end
 
-    def search(path, data)
+    def search(path, data, params = {})
       serialized = serialize(data)
-      response = @client.search(path, serialized)
+      response = @client.search(path, serialized, params)
+      @dumper.load(response)
+    end
+
+    def scroll(params = {})
+      response = @client.scroll(params)
       @dumper.load(response)
     end
 
@@ -52,6 +57,11 @@ module ES
       @dumper.load(response)
     end
 
+    def get_mapping(path)
+      response = @client.get_mapping(path)
+      @dumper.load(response)
+    end
+
     private
     def serialize(data)
       @dumper.dump(data, mode: :compat)

data/lib/es/raw_client.rb

@@ -24,8 +24,12 @@ module ES
       @connection.request(:put, path, data)
     end
 
-    def search(path, query)
-      @connection.request(:post, action_path(path, :search), query)
+    def search(path, query, params = {})
+      @connection.request(:post, action_path(path, :search, params), query)
+    end
+
+    def scroll(params = {})
+      @connection.request(:get, action_path(nil, 'search/scroll', params))
     end
 
     def update(path, data)
@@ -36,9 +40,18 @@ module ES
       @connection.request(:post, action_path(path, :bulk), requests)
     end
 
+    def get_mapping(path)
+      @connection.request(:get, action_path(path, :mapping))
+    end
+
     private
-    def action_path(path, action)
-      path ? "#{path}/_#{action}" : "_#{action}"
+    def action_path(path, action, params = {})
+      full_path = path ? "#{path}/_#{action}" : "_#{action}"
+      params.any? ? "#{full_path}?#{serialize_params(params)}" : full_path
+    end
+
+    def serialize_params(params)
+      params.map { |k, v| "#{k}=#{v}" }.join('&')
     end
   end
 end

data/lib/es/utils.rb

@@ -0,0 +1,23 @@
+module ES
+  def self.copy_index(from_index, to_index, opts = {})
+    scroll_timeout = opts.fetch(:scroll_timeout, '5m')
+    scroll_size = opts.fetch(:scroll_size, 100)
+
+    from = new(host: opts[:from_host])
+    to = new(host: opts[:to_host])
+
+    results = from.search(from_index, {query: {match_all: {}}}, {scroll: scroll_timeout, size: scroll_size})
+
+    while results['hits']['hits'].any?
+      requests = results['hits']['hits'].each_with_object([]) do |hit, requests|
+        requests << {index: {_type: hit['_type'], _id: hit['id']}}
+        requests << hit['_source']
+      end
+
+      to.bulk(requests, to_index)
+
+      scroll_id = results['_scroll_id']
+      results = from.scroll(scroll: scroll_timeout, scroll_id: scroll_id)
+    end
+  end
+end

data/lib/es/version.rb

@@ -1,3 +1,3 @@
 module ES
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/es/client_spec.rb

@@ -42,9 +42,15 @@ describe ES::Client do
   end
 
   it 'serializes data for .search' do
-    client.should_receive(:search).with('index/1', raw_data).and_return(raw_response)
+    client.should_receive(:search).with('index/1', raw_data, {size: 20}).and_return(raw_response)
 
-    subject.search('index/1', data).should == response
+    subject.search('index/1', data, size: 20).should == response
+  end
+
+  it 'serializes data from .scroll' do
+    client.should_receive(:scroll).with({scroll_id: 123}).and_return(raw_response)
+
+    subject.scroll(scroll_id: 123)
   end
 
   it 'serializes data for .update' do
@@ -52,4 +58,16 @@ describe ES::Client do
 
     subject.update('index/1', data).should == response
   end
+
+  it 'unserializes response for .get_mapping' do
+    client.should_receive(:get_mapping).with('index').and_return(raw_response)
+
+    subject.get_mapping('index').should == response
+  end
+
+  it 'should respond to all methods of raw client' do
+    ES::RawClient.instance_methods(false).each do |method|
+      subject.respond_to?(method).should be_true, "expected to respond to message #{method}"
+    end
+  end
 end

data/spec/es/connection_spec.rb

@@ -3,7 +3,7 @@ require 'es/connection'
 describe ES::Connection do
   let(:data) { :data }
   let(:response_body) { :response }
-  let(:response) { stub(response_code: 200, body_str: response_body) }
+  let(:response) { double(response_code: 200, body_str: response_body) }
   let(:driver) { double(:Driver) }
 
   subject { described_class.new('http://localhost:9200', driver) }
@@ -33,7 +33,7 @@ describe ES::Connection do
   end
 
   it 'throws error if response code is not 2XX' do
-    error_response = stub(response_code: 400)
+    error_response = double(response_code: 400)
     driver.should_receive(:http_post).and_return(error_response)
 
     expect { subject.request(:post, 'index/_search', data) }.to raise_error(ES::Connection::Error)

data/spec/es/raw_client_spec.rb

@@ -44,6 +44,20 @@ describe ES::RawClient do
 
       subject.search('index', data).should == response
     end
+
+    it 'sends POST to connection with parameters' do
+      connection.should_receive(:request).with(:post, 'index/_search?scroll=5m&size=100', data).and_return(response)
+
+      subject.search('index', data, scroll: '5m', size: 100)
+    end
+  end
+
+  context '.scroll' do
+    it 'sends GET to connection with parameters' do
+      connection.should_receive(:request).with(:get, '_search/scroll?scroll=5m&scroll_id=123').and_return(response)
+
+      subject.scroll(scroll: '5m', scroll_id: 123)
+    end
   end
 
   context '.bulk' do
@@ -61,4 +75,12 @@ describe ES::RawClient do
       subject.update('index/1', data).should == response
     end
   end
+
+  context '.get_mapping' do
+    it 'sends GET to connection' do
+      connection.should_receive(:request).with(:get, 'index/_mapping').and_return(response)
+
+      subject.get_mapping('index').should == response
+    end
+end
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: es
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jan Suchal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: curb
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple wrapper for elasticsearch
 email:
 - johno@jsmf.net
@@ -92,33 +83,33 @@ files:
 - lib/es/client.rb
 - lib/es/connection.rb
 - lib/es/raw_client.rb
+- lib/es/utils.rb
 - lib/es/version.rb
 - spec/es/client_spec.rb
 - spec/es/connection_spec.rb
 - spec/es/raw_client_spec.rb
 homepage: http://github.com/minio-sk/es
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple wrapper for elasticsearch.
 test_files:
 - spec/es/client_spec.rb