jruby-elasticsearch 0.0.5 → 0.0.6

data/lib/jruby-elasticsearch/client.rb

@@ -4,8 +4,20 @@ require "jruby-elasticsearch/indexrequest"
 require "jruby-elasticsearch/searchrequest"
 
 class ElasticSearch::Client
-  def initialize
-    @node = org.elasticsearch.node.NodeBuilder.nodeBuilder.client(true).node
+  def initialize(options={})
+    builder = org.elasticsearch.node.NodeBuilder.nodeBuilder
+    builder.client(true)
+
+    if !options[:host].nil?
+      port = (options[:port] or "9200")
+      builder.settings.put("es.transport.tcp.port", port)
+    end
+
+    if !options[:cluster].nil?
+      builder.clusterName(options[:cluster])
+    end
+
+    @node = builder.node
     @client = @node.client
   end # def initialize
 

data/lib/jruby-elasticsearch/searchrequest.rb

@@ -32,8 +32,7 @@ class ElasticSearch::SearchRequest < ElasticSearch::Request
   public
   def execute(&block)
     use_callback(&block) if block_given?
-    @prep.setIndices(@indeces) if !@indeces.empty?
-
+    @prep.setIndices(@indeces.to_java(:String))
     action = @prep.execute(@handler)
     return action
   end # def execute
@@ -42,6 +41,7 @@ class ElasticSearch::SearchRequest < ElasticSearch::Request
   # Returns an org.elasticsearch.action.search.SearchResponse
   public
   def execute!
+    @prep.setIndices(@indeces.to_java(:String))
     return @prep.execute.actionGet()
   end # def execute!
 
@@ -60,9 +60,20 @@ class ElasticSearch::SearchRequest < ElasticSearch::Request
   end # def sort
 
   public
-  def query(query_string)
+  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)
+
+    operator = org.elasticsearch.index.query.xcontent.QueryStringQueryBuilder::Operator
+    case default_operator
+      when :and
+        qbuilder.defaultOperator(operator::AND)
+      when :or
+        qbuilder.defaultOperator(operator::OR)
+      else
+        raise "Unknown default operator '#{default_operator.inspect}'"
+    end
+
     @prep.setQuery(qbuilder)
     return self
   end # def query
@@ -83,14 +94,19 @@ class ElasticSearch::SearchRequest < ElasticSearch::Request
   end # def histogram
 
   public
-  def limit(size)
-    @prep.setSize(size)
+  def size(s)
+    @prep.setSize(s)
     return self
   end
+  alias :count :size
+  alias :limit :size
 
   public
-  def offset(from)
+  def from(from)
     @prep.setFrom(from)
     return self
   end
+  alias :offset :from
+  alias :offset :from
+
 end # class ElasticSearch::SearchRequest

metadata

@@ -2,21 +2,21 @@
 name: jruby-elasticsearch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
-- Jordan Sissel
+  - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -07:00
+date: 2011-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: ...
 email: 
-- jls@semicomplete.com
+  - jls@semicomplete.com
 executables: []
 
 extensions: []
@@ -24,41 +24,41 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/jruby-elasticsearch.rb
-- lib/jruby-elasticsearch/searchrequest.rb
-- lib/jruby-elasticsearch/namespace.rb
-- lib/jruby-elasticsearch/bulkrequest.rb
-- lib/jruby-elasticsearch/actionlistener.rb
-- lib/jruby-elasticsearch/request.rb
-- lib/jruby-elasticsearch/indexrequest.rb
-- lib/jruby-elasticsearch/client.rb
-- lib/jruby-elasticsearch/bulkstream.rb
+  - lib/jruby-elasticsearch.rb
+  - lib/jruby-elasticsearch/searchrequest.rb
+  - lib/jruby-elasticsearch/namespace.rb
+  - lib/jruby-elasticsearch/bulkrequest.rb
+  - lib/jruby-elasticsearch/actionlistener.rb
+  - lib/jruby-elasticsearch/request.rb
+  - lib/jruby-elasticsearch/indexrequest.rb
+  - lib/jruby-elasticsearch/client.rb
+  - lib/jruby-elasticsearch/bulkstream.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 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: JRuby API for ElasticSearch using the native ES Java API