solrb 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71788f83e115a345f449b9acb74eee56c3eb539a0b0a479277f1802616bec583
-  data.tar.gz: b531dfec715fd83ea33ee2bf38591e2beddd672463e78b136534dbbc0f14c2a3
+  metadata.gz: f60f6a0571ce8fd909c4fd286f93ff5f57b6874597bc5980207eb97f6d43438f
+  data.tar.gz: df632f68830e1ffb178fd5dfcc757e8f2a11a397fdc3f49c8da112d0e076543b
 SHA512:
-  metadata.gz: bb11372f134addee39b1fa7cb33ab9731aa1dee95658ba6e00697c199f085a358ed488b3238e56867bd00f90aa11d8e73b77a28137f18cde9010bbda4b5fbe0a
-  data.tar.gz: 6f209b29887ecb55dd7e90cc96ebca989ba322fb6694a08e14464079a26df49a07330cad34312f75d0656d728ce2c9a46afd6aa64518a09efe92e3336fc1c620
+  metadata.gz: a363f5c19f5cbb71cdbd24bb1387f93c7c9b7003fb1dac1f1dd0d538052fe2f7f5de333ae4f8208d2533acbc53d92ee38e2d4ad975022ae6456f04c33b9cf01d
+  data.tar.gz: b3fd3713b0f78420ee9491bbc2ea930b3aed58885af7623cf7475efe703d477f200e903282473088bb78014fa98d6ad897c7a028a7b422016fd264bd582c3694

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

data/README.md

@@ -219,6 +219,21 @@ end
   request.run(page: 1, page_size: 10)
 ```
 
+Default sorting logic is following: nulls last, not-nulls first.
+
+```ruby
+  fields = [
+    Solr::Query::Request::FieldWithBoost.new(field: :name)
+  ]
+  sort_fields = [
+    Solr::Query::Request::Sorting::Field.new(name: :is_featured, direction: :desc),
+    Solr::Query::Request::Sorting::Function.new(function: "score desc")
+  ]
+  request = Solr::Query::Request.new(search_term: 'term', fields: fields)
+  request.sorting = Solr::Query::Request::Sorting.new(fields: sort_fields)
+  request.run(page: 1, page_size: 10)
+```
+
 ## Query with grouping
 
 ```ruby

data/lib/solr/query/request.rb

@@ -8,6 +8,7 @@ require 'solr/query/request/grouping'
 require 'solr/query/request/boosting'
 require 'solr/query/request/spellcheck'
 require 'solr/query/request/sorting/field'
+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'

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

@@ -115,11 +115,7 @@ module Solr
 
         def add_sorting(solr_params)
           return solr_params if request.sorting.empty?
-          # sorting nulls last, not-nulls first
-          solr_sorting = request.sorting.fields.map do |sort_field|
-            solr_field = solarize_field(sort_field.name)
-            "exists(#{solr_field}) desc, #{solr_field} #{sort_field.direction}"
-          end
+          solr_sorting = request.sorting.fields.map(&:to_solr_s).join(', ')
           solr_params.merge(sort: solr_sorting)
         end
 

data/lib/solr/query/request/sorting/field.rb

@@ -3,12 +3,24 @@ module Solr
     class Request
       class Sorting
         class Field
+          include Solr::Support::SchemaHelper
+
           attr_reader :name, :direction
+
           def initialize(name:, direction:)
             @name = name
             @direction = direction
             freeze
           end
+
+          # sorting nulls last, not-nulls first
+          def to_solr_s
+            "exists(#{solr_field}) desc, #{solr_field} #{direction}"
+          end
+
+          def solr_field
+            solarize_field(name)
+          end
         end
       end
     end

data/lib/solr/query/request/sorting/function.rb

@@ -0,0 +1,20 @@
+module Solr
+  module Query
+    class Request
+      class Sorting
+        class Function
+          attr_reader :function
+          
+          def initialize(function:)
+            @function = function
+            freeze
+          end
+
+          def to_solr_s
+            function
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Adriano Luz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -217,6 +217,7 @@ files:
 - lib/solr/query/request/runner.rb
 - lib/solr/query/request/sorting.rb
 - lib/solr/query/request/sorting/field.rb
+- lib/solr/query/request/sorting/function.rb
 - lib/solr/query/request/spellcheck.rb
 - lib/solr/query/response.rb
 - lib/solr/query/response/facet_value.rb