jruby-elasticsearch 0.0.3 → 0.0.5

data/lib/jruby-elasticsearch/client.rb

@@ -1,6 +1,7 @@
 require "java"
 require "jruby-elasticsearch/namespace"
 require "jruby-elasticsearch/indexrequest"
+require "jruby-elasticsearch/searchrequest"
 
 class ElasticSearch::Client
   def initialize
@@ -43,6 +44,25 @@ class ElasticSearch::Client
     return indexreq
   end # def index
 
+  # Search for data.
+  # If a block is given, it is passed to SearchRequest#with so you can
+  # more easily configure the search, like so:
+  #
+  #   search = client.search("foo") do
+  #     query("*")
+  #     histogram("field", 1000)
+  #   end
+  #
+  #   The context of the block is of the SearchRequest object.
+  public
+  def search(&block)
+    searchreq = ElasticSearch::SearchRequest.new(@client)
+    if block_given?
+      searchreq.with(&block)
+    end
+    return searchreq
+  end # def search
+
   def cluster
     return @client.admin.cluster
   end

data/lib/jruby-elasticsearch/request.rb

@@ -3,7 +3,7 @@ require "jruby-elasticsearch/actionlistener"
 
 class ElasticSearch::Request
   # Create a new index request.
-  def initialize()
+  def initialize
     @handler = ElasticSearch::ActionListener.new
   end
 

data/lib/jruby-elasticsearch/searchrequest.rb

@@ -0,0 +1,96 @@
+require "jruby-elasticsearch/namespace"
+require "jruby-elasticsearch/request"
+
+class ElasticSearch::SearchRequest < ElasticSearch::Request
+  # Create a new index request.
+  public
+  def initialize(client)
+    @client = client
+    @prep = org.elasticsearch.client.action.search.SearchRequestBuilder.new(@client)
+    @indeces = []
+    super()
+  end # def initialize
+
+  public
+  def with(&block)
+    instance_eval(&block)
+    return self
+  end # def with
+
+  public
+  def index(index_name)
+    @indeces << index_name
+  end
+
+  # Execute this search request.
+  # This call is asynchronous.
+  #
+  # If a block is given, register it for both failure and success.
+  #
+  # On success, callback will receive a
+  # org.elasticsearch.action.search.SearchResponse
+  public
+  def execute(&block)
+    use_callback(&block) if block_given?
+    @prep.setIndices(@indeces) if !@indeces.empty?
+
+    action = @prep.execute(@handler)
+    return action
+  end # def execute
+
+  # Execute this index request synchronously
+  # Returns an org.elasticsearch.action.search.SearchResponse
+  public
+  def execute!
+    return @prep.execute.actionGet()
+  end # def execute!
+
+  public
+  def sort(field, order)
+    case order
+      when :asc
+        order_val = org.elasticsearch.search.sort.SortOrder::ASC
+      when :desc
+        order_val = org.elasticsearch.search.sort.SortOrder::DESC
+      else
+        raise "Invalid sort order '#{order.inspect}'"
+    end
+    @prep.addSort(field, order_val)
+    return self
+  end # def sort
+
+  public
+  def query(query_string)
+    # TODO(sissel): allow doing other queries and such.
+    qbuilder = org.elasticsearch.index.query.xcontent.QueryStringQueryBuilder.new(query_string)
+    @prep.setQuery(qbuilder)
+    return self
+  end # def query
+
+  # Add a histogram facet to this query. Can be invoked multiple times.
+  public
+  def histogram(field, interval, name=nil)
+    if name.nil?
+      # TODO(sissel): How do we expose the name of the histogram?
+      name = "#{field}_#{interval}"
+    end
+    # TODO(sissel): Support 'global' ?
+    builder = org.elasticsearch.search.facet.histogram.HistogramFacetBuilder.new(name)
+    builder.field(field)
+    builder.interval(interval)
+    @prep.addFacet(builder)
+    return self
+  end # def histogram
+
+  public
+  def limit(size)
+    @prep.setSize(size)
+    return self
+  end
+
+  public
+  def offset(from)
+    @prep.setFrom(from)
+    return self
+  end
+end # class ElasticSearch::SearchRequest

metadata

@@ -1,26 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-elasticsearch
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 0
-    - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
-  - Jordan Sissel
+- Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -08:00
+date: 2011-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: ...
 email: 
-  - jls@semicomplete.com
+- jls@semicomplete.com
 executables: []
 
 extensions: []
@@ -28,44 +24,41 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - lib/jruby-elasticsearch.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 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: JRuby API for ElasticSearch using the native ES Java API