rubberband 0.1.6 → 0.9.0

data/.travis.yml

@@ -0,0 +1,17 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+#  - jruby-18mode
+#  - jruby-19mode
+#  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
+
+before_install:
+  - sudo service elasticsearch start
+  - sleep 3
+
+notifications:
+  email: false

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem 'thrift'

data/README.md

@@ -0,0 +1,65 @@
+# RubberBand
+[![Build Status](https://secure.travis-ci.org/grantr/rubberband.png?branch=master)](http://travis-ci.org/grantr/rubberband)
+
+An ElasticSearch client with ThriftClient-like failover handling.
+
+## License
+
+Copyright 2010-2012 Grant Rodgers. See included LICENSE file.
+
+## Features
+
+* Automatic failover, retry, and peer discovery
+* Support for multiple transports (HTTP, Thrift, Memcached)
+* Support for multiple encodings (JSON, Smile TODO)
+
+Rubberband uses MultiJson for JSON encoding and decoding and supports all JSON backends that MultiJson supports.
+
+The HTTP transport uses Faraday, which also supports a number of http backends. Choose the one that works best for you.
+
+## Supported Rubies
+
+Tested on 1.8.7, 1.9.2, 1.9.3, and Rubinius in 1.8 and 1.9 mode. Ruby 1.8.6 is NOT supported due to missing String#bytesize.
+
+## Usage
+
+Instantiate a client:
+
+    client = ElasticSearch.new('http://127.0.0.1:9200', :index => "twitter", :type => "tweet")
+
+Instantiate a client with multiple servers:
+  
+    client = ElasticSearch.new(['127.0.0.1:9200', '127.0.0.1:9201'])
+
+Instantiate a client using a Heroku URL (this sets the default index):
+
+    client = ElasticSearch.new(ENV['ELASTICSEARCH_URL'])
+
+Connect using the thrift transport (requires the thrift gem and elasticsearch thrift plugin to be installed):
+
+    client = ElasticSearch.new('127.0.0.1:9500', :transport => ElasticSearch::Transport::Thrift)
+
+Pass a block to Faraday to configure middleware and options:
+
+```ruby
+  client = ElasticSearch::Client.new('127.0.0.1:9200') do |conn|
+    conn.response :logger
+    conn.adapter Faraday.default_adapter
+  end
+```
+
+API:
+```ruby
+  client.index({:body => "elasticsearch is cool"}, :id => 1)  
+  client.get("1")  
+  client.search("body:elasticsearch")  
+```
+## TODO
+
+See TODO file.
+
+## Contributing
+
+http://github.com/grantr/rubberband
+
+Fork, code, send pull request

data/Rakefile

@@ -8,6 +8,3 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/TODO

@@ -1,7 +1,5 @@
-delete_by_query
 terms
 more_like_this
-bulk ops
 test scroll better, maybe add a scroller object
 handle partial failure cases where some shards are unsuccessful (optionally raise a PartialResult exception, allow override option to return results anyway. results should have a flag that signifies incompleteness)
 tests/specs/features

data/lib/elasticsearch.rb

@@ -8,7 +8,7 @@ require 'client'
 
 module ElasticSearch
 
-  def self.new(servers_or_url, options={})
-    ElasticSearch::Client.new(servers_or_url, options)
+  def self.new(servers_or_url, options={}, &block)
+    ElasticSearch::Client.new(servers_or_url, options, &block)
   end
 end

data/lib/elasticsearch/client/abstract_client.rb

@@ -7,37 +7,40 @@ module ElasticSearch
       :transport => ElasticSearch::Transport::HTTP
     }.freeze
 
-    def initialize(servers_or_url, options={})
+    attr_accessor :servers, :current_server, :connection
+
+    def initialize(servers_or_url, options={}, &block)
       @options = DEFAULTS.merge(options)
-      @server_list, @default_index, @default_type = extract_server_list_and_defaults(servers_or_url)
-      @current_server = @server_list.first
+      @servers, @default_index, @default_type = extract_servers_and_defaults(servers_or_url)
+      @current_server = @servers.first
+      @connect_block = block
     end
 
-    def extract_server_list_and_defaults(servers_or_url)
+    def extract_servers_and_defaults(servers_or_url)
       default_index = default_type = nil
-      servers = Array(servers_or_url).collect do |server|
-        uri = URI.parse(server)
-        _, default_index, default_type = uri.path.split("/")
-        uri.path = "" # is this expected behavior of URI? may be dangerous to rely on
-        uri.to_s
+      given_servers = Array(servers_or_url).collect do |server|
+        begin
+          uri = URI.parse(server)
+          _, default_index, default_type = uri.path.split("/")
+          uri.path = "" # is this expected behavior of URI? may be dangerous to rely on
+          uri.to_s
+        rescue URI::InvalidURIError
+          server
+        end
       end
-      [servers, default_index, default_type]
-    end
-
-    def current_server
-      @current_server
-    end
-
-    def servers
-      @server_list
-    end
-
-    def inspect
-      "<#{self.class} @current_server=#{@current_server} @server_list=#{@server_list.inspect} @options=#{@options.inspect}>"
+      [given_servers, default_index, default_type]
     end
 
     def connect!
-      @connection = @options[:transport].new(@current_server, @options)
+      if @options[:transport].is_a?(Class)
+        if @connect_block
+          @connection = @options[:transport].new(@current_server, @options, &@connect_block)
+        else
+          @connection = @options[:transport].new(@current_server, @options)
+        end
+      else
+        @connection = @options[:transport]
+      end
       @connection.connect!
     end
 

data/lib/elasticsearch/client/admin_index.rb

@@ -5,16 +5,12 @@ module ElasticSearch
         PSEUDO_INDICES = [:all]
 
         def index_status(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          indices = args.empty? ? [(default_index || :all)] : args.flatten
-          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          indices, options = extract_indices_and_options(args)
           execute(:index_status, indices, options)
         end
 
         def index_mapping(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          indices = args.empty? ? [(default_index || :all)] : args.flatten
-          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          indices, options = extract_indices_and_options(args)
           execute(:index_mapping, indices, options)
         end
 
@@ -92,9 +88,7 @@ module ElasticSearch
         # options: refresh
         # default: default_index if defined, otherwise :all
         def flush(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          indices = args.empty? ? [(default_index || :all)] : args.flatten
-          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          indices, options = extract_indices_and_options(args)
           execute(:flush, indices, options)
         end
 
@@ -102,9 +96,7 @@ module ElasticSearch
         # no options
         # default: default_index if defined, otherwise all
         def refresh(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          indices = args.empty? ? [(default_index || :all)] : args.flatten
-          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          indices, options = extract_indices_and_options(args)
           execute(:refresh, indices, options)
         end
 
@@ -112,9 +104,7 @@ module ElasticSearch
         # no options
         # default: default_index if defined, otherwise all
         def snapshot(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          indices = args.empty? ? [(default_index || :all)] : args.flatten
-          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          indices, options = extract_indices_and_options(args)
           execute(:snapshot, indices, options)
         end
 
@@ -122,9 +112,7 @@ module ElasticSearch
         # options: max_num_segments, only_expunge_deletes, refresh, flush
         # default: default_index if defined, otherwise all
         def optimize(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          indices = args.empty? ? [(default_index || :all)] : args.flatten
-          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          indices, options = extract_indices_and_options(args)
           execute(:optimize, indices, options)
         end
 
@@ -143,6 +131,14 @@ module ElasticSearch
         def delete_river(type=nil, options={})
           execute(:delete_river, type, options)
         end
+
+        private
+        def extract_indices_and_options(args)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+          indices = args.empty? ? [(default_index || :all)] : args.flatten
+          indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
+          [indices, options]
+        end
       end
     end
   end

data/lib/elasticsearch/client/auto_discovering_client.rb

@@ -5,7 +5,7 @@ module ElasticSearch
       :auto_discovery => true
     }.freeze
 
-    def initialize(servers, options={})
+    def initialize(servers_or_url, options={})
       super
       @options = AUTO_DISCOVERING_DEFAULTS.merge(@options)
       if @options[:auto_discovery]
@@ -15,7 +15,7 @@ module ElasticSearch
 
     #TODO how to autodiscover on reconnect? don't want to overwrite methods of RetryingClient
     def auto_discover_nodes!
-      @server_list = execute(:all_nodes)
+      @servers = execute(:all_nodes)
     end
   end
 end

data/lib/elasticsearch/client/retrying_client.rb

@@ -14,10 +14,10 @@ module ElasticSearch
     }.freeze
 
     # use cluster status to get server list
-    def initialize(servers, options={})
+    def initialize(servers_or_url, options={})
       super
       @options = RETRYING_DEFAULTS.merge(@options)
-      @retries = options[:retries] || @server_list.size
+      @retries = options[:retries] || @servers.size
       @request_count = 0
       @max_requests = @options[:server_max_requests]
       @retry_period = @options[:server_retry_period]
@@ -46,7 +46,7 @@ module ElasticSearch
     def next_server
       if @retry_period
         rebuild_live_server_list! if Time.now > @last_rebuild + @retry_period
-        raise NoServersAvailable, "No live servers in #{@server_list.inspect} since #{@last_rebuild.inspect}." if @live_server_list.empty?
+        raise NoServersAvailable, "No live servers in #{@servers.inspect} since #{@last_rebuild.inspect}." if @live_server_list.empty?
       elsif @live_server_list.empty?
         rebuild_live_server_list!
       end
@@ -56,9 +56,9 @@ module ElasticSearch
     def rebuild_live_server_list!
       @last_rebuild = Time.now
       if @options[:randomize_server_list]
-        @live_server_list = @server_list.sort_by { rand }
+        @live_server_list = @servers.sort_by { rand }
       else
-        @live_server_list = @server_list.dup
+        @live_server_list = @servers.dup
       end
     end
 

data/lib/elasticsearch/encoding/json.rb

@@ -1,14 +1,26 @@
-require 'yajl'
+require 'multi_json'
 
 module ElasticSearch
   module Encoding
     class JSON < Base
-      def encode(object)
-        Yajl::Encoder.encode(object)
-      end
 
-      def decode(string)
-        Yajl::Parser.parse(string)
+      # MultiJson switched to a new api in 1.3
+      if MultiJson.respond_to?(:adapter)
+        def encode(object)
+          MultiJson.dump(object)
+        end
+
+        def decode(string)
+          MultiJson.load(string)
+        end
+      else
+        def encode(object)
+          MultiJson.encode(object)
+        end
+
+        def decode(string)
+          MultiJson.decode(string)
+        end
       end
 
       def is_encoded?(object)

data/lib/elasticsearch/transport/base_protocol.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module ElasticSearch
   module Transport
     module IndexProtocol
@@ -42,8 +44,8 @@ module ElasticSearch
 
       def search(index, type, query, options={})
         if query.is_a?(Hash)
-          # patron cannot submit get requests with content, so if query is a hash, post it instead (assume a query hash is using the query dsl)
-          response = request(:post, {:index => index, :type => type, :op => "_search"}, options, encoder.encode(query))
+          # Some http libraries cannot submit get requests with content, so if query is a hash, post it instead (assume a query hash is using the query dsl)
+          response = request(:get, {:index => index, :type => type, :op => "_search"}, options, encoder.encode(query))
         else
           response = request(:get, {:index => index, :type => type, :op => "_search"}, options.merge(:q => query))
         end
@@ -58,7 +60,7 @@ module ElasticSearch
       end
 
       def scroll(scroll_id, options={})
-        # patron cannot submit get requests with content, so we pass the scroll_id in the parameters
+        # Some http libraries cannot submit get requests with content, so we pass the scroll_id in the parameters
         response = request(:get, {:op => "_search/scroll"}, options.merge(:scroll_id => scroll_id))
         handle_error(response) unless response.status == 200
         results = encoder.decode(response.body)
@@ -72,7 +74,7 @@ module ElasticSearch
 
       def count(index, type, query, options={})
         if query.is_a?(Hash)
-          # patron cannot submit get requests with content, so if query is a hash, post it instead (assume a query hash is using the query dsl)
+          # Some http libraries cannot submit get requests with content, so if query is a hash, post it instead (assume a query hash is using the query dsl)
           response = request(:post, {:index => index, :type => type, :op => "_count"}, options, encoder.encode(query))
         else
           response = request(:get, {:index => index, :type => type, :op => "_count"}, options.merge(:q => query))
@@ -248,17 +250,12 @@ module ElasticSearch
         nil
       end
 
-      # faster than CGI.escape
-      # stolen from RSolr, who stole it from Rack
       def escape(string)
-        string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-          #'%'+$1.unpack('H2'*$1.size).join('%').upcase
-          '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
-        }.tr(' ', '+')
+        Faraday::Utils.escape(string)
       end
 
       def unescape(string)
-        CGI.unescape(string)
+        Faraday::Utils.unescape(string)
       end
 
       if ''.respond_to?(:force_encoding) && ''.respond_to?(:encoding)
@@ -273,18 +270,6 @@ module ElasticSearch
           string
         end
       end
-
-      # Return the bytesize of String; uses String#size under Ruby 1.8 and
-      # String#bytesize under 1.9.
-      if ''.respond_to?(:bytesize)
-        def bytesize(string)
-          string.bytesize
-        end
-      else
-        def bytesize(string)
-          string.size
-        end
-      end
     end
 
     module BaseProtocol

data/lib/elasticsearch/transport/http.rb

@@ -1,5 +1,4 @@
-require 'patron'
-require 'cgi'
+require 'faraday'
 
 module ElasticSearch
   module Transport
@@ -10,9 +9,12 @@ module ElasticSearch
         :protocol => 'http'
       }.freeze
 
-      def initialize(server, options={})
+      attr_accessor :session
+
+      def initialize(server, options={}, &block)
         super
         @options = DEFAULTS.merge(@options)
+        @connect_block = block if block_given?
 
         # Make sure the server starts with a URI scheme.
         unless @server =~ /^(([^:\/?#]+):)?\/\//
@@ -21,10 +23,12 @@ module ElasticSearch
       end
 
       def connect!
-        @session = Patron::Session.new
-        @session.base_url = @server
-        @session.timeout = @options[:timeout]
-        @session.headers['User-Agent'] = 'ElasticSearch.rb v0.1'
+        if @connect_block
+          @session = Faraday.new :url => @server, :headers => {'User-Agent' => 'Rubberband'}, &@connect_block
+        else
+          @session = Faraday.new :url => @server, :headers => {'User-Agent' => 'Rubberband'}
+        end
+        @session.options[:timeout] = @options[:timeout]
       end
 
       def all_nodes
@@ -41,21 +45,20 @@ module ElasticSearch
 
       def request(method, operation, params={}, body=nil, headers={})
         begin
-          uri = generate_uri(operation)
-          query = generate_query_string(params)
-          path = [uri, query].join("?")
-          #puts "request: #{method} #{@server} #{path} #{body}"
-          response = @session.request(method, path, headers, :data => body)
+          response = @session.send(method, generate_uri(operation)) do |req|
+            req.headers = headers
+            req.params = params
+            req.body = body
+          end
+          # handle all 500 statuses here, other statuses are protocol-specific
           handle_error(response) if response.status >= 500
           response
         rescue Exception => e
           case e
-          when Patron::ConnectionFailed
-            raise ConnectionFailed
-          when Patron::HostResolutionError
-            raise HostResolutionError
-          when Patron::TimeoutError
-            raise TimeoutError
+          when Faraday::Error::ConnectionFailed
+            raise ConnectionFailed, $!
+          when Faraday::Error::TimeoutError
+            raise TimeoutError, $!
           else
             raise e
           end

data/lib/elasticsearch/transport/memcached.rb

@@ -60,7 +60,7 @@ module ElasticSearch
         rescue Exception => e
           case e
           when TimeoutError
-            raise TimeoutError
+            raise TimeoutError, $!
           else
             raise e
           end

data/lib/elasticsearch/transport/thrift.rb

@@ -95,9 +95,9 @@ module ElasticSearch
           when ::Thrift::TransportException
             case e.type
             when ::Thrift::TransportException::TIMED_OUT
-              raise TimeoutError
+              raise TimeoutError, $!
             else
-              raise ConnectionFailed
+              raise ConnectionFailed, $!
             end
           #TODO Thrift::ApplicationException, Thrift::ProtocolException, IOError.. retryable or fatal?
           else

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.1.6"
+  VERSION = "0.9.0"
 end

data/rubberband.gemspec

@@ -22,16 +22,15 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
   s.licenses = ["Apache v2"]
 
-  s.add_runtime_dependency("patron", ["~> 0.4.12"])
-  s.add_runtime_dependency("yajl-ruby", [">= 0"])
-  s.add_development_dependency("rake", ["~> 0.9.2"])
-  s.add_development_dependency("rspec", ["~> 2.0"])
-  s.add_development_dependency("yard", [">= 0.7.0"])
-  s.add_development_dependency("simplecov", [">= 0.3.8"])
-  s.add_development_dependency("mocha", ["~> 0.9.0"])
+  s.add_runtime_dependency "faraday"
+  s.add_runtime_dependency "multi_json"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", ["~> 2.0"]
+  s.add_development_dependency "simplecov", [">= 0.3.8"]
+  s.add_development_dependency "mocha", ["~> 0.9.0"]
 
 end

data/spec/connect_spec.rb

@@ -1,6 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "connect" do
+  context 'ip and port only' do
+    let(:servers) { '127.0.0.1:9200' }
+
+    it 'should connect' do
+      client = ElasticSearch.new(servers)
+      client.nodes_info.should include('cluster_name')
+    end
+  end
 
   context 'one server' do
     let(:servers) { 'http://127.0.0.1:9200' }
@@ -58,4 +66,34 @@ describe "connect" do
       client.default_type.should == 'test_type'
     end
   end
+
+  context 'alternate transport' do
+    let(:servers) { '127.0.0.1:9500' }
+
+    it 'should take an alternate transport class' do
+      client = ElasticSearch.new(servers, :auto_discovery => false, :transport => DummyTransport)
+      client.connect!
+      client.connection.should be_an_instance_of(DummyTransport)
+    end
+
+    it 'should take a transport object' do
+      transport = DummyTransport.new(servers)
+      client = ElasticSearch.new(servers, :auto_discovery => false, :transport => transport)
+      client.connect!
+      client.connection.should be(transport)
+    end
+  end
+
+  context 'with block' do
+    let(:server) { '127.0.0.1:9200' }
+
+    it 'should pass the block to the transport' do
+      client = ElasticSearch.new(server, :auto_discovery => false, :transport => DummyTransport) do
+        'hi there'
+      end
+      client.connect!
+
+      client.connection.block.call.should == 'hi there'
+    end
+  end
 end

data/spec/http_spec.rb

@@ -12,4 +12,17 @@ describe ElasticSearch::Transport::HTTP do
       described_class.new(server, :protocol => 'https').instance_variable_get('@server').should =~ /^https:\/\//
     end
   end
+
+  context 'with block' do
+    let(:server) { 'http://127.0.0.1:9200' }
+
+    it 'should pass the block to Faraday.new' do
+      transport = described_class.new(server) do |conn|
+        conn.options[:foo] = 'bar'
+      end
+      transport.connect!
+
+      transport.session.options[:foo].should == 'bar'
+    end
+  end
 end

data/spec/index_spec.rb

@@ -81,4 +81,14 @@ describe "index ops" do
       { "id" => "3", "fields" => { "foo" => "bazbar" }, "_source" => nil },
     ]
   end
+
+  it 'should handle html escaping and unescaping' do
+    @client.index({'fo/o' => 'ba=r'}, :id => "1'")
+    @client.refresh
+    
+    results = @client.search({:query => { :field => { 'fo/o' => 'ba=r' }}})
+    results.should have(1).item
+    results.first.id.should == "1'"
+    results.first._source.should == {'fo/o' => 'ba=r'}
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if RUBY_VERSION =~ /^1\.9/
+if RUBY_VERSION =~ /^1\.9/ && RUBY_ENGINE == "ruby" # don't run coverage on rbx
   require 'simplecov'
   SimpleCov.start do
     add_filter '/spec/'

data/spec/support/dummy_transport.rb

@@ -0,0 +1,10 @@
+class DummyTransport
+  attr_accessor :block
+
+  def initialize(server, options={}, &block)
+    @block = block
+  end
+
+  def connect!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubberband
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: patron
-  requirement: &16575640 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.12
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16575640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &16575000 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16575000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16574340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16574340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16573760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +69,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *16573760
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &16573180 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: *16573180
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16572580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +85,15 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *16572580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &16571980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +101,12 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *16571980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: An ElasticSearch client with ThriftClient-like failover handling.
 email:
 - grantr@gmail.com
@@ -95,15 +114,16 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - .autotest
 - .gitignore
 - .rspec
+- .travis.yml
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - TODO
 - lib/elasticsearch.rb
@@ -138,6 +158,7 @@ files:
 - spec/http_spec.rb
 - spec/index_spec.rb
 - spec/spec_helper.rb
+- spec/support/dummy_transport.rb
 - spec/type_spec.rb
 - vendor/elasticsearch/elasticsearch.thrift
 homepage: http://github.com/grantr/rubberband
@@ -161,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubberband
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An ElasticSearch client with ThriftClient-like failover handling.
@@ -173,5 +194,6 @@ test_files:
 - spec/http_spec.rb
 - spec/index_spec.rb
 - spec/spec_helper.rb
+- spec/support/dummy_transport.rb
 - spec/type_spec.rb
 has_rdoc: 

data/README.rdoc

@@ -1,44 +0,0 @@
-
-= RubberBand
-
-An ElasticSearch client with ThriftClient-like failover handling.
-
-== License
-
-Copyright 2010-2011 Grant Rodgers. See included LICENSE file.
-
-== Features
-
-* Automatic failover, retry, and peer discovery
-* Support for multiple transports (HTTP, Thrift, Memcached TODO)
-* Support for multiple encodings (JSON (Yajl), Smile TODO)
-
-== Usage
-
-Instantiate a client:
-
-    client = ElasticSearch.new('127.0.0.1:9200', :index => "twitter", :type => "tweet")
-
-Instantiate a client with multiple servers:
-  
-    client = ElasticSearch.new(['127.0.0.1:9200', '127.0.0.1:9201'])
-
-Instantiate a client using a Heroku URL (this sets the default index):
-
-    client = ElasticSearch.new(ENV['ELASTICSEARCH_URL'])
-
-API:
-
-  client.index({:body => "elasticsearch is cool"}, :id => 1)
-  client.get("1")
-  client.search("body:elasticsearch")
-
-== TODO
-
-See TODO file.
-
-== Contributing
-
-http://github.com/grantr/rubberband
-
-Fork, code, send pull request