arelastic 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06329030565acadfbe92651b4980a1f51d1359c9817b01f78cdae14cd703f091'
-  data.tar.gz: 2b8461745e65260efbc515197a0cc3a3af6aae75c7f8a10db9befab84ebcf175
+  metadata.gz: f7edbcecc9f2338f91c04f02153e5be31d1b31dbe0c3f2f8d8ae459a1390ff1c
+  data.tar.gz: ba5a7048b7602c5ac6a1ddbcd35578a14e81f46987665e2f2d3227bce69e3a8b
 SHA512:
-  metadata.gz: 58cf7a1fd5e96cf239cb8ec364c92c95ae8d06f14805ee2680e31e9712600f36fe623ee3294b911eafd6d6c4bb9243558dc9a969d97062d344f4faedeabc13e8
-  data.tar.gz: 959f924208f445d4941e157099f4322c76d324bb2c592be61e1f225591dfbf0be0a9005db9bb228d584c5737b494eaeeed8a896e97a24618d9751a589e2a3578
+  metadata.gz: 1243c2065fb4c6b33e0bba2396ea7306bc08210758ca4b974c25587f0d3bad552431c5c65b95af858385126fd6ddc621db2ee1286f0b16febae8fc4c7694196f
+  data.tar.gz: '0922d96e1247d446dc4acce1ea37f03229b06d85f213d4e1e8263590aeb6d3bc770c838e39a6b16a3ad404f3e41298fca3ce7560d6ce2e0e24134301e3d92a13'

data/lib/arelastic/builders/query.rb

@@ -1,47 +1,55 @@
 module Arelastic
   module Builders
     class Query < Struct.new :name
+      MACROS_TO_ARELASTIC = {
+        bool:                Arelastic::Queries::Bool,
+        constant_score:      Arelastic::Queries::ConstantScore,
+        dis_max:             Arelastic::Queries::DisMax,
+        exists:              Arelastic::Queries::Exists,
+        field:               Arelastic::Queries::Field,
+        filter:              Arelastic::Queries::Filter,
+        function_score:      Arelastic::Queries::FunctionScore,
+        fuzzy:               Arelastic::Queries::Fuzzy,
+        geo_bounding_box:    Arelastic::Queries::GeoBoundingBox,
+        geo_distance:        Arelastic::Queries::GeoDistance,
+        has_child:           Arelastic::Queries::HasChild,
+        ids:                 Arelastic::Queries::Ids,
+        limit:               Arelastic::Queries::Limit,
+        match:               Arelastic::Queries::Match,
+        match_all:           Arelastic::Queries::MatchAll,
+        match_none:          Arelastic::Queries::MatchNone,
+        match_phrase:        Arelastic::Queries::MatchPhrase,
+        multi_match:         Arelastic::Queries::MultiMatch,
+        nested:              Arelastic::Queries::Nested,
+        percolate:           Arelastic::Queries::Percolate,
+        prefix:              Arelastic::Queries::Prefix,
+        query:               Arelastic::Queries::Query,
+        query_string:        Arelastic::Queries::QueryString,
+        range:               Arelastic::Queries::Range,
+        regexp:              Arelastic::Queries::Regexp,
+        script:              Arelastic::Queries::Script,
+        simple_query_string: Arelastic::Queries::SimpleQueryString,
+        term:                Arelastic::Queries::Term,
+        terms:               Arelastic::Queries::Terms,
+        wildcard:            Arelastic::Queries::Wildcard
+      }
+
       class << self
         def [](field)
           new(field)
         end
 
-        def constant_score(search)
-          query Arelastic::Queries::ConstantScore.new(search)
-        end
-
-        def bool(must: nil, filter: nil, should: nil, must_not: nil)
-          query Arelastic::Queries::Bool.new(must: must, filter: filter, should: should, must_not: must_not)
-        end
-
-        def match_all
-          query Arelastic::Queries::MatchAll.new
-        end
-
-        def multi_match(query, fields, options = {})
-          query Arelastic::Queries::MultiMatch.new query, fields, options
-        end
-
-        private
-          def query value
-            Arelastic::Searches::Query.new value
+        MACROS_TO_ARELASTIC.each do |macro, klass|
+          define_method macro do |*args|
+            klass.new(*args)
           end
+        end
       end
 
-      def field other
-        Arelastic::Queries::Field.new name, other
-      end
-
-      def term other
-        Arelastic::Queries::Term.new name, other
-      end
-
-      def terms other
-        Arelastic::Queries::Terms.new name, other
-      end
-
-      def match other
-        Arelastic::Queries::Match.new name, other
+      MACROS_TO_ARELASTIC.each do |macro, klass|
+        define_method macro do |*args|
+          klass.new(name, *args)
+        end
       end
     end
   end

data/test/arelastic/builders/query_test.rb

@@ -3,7 +3,7 @@ require 'helper'
 class Arelastic::Builders::QueryTest < Minitest::Test
   def test_constant_score
     query = Arelastic::Builders::Query.constant_score({"foo" => "bar"})
-    expected = {"query" => {"constant_score" => {"foo" => "bar"}}}
+    expected = {"constant_score" => {"foo" => "bar"}}
 
     assert_equal expected, query.as_elastic
   end
@@ -13,14 +13,14 @@ class Arelastic::Builders::QueryTest < Minitest::Test
       must: {"query_string" => "foo"},
       filter: {"term" => "bar"}
     )
-    expected = {"query" => {"bool" => {"must" => {"query_string" => "foo"}, "filter" => {"term" => "bar"}}}}
+    expected = {"bool" => {"must" => {"query_string" => "foo"}, "filter" => {"term" => "bar"}}}
 
     assert_equal expected, query.as_elastic
   end
 
   def test_match_all
     query = Arelastic::Builders::Query.match_all
-    expected = {"query" => {"match_all" => {}}}
+    expected = {"match_all" => {}}
 
     assert_equal expected, query.as_elastic
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Elastic Search query builder