solrb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3637c02593d33983f84a2551af954a36f29b5699ad027eaae39ba2b31f7337f8
-  data.tar.gz: 2b39d8bafafed8602c1574b3684ebafa78e834bb0fc2b4d14e5d93fe4c3fa82b
+  metadata.gz: a5f653429c9d04cf698507f5a295d6163704bebce83e28af6d37e72c68579218
+  data.tar.gz: '0118530a85c2a43f534227e7494482109b38b6bc197a14cccf03e1672dba2fe1'
 SHA512:
-  metadata.gz: 6c9725930a7d4386b71c7b8ce64e5add5e71487db16fbe47754420f0c7c6c65df7b6e634a0362b0ceb8d756dae7d3122cf07bf5890f79a582de7765267ad35d0
-  data.tar.gz: 5e594b4c0ee42a206ec390694be47871192749244be79e6f99b236faf0b52908981bf7ffc6a8b0294409a6b3cb7b1ce32874e49f0a2d668fe20933db1539111e
+  metadata.gz: d0ceb6776fad084292047ac498f7112834369526e67a55aa6404fa8c44a9eaba181325a940c84189f09434f020a463509bf0a9d9085ef17784b5df562f3e5fa2
+  data.tar.gz: e1340426003c2ab5813f252ea71e358cd87c88ad8c3364894e9a9650ea0b469f34299429c439564db7593b7fb129d605b252c6ef8370b859bbd5f6e6e41cc772

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    solrb (0.1.9)
+    solrb (0.2.1)
       addressable
       faraday
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     byebug (10.0.2)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     jaro_winkler (1.5.1)
     json (2.1.0)

data/README.md

@@ -421,8 +421,8 @@ If you want to run it locally, you can either use  [CircleCI CLI](https://circle
 or do a completely manual setup (for up-to-date steps see circleci config)
 
 ```sh
-docker pull solr:7.4.0
-docker run -it --name test-solr -p 8983:8983/tcp -t solr:7.4.0
+docker pull solr:7.7.1
+docker run -it --name test-solr -p 8983:8983/tcp -t solr:7.7.1
 # create a core
 curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=test-core&configSet=_default'
 # disable field guessing

data/lib/solr/indexing/request.rb

@@ -1,4 +1,5 @@
 require 'solr/request/http_request'
+require 'solr/request/leader_node_selection_strategy'
 
 module Solr
   module Indexing
@@ -11,9 +12,10 @@ module Solr
         @documents = documents
       end
 
-      def run(commit: false)
+      def run(commit: false, options: {})
         http_request = build_http_request(commit)
-        Solr::Request::Runner.call(request: http_request)
+        runner_options = { node_selection_strategy: Solr::Request::LeaderNodeSelectionStrategy }
+        Solr::Request::Runner.call(request: http_request, **runner_options.merge(options))
       end
 
       private

data/lib/solr/request/leader_node_selection_strategy.rb

@@ -0,0 +1,28 @@
+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
+
+      def call
+        return [solr_url] unless Solr.cloud_enabled?
+
+        [leader_replica_node_for(collection: @collection_name)]
+      end
+
+      private
+
+      def leader_replica_node_for(collection:)
+        shards = Solr.shards_for(collection: collection)
+        return unless shards
+        first_shard_name = shards.sort.first
+        Solr.leader_replica_node_for(collection: collection, shard: first_shard_name)
+      end
+    end
+  end
+end

data/lib/solr/request/runner.rb

@@ -56,10 +56,7 @@ module Solr
 
       def solr_cloud_collection_urls
         urls = node_selection_strategy.call(collection_name)
-        return unless urls
-        urls.map do |url|
-          File.join(url, collection_name.to_s)
-        end
+        urls&.map { |u| File.join(u, collection_name.to_s) }
       end
 
       def collection_name

data/lib/solr/support/url_helper.rb

@@ -10,7 +10,7 @@ module Solr
         full_uri
       end
 
-      def build_request_url(url:,path:, url_params: {})
+      def build_request_url(url:, path:, url_params: {})
         action_url = File.join(url, path).chomp('/')
         full_uri = Addressable::URI.parse(action_url)
         full_uri.query_values = url_params if url_params && url_params.any?

data/lib/solr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Adriano Luz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -238,6 +238,7 @@ files:
 - lib/solr/request/default_node_selection_strategy.rb
 - 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/runner.rb
 - lib/solr/response.rb
 - lib/solr/response/header.rb
@@ -273,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Solr Ruby client with a nice object-oriented API