arelastic 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b2709cca3f4723d5f150393c9f6775a8b7cbcc
-  data.tar.gz: e5486609d6bc06427221f16934c654e4734251ee
+  metadata.gz: d7e7cece5f867bbfe2dedcc985f0f6fec1a930fa
+  data.tar.gz: 76161f732806f810c4b8b48a197331fec647fb1f
 SHA512:
-  metadata.gz: e487e432fee0ec87e3605e53fb31762afc997b3d70f7a462a7268a590903d8966d6cc65d5f45a68923097c856381e8f121cabf21288647cad9bafe074a0f73a5
-  data.tar.gz: 0fba9e18f025a42890305a02f5cffadc7c930c64f90b6bb86608529d53c785f533ffd3cfcc15ea03bd2c7a2bd06316f5c40a9e68e8a1ab7920f4da79d861f418
+  metadata.gz: '08fef26bfa8760dfff29d33e42926ffa23ea1d3ef978a64668c19047f2482eda7e6ff51f4095e694ade704db5f5f64740e97b07dd227180b1688fd86adceeea7'
+  data.tar.gz: 99c5b03d1ca49a7e1c7b262fd95cc002b61e1e9ae583f32270dcb8bd4da65f9646e6bca6d8134e1dca692250c703f4e69ff2313e4674ab333994b3229c24fd00

data/lib/arelastic/aggregations/bucket.rb

@@ -5,7 +5,7 @@ module Arelastic
 
       def initialize(name, options = {})
         options = options.dup
-        @aggs = options.delete(:aggs) || options.delete('aggs')
+        @aggs = read_option! options, 'aggs'
         super(name, options)
       end
 

data/lib/arelastic/nodes/node.rb

@@ -13,6 +13,10 @@ module Arelastic
         end
       end
 
+      def read_option!(options, key)
+        options.delete(key) || options.delete(key.to_sym)
+      end
+
       def ==(other)
         other.is_a?(Arelastic::Nodes::Node) && as_elastic == other.as_elastic
       end

data/lib/arelastic/queries.rb

@@ -5,6 +5,8 @@ require 'arelastic/queries/constant_score'
 require 'arelastic/queries/dis_max'
 require 'arelastic/queries/exists'
 require 'arelastic/queries/field'
+require 'arelastic/queries/filter'
+require 'arelastic/queries/function_score'
 require 'arelastic/queries/geo_bounding_box'
 require 'arelastic/queries/geo_distance'
 require 'arelastic/queries/has_child'

data/lib/arelastic/queries/bool.rb

@@ -1,12 +1,13 @@
 module Arelastic
   module Queries
     class Bool < Arelastic::Queries::Query
-      attr_accessor :must, :filter, :should, :must_not
-      def initialize(must: nil, filter: nil, should: nil, must_not: nil)
-        @must     = must
-        @filter   = filter
-        @should   = should
-        @must_not = must_not
+      attr_accessor :must, :filter, :should, :must_not, :options
+      def initialize(options)
+        @must     = read_option! options, 'must'
+        @filter   = read_option! options, 'filter'
+        @should   = read_option! options, 'should'
+        @must_not = read_option! options, 'must_not'
+        @options  = options
       end
 
       def as_elastic
@@ -21,7 +22,7 @@ module Arelastic
           searches[k] = convert_to_elastic(v) if v
         end
 
-        {'bool' => searches}
+        { 'bool' => searches.update(options) }
       end
     end
   end

data/lib/arelastic/queries/dis_max.rb

@@ -3,7 +3,7 @@ module Arelastic
     class DisMax < Arelastic::Queries::Query
       attr_accessor :queries, :options
       def initialize(options)
-        @queries   = options.delete('queries') || options.delete(:queries)
+        @queries   = read_option! options, 'queries'
         @options   = options
       end
 

data/lib/arelastic/queries/filter.rb

@@ -1,8 +1,16 @@
 module Arelastic
   module Queries
     class Filter < Arelastic::Queries::Query
-      def nested path
-        Arelastic::Queries::Nested.new path, self
+      attr_accessor :query, :options
+      def initialize(query, options = {})
+        @query   = query
+        @options = options
+      end
+
+      def as_elastic
+        {
+          'filter' => convert_to_elastic(query)
+        }.update(options)
       end
     end
   end

data/lib/arelastic/queries/function_score.rb

