solrb 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea33f82de9a9b3bb71a87821df6be65e39e1156704ed713c556752781257012a
-  data.tar.gz: 8b06c57da1f0948858a1ea97c8adc9e318e53f5288549eb80236d1e1c6e54a88
+  metadata.gz: 890bdddf977e6d555f4863777d80d58118d58be0230f65c1e159149e4943ec4b
+  data.tar.gz: 64659a76d63f8cdaeaf88c295f72215620d5a2fadad002c6d77febc1c319fdc1
 SHA512:
-  metadata.gz: c7b5cd5683b89b389d9d39a8e026a0483a2f9daa6c435a967bc93723150d8fddfc3f804496fece068fb06d9fd2732892fbe9305ca2b3876180f8d8433f270a36
-  data.tar.gz: bf7ca512022d6edbf347c6d0d2697aa90b1d1fc610d6dd8674cc5d78c30ce7e513f463538877857624ae002826e0fa0c3582712c53cd46835c77170a0e960ada
+  metadata.gz: f8d4c6bc82c7948f01e876ce8e21c0ea3239c4136ed6e1e7706fbc8ec612e76446383c8ceb6ffc24fc903c666a13251eaddaa509e5b755c4907863be805e447d
+  data.tar.gz: fcf165ac576f8facd86f4df33a1a9cd6557d20b029ea92477b543b3d63e17eec5d2472c6ca9e11778073448ec9c539c2330da96fbb03695e5de2f266b320c71d

data/README.md

