stretcher 1.11.1 → 1.12.0

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -1,6 +1,9 @@
 # Stretcher
 
+[![Gem Version](https://badge.fury.io/rb/stretcher.png)](http://badge.fury.io/rb/stretcher)
 [![Build Status](https://travis-ci.org/PoseBiz/stretcher.png?branch=master)](https://travis-ci.org/PoseBiz/stretcher)
+[![Code Climate](https://codeclimate.com/github/PoseBiz/stretcher.png)](https://codeclimate.com/github/PoseBiz/stretcher)
+[![Coverage Status](https://coveralls.io/repos/PoseBiz/stretcher/badge.png)](https://coveralls.io/r/PoseBiz/stretcher)
 
 A concise, fast ElasticSearch client designed to reflect the actual elastic search API as closely as possible. Elastic search's API is complex, and mostly documented on the Elastic Search Guide. This client tries to stay out of your way more than others making advanced techniques easier to implement, and making debugging Elastic Search's sometimes cryptic errors easier.
 
@@ -25,7 +28,7 @@ gem 'stretcher'
 
 ### Basic Usage
 
-```ruby   
+```ruby
 # First Create a server
 server = Stretcher::Server.new('http://localhost:9200')
 # Delete an index (in case you already have this one)
@@ -54,13 +57,13 @@ res.raw     # => #<Hashie::Mash ...> Raw JSON from the search
 Stretcher::Server.with_server('http://localhost:9200') {|srv|
   srv.index(:foo) {|idx|
     idx.type(:tweet) {|t| {exists: t.exists?, mapping: t.get_mapping} }
-  } 
+  }
 }
 # => {:exists=>true, :mapping=>#<Hashie::Mash tweet=...>}
 ```
 
 ### Multi Search
-    
+
 ```ruby
 # Within a single index
 server.index(:foo).msearch([{query: {match_all: {}}}])
@@ -71,7 +74,7 @@ server.msearch([{index: :foo}, {query: {match_all: {}}}])
 ```
 
 ### Bulk Indexing
-    
+
 ```ruby
 docs = [{"_type" => "tweet", "_id" => 91011, "text" => "Bulked"}]
 server.index(:foo).bulk_index(docs)

data/lib/stretcher.rb

@@ -1,6 +1,7 @@
+require 'thread'
 require 'logger'
 require 'hashie'
-require 'net/http/persistent'
+require 'excon'
 require 'faraday'
 require 'faraday_middleware'
 Faraday.load_autoloaded_constants

data/lib/stretcher/server.rb

@@ -15,7 +15,17 @@ module Stretcher
     # The options hash takes an optional instance of Logger under :logger.
     #
     #    server = Stretcher::Server.new('http://localhost:9200')
+    # 
+    # The default implementation here uses the net_http_persistent adapter
+    # for faraday. If you would like to use a different HTTP library, or alter
+    # other faraday config settings you may specify an optional :faraday_configurator
+    # argument, with a Proc as a value. This will be called once with the faraday builder.
+    #
+    # For instance:
+    # configurator = proc {|builder| builder.adapter :typhoeus
+    # Stretcher::Server.new('http://localhost:9200', :faraday_configurator => configurator)
     def initialize(uri='http://localhost:9200', options={})
+      @request_mtx = Mutex.new
       @uri = uri
 
       @http = Faraday.new(:url => @uri) do |builder|
@@ -24,10 +34,14 @@ module Stretcher
 
         builder.request :json
 
-        builder.adapter :net_http_persistent
+        builder.options[:read_timeout] = 4 || options[:read_timeout]
+        builder.options[:open_timeout] = 2 || options[:open_timeout]
 
-        builder.options[:read_timeout] = 4
-        builder.options[:open_timeout] = 2
+        if faraday_configurator = options[:faraday_configurator]
+          faraday_configurator.call(builder)
+        else
+          builder.adapter :excon
+        end
       end
 
       uri_components = URI.parse(@uri)
@@ -124,14 +138,18 @@ module Stretcher
         req.body = text
       end
     end
-    
+
     # Implements the Aliases API
-    # Ex: 
+    # Ex:
     # server.aliases({actions: {add: {index: :my_index, alias: :my_alias}}})
     # as per: http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases.html
-    def aliases(body)
-      request(:post, path_uri("/_aliases")) do |req|
-        req.body = body
+    def aliases(body=nil)
+      if body
+        request(:post, path_uri("/_aliases")) do |req|
+          req.body = body
+        end
+      else
+        request(:get, path_uri("/_aliases"))
       end
     end
 
@@ -149,15 +167,20 @@ module Stretcher
     # Will raise an exception when the status is not in the 2xx range
     def request(method, url=nil, query_opts=nil, *args, &block)
       logger.info { "Stretcher: Issuing Request #{method.to_s.upcase}, #{Util.qurl(url,query_opts)}" }
-      res = if block
-              http.send(method, url, query_opts, *args) do |req|
-                # Elastic search does mostly deal with JSON
-                req.headers["Content-Type"] = 'application/json'
-                block.call(req)
+      
+      # Our default client is threadsafe, but some others might not be
+      res = nil
+      @request_mtx.synchronize {
+        res = if block
+                http.send(method, url, query_opts, *args) do |req|
+                  # Elastic search does mostly deal with JSON
+                  req.headers["Content-Type"] = 'application/json'
+                  block.call(req)
+                end
+              else
+                http.send(method, url, query_opts, *args)
               end
-            else
-              http.send(method, url, query_opts, *args)
-            end
+      }
 
       if res.status >= 200 && res.status <= 299
         res.body

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.11.1"
+  VERSION = "1.12.0"
 end

data/spec/lib/stretcher_server_spec.rb

@@ -17,6 +17,18 @@ describe Stretcher::Server do
     exposed.class.should == Stretcher::Server
   end
 
+  it "should properly set alternate faraday options if requested" do
+    # This spec could work better, but it's hard to reach into the
+    # guts of faraday
+    conf_called = false
+    configurator = lambda {|builder|
+      builder.adapter :net_http
+      conf_called = true
+    }
+    srv = Stretcher::Server.new(ES_URL, {:faraday_configurator => configurator})
+    conf_called.should be_true
+  end
+
   it "should properly return that our server is up" do
     server.up?.should be_true
   end
@@ -29,11 +41,12 @@ describe Stretcher::Server do
     # Tear down any leftovers from previous runs
     server.aliases(:actions => [{:remove => {:alias => :foo_alias}}]) if server.index(:foo_alias).exists?
     server.index(:foo).delete if server.index(:foo).exists?
-
     server.index(:foo).create
     server.aliases(:actions => [{:add => {:index => :foo, :alias => :foo_alias}}])
 
     server.index(:foo_alias).get_settings.should == server.index(:foo).get_settings
+
+    server.aliases[:foo][:aliases].keys.should include 'foo_alias'
   end
 
   it "should check the status w/o error" do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rspec'
 require 'stretcher'
 

data/stretcher.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('faraday', '~> 0.8')
   gem.add_dependency('faraday_middleware', '~> 0.9.0')
-  gem.add_dependency('net-http-persistent', '~> 2.8')
+  gem.add_dependency('excon', '>= 0.16')
   gem.add_dependency('hashie', '~> 1.2.0')
 
   gem.add_development_dependency 'rspec', '>= 2.5.0'
+  gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,21 +44,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +162,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - Gemfile