caoutsearch 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c909350638d5b778a223df94d8b5692984c1060aa1d3a8ade199d9b92a7e278
-  data.tar.gz: 760e99bffe678f12997a49855b860bd8dd8f85e871e67e01603fa6a1507b58b2
+  metadata.gz: 9a9f19fbbee99086c07a66881e1b3d5f5df90f4dc06d32ce4a4d4dfc323a85bb
+  data.tar.gz: cf8736b55478e95f3e98a529d9e2f4102de8a59921108bf99703d9c6fe742a54
 SHA512:
-  metadata.gz: 7f2ed2ab8c08ba6d7a2ac9077a8c59e5bb92b9606ab3fd825b8b10fdea039a2c2a3aefa7b2705c98601e150de5b48becb0cea7dbfa4eb15256e5b650f0251523
-  data.tar.gz: e33c6d5ed88ecd9d3fbd03aad636bd3c636098775c8a35295df8aa3ec8518cccd1ea125689052a25fab3270af22739d9977b3bda2e6511ac9d427dd0fb94b401
+  metadata.gz: 3ee219e96b1b77bbdea6b20a91bb252915b2f557c82924892e67d9ca6d08caf7013f8a8ac05852375f9821cda4e7fb0ba23226ff04943e03a4a7f2d16dd80bf4
+  data.tar.gz: d154e911d74f71f14540d551ead74a9452770660a8be4b991a73d2d2dbed3a206274b51a30b1c7090587e6bbdea389729104af293fd6f542211ae7fd952ec12a

data/README.md

@@ -187,14 +187,15 @@ You can define simple to complex aggregations.
 
 ````ruby
 class ArticleSearch < Caoutsearch::Search::Base
-  has_aggregation :view_count, sum: { field: :view_count }
-  has_aggregation :popular_tags,
+  has_aggregation :view_count, { sum: { field: :view_count } }
+  has_aggregation :popular_tags, {
     filter: { term: { published: true } },
     aggs: {
       published: {
         terms: { field: :tags, size: 10 }
       }
     }
+  }
 end
 ````
 
@@ -314,8 +315,8 @@ You can also use transformations to combine multiple aggregations:
 
 ````ruby
 class ArticleSearch < Caoutsearch::Search::Base
-  has_aggregation :blog_count,     filter: { term: { category: "blog" } }
-  has_aggregation :archives_count, filter: { term: { archived: true } }
+  has_aggregation :blog_count,     { filter: { term: { category: "blog" } } }
+  has_aggregation :archives_count, { filter: { term: { archived: true } } }
 
   transform_aggregation :stats, from: %i[blog_count archives_count] do |aggs|
     {
@@ -335,9 +336,10 @@ This is also usefull to unify the API between different search engines:
 
 ````ruby
 class ArticleSearch < Caoutsearch::Search::Base
-  has_aggregation :popular_tags,
+  has_aggregation :popular_tags, {
     filter: { term: { published: true } },
     aggs: { published: { terms: { field: :tags, size: 10 } } }
+  }
 
   transform_aggregation :popular_tags do |aggs|
     aggs.dig(:popular_tags, :published, :buckets).pluck(:key)
@@ -345,8 +347,9 @@ class ArticleSearch < Caoutsearch::Search::Base
 end
 
 class TagSearch < Caoutsearch::Search::Base
-  has_aggregation :popular_tags,
+  has_aggregation :popular_tags, {
     terms: { field: "label", size: 20, order: { used_count: "desc" } }
+  }
 
   transform_aggregation :popular_tags do |aggs|
     aggs.dig(:popular_tags, :buckets).pluck(:key)
@@ -366,7 +369,7 @@ Transformations are performed on demand and result is memorized. That means:
 
 ````ruby
 class ArticleSearch < Caoutsearch::Search::Base
-  has_aggregation :popular_tags, …
+  has_aggregation :popular_tags, {…}
 
   transform_aggregation :popular_tags do |aggs|
     tags       = aggs.dig(:popular_tags, :published, :buckets).pluck(:key)

data/lib/caoutsearch/filter/date.rb

@@ -27,8 +27,6 @@ module Caoutsearch
             build_range_query(input)
           when ::Hash
             case input
-            in { operator:, value:, **other}
-              build_legacy_range_query_from_hash(input)
             in { between: dates }
               build_range_query(dates)
             else
@@ -61,23 +59,6 @@ module Caoutsearch
         query
       end
 
-      def build_legacy_range_query_from_hash(input)
-        ActiveSupport::Deprecation.warn("This form of hash to search for dates will be removed")
-        operator, value, unit = input.values_at(:operator, :value, :unit)
-
-        case operator
-        when "less_than"
-          {range: {key => {gte: cast_date(value, unit)}}}
-        when "greater_than"
-          {range: {key => {lt: cast_date(value, unit)}}}
-        when "between"
-          dates = value.map { |v| cast_date(v, unit) }.sort
-          {range: {key => {gte: dates[0], lt: dates[1]}}}
-        else
-          raise ArgumentError, "unknown operator #{operator.inspect} in #{value.inspect}"
-        end
-      end
-
       RANGE_OPERATORS = {
         "less_than" => "lt",
         "less_than_or_equal" => "lte",

data/lib/caoutsearch/search/internal_dsl.rb

@@ -68,11 +68,11 @@ module Caoutsearch
           sort(new_name) { |direction| sort_by(old_name, direction) }
         end
 
-        def has_aggregation(name, **options, &block)
-          raise ArgumentError, "has_aggregation accepts options or block but not both" if block && options.any?
+        def has_aggregation(name, definition = {}, &block)
+          raise ArgumentError, "has_aggregation accepts Hash definition or block but not both" if block && definition.any?
 
           self.aggregations = aggregations.dup
-          aggregations[name.to_s] = Caoutsearch::Search::DSL::Item.new(name, options, &block)
+          aggregations[name.to_s] = Caoutsearch::Search::DSL::Item.new(name, definition, &block)
         end
 
         def alias_aggregation(new_name, old_name)

data/lib/caoutsearch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Caoutsearch
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caoutsearch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Savater Sebastien
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: An alternative approach to index & search with Elasticsearch & Ruby on Rails