@@ -399,6 +399,18 @@ Example of usage:
   )
 ```
 
+## Query with shards.preference
+
+```ruby
+  shards_preference = Solr::Query::Request::ShardsPreference.new(
+    properties: [
+      Solr::Query::Request::ShardsPreferences::Property.new(name: 'replica.type', value: 'PULL')
+    ]
+  )
+  request = Solr::Query::Request.new(search_term: 'term', shards_preference: shards_preference)
+  request.run(page: 1, page_size: 10)
+```
+
 ## Field list
 
 

data/lib/solr/configuration.rb

@@ -73,14 +73,7 @@ module Solr
     end
 
     def core_name_from_solr_url_env
-      full_solr_core_uri = URI.parse(ENV['SOLR_URL'])
-      core_name = full_solr_core_uri.path.gsub('/solr', '').delete('/')
-
-      if !core_name || core_name == ''
-        raise Solr::Errors::CouldNotInferImplicitCoreName
-      end
-
-      core_name
+      Solr::Support::UrlHelper.core_name_from_url(ENV['SOLR_URL'])
     end
 
     def build_env_url_core_config(name: nil)

data/lib/solr/errors/could_not_detect_endpoint_in_url.rb

@@ -0,0 +1,14 @@
+module Solr
+  module Errors
+    class CouldNotDetectEndpointInUrl < StandardError
+      MESSAGE = '
+        TODO: Add message
+
+      '.freeze
+
+      def initialize
+        super(MESSAGE)
+      end
+    end
+  end
+end

data/lib/solr/query/request/edismax_adapter.rb

@@ -15,6 +15,7 @@ module Solr
         RERANK_QUERY = :rq
         QUERY_OPERATOR = :'q.op'
         JSON_FACET = :'json.facet'
+        SHARDS_PREFERENCE = :'shards.preference'
 
         attr_reader :request
 
@@ -36,6 +37,7 @@ module Solr
           solr_params = add_rerank_query(solr_params)
           solr_params = add_phrase_slop(solr_params)
           solr_params = add_query_operator(solr_params)
+          solr_params = add_shards_preference(solr_params)
           solr_params
         end
 
@@ -52,7 +54,7 @@ module Solr
           solr_params[FILTER_QUERY] = filters
           solr_params
         end
-        
+
         def add_facets(solr_params)
           return solr_params if Array(request.facets).empty?
           solr_params[JSON_FACET] = request.facets.map(&:to_solr_h).reduce(&:merge).to_json
@@ -156,6 +158,12 @@ module Solr
           solr_params[QUERY_OPERATOR] = request.query_operator
           solr_params
         end
+
+        def add_shards_preference(solr_params)
+          return solr_params if request.shards_preference.empty?
+          solr_params[SHARDS_PREFERENCE] = request.shards_preference.to_solr_s
+          solr_params
+        end
       end
     end
   end

data/lib/solr/query/request/shards_preference.rb

@@ -0,0 +1,27 @@
+require 'solr/query/request/shards_preferences/property'
+
+module Solr
+  module Query
+    class Request
+      class ShardsPreference
+        attr_accessor :properties
+
+        def self.none
+          new
+        end
+
+        def initialize(properties: [])
+          @properties = properties
+        end
+
+        def empty?
+          properties.empty?
+        end
+
+        def to_solr_s
+          properties.map(&:to_solr_s).join(',')
+        end
+      end
+    end
+  end
+end

data/lib/solr/query/request/shards_preferences/property.rb

@@ -0,0 +1,21 @@
+module Solr
+  module Query
+    class Request
+      class ShardsPreferences
+        class Property
+          attr_reader :name, :value
+
+          def initialize(name:, value:)
+            @name = name
+            @value = value
+            freeze
+          end
+
+          def to_solr_s
+            "#{name}:#{value}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solr/query/request.rb

@@ -13,6 +13,7 @@ require 'solr/query/request/sorting/function'
 require 'solr/query/request/field_with_boost'
 require 'solr/query/request/or_filter'
 require 'solr/query/request/and_filter'
+require 'solr/query/request/shards_preference'
 require 'solr/query/handler'
 
 module Solr
@@ -21,7 +22,7 @@ module Solr
       attr_reader :search_term
       attr_accessor :filters, :query_fields, :field_list, :facets, :boosting, :debug_mode, :spellcheck,
                     :limit_docs_by_field, :phrase_slop, :query_operator
-      attr_writer :grouping, :sorting
+      attr_writer :grouping, :sorting, :shards_preference
 
       def initialize(search_term:, query_fields: [], field_list: Solr::Query::Request::FieldList.new, filters: [])
         @search_term = search_term
@@ -45,6 +46,10 @@ module Solr
         @sorting ||= Solr::Query::Request::Sorting.none
       end
 
+      def shards_preference
+        @shards_preference ||= Solr::Query::Request::ShardsPreference.none
+      end
+
       def to_h
         Solr::Query::Request::EdismaxAdapter.new(self).to_h
       end

data/lib/solr/support/url_helper.rb

@@ -33,6 +33,27 @@ module Solr
       def current_core
         Solr.current_core_config
       end
+
+      def core_name_from_url(url)
+        full_solr_core_uri = URI.parse(url)
+        core_name = full_solr_core_uri.path.gsub('/solr', '').delete('/')
+
+        if !core_name || core_name == ''
+          raise Solr::Errors::CouldNotInferImplicitCoreName
+        end
+
+        core_name
+      end
+
+      def solr_endpoint_from_url(url)
+        solr_endpoint = url[/(\A.+\/solr)/]
+
+        if !solr_endpoint || solr_endpoint == ''
+          raise Solr::Errors::CouldNotDetectEndpointInUrl
+        end
+
+        solr_endpoint
+      end
     end
   end
 end

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Adriano Luz
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -176,6 +176,7 @@ files:
 - lib/solr/document.rb
 - lib/solr/document_collection.rb
 - lib/solr/errors/ambiguous_core_error.rb
+- lib/solr/errors/could_not_detect_endpoint_in_url.rb
 - lib/solr/errors/could_not_infer_implicit_core_name.rb
 - lib/solr/errors/no_active_solr_nodes_error.rb
 - lib/solr/errors/solr_connection_failed_error.rb
@@ -216,6 +217,8 @@ files:
 - lib/solr/query/request/geo_filter.rb
 - lib/solr/query/request/grouping.rb
 - lib/solr/query/request/or_filter.rb
+- lib/solr/query/request/shards_preference.rb
+- lib/solr/query/request/shards_preferences/property.rb
 - lib/solr/query/request/sorting.rb
 - lib/solr/query/request/sorting/field.rb
 - lib/solr/query/request/sorting/function.rb