rubberband 0.0.5 → 0.0.6

data/README.rdoc

@@ -9,8 +9,9 @@ Copyright 2010 Grant Rodgers. See included LICENSE file.
 
 == Features
 
-* Automatic failover and retry
-* Multiple transports and encodings (TODO)
+* Automatic failover, retry, and peer discovery
+* Multiple transports (HTTP, Thrift, Memcached TODO)
+* Multiple encodings (JSON (Yajl), Smile TODO)
 
 == Usage
 
@@ -18,7 +19,7 @@ Instantiate a client:
 
   client = ElasticSearch.new('127.0.0.1:9200', :index => "twitter", :type => "tweet")
 
-API is subject to change, but here is a trivial example:
+API:
 
   client.index({:body => "elasticsearch is cool"}, :id => 1)
   client.get("1")
@@ -26,8 +27,7 @@ API is subject to change, but here is a trivial example:
 
 == TODO
 
-lots! :)
-
+See TODO file.
 
 == Contributing
 

data/Rakefile

@@ -27,7 +27,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 

data/TODO

@@ -1,29 +1,9 @@
-index api:
-  index*
-  get*
-  delete*
-  delete_by_query
-  count*
-  search*
-  terms
-  more_like_this
-admin index api:
-  status*
-  create*
-  delete*
-  alias*
-  mapping*
-  flush*
-  refresh*
-  snapshot*
-  optimize*
-admin cluster api:
-  health*
-  state*
-  nodes info*
-  nodes stats*
-  nodes shutdown*
-  nodes restart*
-
-handle partial failure cases where some shards are unsuccessful (maybe raise a PartialResult exception, allow override option to return results anyway. results should have a flag that signifies incompleteness)
+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
+memcached transport
+smile encoding

data/lib/elasticsearch/client/index.rb

@@ -13,11 +13,16 @@ module ElasticSearch
         # timeout (optional)
         # document (optional)
 
-        result = execute(:index, options[:index], options[:type], options[:id], document, options)
-        if result["ok"]
-          result["_id"]
+        if @batch
+          @batch << { :index => { :_index => options[:index], :_type => options[:type], :_id => options[:id] }}
+          @batch << document
         else
-          false
+          result = execute(:index, options[:index], options[:type], options[:id], document, options)
+          if result["ok"]
+            result["_id"]
+          else
+            false
+          end
         end
       end
 
@@ -38,8 +43,13 @@ module ElasticSearch
       def delete(id, options={})
         set_default_scope!(options)
         raise "index and type or defaults required" unless options[:index] && options[:type]
-        result = execute(:delete, options[:index], options[:type], id, options)
-        result["ok"]
+
+        if @batch
+          @batch << { :delete => { :_index => options[:index], :_type => options[:type], :_id => id }}
+        else
+          result = execute(:delete, options[:index], options[:type], id, options)
+          result["ok"]
+        end
       end
 
       #df	 The default field to use when no field prefix is defined within the query.
@@ -89,6 +99,16 @@ module ElasticSearch
         response["count"].to_i #TODO check if count is nil
       end
 
+      # Starts a bulk operation batch and yields self. Index and delete requests will be 
+      # queued until the block closes, then sent as a single _bulk call.
+      def bulk
+        @batch = []
+        yield(self)
+        response = execute(:bulk, @batch)
+      ensure
+        @batch = nil
+      end
+
       private
 
       def slice_hash(hash, *keys)

data/lib/elasticsearch/transport.rb

@@ -10,5 +10,6 @@ module ElasticSearch
   module Transport
     autoload :HTTP, 'transport/http'
     autoload :Thrift, 'transport/thrift'
+    autoload :Memcached, 'transport/memcached'
   end
 end

data/lib/elasticsearch/transport/base_protocol.rb

@@ -68,6 +68,13 @@ module ElasticSearch
         handle_error(response) unless response.status == 200
         encoder.decode(response.body) # {"count", "_shards"=>{"failed", "total", "successful"}}
       end
