solrb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f653429c9d04cf698507f5a295d6163704bebce83e28af6d37e72c68579218
-  data.tar.gz: '0118530a85c2a43f534227e7494482109b38b6bc197a14cccf03e1672dba2fe1'
+  metadata.gz: e9ae1ed7f5931da9955de331a59ca5c10598882b38e137136464a136c9b9b079
+  data.tar.gz: 91b33fad87d4bc4b286d591a0b2c91d1c51a63e59e9a53f9cc8e8891592fba87
 SHA512:
-  metadata.gz: d0ceb6776fad084292047ac498f7112834369526e67a55aa6404fa8c44a9eaba181325a940c84189f09434f020a463509bf0a9d9085ef17784b5df562f3e5fa2
-  data.tar.gz: e1340426003c2ab5813f252ea71e358cd87c88ad8c3364894e9a9650ea0b469f34299429c439564db7593b7fb129d605b252c6ef8370b859bbd5f6e6e41cc772
+  metadata.gz: 1539610c599f2493f8b3d6f0fd0c9b926b69032a2bffc0b0519aaf73c0e5175d63196657893452ce11b147a45243e648c683983049e0f685503be21ec6d60506
+  data.tar.gz: 8d059163628f2c9220a467d6cada61e7b26cb088cc2db82d6b02f14836875f6089e5eb001de0d9dea8f3a74f92eb498bd26ac84a54e85901b7feefadc17b7b62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solrb (0.2.1)
+    solrb (0.2.2)
       addressable
       faraday
 

data/lib/solr/commands.rb

@@ -5,20 +5,24 @@ require 'solr/data_import/request'
 
 module Solr
   module Commands
-    def commit
-      Solr::Commit::Request.new.run
+    def commit(open_searcher: true, runner_options: nil)
+      Solr::Commit::Request.new.run(open_searcher: open_searcher,
+                                    runner_options: runner_options)
     end
 
-    def delete_by_id(id, commit: false)
-      Solr::Delete::Request.new(id: id).run(commit: commit)
+    def delete_by_id(id, commit: false, runner_options: nil)
+      request = Solr::Delete::Request.new(id: id)
+      request.run(commit: commit, runner_options: runner_options)
     end
 
-    def delete_by_query(query, commit: false)
-      Solr::Delete::Request.new(query: query).run(commit: commit)
+    def delete_by_query(query, commit: false, runner_options: nil)
+      request = Solr::Delete::Request.new(query: query)
+      request.run(commit: commit, runner_options: runner_options)
     end
 
-    def data_import(params)
-      Solr::DataImport::Request.new(params).run
+    def data_import(params, runner_options: nil)
+      request = Solr::DataImport::Request.new(params)
+      request.run(runner_options: runner_options)
     end
   end
 end

data/lib/solr/commit/request.rb

@@ -3,9 +3,22 @@ module Solr
     class Request
       PATH = '/update'.freeze
 
-      def run
-        http_request = Solr::Request::HttpRequest.new(path: PATH, url_params: { commit: true }, method: :post)
-        Solr::Request::Runner.call(request: http_request)
+      def run(open_searcher: true, runner_options: nil)
+        http_request = build_http_request(open_searcher)
+        options = default_runner_options.merge(runner_options || {})
+        Solr::Request::Runner.call(request: http_request, **options)
+      end
+
+      private
+
+      def default_runner_options
+        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+      end
+
+      def build_http_request(open_searcher)
+        Solr::Request::HttpRequest.new(path: PATH,
+                                       url_params: { commit: true, openSearcher: open_searcher },
+                                       method: :post)
       end
     end
   end

data/lib/solr/data_import/request.rb

@@ -1,5 +1,3 @@
-require 'solr/request/first_shard_leader_node_selection_strategy'
-
 module Solr
   module DataImport
     class Request
@@ -14,13 +12,16 @@ module Solr
       # We want to make sure we send every dataimport request to the same node because this same class
       # could be used to start a dataimport and to get dataimport progress data afterwards.
       # To make it consistent we will send dataimport requests only to the first shard leader replica
-      def run
+      def run(runner_options: nil)
         http_request = Solr::Request::HttpRequest.new(path: PATH, url_params: params, method: :get)
-        Solr::Request::Runner.call(request: http_request, node_selection_strategy: build_node_selection_strategy)
+        options = default_runner_options.merge(runner_options || {})
+        Solr::Request::Runner.call(request: http_request, **options)
       end
 
-      def build_node_selection_strategy
-        Solr::Request::FirstShardLeaderNodeSelectionStrategy
+      private
+
+      def default_runner_options
+        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
       end
     end
   end

data/lib/solr/delete/request.rb

@@ -12,15 +12,23 @@ module Solr
         @delete_command = { delete: options }
       end
 
-      def run(commit: false)
+      def run(commit: false, runner_options: nil)
         http_request = build_http_request(commit)
-        Solr::Request::Runner.call(request: http_request)
+        options = default_runner_options.merge(runner_options || {})
+        Solr::Request::Runner.call(request: http_request, **options)
       end
 
       private
 
+      def default_runner_options
+        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+      end
+
       def build_http_request(commit)
-        Solr::Request::HttpRequest.new(path: PATH, body: delete_command, url_params: { commit: commit }, method: :post)
+        Solr::Request::HttpRequest.new(path: PATH,
+                                       body: delete_command,
+                                       url_params: { commit: commit },
+                                       method: :post)
       end
 
       def validate_delete_options!(options)

