elasticband 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDhiZDVmMGVmOWE1ZTljZjcyM2VjNzFkNjg4NzVlNjY0YzM0OTU0MQ==
+    ZGRjZjQxZjYzZWIxYmM2MTNjODZkOTE5OTM4OGJhZjUyYmZlY2Q4Yw==
   data.tar.gz: !binary |-
-    MjkzYTEzMDkyZGQyZTliMTQ5MGI1ZDc5ZDE0ZGQ5MmYwY2RhNmU5MA==
+    MjIzZjRkY2YyMjU2ZGFkNWFlNDg2MWZmOGMwNTcyYzRkMTBhNWVhYg==
 SHA512:
   metadata.gz: !binary |-
-    ZmY3ZDY3YmY3ZWQ4NDQ5M2M2NjVlMTI4NzdhYThjODhlMGNlNjRhN2U3OWIx
-    YTU4YjMzODExYjNhNzExOTMxNzc5MGFmZjIwZDdlODk1NzRlOWE3NWQ4ZjNh
-    OWIyNTRiMmQ5ZTdiMzc3ZGE1Zjg5Mzk4Mjk5ZTUzZmFmN2ZmNjM=
+    ZGE5ZmU3YjkyYWM4NWY5MTBhNTVkMzE2NDI2ZWVmNWJlNDEyYmIyMjI1ZjMx
+    ZDFhZjQ2YTdkMGZjN2NkY2RmYzlhOTVmODcyYzJiNGUzYTc0MTE5MWI0OTVh
+    ZmFkZmZmYzk4NjBiNjBkMGU1ZWRhYmY4MzEyZmI3MWIwYjRjYjU=
   data.tar.gz: !binary |-
-    YjQ0ZTJkNTdlMDM3MDUzYTAwOTc5ODE5ZWY1MDU2YTVjMmRlMTA0NjIzOGIw
-    NWYwY2U1NzRjNGZlZmY0ZjljY2MwYTUxY2JhNTcwZDlkZWY2YmE4ZDlkNzE5
-    YWRiNjg1YmE1ZWNjYzc5Y2Q0MDkwM2ZkZDc0Y2U1ZTI3ODFlZTg=
+    Y2EyNWVjNDM1MDVlYzRiZGEwZjM2Y2EyNGUxNjliZDgyNDc2YzNhYWE1MThl
+    YTNlMGI5Y2JmNDVjNDA4OWVmODk5ZGUxZWM4ZDQ0ZWQzZjJlM2JiNDZmNTlm
+    N2NmMDFkOWFkMTgwMzEwZjE4ODBjOWQzNTc4NzZmZGY0ZjJjMTk=

data/lib/elasticband/filter/range.rb

@@ -0,0 +1,31 @@
+module Elasticband
+  class Filter
+    class Range < Filter
+      attr_accessor :field, :ranges
+
+      RANGES = %i(gt gteq lt lteq)
+
+      def initialize(field, ranges)
+        self.field = field.to_sym
+        self.ranges = permitted_ranges(ranges)
+      end
+
+      def to_h
+        { range: { field => parsed_ranges } }
+      end
+
+      def permitted_ranges(ranges)
+        ranges.keep_if { |key, _| RANGES.include?(key) }
+      end
+
+      def parsed_ranges
+        translated_range = ranges.dup
+
+        translated_range[:gte] = translated_range.delete(:gteq) if translated_range.key?(:gteq)
+        translated_range[:lte] = translated_range.delete(:lteq) if translated_range.key?(:lteq)
+
+        translated_range
+      end
+    end
+  end
+end

data/lib/elasticband/filter.rb

@@ -1,12 +1,13 @@
 require 'elasticband/filter/and'
 require 'elasticband/filter/not'
 require 'elasticband/filter/query'
+require 'elasticband/filter/range'
 require 'elasticband/filter/term'
 require 'elasticband/filter/terms'
 
 module Elasticband
   class Filter
-    PARSE_FILTERS = %i(only except includes)
+    PARSE_FILTERS = %i(only except includes range)
 
     def to_h
       { match_all: {} }
@@ -20,6 +21,7 @@ module Elasticband
       # * `only:` Filter the search results where the condition is `true`
       # * `except`: Filter the search results where the condition is `false`.
       # * `includes:` Filter the search results with a `Match` query.
