caoutsearch 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63cce452c0627b856cb582366494c13b997a5e387ed03d2311b7f9ea8ea80f0
-  data.tar.gz: f9fe10e15528bef3d13b668fe6e2cc9e1a693c0d171797a463cf93ae4e3aca37
+  metadata.gz: 82878f34c8444b35c7b9613b9d0991adbea0e7a66c38f8a8767e4ecd5007bf86
+  data.tar.gz: 4d2c7764cb043b19a6bf45f3fe4f3b169880e8893621d8fe14eef69c69e48b4b
 SHA512:
-  metadata.gz: 9b5b638e8050f586b8140f729847d236e280c44e074b3300e746cf763fb861cfde3a5e5ac4071601782008aed363ed7130614914c25ec9f4c68f6542839145ad
-  data.tar.gz: 0b2e3ec3ff278bd7615d4b39e82738bb805c25264ae0cad3289c7c626e7a9e71b0cddc8cad1f9b28bbbb2e059061f800aa7df3189bae860da2fd39fee44cfd99
+  metadata.gz: 3f07406c04c8e677a4de15ee406c047232049edb7c794c8787519c7ce09f8272e4a4f02c0a51e4957ffcc6972a1500a0192b8c9d08008c47689646bcea2339bc
+  data.tar.gz: 6d2ee0e46b4480e742a8921b68e3afbe55846c2fd5ce6603fc30d6513ec63e096b85ac59104396c223712bad2eefd8badbb486d158aa0fb85dddf9b32eafc280

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Mon Territoire
+Copyright (c) 2023 Solutions & Territoire
 
 MIT License
 

data/README.md

