es_client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 843f33d86423abe66668f3a433877678d0e82435
-  data.tar.gz: 785f403f7aae35ac33896e67b82b03e809d36c05
+  metadata.gz: c39fa72b26d853a0812871c797d706bc38fde342
+  data.tar.gz: 7bf1d0d4f2ae7f2878df4b4ce9d010296d51ceb2
 SHA512:
-  metadata.gz: 647d9d56a31b29d570fc2e0cf175a2a717aa0e055acaf2ecb6ad84414d5b16761eac264a4de07f33d86e5ff1248dc30112f95552964dbdf499cf314615b95cfb
-  data.tar.gz: 6943f76a4645317c49c196ab678a1ee108089516f9a73cc3850b98ad161d261387479e5a37e131357752cb55e747c0645fda60aa842526c6d3494a85195479d5
+  metadata.gz: fb83231b8766826cf7d53bff65795b33bcef8fb1519ded4e09783fca9433104dc52e7c3e10b6352df6076efa207da51c4f219b270cae24cd8e0b58327dab0998
+  data.tar.gz: 79ad067307fc768595da2d654d80575d23cd072780669e65afeac89318403f7d8099326f59fc3ec0a3acfa32d3cb93839368e556ce6afb661985a0459b855183

data/.gitignore

@@ -15,4 +15,4 @@ mkmf.log
 .ruby-gemset
 .ruby-version
 /etc
