jruby-elasticsearch 0.0.15 → 0.0.16

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e6bd7db81e8b76fe90b5eb8a2a6b1cae7b37d7f4
+  data.tar.gz: 78cca76d3270554c79f8933457707ef52042d94a
+SHA512:
+  metadata.gz: d43955a359b80bdc46751c5ad4d639b7dc1b36e202734e9afc40a18aac42172ea1756408bf2c9eca565a54073241eb550eb1467ab03a5265dd64c718a01e149e
+  data.tar.gz: f746bcb7c1b692f32e75aa731bb8960b43869989d26410d4897ed159faeb2923de8d427df21ee8f33426d630878be9e87b5039c5e371dcaf24021bd0a2ff2183

data/lib/jruby-elasticsearch/client.rb

@@ -4,6 +4,8 @@ require "jruby-elasticsearch/indexrequest"
 require "jruby-elasticsearch/searchrequest"
 
 class ElasticSearch::Client
+  class Error < StandardError; end
+  class ConfigurationError < Error; end
 
   # Creates a new ElasticSearch client.
   #
@@ -15,55 +17,64 @@ class ElasticSearch::Client
   # :cluster => "clustername" - the cluster name to use
   # :node_name => "node_name" - the node name to use when joining the cluster
   def initialize(options={})
-    builder = org.elasticsearch.node.NodeBuilder.nodeBuilder
-    builder.client(true)
+    builder = org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder
+    builder.put("node.client", true)
 
     # 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?
-        port = (options[:port] or "9300")
-        builder.settings.put("discovery.zen.ping.multicast.enabled", false)
-        if port =~ /^\d+-\d+$/
-          # port ranges are 'host[port1-port2]' according to 
-          # http://www.elasticsearch.org/guide/reference/modules/discovery/zen/
-          # However, it seems to only query the first port.
-          # So generate our own list of unicast hosts to scan.
-          range = Range.new(*port.split("-"))
-          hosts = range.collect { |p| "#{options[:host]}:#{p}" }.join(",")
-          builder.settings.put("discovery.zen.ping.unicast.hosts", hosts)
-        else
-          # only one port, not a range.
-          puts "PORT SETTINGS #{options[:host]}:#{port}"
-          builder.settings.put("discovery.zen.ping.unicast.hosts",
-                               "#{options[:host]}:#{port}")
-        end
+    builder.put("http.enabled", false)
+
+    # Use unicast discovery a host is given
+    if !options[:host].nil?
+      port = (options[:port] or "9300")
+      builder.put("discovery.zen.ping.multicast.enabled", false)
+      if port =~ /^\d+-\d+$/
+        # port ranges are 'host[port1-port2]' according to 
+        # http://www.elasticsearch.org/guide/reference/modules/discovery/zen/
+        # However, it seems to only query the first port.
+        # So generate our own list of unicast hosts to scan.
+        range = Range.new(*port.split("-"))
+        hosts = range.collect { |p| "#{options[:host]}:#{p}" }.join(",")
+        builder.put("discovery.zen.ping.unicast.hosts", hosts)
+      else
+        # only one port, not a range.
+        puts "PORT SETTINGS #{options[:host]}:#{port}"
+        builder.put("discovery.zen.ping.unicast.hosts",
+                             "#{options[:host]}:#{port}")
       end
+    end
 
-      if options[:bind_host]
-        builder.settings.put('network.host', options[:bind_host])
-      end
+    if options[:bind_host]
+      builder.put('network.host', options[:bind_host])
+    end
 
-      if options[:node_name]
-        builder.settings.put('node.name', options[:node_name])
-      end
+    if options[:bind_port]
+      builder.put('transport.tcp.port', options[:bind_port])
+    end
 
-      if !options[:cluster].nil?
-        builder.clusterName(options[:cluster])
-      end
-      @node = builder.node
-      @client = @node.client
+    if options[:node_name]
+      builder.put('node.name', options[:node_name])
+    end
+
+    if !options[:cluster].nil?
+      builder.put('cluster.name', options[:cluster])
     end
 
+    case options[:type]
+      when :transport 
+        @client = org.elasticsearch.client.transport.TransportClient.new(builder.build)
+        if options[:host]
+          @client.addTransportAddress(
+            org.elasticsearch.common.transport.InetSocketTransportAddress.new(
+              options[:host], options[:port] || 9300
+            )
+          )
+        else
+          raise ConfigurationError, "When using a transport client, you must give a :host setting to ElasticSearch::Client.new. Otherwise, I don't know what elasticsearch servers talk to."
+        end
+      else
+        nodebuilder = org.elasticsearch.node.NodeBuilder.nodeBuilder
+        @client = nodebuilder.settings(builder).node.client
+    end
   end # def initialize
 
   # Get a new BulkRequest for sending multiple updates to elasticsearch in one

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jruby-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.0.15
-  prerelease: 
+  version: 0.0.16
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies: []
-description: ! '...'
+description: '...'
 email:
 - jls@semicomplete.com
 executables: []
@@ -20,38 +19,37 @@ extra_rdoc_files: []
 files:
 - lib/jruby-elasticsearch.rb
 - lib/jruby-elasticsearch/indexrequest.rb
-- lib/jruby-elasticsearch/searchrequest.rb
-- lib/jruby-elasticsearch/actionlistener.rb
-- lib/jruby-elasticsearch/namespace.rb
 - lib/jruby-elasticsearch/client.rb
+- lib/jruby-elasticsearch/namespace.rb
 - lib/jruby-elasticsearch/request.rb
 - lib/jruby-elasticsearch/bulkstream.rb
 - lib/jruby-elasticsearch/bulkrequest.rb
+- lib/jruby-elasticsearch/searchrequest.rb
+- lib/jruby-elasticsearch/actionlistener.rb
 - test/test_integration.rb
 homepage: https://github.com/jordansissel/jruby-elasticsearch
 licenses:
 - Apache License (2.0)
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
+specification_version: 4
 summary: JRuby API for ElasticSearch using the native ES Java API
 test_files: []