+      # * `range:` Filter the search results where the condition is on the given range.
       #
       # #### Examples
       # ```
@@ -31,6 +33,9 @@ module Elasticband
       #
       # Filter.parse(includes: ['company', on: :description])
       # => { query: { match: { description: 'company' } } }
+      #
+      # Filter.parse(range: { companies_count: { gt: 1, gteq: 1, lt: 1, lteq: 1 } })
+      # => { range: { companies_count: { gt: 1, gte: 1, lt: 1, lte: 1 } } }
       # ```
       def parse(options = {})
         return {} if options.blank?
@@ -38,6 +43,7 @@ module Elasticband
         filter = parse_filters(options[:only])
         filter += parse_filters(options[:except]).map { |f| Filter::Not.new(f) }
         filter += parse_includes_filter(options[:includes])
+        filter += parse_range_filter(options[:range])
         join_filters(filter).to_h
       end
 
@@ -53,6 +59,12 @@ module Elasticband
         [Filter::Query.new(Elasticband::Query.parse(*includes_options))]
       end
 
+      def parse_range_filter(range_options)
+        return [] if range_options.blank?
+
+        [Filter::Range.new(range_options.keys.first, range_options.values.first)]
+      end
+
       def parse_filters(options)
         return [] if options.blank?
 

data/lib/elasticband/version.rb

@@ -1,3 +1,3 @@
 module Elasticband
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/filter/range_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+RSpec.describe Elasticband::Filter::Range do
+  describe '#to_h' do
+    subject { described_class.new(:field_name, options).to_h }
+
+    context 'with `:gt` option' do
+      let(:options) { { gt: 1 } }
+
+      it { is_expected.to eq(range: { field_name: { gt: 1 } }) }
+    end
+
+    context 'with `:gteq` option' do
+      let(:options) { { gteq: 1 } }
+
+      it { is_expected.to eq(range: { field_name: { gte: 1 } }) }
+    end
+
+    context 'with `:lt` option' do
+      let(:options) { { lt: 1 } }
+
+      it { is_expected.to eq(range: { field_name: { lt: 1 } }) }
+    end
+
+    context 'with `:lteq` option' do
+      let(:options) { { lteq: 1 } }
+
+      it { is_expected.to eq(range: { field_name: { lte: 1 } }) }
+    end
+  end
+
+  describe '#parsed_ranges' do
+    subject { described_class.new(:field_name, options).parsed_ranges }
+
+    context 'with `:gteq` option' do
+      let(:options) { { gteq: 1 } }
+
+      it { is_expected.to eq(gte: 1) }
+    end
+
+    context 'with `:lteq` option' do
+      let(:options) { { lteq: 1 } }
+
+      it { is_expected.to eq(lte: 1) }
+    end
+
+    context 'with an unpermitted option' do
+      let(:options) { { unpermitted: 1 } }
+
+      it { is_expected.to eq({}) }
+    end
+  end
+end

data/spec/filter_spec.rb

@@ -83,5 +83,19 @@ RSpec.describe Elasticband::Filter do
 
       it { is_expected.to eq(query: { name: 'query' }) }
     end
+
+    context 'with `:range` option' do
+      context 'with one range' do
+        let(:options) { { range: { foo: { gt: 1 } } } }
+
+        it { is_expected.to eq(range: { foo: { gt: 1 } }) }
+      end
+
+      context 'with more than one range' do
+        let(:options) { { range: { foo: { gt: 1, lt: 2 } } } }
+
+        it { is_expected.to eq(range: { foo: { gt: 1, lt: 2 } }) }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticband
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Glauber Campinho
@@ -125,6 +125,7 @@ files:
 - lib/elasticband/filter/and.rb
 - lib/elasticband/filter/not.rb
 - lib/elasticband/filter/query.rb
+- lib/elasticband/filter/range.rb
 - lib/elasticband/filter/term.rb
 - lib/elasticband/filter/terms.rb
 - lib/elasticband/query.rb
@@ -150,6 +151,7 @@ files:
 - spec/filter/and_spec.rb
 - spec/filter/not_spec.rb
 - spec/filter/query_spec.rb
+- spec/filter/range_spec.rb
 - spec/filter/term_spec.rb
 - spec/filter/terms_spec.rb
 - spec/filter_spec.rb