jruby-elasticsearch 0.0.9 → 0.0.10

data/lib/jruby-elasticsearch/client.rb

@@ -17,8 +17,16 @@ class ElasticSearch::Client
     builder = org.elasticsearch.node.NodeBuilder.nodeBuilder
     builder.client(true)
 
-    if options[:type] == :local
+    # The client doesn't need to serve http
+    builder.settings.put("http.enabled", false)
+
+    case options[:type]
+    when :local
       builder.local(true)
+      @node = builder.node
+      @client = @node.client
+    when :transport
+      # TODO(sissel): Support transport client
     else
       # Use unicast discovery a host is given
       if !options[:host].nil?
@@ -35,10 +43,10 @@ class ElasticSearch::Client
       if !options[:cluster].nil?
         builder.clusterName(options[:cluster])
       end
+      @node = builder.node
+      @client = @node.client
     end
 
-    @node = builder.node
-    @client = @node.client
   end # def initialize
 
   # Index a new document

data/lib/jruby-elasticsearch/searchrequest.rb

@@ -2,6 +2,13 @@ require "jruby-elasticsearch/namespace"
 require "jruby-elasticsearch/request"
 
 class ElasticSearch::SearchRequest < ElasticSearch::Request
+  begin
+    QueryStringQueryBuilder = org.elasticsearch.index.query.xcontent.QueryStringQueryBuilder
+  rescue NameError
+    # The 'xcontent' namespace was removed in elasticsearch 0.17.0
+    QueryStringQueryBuilder = org.elasticsearch.index.query.QueryStringQueryBuilder
+  end
+
   # Create a new index request.
   public
   def initialize(client)
@@ -62,9 +69,9 @@ class ElasticSearch::SearchRequest < ElasticSearch::Request
   public
   def query(query_string, default_operator=:and)
     # TODO(sissel): allow doing other queries and such.
-    qbuilder = org.elasticsearch.index.query.xcontent.QueryStringQueryBuilder.new(query_string)
+    qbuilder = QueryStringQueryBuilder.new(query_string)
 
-    operator = org.elasticsearch.index.query.xcontent.QueryStringQueryBuilder::Operator
+    operator = QueryStringQueryBuilder::Operator
     case default_operator
       when :and
         qbuilder.defaultOperator(operator::AND)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-elasticsearch
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -07:00
+date: 2011-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,14 +30,14 @@ extra_rdoc_files: []
 
 files: 
 - lib/jruby-elasticsearch.rb
-- lib/jruby-elasticsearch/request.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/actionlistener.rb
-- lib/jruby-elasticsearch/bulkrequest.rb
+- lib/jruby-elasticsearch/request.rb
 - lib/jruby-elasticsearch/namespace.rb
 - lib/jruby-elasticsearch/client.rb
-- lib/jruby-elasticsearch/bulkstream.rb
 has_rdoc: true
 homepage: https://github.com/jordansissel/jruby-elasticsearch
 licenses: 
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: JRuby API for ElasticSearch using the native ES Java API