elasticband 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTJlMTE0ZjI5Mjc0ODE5MjNkODU0YjgwNzlhYTI5M2JhOTM5ZGQzMQ==
+    MWU0ZWNlNDdlMmZkM2YzMjBmOTc0MjNlMmZiNWM5MjdiMjY3MDM5NQ==
   data.tar.gz: !binary |-
-    NzNmZTY1MzY0ZmZmNzFmM2Q3NGQwYjE1MjkwMzBhMDNiMjU3ZDQ1Ng==
+    ZjI5MGQ5ZGY1MWEwM2IwMGQzODQ0NTBlYTlkZDliZDIzNDk1ZDVlNg==
 SHA512:
   metadata.gz: !binary |-
-    MDdmYjljMDZmYWI3YTE3NmE2ODhmZGQyY2ZjOTAxMGUwOTQ0ZTYyOWY5M2Jl
-    MTdkNDYzYWQxZDA0ZDNmZmQ5ZWQ3OThjZjk0OWU3MWUxZmI2ZDA0OGM4MzU5
-    Yjk1NzIwOTRiMzM0ZGY4ODFmODgwMTUxODc1ZDIzNDc1YjVmMzQ=
+    OTk5YjUyZjBkNDNiZTI4MzI3MDI0N2YyNDJiNmU2NWZkNjg1ZDRlYzk1YjFj
+    NWY4MDliM2M0OThkYzMzNzVkNmE2MTg3N2NlZGMxY2Q4OTZlNjYyZGJlNWQ2
+    Yzk0MmU2NDQ1NjM0ZGIwMjIwYzEzNjA0NWI4MGEyZGZhOWM0YjU=
   data.tar.gz: !binary |-
-    OTcyZGNkY2UyYTNhMWUxODk4N2EwMWJlZDg2YWUxMmI1NDdiZDU1NzkyY2Y4
-    MzY3YWJkNjBjOGYzYTdmOTkxODBmYjIwY2Q3YjQ3OTA0MDJlM2NhMjMxOWRk
-    MzhmYWViYjEyODhlOWFkYjE0YWQzMTE2MGRmZGVlODdiNTYyZTk=
+    YjcxNjU3OGFjMGVkZDZjNGM5OGQ1ZWUxNjQ5MDlmYjY3NDVjNDdkYWQzMDU0
+    YjZkYTg2NmQ5MmFkMDkxOTE3NWYxMDc0NDZiYjk0NTM3OTAwYjE0ZDA4NTcw
+    NzYwODE5MjlmYzdmMDE4NTJmNmQ0N2I2YmY1NjE1OGJlZjNiMmU=

data/lib/elasticband/filter.rb

@@ -41,8 +41,8 @@ module Elasticband
       # Filter.parse(range: { companies_count: { gt: 1, gteq: 1, lt: 1, lteq: 1 } })
       # => { range: { companies_count: { gt: 1, gte: 1, lt: 1, lte: 1 } } }
       #
-      # Filter.parse(near: { latitude: 12, longitude: 34, distance: '5km' })
-      # => { geo_distance: { location: { lat: 12, lon: 34 } }, distance: '5km' }
+      # Filter.parse(near: { latitude: 12, longitude: 34, distance: '5km', type: :arc })
+      # => { geo_distance: { location: { lat: 12, lon: 34 } }, distance: '5km', distance_type: :arc }
       #
       # Filter.parse(script: ['(param1 + param2) > 0', param1: 1, param2: 1])
       # => { script: { script: '(param1 + param2) > 0', params: { param1: 1, param2: 1 } } }

data/lib/elasticband/filter/near.rb

@@ -1,20 +1,22 @@
 module Elasticband
   class Filter
     class Near < Filter
-      attr_accessor :on, :latitude, :longitude, :distance
+      attr_accessor :on, :latitude, :longitude, :distance, :type
 