data/lib/solr/errors/solr_connection_failed_error.rb

@@ -3,7 +3,7 @@ module Solr
     class SolrConnectionFailedError < StandardError
       def initialize(solr_urls)
         message = <<~MESSAGE
-          Could not connection to any available solr instance:
+          Could not connect to any available solr instance:
           #{solr_urls.join(', ')}
         MESSAGE
         super(message)

data/lib/solr/indexing/request.rb

@@ -1,6 +1,3 @@
-require 'solr/request/http_request'
-require 'solr/request/leader_node_selection_strategy'
-
 module Solr
   module Indexing
     class Request
@@ -12,14 +9,18 @@ module Solr
         @documents = documents
       end
 
-      def run(commit: false, options: {})
+      def run(commit: false, runner_options: nil)
         http_request = build_http_request(commit)
-        runner_options = { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
-        Solr::Request::Runner.call(request: http_request, **runner_options.merge(options))
+        options = default_runner_options.merge(runner_options || {})
+        Solr::Request::Runner.call(request: http_request, **options)
       end
 
       private
 
+      def default_runner_options
+        { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+      end
+
       def build_http_request(commit)
         Solr::Request::HttpRequest.new(path: PATH, body: documents, url_params: { commit: commit }, method: :post)
       end

data/lib/solr/request/default_node_selection_strategy.rb

@@ -1,16 +1,6 @@
 module Solr
   module Request
-    class DefaultNodeSelectionStrategy
-      attr_reader :collection_name
-
-      def self.call(collection_name)
-        new(collection_name).call
-      end
-
-      def initialize(collection_name)
-        @collection_name = collection_name
-      end
-
+    class DefaultNodeSelectionStrategy < NodeSelectionStrategy
       def call
         Solr.active_nodes_for(collection: collection_name).shuffle
       end

data/lib/solr/request/first_shard_leader_node_selection_strategy.rb

@@ -1,18 +1,10 @@
 module Solr
   module Request
-    class FirstShardLeaderNodeSelectionStrategy
-      def self.call(collection_name)
-        new(collection_name).call
-      end
-
-      def initialize(collection_name)
-        @collection_name = collection_name
-      end
-
+    class FirstShardLeaderNodeSelectionStrategy < NodeSelectionStrategy
       def call
-        return [solr_url] unless Solr.cloud_enabled?
-
-        ([first_shard_leader_replica_node_for(collection: @collection_name)] + solr_cloud_active_nodes_urls.shuffle).flatten.uniq
+        leader = first_shard_leader_replica_node_for(collection: collection_name)
+        replicas = solr_cloud_active_nodes_urls.shuffle
+        ([leader] + replicas).flatten.uniq
       end
 
       private
@@ -25,7 +17,7 @@ module Solr
       end
 
       def solr_cloud_active_nodes_urls
-        Solr.active_nodes_for(collection: @collection_name)
+        Solr.active_nodes_for(collection: collection_name)
       end
     end
   end

data/lib/solr/request/leader_node_selection_strategy.rb

@@ -1,18 +1,8 @@
 module Solr
   module Request
-    class LeaderNodeSelectionStrategy
-      def self.call(collection_name)
-        new(collection_name).call
-      end
-
-      def initialize(collection_name)
-        @collection_name = collection_name
-      end
-
+    class LeaderNodeSelectionStrategy < NodeSelectionStrategy
       def call
-        return [solr_url] unless Solr.cloud_enabled?
-
-        [leader_replica_node_for(collection: @collection_name)]
+        [leader_replica_node_for(collection: collection_name)]
       end
 
       private

data/lib/solr/request/node_selection_strategy.rb

@@ -0,0 +1,19 @@
+module Solr
+  module Request
+    class NodeSelectionStrategy
+      attr_reader :collection_name
+
+      def self.call(collection_name)
+        new(collection_name).call
+      end
+
+      def initialize(collection_name)
+        @collection_name = collection_name
+      end
+
+      def call
+        raise "Not implemented"
+      end
+    end
+  end
+end

data/lib/solr/request/runner.rb

@@ -1,4 +1,7 @@
+require 'solr/request/node_selection_strategy'
 require 'solr/request/default_node_selection_strategy'
+require 'solr/request/first_shard_leader_node_selection_strategy'
+require 'solr/request/leader_node_selection_strategy'
 require 'solr/errors/solr_query_error'
 require 'solr/errors/solr_connection_failed_error'
 require 'solr/errors/no_active_solr_nodes_error'

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/solr.rb

@@ -9,6 +9,7 @@ require 'solr/document'
 require 'solr/document_collection'
 require 'solr/grouped_document_collection'
 require 'solr/response'
+require 'solr/request/http_request'
 require 'solr/request/runner'
 require 'solr/query/request'
 require 'solr/indexing/document'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Adriano Luz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -239,6 +239,7 @@ files:
 - lib/solr/request/first_shard_leader_node_selection_strategy.rb
 - lib/solr/request/http_request.rb
 - lib/solr/request/leader_node_selection_strategy.rb
+- lib/solr/request/node_selection_strategy.rb
 - lib/solr/request/runner.rb
 - lib/solr/response.rb
 - lib/solr/response/header.rb