elasticated 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8153fc5ed863fc035edd819e032298c140942d
-  data.tar.gz: b92fbd97b92746e57982ae8d053214242986b239
+  metadata.gz: 0c21bce40f279a26bfc18215caed1f0e2869584d
+  data.tar.gz: b6b33eabf8cb3ea40a848b4ba012201c630c6b2b
 SHA512:
-  metadata.gz: 3455584f5b597ec4c21df45378ee2f23f0694f6129bb40d0b3392bfba3e8efeeb4582f30ee636fc716bc2a72ede184b0b37e40af8665c3f78890279f00387b53
-  data.tar.gz: eccb09df3c2ab43a38e795c7d063b4a36551652053f821be0304dfc3c60e5456e18b00f7d2a0e15986f8192c53e574e9876049d9fb309aa0f0299ae2db156e07
+  metadata.gz: 1f6b73bf87e1c6da918a9dcbe88ddec3f7cc2a0fa1dbe49133c3170908f58ecf095a197082846506b5dc8e23ef3be5cfd5be7f4a86bbf48f9196f98d6f3d2fd6
+  data.tar.gz: 51fdff057ce01cce2113d448c7426ec89fb0304e76b7fe646f28071730118b17b5805e1779b0843f153200bcf24d9e0a54e0fc68973a3c8aeba548a2580e765e

data/lib/elasticated/query.rb

@@ -53,16 +53,23 @@ module Elasticated
     end
     alias_method :offset, :from
 
-    def sort(field, method=nil)
+    def custom_sort(custom_hash)
       self._sort ||= Array.new
-      _sort << { field => { order: method || :asc } }
+      _sort << custom_hash
       self
     end
 
+    def sort(field, method=nil)
+      custom_sort(field => { order: method || :asc })
+    end
+    alias_method :sort_by_field, :sort
+
+    def sort_by_script(script_hash)
+      custom_sort(_script: script_hash)
+    end
+
     def sort_randomly
-      self._sort ||= Array.new
-      _sort << { _script: { script: "Math.random()", type: "number" } }
-      self
+      sort_by_script(script: "Math.random()", type: "number")
     end
 
     def source(*fields_array)

data/lib/version.rb

@@ -1,9 +1,13 @@
 module Elasticated
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end
 
 # Changelog
 
+# 2.4.0
+# Ahora se puede ordenar un search por un campo, script o hash custom
+
+# 2.3.0
 # Ahora DateFieldDelimiter admite multiples fechas declaradas en un TermsCondition
 
 # 2.2.0

data/spec/query_spec.rb

@@ -67,6 +67,16 @@ module Elasticated
 
     describe "the build method (over other fields)" do
 
+      it "should build a 'match_all' query sorted by a custom hash" do
+        my_custom_hash = { any_key: 'any_value' }
+        q.custom_sort(my_custom_hash)
+        expected_result = {
+          query: { match_all: {} },
+          sort: [my_custom_hash]
+        }
+        expect(q.build).to eq expected_result
+      end
+
       it "should build a 'match_all' query sorted by a single field" do
         q.sort :field
         expected_result = {
@@ -94,6 +104,16 @@ module Elasticated
         expect(q.build).to eq expected_result
       end
 
+      it "should build a 'match_all' query sorted by a custom script" do
+        my_script_hash = { script: "my_script", type: "my_type" }
+        q.sort_by_script(my_script_hash)
+        expected_result = {
+          query: { match_all: {} },
+          sort: [ { _script: my_script_hash } ]
+        }
+        expect(q.build).to eq expected_result
+      end
+
       it "should build a 'match_all' query sorted randomly" do
         q.sort_randomly
         expected_result = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler