rubberband 0.0.2 → 0.0.4

data/lib/elasticsearch/transport/thrift.rb

@@ -0,0 +1,101 @@
+begin
+  require 'thrift'
+rescue LoadError => error
+  raise "Please install the thrift gem (>= 0.5.0) to use the Thrift transport."
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "thrift"))
+require 'rest'
+
+module ElasticSearch
+  module Transport
+    class Thrift < Base
+
+      DEFAULTS = {
+        :timeout => 5,
+        :thrift_protocol => ::Thrift::BinaryProtocol,
+        :thrift_protocol_extra_params => [],
+        :thrift_transport => ::Thrift::Socket,
+        :thrift_transport_wrapper => ::Thrift::BufferedTransport,
+        :client_class => ElasticSearch::Thrift::Rest::Client
+      }.freeze
+
+      def initialize(server, options={})
+        super
+        @options = DEFAULTS.merge(@options)
+      end
+
+      def connect!
+        host, port = parse_server(@server)
+
+        @transport = @options[:thrift_transport].new(host, port.to_i, @options[:timeout])
+        @transport = @transport_wrapper.new(@transport) if @transport_wrapper
+        @transport.open
+
+        @client = @options[:client_class].new(@options[:thrift_protocol].new(@transport, *@options[:thrift_protocol_extra_params]))
+      rescue ::Thrift::TransportException, Errno::ECONNREFUSED
+        close
+        raise ConnectionFailed
+      end
+
+      def close
+        @transport.close rescue nil
+      end
+
+      private
+
+      def parse_server(server)
+        host, port = server.to_s.split(":")
+        raise ArgumentError, 'Servers must be in the form "host:port"' unless host and port
+        [host, port]
+      end
+
+      def stringify!(hash)
+        hash.keys.each do |k|
+          hash[k.to_s] = hash.delete(k).to_s
+        end
+        hash
+      end
+
+      def request(method, operation, params={}, body=nil, headers={})
+        begin
+          uri = generate_uri(operation)
+          #puts "request: #{@server} #{method} #{uri} #{params.inspect} #{body}"
+          request = ElasticSearch::Thrift::RestRequest.new
+          case method
+          when :get
+            request.method = ElasticSearch::Thrift::Method::GET
+          when :put
+            request.method = ElasticSearch::Thrift::Method::GET
+          when :post
+            request.method = ElasticSearch::Thrift::Method::POST
+          when :delete
+            request.method = ElasticSearch::Thrift::Method::DELETE
+          end
+
+          request.uri = uri
+          request.parameters = stringify!(params)
+          request.body = body
+          request.headers = stringify!(headers)
+          response = @client.execute(request)
+          handle_error(response) if response.status >= 500
+          response
+        rescue Exception => e
+          case e
+          when ::Thrift::TransportException
+            case e.type
+            when ::Thrift::TransportException::TIMED_OUT
+              raise TimeoutError
+            else
+              raise ConnectionFailed
+            end
+          #TODO Thrift::ApplicationException, Thrift::ProtocolException, IOError.. retryable or fatal?
+          else
+            raise e
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/transport/thrift/elasticsearch_constants.rb

@@ -0,0 +1,12 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'elasticsearch_types'
+
+    module ElasticSearch
+      module Thrift
+  end
+end

data/lib/elasticsearch/transport/thrift/elasticsearch_types.rb