-/log
+/log/*.log

data/.travis.yml

@@ -1,3 +1,10 @@
 language: ruby
+
+services:
+  - elasticsearch
+
+gemfile:
+  - Gemfile
+
 rvm:
-  - 2.1.5
+  - 2.2.0

data/README.md

@@ -1,5 +1,8 @@
 # EsClient
 
+[![Build Status](https://travis-ci.org/leschenko/es_client.png?branch=master)](https://travis-ci.org/leschenko/es_client)
+[![Dependency Status](https://gemnasium.com/leschenko/es_client.png)](https://gemnasium.com/leschenko/es_client)
+
 This elasticsearch client is just all you need to index and search your data with persistent http connection.
 It don't tend to wrap [elasticsearch](http://elasticsearch.org) dsl into ruby style dsl.
 [Excon](https://github.com/excon/excon) used for http staff.
@@ -25,7 +28,7 @@ Or install it yourself as:
 
 Create index:
 ```ruby
-index = EsClient::Index.new('products', mappings: {product: {properties: {sku: {type: 'string'}}}}, settings: {number_of_shards: 1})
+index = EsClient::Index.new('products')
 index.create
 ```
 
@@ -49,7 +52,33 @@ And, of course, search:
 index.search(query: {query_string: {query: 'table OR chair'}}).decoded
 ```
 
-## With ActiveRecord model:
+### Configuration options
+```ruby
+EsClient.setup do |config|
+  # path to log file
+  config.log_path = Rails.root.join('log', 'elasticsearch.log')
+
+  # log level (successful requests logged in debug)
+  # config.logger.level = ::Logger::Severity::INFO unless Rails.env.development?
+
+  # log options, should be set to false in production for better performance
+  #   `log_binary` - log binary data in bulk requests
+  #   `log_response` - log response json, can be disabled in production
+  #   `pretty` - pretty generate json in logs
+  # config.logger_options = {log_binary: true, log_response: true, pretty: true}
+
+  # application wide index prefix
+  config.index_prefix = 'my_app_name_here'
+
+  # enable indexing callbacks
+  # config.callbacks_enabled = true
+
+  # options passed to Excon initializer
+  # config.http_client_options = {persistent: true}
+end
+```
+
+### With ActiveRecord model:
 
 Include EsClient modules:
 ```ruby
@@ -92,7 +121,7 @@ User.es_client_reindex_with_progress
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/es_client/fork )
+1. Fork it ( https://github.com/leschenko/es_client/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,7 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
-
+task default: :spec

data/lib/es_client/active_record/adapter.rb

@@ -29,8 +29,8 @@ module EsClient
 
       def mapping(value=nil)
         if value
-          @index.options[:mappings] ||= {}
-          @index.options[:mappings].deep_merge!(value)
+          index.options[:mappings] ||= {}
+          index.options[:mappings].deep_merge!(value)
         else
           index.get_mapping
         end
@@ -38,8 +38,8 @@ module EsClient
 
       def settings(value=nil)
         if value
-          @index.options[:settings] ||= {}
-          @index.options[:settings].deep_merge!(value)
+          index.options[:settings] ||= {}
+          index.options[:settings].deep_merge!(value)
         else
           index.get_settings
         end

data/lib/es_client/client.rb

@@ -2,29 +2,26 @@ module EsClient
   class Client
     RETRY_TIMES = 1
 
+    HTTP_VERBS = %i(get post put delete head)
+
+    SUCCESS_HTTP_CODES = [200, 201]
+
     def initialize(host, options)
       @host = host
       @options = options
     end
 
-    def get(path, options={})
-      request options.merge(method: :get, path: path)
-    end
-
-    def post(path, options={})
-      request options.merge(method: :post, path: path)
-    end
-
-    def put(path, options={})
-      request options.merge(method: :put, path: path)
-    end
-
-    def delete(path, options={})
-      request options.merge(method: :delete, path: path)
-    end
+    HTTP_VERBS.each do |method|
+      class_eval <<-DEF, __FILE__, __LINE__ + 1
+        def #{method}(path, options={})
+          request options.merge(method: :#{method}, path: path)
+        end
 
-    def head(path, options={})
-      request options.merge(method: :head, path: path)
+        def #{method}!(path, options={})
+          options[:expects] = SUCCESS_HTTP_CODES
+          #{method}(path, options)
+        end
+      DEF
     end
 
     def request(options)
@@ -36,13 +33,16 @@ module EsClient
         response
       rescue Excon::Errors::SocketError => e
         if retry_times >= RETRY_TIMES
-          exception = ::EsClient::Client::Error.new(e, self)
-          EsClient.logger.exception(exception, http, options) if EsClient.logger
-          raise exception
+          EsClient.logger.exception(e, http, options) if EsClient.logger
+          raise
         end
         retry_times += 1
+        EsClient.logger.info "[#{retry_times}] Try reconnect to #{@host}"
         reconnect!
         retry
+      rescue Excon::Errors::BadRequest => e
+        EsClient.logger.exception(e, http, options.merge(response: e.response.body)) if EsClient.logger
+        raise
       end
     end
 
@@ -57,15 +57,5 @@ module EsClient
     def log(message, level=:info)
       EsClient.logger.try!(level, message)
     end
-
-    class Error < StandardError
-      attr_reader :transport
-
-      def initialize(excon_error, transport)
-        @transport = transport
-        super("#{excon_error.message} (#{excon_error.class})")
-        set_backtrace(excon_error.backtrace)
-      end
-    end
   end
 end

data/lib/es_client/index.rb

@@ -23,11 +23,12 @@ module EsClient
 
     def create
       request_options = @options.present? ? {body: @options.to_json} : {}
-      EsClient.client.post("/#{name}", request_options)
+      EsClient.client.post!("/#{name}", request_options)
     end
 
     def delete
-      EsClient.client.delete("/#{name}")
+      return unless exists?
+      EsClient.client.delete!("/#{name}")
     end
 
     def refresh

data/lib/es_client/logger.rb

@@ -6,17 +6,19 @@ module EsClient
     end
 
     def request(http, response, options)
-      return unless debug?
+      log_level = response.success? ? :debug : :warn
+      return unless send("#{log_level}?")
       took = response.try!(:decoded).try!(:[], 'took') ? response.decoded['took'] : 'N/A'
       message = "[#{response.code}](#{took} msec) #{to_curl(http, options)}"
       message << "\n#{JSON.pretty_generate(response.decoded)}" if @options[:log_response] && response.try!(:decoded)
-      debug message
+      send log_level, message
     end
 
     def exception(e, http=nil, options=nil)
+      return unless error?
       backtrace = e.backtrace.map { |l| "#{' ' * 2}#{l}" }.join("\n")
-      curl = "\n  #{to_curl(http, options)}" if options && http
-      error "#{e.class} #{e.message} #{curl}\n#{backtrace}\n\n"
+      curl = "#{to_curl(http, options)}" if options && http
+      error "#{e.class} #{e.message}#{curl}\n#{options[:response]}\n#{backtrace}\n\n"
     end
 
     private

data/lib/es_client/version.rb

@@ -1,3 +1,3 @@
 module EsClient
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/es_client/{transport_spec.rb → client_spec.rb}

@@ -32,6 +32,18 @@ describe EsClient::Client do
     end
 
     context 'failure' do
+      it 'non bang method do not raise exception' do
+        Excon.stub({}, {body: '{}', status: 400})
+        transport = EsClient::Client.new('http://example.com', {})
+        expect { transport.get('/example', mock: true) }.not_to raise_error
+      end
+
+      it 'bang method raise exception' do
+        Excon.stub({}, {body: '{}', status: 400})
+        transport = EsClient::Client.new('http://example.com', {})
+        expect { transport.get!('/example', mock: true) }.to raise_error
+      end
+
       it 'reconnect on failed request' do
         transport = EsClient::Client.new('http://example.com', {})
         allow(transport.http).to receive(:request) { raise Excon::Errors::SocketError.new(StandardError.new) }

data/spec/es_client/index_spec.rb

@@ -18,7 +18,7 @@ describe EsClient::Index do
   describe 'create' do
     it 'create index' do
       index = EsClient::Index.new('test_index')
-      allow(EsClient.client).to receive(:post).with('/test_index', {}).and_return(double(:response, success?: true))
+      allow(EsClient.client).to receive(:post).with('/test_index', {expects: [200, 201]}).and_return(double(:response, success?: true))
       expect(index.create.success?).to eq true
     end
   end
@@ -26,7 +26,8 @@ describe EsClient::Index do
   describe 'delete' do
     it 'create index' do
       index = EsClient::Index.new('test_index')
-      allow(EsClient.client).to receive(:delete).with('/test_index').and_return(double(:response, success?: true))
+      allow(EsClient.client).to receive(:delete!).with('/test_index').and_return(double(:response, success?: true))
+      expect(index).to receive(:exists?).and_return(true)
       expect(index.delete.success?).to eq true
     end
   end

data/spec/integration/es_client/index_spec.rb

@@ -10,7 +10,7 @@ describe EsClient::Index do
 
     it 'index not exists' do
       index = EsClient::Index.new('test_index')
-      index.create
+      index.recreate
       expect(index.exists?).to eq true
     end
   end
@@ -32,22 +32,22 @@ describe EsClient::Index do
 
     it 'create index error' do
       index = EsClient::Index.new('test_index')
-      index.create
-      expect(index.create.success?).to eq false
+      index.recreate
+      expect { index.create }.to raise_exception(Excon::Errors::BadRequest)
     end
   end
 
   describe 'delete' do
     it 'delete index' do
       index = EsClient::Index.new('test_index')
-      index.create
+      index.recreate
       expect(index.delete.success?).to eq true
     end
 
     it 'delete index error' do
       index = EsClient::Index.new('test_index')
       index.delete
-      expect(index.delete.success?).to eq false
+      expect(index.delete).to be_nil
     end
   end
 

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ end
 
 EsClient.setup do |config|
   config.log_path = File.expand_path('../../log/elasticsearch.log', __FILE__)
-  config.host = 'http://localhost:9201'
+  config.host = "http://localhost:#{ENV['ES_PORT'] || 9200}"
 end
 
 class RspecActiveRecordBase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,13 +135,14 @@ files:
 - lib/es_client/logger.rb
 - lib/es_client/response.rb
 - lib/es_client/version.rb
+- log/.gitkeep
 - spec/es_client/active_record/adapter_spec.rb
 - spec/es_client/active_record/glue_spec.rb
 - spec/es_client/active_record/shortcuts_spec.rb
+- spec/es_client/client_spec.rb
 - spec/es_client/index_spec.rb
 - spec/es_client/logger_spec.rb
 - spec/es_client/responce_spec.rb
-- spec/es_client/transport_spec.rb
 - spec/es_client_spec.rb
 - spec/integration/es_client/index_spec.rb
 - spec/spec_helper.rb
@@ -173,10 +174,10 @@ test_files:
 - spec/es_client/active_record/adapter_spec.rb
 - spec/es_client/active_record/glue_spec.rb
 - spec/es_client/active_record/shortcuts_spec.rb
+- spec/es_client/client_spec.rb
 - spec/es_client/index_spec.rb
 - spec/es_client/logger_spec.rb
 - spec/es_client/responce_spec.rb
-- spec/es_client/transport_spec.rb
 - spec/es_client_spec.rb
 - spec/integration/es_client/index_spec.rb
 - spec/spec_helper.rb