rsolr-cloud-lw 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8d5a6f0c5dc0b14ed1447b055ed562cf7862cd7ed9c3912bb6f662242159d0
-  data.tar.gz: 70260d0cb6d8565f5f55e393dc31e12fd3609e714ed59d4de52929315f17b00d
+  metadata.gz: 338ad609dcb7e15e561b387d16a77e1399bc3458d81366643e3a045e6c841253
+  data.tar.gz: 1c019ca48edb2f7745d079b08ff5ee3f8a4ebaf26e8aaf9d2fa031c87cf278e5
 SHA512:
-  metadata.gz: 16c47852e31bcb22e5c90e396faa04b7b5914959bf1fcc6115ddc4ffa24746859bce28b51e54e48edc8642454381c4906ae69732900d3ee1e1817a91023e42d4
-  data.tar.gz: 05222647c3f9e320452b8445cde36b96f63dc220d72577b27131f459ca181660a92f617fbe7c57886d5275856c10bee7c511f1a7232d3ba390adde7225d8e6be
+  metadata.gz: ac748b9607791d83566af7c1f8403daa62576ce858fee1a5804748ff5b9032d693b06a6d7564fce984d24fc07d14d8eaed1fb004473d1a2abf9e868fefdf4699
+  data.tar.gz: 6d0142a79f555b4e294de0502bee029ddf613deb56bf05fb96bc08cac31317d9af5ede1acad67c33853b5516a8dd7ded47f5d35242f748e86f6c2c2a9fc025e8

data/lib/rsolr/cloud/connection.rb

@@ -7,9 +7,10 @@ module RSolr
       ZNODE_LIVE_NODES = '/live_nodes'.freeze
       ZNODE_CLUSTER_PROPS = '/clusterprops.json'.freeze
 
-      def initialize(zk)
+      def initialize(zk, options = {})
         super()
         @zk = zk
+        @options = options
         init_url_scheme
         init_live_node_watcher
       end
@@ -52,11 +53,22 @@ module RSolr
         synchronize do
           @live_nodes = []
           @zk.children(ZNODE_LIVE_NODES, watch: true).each do |node|
-            # "/" between host_and_port part of url and context is replaced with "_" in ZK
-            @live_nodes << @url_scheme + '://' + node.tr('_', '/')
+            @live_nodes << node_url(node)
           end
         end
       end
+
+      def node_url(node)
+        # "/" between host_and_port part of url and context is replaced with "_" in ZK
+        u = node.tr('_', '/')
+        # add basic auth credentials in the form of "http://user:pass@host"
+        if @options[:user] && @options[:password]
+          u = @options[:user] + ':' + @options[:password] + '@' + u
+        end
+        # add url scheme
+        u = @url_scheme + '://' + u
+        u
+      end
     end
   end
 end

data/lib/rsolr/cloud/version.rb

@@ -1,5 +1,5 @@
 module Rsolr
   module Cloud
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/spec/rsolr/cloud/connection_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe RSolr::Cloud::Connection do
   before do
     @zk_in_solr = ZK.new
     delete_with_children(@zk_in_solr, '/live_nodes')
+    delete_with_children(@zk_in_solr, '/clusterprops.json')
     wait_until(10) do
       !@zk_in_solr.exists?('/live_nodes')
     end
@@ -67,6 +68,15 @@ RSpec.describe RSolr::Cloud::Connection do
        'http://192.168.1.24:8983/solr'].sort)
   end
 
+  it 'should use basic auth.' do
+    @subject = RSolr::Cloud::Connection.new @zk, :user => 'user1', :password => 'pass1'
+    expect(@subject.instance_variable_get(:@live_nodes).sort).to eq(
+      ['http://user1:pass1@192.168.1.21:8983/solr',
+       'http://user1:pass1@192.168.1.22:8983/solr',
+       'http://user1:pass1@192.168.1.23:8983/solr',
+       'http://user1:pass1@192.168.1.24:8983/solr'].sort)
+  end
+
   it 'should obey url scheme.' do
     @zk_in_solr.create('/clusterprops.json', '{"urlScheme": "https"}')
     @subject = RSolr::Cloud::Connection.new @zk

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr-cloud-lw
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Shintaro Kimura
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement