elasticband 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmE0MWFkZjBhOWEzNjY1ODgzZTkwZGIwMWE2YTc2OWVlZjUwZDc3NQ==
+    YTJlMTE0ZjI5Mjc0ODE5MjNkODU0YjgwNzlhYTI5M2JhOTM5ZGQzMQ==
   data.tar.gz: !binary |-
-    NDNlMGI1Y2VjNjA3ZGYyN2ViZDg2ODhkNzY5YjQ5OTFlMDRkODEyYw==
+    NzNmZTY1MzY0ZmZmNzFmM2Q3NGQwYjE1MjkwMzBhMDNiMjU3ZDQ1Ng==
 SHA512:
   metadata.gz: !binary |-
-    Yjg1MzQ3M2U4ZmY0YWZhNTVhZDVjOThiOGE3NTEwMGY2NWQ0ZDAxNTllODc3
-    ZThjZjQ0NDlmMzMwMDg0OWI4NjZhM2MxNjQ4ODQ1OTFiMTgyMmI5NmE0YmQ4
-    YTVlZGM1NGQzNDBhNTc4NDMzMGNlNThiMDE3YzJkNTRjY2Y0NDc=
+    MDdmYjljMDZmYWI3YTE3NmE2ODhmZGQyY2ZjOTAxMGUwOTQ0ZTYyOWY5M2Jl
+    MTdkNDYzYWQxZDA0ZDNmZmQ5ZWQ3OThjZjk0OWU3MWUxZmI2ZDA0OGM4MzU5
+    Yjk1NzIwOTRiMzM0ZGY4ODFmODgwMTUxODc1ZDIzNDc1YjVmMzQ=
   data.tar.gz: !binary |-
-    YWYyMmEzMzBhOWQ3Y2ZjZWY4YmVkMmFmODlhNTA0MWI2YWJmNjg4YmNjMGUx
-    OWQ2Njk4NTRkMGFlOTQzMmYyNGY1ZmQ4YzkyNGM3YjAzMmQyMzI0MTJkOWY2
-    YTViNWEwNTNlMWMzNmIzYWM5MTg3MTU4M2RiMjA5MjM4OGIwMWQ=
+    OTcyZGNkY2UyYTNhMWUxODk4N2EwMWJlZDg2YWUxMmI1NDdiZDU1NzkyY2Y4
+    MzY3YWJkNjBjOGYzYTdmOTkxODBmYjIwY2Q3YjQ3OTA0MDJlM2NhMjMxOWRk
+    MzhmYWViYjEyODhlOWFkYjE0YWQzMTE2MGRmZGVlODdiNTYyZTk=

data/lib/elasticband/filter/script.rb

@@ -0,0 +1,26 @@
+module Elasticband
+  class Filter
+    class Script < Filter
+      attr_accessor :script, :params
+
+      def initialize(script, params = {})
+        self.script = script
+        self.params = params
+      end
+
+      def to_h
+        return {} unless script
+
+        { script: { script: script }.merge(params_hash) }
+      end
+
+      private
+
+      def params_hash
+        return {} unless params.any?
+
+        { params: params }
+      end
+    end
+  end
+end

data/lib/elasticband/filter.rb

@@ -5,6 +5,7 @@ require 'elasticband/filter/range'
 require 'elasticband/filter/near'
 require 'elasticband/filter/term'
 require 'elasticband/filter/terms'
+require 'elasticband/filter/script'
 
 module Elasticband
   class Filter
@@ -24,6 +25,7 @@ module Elasticband
       # * `includes:` Filter the search results with a `Match` query.
       # * `range:` Filter the search results where the condition is on the given range.
       # * `near:` Filter the search results where the results are near a geo point.
+      # * `script:` Filter the search results where the results match the script.
       #
       # #### Examples
       # ```
@@ -41,19 +43,30 @@ module Elasticband
       #
       # Filter.parse(near: { latitude: 12, longitude: 34, distance: '5km' })
       # => { geo_distance: { location: { lat: 12, lon: 34 } }, distance: '5km' }
+      #
+      # Filter.parse(script: ['(param1 + param2) > 0', param1: 1, param2: 1])
+      # => { script: { script: '(param1 + param2) > 0', params: { param1: 1, param2: 1 } } }
       # ```
       def parse(options = {})
         return {} if options.blank?
 
-        filter = only_and_except_filters(options[:only], options[:except])
-        filter += includes_filter(options[:includes])
-        filter += range_filter(options[:range])
-        filter += near_filter(options[:near])
-        join_filters(filter).to_h
+        filters = map_filters(options)
+
+        join_filters(filters).to_h
       end
 
       private
 
+      def map_filters(options)
+        filters = only_and_except_filters(options[:only], options[:except])
+        filters += includes_filter(options[:includes])
+        filters += range_filter(options[:range])
+        filters += near_filter(options[:near])
+        filters += script_filter(options[:script])
+
+        filters
+      end
+
       def only_and_except_filters(only_options, except_options)
         parse_filters(only_options) + parse_filters(except_options).map { |f| Filter::Not.new(f) }
       end
@@ -80,6 +93,12 @@ module Elasticband
         [Filter::Near.new(options)]
       end
 
+      def script_filter(script_options)
+        return [] if script_options.blank?
+
+        [Filter::Script.new(*script_options)]
+      end
+
       def parse_filters(options)
         return [] if options.blank?
 

data/lib/elasticband/version.rb

@@ -1,3 +1,3 @@
 module Elasticband
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/filter/script_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+RSpec.describe Elasticband::Filter::Script do
+  describe '#to_h' do
+    context 'without params' do
+      subject { described_class.new('(param1 + param2) > 0').to_h }
+
+      it { is_expected.to eq(script: { script: '(param1 + param2) > 0' }) }
+    end
+
+    context 'with params' do
+      subject { described_class.new('(param1 + param2) > 0', param1: 1, param2: 1).to_h }
+
+      it { is_expected.to eq(script: { script: '(param1 + param2) > 0', params: { param1: 1, param2: 1 } }) }
+    end
+  end
+end

data/spec/filter_spec.rb

@@ -104,5 +104,12 @@ RSpec.describe Elasticband::Filter do
 
       it { is_expected.to eq(filter) }
     end
+
+    context 'with `:script` option' do
+      let(:options) { { script: ['(param1 + param2) > 0', param1: 1, param2: 1] } }
+      let(:filter) { { script: { script: '(param1 + param2) > 0', params: { param1: 1, param2: 1 } } } }
+
+      it { is_expected.to eq(filter) }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticband
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Glauber Campinho
@@ -127,6 +127,7 @@ files:
 - lib/elasticband/filter/not.rb
 - lib/elasticband/filter/query.rb
 - lib/elasticband/filter/range.rb
+- lib/elasticband/filter/script.rb
 - lib/elasticband/filter/term.rb
 - lib/elasticband/filter/terms.rb
 - lib/elasticband/query.rb
@@ -158,6 +159,7 @@ files:
 - spec/filter/not_spec.rb
 - spec/filter/query_spec.rb
 - spec/filter/range_spec.rb
+- spec/filter/script_spec.rb
 - spec/filter/term_spec.rb
 - spec/filter/terms_spec.rb
 - spec/filter_spec.rb