+
+      def bulk(actions)
+        body = actions.inject("") { |a, s| a << encoder.encode(s) << "\n" }
+        response = request(:post, {:op => '_bulk'}, {}, body)
+        handle_error(response) unless response.status == 200
+        encoder.decode(response.body) # {"items => [ {"delete"/"create" => {"_index", "_type", "_id", "ok"}} ] }
+      end
     end
 
     module IndexAdminProtocol
@@ -154,8 +161,9 @@ module ElasticSearch
       def generate_uri(options)
         path = ""
         path << "/#{Array(options[:index]).collect { |i| escape(i.downcase) }.join(",")}" if options[:index] && !options[:index].empty?
+        path << "/" if options[:index] && options[:index].empty?
         path << "/#{Array(options[:type]).collect { |t| escape(t) }.join(",")}" if options[:type] && !options[:type].empty?
-        path << "/#{Array(options[:id]).collect { |id| escape(id) }.join(",")}" if options[:id] && !options[:id].empty?
+        path << "/#{Array(options[:id]).collect { |id| escape(id) }.join(",")}" if options[:id] && !options[:id].to_s.empty?
         path << "/#{options[:op]}" if options[:op]
         path
       end

data/lib/elasticsearch/transport/http.rb

@@ -38,7 +38,7 @@ module ElasticSearch
           uri = generate_uri(operation)
           query = generate_query_string(params)
           path = [uri, query].join("?")
-          #puts "request: #{@server} #{path} #{body}"
+          #puts "request: #{method} #{@server} #{path} #{body}"
           response = @session.request(method, path, headers, :data => body)
           handle_error(response) if response.status >= 500
           response

data/lib/elasticsearch/transport/memcached.rb

@@ -0,0 +1,72 @@
+begin
+  require 'memcached'
+rescue LoadError => error
+  raise "Please install the memcached gem to use the memcached transport."
+end
+
+module ElasticSearch
+  module Transport
+    class Memcached < Base
+      Response = Struct.new(:status, :headers, :body)
+
+      DEFAULTS = {
+        :timeout => 5
+      }.freeze
+
+      def initialize(server, options={})
+        super
+        @options = DEFAULTS.merge(@options)
+      end
+
+      def connect!
+        @memcached = ::Memcached.new(@server, :timeout => @options[:timeout]) #TODO allow passing other options?
+      end
+
+      def close
+        @memcached.quit
+      end
+
+      def all_nodes
+        memcached_addresses = nodes_info([])["nodes"].collect { |id, node| node["memcached_address"] }
+        memcached_addresses.collect! do |a|
+          if a =~ /inet\[.*\/([\d.:]+)\]/
+            $1
+          end
+        end.compact!
+        memcached_addresses
+      end
+
+      private
+
+      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 = case method
+          when :get
+            @memcached.get(path, false)
+          when :put, :post
+            #TODO put vs post?
+            @memcached.set(path, body, 0, false)
+          when :delete
+            @memcached.delete(path)
+          end
+          #puts "response: #{response}"
+          response = Response.new(200, {}, response) #TODO
+          handle_error(response) if response.status >= 500
+          response
+        rescue Exception => e
+          case e
+          when TimeoutError
+            raise TimeoutError
+          else
+            raise e
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/transport/thrift.rb

@@ -76,7 +76,7 @@ module ElasticSearch
           when :get
             request.method = ElasticSearch::Thrift::Method::GET
           when :put
-            request.method = ElasticSearch::Thrift::Method::GET
+            request.method = ElasticSearch::Thrift::Method::PUT
           when :post
             request.method = ElasticSearch::Thrift::Method::POST
           when :delete

data/lib/elasticsearch/version.rb

@@ -2,7 +2,7 @@ module ElasticSearch
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/rubberband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubberband}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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.date = %q{2011-01-07}
   s.description = %q{An ElasticSearch client with ThriftClient-like failover handling.}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "lib/elasticsearch/transport/base.rb",
     "lib/elasticsearch/transport/base_protocol.rb",
     "lib/elasticsearch/transport/http.rb",
+    "lib/elasticsearch/transport/memcached.rb",
     "lib/elasticsearch/transport/thrift.rb",
     "lib/elasticsearch/transport/thrift/elasticsearch_constants.rb",
     "lib/elasticsearch/transport/thrift/elasticsearch_types.rb",
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
     "test/elasticsearch_test.rb",
     "test/hits_test.rb",
     "test/test_helper.rb",
+    "test/type_test.rb",
     "vendor/elasticsearch/elasticsearch.thrift"
   ]
   s.homepage = %q{http://github.com/grantr/rubberband}
@@ -61,7 +63,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/elasticsearch_test.rb",
     "test/hits_test.rb",
-    "test/test_helper.rb"
+    "test/test_helper.rb",
+    "test/type_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/type_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class TypeTest < Test::Unit::TestCase
+  context "Test with differents Types" do
+    #TODO figure out how to have one setup and one teardown
+    setup do
+      @client = ElasticSearch.new('127.0.0.1:9200', :index => "twitter", :type => "tweet")
+      @client.index({:user => "kimchy"}, :id => 1)
+      @client.index({:user => "kimchy"}, :id => 2, :type => "grillo")
+      @client.index({:user => "kimchy"}, :id => 3, :type => "cote")
+      @client.index({:user => "kimchy"}, :id => 4, :index => "cotes", :type => "cote")
+      @client.index({:user => "kimchy"}, :id => 5, :index => "menchos", :type => "mencho")
+      @client.index({:user => "kimchy"}, :id => 6, :index => "menchos", :type => "cote")
+      @client.refresh("twitter", "cotes", "menchos")
+    end
+
+    teardown do
+      #@client.delete_index("twitter")
+      #@client.delete_index("cotes")
+      #@client.delete_index("menchos")
+    end
+
+    should "search in all indexes" do
+      assert_equal @client.count("kimchy",{:index => "", :type => ""}), 6
+    end
+    
+    should "search in all types with index twitter" do
+      assert_equal @client.count("kimchy",{:index => "twitter", :type => ""}), 3
+    end
+    
+    should "search in index twitter with types tweet,cote" do
+      assert_equal @client.count("kimchy",{:index => "twitter", :type => "tweet,cote"}), 2
+    end
+    
+    should "search in index twitter,cotes" do
+      assert_equal @client.count("kimchy",{:index => "twitter,cotes",  :type => ""}), 4
+    end
+    
+    should "search in types grillo,cote of all indexes" do
+      assert_equal @client.count("kimchy",{:index => "",  :type => "grillo,cote"}), 4
+    end
+    
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - grantr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
+date: 2011-01-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ files:
 - lib/elasticsearch/transport/base.rb
 - lib/elasticsearch/transport/base_protocol.rb
 - lib/elasticsearch/transport/http.rb
+- lib/elasticsearch/transport/memcached.rb
 - lib/elasticsearch/transport/thrift.rb
 - lib/elasticsearch/transport/thrift/elasticsearch_constants.rb
 - lib/elasticsearch/transport/thrift/elasticsearch_types.rb
@@ -143,6 +144,7 @@ files:
 - test/elasticsearch_test.rb
 - test/hits_test.rb
 - test/test_helper.rb
+- test/type_test.rb
 - vendor/elasticsearch/elasticsearch.thrift
 has_rdoc: true
 homepage: http://github.com/grantr/rubberband
@@ -158,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2243995552158926682
+      hash: -3014120754088484755
       segments: 
       - 0
       version: "0"
@@ -181,3 +183,4 @@ test_files:
 - test/elasticsearch_test.rb
 - test/hits_test.rb
 - test/test_helper.rb
+- test/type_test.rb