@@ -1,13 +1,13 @@
 # Caoutsearch [\ˈkawt͡ˈsɝtʃ\\](http://ipa-reader.xyz/?text=ˈkawt͡ˈsɝtʃ)
 
 <span>[![Gem Version](https://badge.fury.io/rb/caoutsearch.svg)](https://rubygems.org/gems/caoutsearch)</span> <span>
-[![CI Status](https://github.com/mon-territoire/caoutsearch/actions/workflows/ci.yml/badge.svg)](https://github.com/mon-territoire/caoutsearch/actions/workflows/ci.yml)</span> <span>
+[![CI Status](https://github.com/solutions-territoire/caoutsearch/actions/workflows/ci.yml/badge.svg)](https://github.com/solutions-territoire/caoutsearch/actions/workflows/ci.yml)</span> <span>
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)</span> <span>
-[![Maintainability](https://api.codeclimate.com/v1/badges/fbe73db3fd8be9a10e12/maintainability)](https://codeclimate.com/github/mon-territoire/caoutsearch/maintainability)</span> <span>
-[![Test Coverage](https://api.codeclimate.com/v1/badges/fbe73db3fd8be9a10e12/test_coverage)](https://codeclimate.com/github/mon-territoire/caoutsearch/test_coverage)</span>
+[![Maintainability](https://api.codeclimate.com/v1/badges/fbe73db3fd8be9a10e12/maintainability)](https://codeclimate.com/github/solutions-territoire/caoutsearch/maintainability)</span> <span>
+[![Test Coverage](https://api.codeclimate.com/v1/badges/fbe73db3fd8be9a10e12/test_coverage)](https://codeclimate.com/github/solutions-territoire/caoutsearch/test_coverage)</span>
 
-<span>[![JRuby](https://github.com/mon-territoire/caoutsearch/actions/workflows/jruby.yml/badge.svg)](https://github.com/mon-territoire/caoutsearch/actions/workflows/jruby.yml)</span> <span>
-[![Truffle Ruby](https://github.com/mon-territoire/caoutsearch/actions/workflows/truffle_ruby.yml/badge.svg)](https://github.com/mon-territoire/caoutsearch/actions/workflows/truffle_ruby.yml)</span>
+<span>[![JRuby](https://github.com/solutions-territoire/caoutsearch/actions/workflows/jruby.yml/badge.svg)](https://github.com/solutions-territoire/caoutsearch/actions/workflows/jruby.yml)</span> <span>
+[![Truffle Ruby](https://github.com/solutions-territoire/caoutsearch/actions/workflows/truffle_ruby.yml/badge.svg)](https://github.com/solutions-territoire/caoutsearch/actions/workflows/truffle_ruby.yml)</span>
 
 **!! Gem under development before public release !!**
 
@@ -15,14 +15,14 @@ Caoutsearch is a new Elasticsearch integration for Ruby and/or Rails.
 It provides a simple but powerful DSL to perform complex indexing and searching, while securely exposing search criteria to a public and chainable API, without overwhelming your models.
 
 Caoutsearch only supports Elasticsearch 8.x right now.  
-It is used in production in a robust application, updated and maintained for several years at [Mon Territoire](https://mon-territoire.fr).
+It is used in production in a robust application, updated and maintained for several years at [Solutions & Territoire](https://solutions-territoire.fr).
 
 Caoutsearch was inspired by awesome gems such as [elasticsearch-rails](https://github.com/elastic/elasticsearch-rails) or [search_flip](https://github.com/mrkamel/search_flip).  
 Depending on your search scenarios, they may better suite your needs.
 
 ## Documentation
 
-Visit our [offical documentation](https://mon-territoire.github.io/caoutsearch) to understand how to use Caoutsearch.
+Visit our [offical documentation](https://solutions-territoire.github.io/caoutsearch) to understand how to use Caoutsearch.
 
 ## Installation
 
@@ -71,8 +71,8 @@ ArticleSearch.search(published_on: [["now-1y", nil]]).aggregate(:popular_tags)
 
 ## Contributing
 
-1. Don't hesitate to submit your feature/idea/fix in [issues](https://github.com/inkstak/activejob-status)
-2. Fork the [repository](https://github.com/inkstak/activejob-status)
+1. Don't hesitate to submit your feature/idea/fix in [issues](https://github.com/solutions-territoire/caoutsearch/issues)
+2. Fork the [repository](https://github.com/solutions-territoire/caoutsearch)
 3. Create your feature branch
 4. Ensure RSpec & Rubocop are passing
 4. Create a pull request
@@ -99,7 +99,7 @@ bundle exec rake
 
 ## License & credits
 
-Please see [LICENSE](https://github.com/mon-territoire/caoutsearch/blob/main/LICENSE) for further details.
+Please see [LICENSE](https://github.com/solutions-territoire/caoutsearch/blob/main/LICENSE) for further details.
 
-Contributors: [./graphs/contributors](https://github.com/mon-territoire/caoutsearch/graphs/contributors)
+Contributors: [./graphs/contributors](https://github.com/solutions-territoire/caoutsearch/graphs/contributors)
 

data/lib/caoutsearch/config/mappings.rb

@@ -25,7 +25,11 @@ module Caoutsearch
         protected
 
         def default_mappings
-          path = ::Rails.root.join("config/elasticsearch/#{index_name}.json")
+          if defined?(Rails)
+            path = ::Rails.root.join("config/elasticsearch/#{index_name}.json")
+          else
+            raise NotImplementedError, "Mappings files cannot be found out of a Rails application"
+          end
           raise ArgumentError, "No mappings file found for #{index_name} at #{path}" unless path.exist?
 
           MultiJson.load(path.read)

data/lib/caoutsearch/filter/boolean.rb

@@ -6,7 +6,11 @@ module Caoutsearch
       def filter
         return {} if value.nil?
 
-        {term: {key => value}}
+        if value.is_a?(Array)
+          {terms: {key => value}}
+        else
+          {term: {key => value}}
+        end
       end
 
       protected

data/lib/caoutsearch/filter/date.rb

@@ -27,7 +27,7 @@ module Caoutsearch
             build_range_query(input)
           when ::Hash
             case input
-            in { between: dates }
+            in {between: dates}
               build_range_query(dates)
             else
               parameters = input.to_h do |operator, value|

data/lib/caoutsearch/instrumentation/base.rb

@@ -12,7 +12,7 @@ module Caoutsearch
         request = payload[:request]
 
         debug do
-          title = color("#{payload[:klass]} #{subject}", GREEN, true)
+          title = color("#{payload[:klass]} #{subject}", GREEN, bold: true)
           request_body = format_request_body(request, format: format)
 
           message = "  #{title} #{request_body}"
@@ -27,11 +27,11 @@ module Caoutsearch
         return unless response
 
         debug do
-          title = color("#{payload[:klass]} #{subject}", GREEN, true)
+          title = color("#{payload[:klass]} #{subject}", GREEN, bold: true)
 
           duration = "#{event.duration.round(1)}ms"
           duration += " / took #{response["took"]}ms" if response.key?("took")
-          duration = color("(#{duration})", GREEN, true)
+          duration = color("(#{duration})", GREEN, bold: true)
 
           message = "  #{title} #{duration}"
           message += " got errors" if response["errors"]
@@ -44,7 +44,7 @@ module Caoutsearch
 
         errors = response["items"].select { |k, _| k.values.first["error"] }
         errors.each do |error|
-          warn { color(error, RED, true) }
+          warn { color(error, RED, bold: true) }
         end
       end
 
@@ -54,16 +54,24 @@ module Caoutsearch
           body.ai(limit: true, index: false)
         when "full"
           json = MultiJson.dump(body)
-          color(json, BLUE, true)
+          color(json, BLUE, bold: true)
         when "truncated"
           json = MultiJson.dump(body).truncate(200, omission: "…}")
-          color(json, BLUE, true)
+          color(json, BLUE, bold: true)
         end
       end
 
       def inspect_json_size(json)
         ApplicationController.helpers.number_to_human_size(MultiJson.dump(json).bytesize)
       end
+
+      def color(message, color, bold: false)
+        if Gem::Version.new(ActiveSupport.version) >= Gem::Version.new("7.1.0")
+          super
+        else
+          super(message, color, bold)
+        end
+      end
     end
   end
 end

data/lib/caoutsearch/model/indexable.rb

@@ -19,8 +19,8 @@ module Caoutsearch
       end
 
       module ClassMethods
-        def reindex(*properties, **options, &block)
-          index_engine_class.reindex(all, *properties, **options, &block)
+        def reindex(...)
+          index_engine_class.reindex(all, ...)
         end
 
         def delete_indexes

data/lib/caoutsearch/search/callbacks.rb

@@ -11,16 +11,16 @@ module Caoutsearch
       end
 
       class_methods do
-        def before_build(*filters, &blk)
-          set_callback(:build, :before, *filters, &blk)
+        def before_build(...)
+          set_callback(:build, :before, ...)
         end
 
-        def after_build(*filters, &blk)
-          set_callback(:build, :after, *filters, &blk)
+        def after_build(...)
+          set_callback(:build, :after, ...)
         end
 
-        def around_build(*filters, &blk)
-          set_callback(:build, :around, *filters, &blk)
+        def around_build(...)
+          set_callback(:build, :around, ...)
         end
       end
     end

data/lib/caoutsearch/search/dsl/item.rb

@@ -32,7 +32,7 @@ module Caoutsearch
 
         def properties_to_inspect
           PROPERTIES_TO_INSPECT.each_with_object({}) do |name, properties|
-            value = instance_variable_get("@#{name}")
+            value = instance_variable_get(:"@#{name}")
             properties[name] = value.inspect if value.present?
           end
         end

data/lib/caoutsearch/search/inspect.rb

@@ -25,7 +25,7 @@ module Caoutsearch
 
       def properties_to_inspect
         PROPERTIES_TO_INSPECT.each_with_object({}) do |name, properties|
-          value = instance_variable_get("@#{name}")
+          value = instance_variable_get(:"@#{name}")
           properties[name] = value.inspect if value
         end
       end

data/lib/caoutsearch/search/type_cast.rb

@@ -53,8 +53,9 @@ module Caoutsearch
         # rubocop:enable Lint/BooleanSymbol
 
         def cast_as_boolean(value)
-          if value == ""
-            nil
+          case value
+          when nil, "" then nil
+          when Array then value.map { |v| cast_as_boolean(v) }.uniq.compact
           else
             BOOLEAN_FALSE_VALUES.exclude?(value)
           end

data/lib/caoutsearch/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caoutsearch
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Savater Sebastien
 - Bailhache Jeanne
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -81,217 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: amazing_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner-active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description:
 email: github.60k5k@simplelogin.co
 executables: []
 extensions: []
@@ -371,11 +159,10 @@ files:
 - lib/caoutsearch/testing.rb
 - lib/caoutsearch/testing/mock_requests.rb
 - lib/caoutsearch/version.rb
-homepage: http://github.com/mon-territoire/caoutsearch
+homepage: http://github.com/solutions-territoire/caoutsearch
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -390,8 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: An alternative approach to index & search with Elasticsearch & Ruby on Rails
 test_files: []