-      def initialize(on: :location, latitude: nil, longitude: nil, distance: '100km')
+      def initialize(on: :location, latitude: nil, longitude: nil, distance: '100km', type: :arc)
         self.on = on
         self.latitude = latitude
         self.longitude = longitude
         self.distance = distance
+        self.type = type
       end
 
       def to_h
         {
           geo_distance: {
             on => { lat: latitude, lon: longitude },
-            distance: distance
+            distance: distance,
+            distance_type: type
           }
         }
       end

data/lib/elasticband/version.rb

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

data/spec/filter/near_spec.rb

@@ -4,22 +4,60 @@ RSpec.describe Elasticband::Filter::Near do
   describe '#to_h' do
     subject { described_class.new(options).to_h }
 
-    context 'with `:latidute` and `:latidute` option' do
+    context 'with `:latitude` and `:longitude` option' do
       let(:options) { { latitude: 12.5, longitude: -34.6 } }
 
-      it { is_expected.to eq(geo_distance: { location: { lat: 12.5, lon: -34.6 }, distance: '100km' }) }
+      it 'contains the given latitude and longitude options' do
+        is_expected.to eq(
+          geo_distance: {
+            location: { lat: 12.5, lon: -34.6 },
+            distance: '100km',
+            distance_type: :arc
+          }
+        )
+      end
     end
 
     context 'with `:on` option' do
       let(:options) { { on: :loc, latitude: 12.5, longitude: -34.6 } }
 
-      it { is_expected.to eq(geo_distance: { loc: { lat: 12.5, lon: -34.6 }, distance: '100km' }) }
+      it 'contains the given on option' do
+        is_expected.to eq(
+          geo_distance: {
+            loc: { lat: 12.5, lon: -34.6 },
+            distance: '100km',
+            distance_type: :arc
+          }
+        )
+      end
     end
 
     context 'with `:distance` option' do
       let(:options) { { distance: '5km', latitude: 12.5, longitude: -34.6 } }
 
-      it { is_expected.to eq(geo_distance: { location: { lat: 12.5, lon: -34.6 }, distance: '5km' }) }
+      it 'contains the given distance option' do
+        is_expected.to eq(
+          geo_distance: {
+            location: { lat: 12.5, lon: -34.6 },
+            distance: '5km',
+            distance_type: :arc
+          }
+        )
+      end
+    end
+
+    context 'with `:type` option' do
+      let(:options) { { distance: '5km', latitude: 12.5, longitude: -34.6, type: :plane } }
+
+      it 'contains the given type option' do
+        is_expected.to eq(
+          geo_distance: {
+            location: { lat: 12.5, lon: -34.6 },
+            distance: '5km',
+            distance_type: :plane
+          }
+        )
+      end
     end
   end
 end

data/spec/filter_spec.rb

@@ -100,7 +100,9 @@ RSpec.describe Elasticband::Filter do
 
     context 'with `:near` option' do
       let(:options) { { near: { on: :location, latitude: 12.5, longitude: -34.9, distance: '5km' } } }
-      let(:filter) { { geo_distance: { location: { lat: 12.5, lon: -34.9 }, distance: '5km' } } }
+      let(:filter) do
+        { geo_distance: { location: { lat: 12.5, lon: -34.9 }, distance: '5km', distance_type: :arc } }
+      end
 
       it { is_expected.to eq(filter) }
     end

data/spec/query_spec.rb

@@ -265,7 +265,9 @@ RSpec.describe Elasticband::Query do
         let(:options) { { near: { on: :location, latitude: 12.5, longitude: -34.9, distance: '5km' } } }
 
         let(:query) { { match: { _all: 'foo' } } }
-        let(:filter) { { geo_distance: { location: { lat: 12.5, lon: -34.9 }, distance: '5km' } } }
+        let(:filter) do
+          { geo_distance: { location: { lat: 12.5, lon: -34.9 }, distance: '5km', distance_type: :arc } }
+        end
 
         it 'return a filtered query by geo_distance' do
           is_expected.to eq(filtered: { query: query, filter: filter })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticband
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Glauber Campinho