@@ -0,0 +1,21 @@
+module Arelastic
+  module Queries
+    class FunctionScore < Arelastic::Queries::Query
+      attr_accessor :query, :functions, :options
+      def initialize(options)
+        @query     = read_option! options, 'query'
+        @functions = read_option! options, 'functions'
+        @options   = options
+      end
+
+      def as_elastic
+        {
+          'function_score' => {
+            'query'     => convert_to_elastic(query),
+            'functions' => convert_to_elastic(functions)
+          }.update(options)
+        }
+      end
+    end
+  end
+end

data/test/arelastic/queries/bool_test.rb

@@ -17,7 +17,7 @@ class Arelastic::Queries::BoolTest < Minitest::Test
   #
   #   assert_equal expected, filtered.as_elastic
   # end
-  
+
   def test_as_elastic
     bool = Arelastic::Queries::Bool.new(
       must: {
@@ -28,7 +28,8 @@ class Arelastic::Queries::BoolTest < Minitest::Test
       must_not: Arelastic::Queries::Match.new('color', 'green'),
       should: [
         Arelastic::Queries::Match.new('height', 6)
-      ]
+      ],
+      'boost' => 1.0
     )
 
     expected = {
@@ -47,10 +48,11 @@ class Arelastic::Queries::BoolTest < Minitest::Test
           'match' => {
             'height' => 6
           }
-        ]
+        ],
+        'boost' => 1.0
       }
     }
 
     assert_equal expected, bool.as_elastic
   end
-end
+end

data/test/arelastic/queries/dis_max_test.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class Arelastic::Queries::DisMaxTest < Minitest::Test
   def test_as_elastic
-    bool = Arelastic::Queries::DisMax.new(
+    dis_max = Arelastic::Queries::DisMax.new(
       queries: [
         {'term' => {'user' => 'kimchy'}},
         Arelastic::Queries::Match.new('color', 'green')
@@ -18,6 +18,6 @@ class Arelastic::Queries::DisMaxTest < Minitest::Test
       }
     }
 
-    assert_equal expected, bool.as_elastic
+    assert_equal expected, dis_max.as_elastic
   end
-end
+end

data/test/arelastic/queries/filter_test.rb

@@ -1,22 +1,20 @@
 require 'helper'
 
 class Arelastic::Queries::FilterTest < Minitest::Test
-  def test_nested
-    filter = Arelastic::Queries::Term.new('foo', 'bar')
+  def test_as_elastic
+    filter = Arelastic::Queries::Filter.new(
+      Arelastic::Queries::Match.new('color', 'green'),
+      'weight' => 23
+    )
 
-    nested_filter = filter.nested 'links'
-
-    assert nested_filter.is_a?(Arelastic::Queries::Nested)
-    expected = {
-      "nested" => {
-        "path" => "links",
-        "query" => {
-          "term" => {
-            "foo" => "bar"
-          }
-        }
-      }
-    }
-    assert_equal(expected, nested_filter.as_elastic)
+   expected = {
+     'filter' => {
+       'match' => {
+         'color' => 'green'
+       }
+     },
+     'weight' => 23
+   }
+    assert_equal expected, filter.as_elastic
   end
 end

data/test/arelastic/queries/function_score_test.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class Arelastic::Queries::FunctionScoreTest < Minitest::Test
+  def test_as_elastic
+    function_score = Arelastic::Queries::FunctionScore.new(
+      query: Arelastic::Queries::MatchAll.new,
+      'functions' => [
+        Arelastic::Queries::Filter.new(
+          Arelastic::Queries::Match.new('color', 'green')
+        )
+      ],
+      'boost' => 1.0
+    )
+
+    expected = {
+      'function_score' => {
+        'query' => { 'match_all' => {} },
+        'functions' => [
+          {
+            'filter' => {
+              'match' => {
+                'color' => 'green'
+              }
+            }
+          }
+        ],
+        'boost' => 1.0
+      }
+    }
+
+    assert_equal expected, function_score.as_elastic
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Matthew Higgins
@@ -59,6 +59,7 @@ files:
 - lib/arelastic/queries/exists.rb
 - lib/arelastic/queries/field.rb
 - lib/arelastic/queries/filter.rb
+- lib/arelastic/queries/function_score.rb
 - lib/arelastic/queries/geo_bounding_box.rb
 - lib/arelastic/queries/geo_distance.rb
 - lib/arelastic/queries/has_child.rb
@@ -115,6 +116,7 @@ files:
 - test/arelastic/queries/dis_max_test.rb
 - test/arelastic/queries/exists_test.rb
 - test/arelastic/queries/filter_test.rb
+- test/arelastic/queries/function_score_test.rb
 - test/arelastic/queries/geo_bounding_box_test.rb
 - test/arelastic/queries/geo_distance_test.rb
 - test/arelastic/queries/has_child_test.rb