jruby-elasticsearch 0.0.10 → 0.0.11

data/lib/jruby-elasticsearch/bulkrequest.rb

@@ -5,9 +5,8 @@ class ElasticSearch::BulkRequest < ElasticSearch::Request
   # Create a new index request.
   def initialize(client)
     @client = client
-
-    @prep = @client.prepareBulk(index, type, id)
-    super
+    @prep = @client.prepareBulk()
+    super()
   end
 
   # Execute this index request.
@@ -15,7 +14,7 @@ class ElasticSearch::BulkRequest < ElasticSearch::Request
   #
   # If a block is given, register it for both failure and success.
   def execute(&block)
-    use_callback(&block) if block_given
+    use_callback(&block) if block_given?
     action = @prep.execute(@handler)
     return action
   end
@@ -25,6 +24,14 @@ class ElasticSearch::BulkRequest < ElasticSearch::Request
     return @prep.execute.actionGet()
   end
 
+  def index(index, type, id=nil, data={})
+    req = org.elasticsearch.action.index.IndexRequest.new(index)
+    req.type(type) if type
+    req.id(id.to_s) if id
+    req.source(data)
+    @prep.add(req)
+  end
+
   def <<(request)
     @prep.add(request)
   end # def <<

data/lib/jruby-elasticsearch/client.rb

@@ -49,6 +49,13 @@ class ElasticSearch::Client
 
   end # def initialize
 
+  # Get a new BulkRequest for sending multiple updates to elasticsearch in one
+  # request.
+  public
+  def bulk
+    ElasticSearch::BulkRequest.new(@client)
+  end # def bulk
+
   # Index a new document
   #
   # args:

data/lib/jruby-elasticsearch.rb

@@ -1,4 +1,5 @@
 require "jruby-elasticsearch/client"
+require "jruby-elasticsearch/bulkrequest"
 
 #class Proc
   #include java.lang.Runnable

data/test/test_integration.rb

@@ -0,0 +1,72 @@
+require "test/unit"
+
+class TestElasticSearch < Test::Unit::TestCase
+  def setup
+    # Require all the elasticsearch libs
+    raise "Please set ELASTICSEARCH_HOME" if ENV['ELASTICSEARCH_HOME'].nil?
+    Dir[File.join(ENV['ELASTICSEARCH_HOME'],"lib/*.jar")].each do |jar|
+      require jar
+    end
+
+    $:.unshift("lib")
+    require "jruby-elasticsearch"
+
+    # Start a local elasticsearch node
+    builder = org.elasticsearch.node.NodeBuilder.nodeBuilder
+    builder.local(true)
+    @elasticsearch = builder.node
+    @elasticsearch.start
+
+    # Create a client which will find a nearby elasticsearch cluster using
+    # the default discovery mechanism.
+    @client = ElasticSearch::Client.new({:type => :local})
+  end
+
+  def test_index_asynchronously
+    data = { "fizzle" => "dazzle", "pants" => "off" }
+    req = @client.index("twitter", "tweet", data)
+
+    # Set up async callbacks
+    done = false
+    req.on(:success) do |response|
+      assert_not_nil response
+      done = true
+    end.on(:failure) do |exception|
+      raise exception
+      done = true
+    end
+
+    # Execute it, but do it asynchronously.
+    req.execute
+
+    # Wait until we are done.
+    while !done
+      sleep 1
+    end
+  end
+
+  def test_bulk_index_asynchronously
+    data = { "fizzle" => "dazzle", "pants" => "off" }
+    bulk = @client.bulk
+    bulk.index("twitter", "tweet1", data)
+    bulk.index("twitter", "tweet2")
+
+    # Set up async callbacks
+    done = false
+    bulk.on(:success) do |response|
+      assert_not_nil response
+      done = true
+    end.on(:failure) do |exception|
+      raise exception
+      done = true
+    end
+
+    # Execute it, but do it asynchronously.
+    bulk.execute
+
+    # Wait until we are done.
+    while !done
+      sleep 1
+    end
+  end
+end

metadata

@@ -1,27 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-elasticsearch
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 10
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
-- Jordan Sissel
+  - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 -07:00
+date: 2011-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: ...
 email: 
-- jls@semicomplete.com
+  - jls@semicomplete.com
 executables: []
 
 extensions: []
@@ -29,47 +24,42 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/jruby-elasticsearch.rb
-- lib/jruby-elasticsearch/bulkstream.rb
-- lib/jruby-elasticsearch/bulkrequest.rb
-- lib/jruby-elasticsearch/actionlistener.rb
-- lib/jruby-elasticsearch/searchrequest.rb
-- lib/jruby-elasticsearch/indexrequest.rb
-- lib/jruby-elasticsearch/request.rb
-- lib/jruby-elasticsearch/namespace.rb
-- lib/jruby-elasticsearch/client.rb
+  - lib/jruby-elasticsearch.rb
+  - lib/jruby-elasticsearch/indexrequest.rb
+  - lib/jruby-elasticsearch/bulkstream.rb
+  - lib/jruby-elasticsearch/actionlistener.rb
+  - lib/jruby-elasticsearch/searchrequest.rb
+  - lib/jruby-elasticsearch/namespace.rb
+  - lib/jruby-elasticsearch/bulkrequest.rb
+  - lib/jruby-elasticsearch/request.rb
+  - lib/jruby-elasticsearch/client.rb
+  - test/test_integration.rb
 has_rdoc: true
 homepage: https://github.com/jordansissel/jruby-elasticsearch
 licenses: 
-- Apache License (2.0)
+  - Apache License (2.0)
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
-- lib
+  - lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: JRuby API for ElasticSearch using the native ES Java API