@@ -0,0 +1,124 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+
+module ElasticSearch
+  module Thrift
+        module Method
+          GET = 0
+          PUT = 1
+          POST = 2
+          DELETE = 3
+          HEAD = 4
+          OPTIONS = 5
+          VALUE_MAP = {0 => "GET", 1 => "PUT", 2 => "POST", 3 => "DELETE", 4 => "HEAD", 5 => "OPTIONS"}
+          VALID_VALUES = Set.new([GET, PUT, POST, DELETE, HEAD, OPTIONS]).freeze
+        end
+
+        module Status
+          CONT = 100
+          SWITCHING_PROTOCOLS = 101
+          OK = 200
+          CREATED = 201
+          ACCEPTED = 202
+          NON_AUTHORITATIVE_INFORMATION = 203
+          NO_CONTENT = 204
+          RESET_CONTENT = 205
+          PARTIAL_CONTENT = 206
+          MULTI_STATUS = 207
+          MULTIPLE_CHOICES = 300
+          MOVED_PERMANENTLY = 301
+          FOUND = 302
+          SEE_OTHER = 303
+          NOT_MODIFIED = 304
+          USE_PROXY = 305
+          TEMPORARY_REDIRECT = 307
+          BAD_REQUEST = 400
+          UNAUTHORIZED = 401
+          PAYMENT_REQUIRED = 402
+          FORBIDDEN = 403
+          NOT_FOUND = 404
+          METHOD_NOT_ALLOWED = 405
+          NOT_ACCEPTABLE = 406
+          PROXY_AUTHENTICATION = 407
+          REQUEST_TIMEOUT = 408
+          CONFLICT = 409
+          GONE = 410
+          LENGTH_REQUIRED = 411
+          PRECONDITION_FAILED = 412
+          REQUEST_ENTITY_TOO_LARGE = 413
+          REQUEST_URI_TOO_LONG = 414
+          UNSUPPORTED_MEDIA_TYPE = 415
+          REQUESTED_RANGE_NOT_SATISFIED = 416
+          EXPECTATION_FAILED = 417
+          UNPROCESSABLE_ENTITY = 422
+          LOCKED = 423
+          FAILED_DEPENDENCY = 424
+          INTERNAL_SERVER_ERROR = 500
+          NOT_IMPLEMENTED = 501
+          BAD_GATEWAY = 502
+          SERVICE_UNAVAILABLE = 503
+          GATEWAY_TIMEOUT = 504
+          INSUFFICIENT_STORAGE = 506
+          VALUE_MAP = {100 => "CONT", 101 => "SWITCHING_PROTOCOLS", 200 => "OK", 201 => "CREATED", 202 => "ACCEPTED", 203 => "NON_AUTHORITATIVE_INFORMATION", 204 => "NO_CONTENT", 205 => "RESET_CONTENT", 206 => "PARTIAL_CONTENT", 207 => "MULTI_STATUS", 300 => "MULTIPLE_CHOICES", 301 => "MOVED_PERMANENTLY", 302 => "FOUND", 303 => "SEE_OTHER", 304 => "NOT_MODIFIED", 305 => "USE_PROXY", 307 => "TEMPORARY_REDIRECT", 400 => "BAD_REQUEST", 401 => "UNAUTHORIZED", 402 => "PAYMENT_REQUIRED", 403 => "FORBIDDEN", 404 => "NOT_FOUND", 405 => "METHOD_NOT_ALLOWED", 406 => "NOT_ACCEPTABLE", 407 => "PROXY_AUTHENTICATION", 408 => "REQUEST_TIMEOUT", 409 => "CONFLICT", 410 => "GONE", 411 => "LENGTH_REQUIRED", 412 => "PRECONDITION_FAILED", 413 => "REQUEST_ENTITY_TOO_LARGE", 414 => "REQUEST_URI_TOO_LONG", 415 => "UNSUPPORTED_MEDIA_TYPE", 416 => "REQUESTED_RANGE_NOT_SATISFIED", 417 => "EXPECTATION_FAILED", 422 => "UNPROCESSABLE_ENTITY", 423 => "LOCKED", 424 => "FAILED_DEPENDENCY", 500 => "INTERNAL_SERVER_ERROR", 501 => "NOT_IMPLEMENTED", 502 => "BAD_GATEWAY", 503 => "SERVICE_UNAVAILABLE", 504 => "GATEWAY_TIMEOUT", 506 => "INSUFFICIENT_STORAGE"}
+          VALID_VALUES = Set.new([CONT, SWITCHING_PROTOCOLS, OK, CREATED, ACCEPTED, NON_AUTHORITATIVE_INFORMATION, NO_CONTENT, RESET_CONTENT, PARTIAL_CONTENT, MULTI_STATUS, MULTIPLE_CHOICES, MOVED_PERMANENTLY, FOUND, SEE_OTHER, NOT_MODIFIED, USE_PROXY, TEMPORARY_REDIRECT, BAD_REQUEST, UNAUTHORIZED, PAYMENT_REQUIRED, FORBIDDEN, NOT_FOUND, METHOD_NOT_ALLOWED, NOT_ACCEPTABLE, PROXY_AUTHENTICATION, REQUEST_TIMEOUT, CONFLICT, GONE, LENGTH_REQUIRED, PRECONDITION_FAILED, REQUEST_ENTITY_TOO_LARGE, REQUEST_URI_TOO_LONG, UNSUPPORTED_MEDIA_TYPE, REQUESTED_RANGE_NOT_SATISFIED, EXPECTATION_FAILED, UNPROCESSABLE_ENTITY, LOCKED, FAILED_DEPENDENCY, INTERNAL_SERVER_ERROR, NOT_IMPLEMENTED, BAD_GATEWAY, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, INSUFFICIENT_STORAGE]).freeze
+        end
+
+        class RestRequest
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          METHOD = 1
+          URI = 2
+          PARAMETERS = 3
+          HEADERS = 4
+          BODY = 5
+
+          FIELDS = {
+            METHOD => {:type => ::Thrift::Types::I32, :name => 'method', :enum_class => ElasticSearch::Thrift::Method},
+            URI => {:type => ::Thrift::Types::STRING, :name => 'uri'},
+            PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+            HEADERS => {:type => ::Thrift::Types::MAP, :name => 'headers', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+            BODY => {:type => ::Thrift::Types::STRING, :name => 'body', :binary => true, :optional => true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field method is unset!') unless @method
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field uri is unset!') unless @uri
+            unless @method.nil? || ElasticSearch::Thrift::Method::VALID_VALUES.include?(@method)
+              raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field method!')
+            end
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        class RestResponse
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          STATUS = 1
+          HEADERS = 2
+          BODY = 3
+
+          FIELDS = {
+            STATUS => {:type => ::Thrift::Types::I32, :name => 'status', :enum_class => ElasticSearch::Thrift::Status},
+            HEADERS => {:type => ::Thrift::Types::MAP, :name => 'headers', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+            BODY => {:type => ::Thrift::Types::STRING, :name => 'body', :binary => true, :optional => true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+            unless @status.nil? || ElasticSearch::Thrift::Status::VALID_VALUES.include?(@status)
+              raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field status!')
+            end
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+      end
+    end

data/lib/elasticsearch/transport/thrift/rest.rb

@@ -0,0 +1,83 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'elasticsearch_types'
+
+        module ElasticSearch
+          module Thrift
+            module Rest
+              class Client
+                include ::Thrift::Client
+
+                def execute(request)
+                  send_execute(request)
+                  return recv_execute()
+                end
+
+                def send_execute(request)
+                  send_message('execute', Execute_args, :request => request)
+                end
+
+                def recv_execute()
+                  result = receive_message(Execute_result)
+                  return result.success unless result.success.nil?
+                  raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'execute failed: unknown result')
+                end
+
+              end
+
+              class Processor
+                include ::Thrift::Processor
+
+                def process_execute(seqid, iprot, oprot)
+                  args = read_args(iprot, Execute_args)
+                  result = Execute_result.new()
+                  result.success = @handler.execute(args.request)
+                  write_result(result, oprot, 'execute', seqid)
+                end
+
+              end
+
+              # HELPER FUNCTIONS AND STRUCTURES
+
+              class Execute_args
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                REQUEST = 1
+
+                FIELDS = {
+                  REQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'request', :class => ElasticSearch::Thrift::RestRequest}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                  raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field request is unset!') unless @request
+                end
+
+                ::Thrift::Struct.generate_accessors self
+              end
+
+              class Execute_result
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                SUCCESS = 0
+
+                FIELDS = {
+                  SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ElasticSearch::Thrift::RestResponse}
+                }
+
+                def struct_fields; FIELDS; end
+
+                def validate
+                end
+
+                ::Thrift::Struct.generate_accessors self
+              end
+
+            end
+
+          end
+        end

data/lib/rubberband.rb

@@ -0,0 +1 @@
+require 'elasticsearch'

data/rubberband.gemspec

@@ -0,0 +1,83 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rubberband}
+  s.version = "0.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["grantr"]
+  s.date = %q{2010-12-06}
+  s.description = %q{An ElasticSearch Client with ThriftClient-like failover handling.}
+  s.email = %q{grantr@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc",
+    "TODO"
+  ]
+  s.files = [
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "lib/elasticsearch.rb",
+    "lib/elasticsearch/client.rb",
+    "lib/elasticsearch/client/abstract_client.rb",
+    "lib/elasticsearch/client/admin_cluster.rb",
+    "lib/elasticsearch/client/admin_index.rb",
+    "lib/elasticsearch/client/auto_discovering_client.rb",
+    "lib/elasticsearch/client/default_scope.rb",
+    "lib/elasticsearch/client/hits.rb",
+    "lib/elasticsearch/client/index.rb",
+    "lib/elasticsearch/client/retrying_client.rb",
+    "lib/elasticsearch/encoding.rb",
+    "lib/elasticsearch/encoding/base.rb",
+    "lib/elasticsearch/encoding/json.rb",
+    "lib/elasticsearch/transport.rb",
+    "lib/elasticsearch/transport/base.rb",
+    "lib/elasticsearch/transport/base_protocol.rb",
+    "lib/elasticsearch/transport/http.rb",
+    "lib/elasticsearch/transport/thrift.rb",
+    "lib/elasticsearch/transport/thrift/elasticsearch_constants.rb",
+    "lib/elasticsearch/transport/thrift/elasticsearch_types.rb",
+    "lib/elasticsearch/transport/thrift/rest.rb",
+    "lib/rubberband.rb",
+    "rubberband.gemspec",
+    "test/elasticsearch_test.rb",
+    "test/hits_test.rb",
+    "test/test_helper.rb",
+    "vendor/elasticsearch/elasticsearch.thrift"
+  ]
+  s.homepage = %q{http://github.com/grantr/rubberband}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{An ElasticSearch client.}
+  s.test_files = [
+    "test/elasticsearch_test.rb",
+    "test/hits_test.rb",
+    "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<patron>, [">= 0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<patron>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<patron>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+  end
+end
+

data/test/elasticsearch_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 class ElasticSearchTest < Test::Unit::TestCase
   should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+    #flunk "hey buddy, you should probably rename this file and start testing for real"
   end
 end

data/test/hits_test.rb

@@ -19,16 +19,83 @@ class HitsTest < Test::Unit::TestCase
       assert @hit.attributes.frozen?
     end
 
-
   end
 
   context "A Hits instance" do
     setup do
-      @response1 = {"_source" => {"foo" => "bar"}, "_id" => "1"}
-      @hit = ElasticSearch::Api::Hit.new(@response)
-      
+      @response = {
+        "_shards"=>{"total"=>30, "successful"=>30, "failed"=>0}, 
+        "hits"=>{"total"=>2, "max_score"=>1.0, "hits"=>[
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"1", "_score"=>1.0, "_source"=>{"foo" => "bar"}},
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"2", "_score"=>1.0, "_source"=>{"foo" => "baz"}}
+      ]}}
+      @hits = ElasticSearch::Api::Hits.new(@response)
+    end
+
+    should "set response" do
+      assert_equal @response, @hits.response
+    end
+
+    should "set total_entries" do
+      assert_equal @response["hits"]["hits"].size, @hits.total_entries
+    end
+
+    should "instantiate hits in order" do
+      @response["hits"]["hits"].each_with_index do |hit, i|
+        assert_equal ElasticSearch::Api::Hit.new(hit), @hits.hits[i]
+      end
     end
 
-    should "exist"
+    should "freeze hits" do
+      assert @hits.hits.all? { |h| h.frozen? }
+    end
+
+    should "freeze hits array when frozen" do
+      @hits.freeze
+      assert @hits.hits.frozen?
+    end
+
+    should "respond to to_a" do
+      assert_equal @hits.hits, @hits.to_a
+    end
+
+    should "respond to array methods" do
+      assert @hits.respond_to?(:collect)
+      assert_equal @response["hits"]["hits"].collect { |h| h["_id"] }, @hits.collect { |h| h.id }
+    end
+  end
+
+  context "a paginated hits instance" do
+    setup do
+      @response = {
+        "_shards"=>{"total"=>30, "successful"=>30, "failed"=>0}, 
+        "hits"=>{"total"=>6, "max_score"=>1.0, "hits"=>[
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"3", "_score"=>1.0, "_source"=>{"foo" => "bar"}},
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"4", "_score"=>1.0, "_source"=>{"foo" => "baz"}}
+      ]}}
+      @per_page = 2
+      @page = 2
+      @hits = ElasticSearch::Api::Hits.new(@response, {:page => @page, :per_page => @per_page})
+    end
+
+    should "respond to total_pages" do
+      assert_equal (@response["hits"]["total"] / @per_page.to_f).ceil, @hits.total_pages
+    end
+
+    should "respond to next_page" do
+      assert_equal @page + 1, @hits.next_page
+    end
+
+    should "respond to previous_page" do
+      assert_equal @page - 1, @hits.previous_page
+    end
+
+    should "respond to current_page" do
+      assert_equal @page, @hits.current_page
+    end
+
+    should "respond to per page" do
+      assert_equal @per_page, @hits.per_page
+    end
   end
 end