search_rails 2.0.2 → 3.0.0

data/lib/search.rb

@@ -28,7 +28,7 @@ module Search
     end
 
     def _search_cast(node:, type: "text")
-      Arel::Nodes::NamedFunction.new("cast", [node.as(type)])
+      Arel::Nodes::NamedFunction.new("cast", [node.as(type.to_s)])
     end
 
     def _search_cast_boolean(value)
@@ -94,8 +94,8 @@ module Search
     # fields:
     #   [:id, :name, :input]
     scope :search,
-          ->(q: "", fields: self.search_fields&.keys) do
-            raise ArgumentError unless self.search_fields.is_an?(Hash)
+          lambda { |q: "", fields: search_fields&.keys|
+            raise ArgumentError unless search_fields.is_an?(Hash)
             raise ArgumentError unless fields.is_an?(Array)
 
             fields = fields.map(&:to_s)
@@ -113,22 +113,24 @@ module Search
                   fields: fields
                 )
             )
-          end
+          }
 
     scope :_search_joins,
-          ->(scope:, fields:) do
+          lambda { |scope:, fields:|
             fields = fields.map(&:to_s)
 
             relations =
-              fields.map { |field| self.search_fields.fetch(field.to_sym)[:relation] }.compact
+              fields.filter_map do |field|
+                search_fields.fetch(field.to_sym)[:relation]
+              end
 
             relations.reduce(scope) do |scope_with_relations, relation|
               relation.call(scope_with_relations)
             end
-          end
+          }
 
     scope :_search_parsed,
-          ->(parsed:, scope:, fields:) do
+          lambda { |parsed:, scope:, fields:|
             if parsed.is_a?(String)
               scope._search_fields(q: parsed, fields: fields)
             elsif parsed.is_a?(Hash)
@@ -186,7 +188,11 @@ module Search
                 if key.blank?
                   scope.none
                 else
-                  scope._search_field(key: key, operator: operator, value: value)
+                  scope._search_field(
+                    key: key,
+                    operator: operator,
+                    value: value
+                  )
                 end
               else
                 raise ArgumentError
@@ -194,14 +200,14 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     # q:
     #   "dorian"
     #   "1"
     # fields: [:id, :given_name, :family_name]
     scope :_search_fields,
-          ->(q: "", fields: search_fields&.keys) do
+          lambda { |q: "", fields: search_fields&.keys|
             raise ArgumentError unless search_fields.is_an?(Hash)
             raise ArgumentError unless fields.is_an?(Array)
 
@@ -211,21 +217,20 @@ module Search
             where(
               fields
                 .map do |field|
-                  field = self.search_fields.fetch(field.to_sym)
+                  field = search_fields.fetch(field.to_sym)
                   node = field[:node].call
                   casted_field = _search_cast(node: node, type: :text)
                   casted_field.matches("%#{q}%", nil, false)
                 end
                 .reduce(&:or)
             )
-
-          end
+          }
 
     # key: input, name, id, created_at, updated_at, verified, admin, ...
     # operator: :, =, >, ~, <, >=, ...
     # value: "pomodoro", 123, true, false
     scope :_search_field,
-          ->(key:, operator: ":", value:, fields: search_fields&.keys) do
+          lambda { |key:, value:, operator: ":", fields: search_fields&.keys|
             raise ArgumentError unless search_fields.is_an?(Hash)
             raise ArgumentError unless fields.is_an?(Array)
 
@@ -235,7 +240,7 @@ module Search
             raise ArgumentError if key.blank?
             raise ArgumentError if operator.blank?
 
-            field = self.search_fields.fetch(key.to_sym)
+            field = search_fields.fetch(key.to_sym)
 
             case operator
             when ":"
@@ -256,9 +261,7 @@ module Search
               _search_matches(field: field, value: value)
             when "="
               _search_equal(field: field, value: value)
-            when "!:"
-              where.not(id: _search_colon(field: field, value: value))
-            when "!!"
+            when "!:", "!!"
               where.not(id: _search_colon(field: field, value: value))
             when "!^"
               where.not(id: _search_starts(field: field, value: value))
@@ -279,11 +282,11 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     # id:1, name:dorian, verified:true, created_at:today
     scope :_search_colon,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -298,10 +301,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_matches,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -316,10 +319,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_ends,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -334,10 +337,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_starts,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -352,10 +355,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_equal,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -370,10 +373,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_lesser,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -388,10 +391,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_lesser_or_equal,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -406,10 +409,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_greater,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -424,10 +427,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_greater_or_equal,
-          ->(field:, value:) do
+          lambda { |field:, value:|
             node = field[:node].call
 
             case field[:type]
@@ -442,10 +445,10 @@ module Search
             else
               raise ArgumentError
             end
-          end
+          }
 
     scope :_search_integer_eq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :bigint)
             value = _search_cast_integer(value)
 
@@ -458,10 +461,10 @@ module Search
             else
               where(node.eq(value))
             end
-          end
+          }
 
     scope :_search_datetime_eq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :timestamp)
             value = _search_cast_datetime(value)
 
@@ -474,10 +477,10 @@ module Search
             else
               where(node.eq(value))
             end
-          end
+          }
 
     scope :_search_string_eq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
 
@@ -490,10 +493,10 @@ module Search
             else
               where(node.eq(value))
             end
-          end
+          }
 
     scope :_search_boolean_eq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :boolean)
             value = _search_cast_boolean(value)
 
@@ -506,118 +509,118 @@ module Search
             else
               where(node.eq(value))
             end
-          end
+          }
 
     scope :_search_integer_lt,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :bigint)
             value = _search_cast_integer(value)
             value = value.first if value.is_a?(Range)
 
             where(node.lt(value))
-          end
+          }
 
     scope :_search_datetime_lt,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :timestamp)
             value = _search_cast_datetime(value)
             value = value.first if value.is_a?(Range)
 
             where(node.lt(value))
-          end
+          }
 
     scope :_search_string_lt,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
             value = value.first if value.is_a?(Range)
 
             where(node.lt(value))
-          end
+          }
 
     scope :_search_integer_lteq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :bigint)
             value = _search_cast_integer(value)
             value = value.first if value.is_a?(Range)
 
             where(node.lteq(value))
-          end
+          }
 
     scope :_search_datetime_lteq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :timestamp)
             value = _search_cast_datetime(value)
             value = value.first if value.is_a?(Range)
 
             where(node.lteq(value))
-          end
+          }
 
     scope :_search_string_lteq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
             value = value.first if value.is_a?(Range)
 
             where(node.lteq(value))
-          end
+          }
 
     scope :_search_integer_gt,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :bigint)
             value = _search_cast_integer(value)
             value = value.last if value.is_a?(Range)
 
             where(node.gt(value))
-          end
+          }
 
     scope :_search_datetime_gt,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :timestamp)
             value = _search_cast_datetime(value)
             value = value.last if value.is_a?(Range)
 
             where(node.gt(value))
-          end
+          }
 
     scope :_search_string_gt,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
             value = value.last if value.is_a?(Range)
 
             where(node.gt(value))
-          end
+          }
 
     scope :_search_integer_gteq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :bigint)
             value = _search_cast_integer(value)
             value = value.last if value.is_a?(Range)
 
             where(node.gteq(value))
-          end
+          }
 
     scope :_search_datetime_gteq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :timestamp)
             value = _search_cast_datetime(value)
             value = value.last if value.is_a?(Range)
 
             where(node.gteq(value))
-          end
+          }
 
     scope :_search_string_gteq,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
             value = value.last if value.is_a?(Range)
 
             where(node.gteq(value))
-          end
+          }
 
     scope :_search_string_matches,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
 
@@ -630,10 +633,10 @@ module Search
             else
               where(node.matches("%#{value}%", nil, false))
             end
-          end
+          }
 
     scope :_search_string_ends,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
 
@@ -646,10 +649,10 @@ module Search
             else
               where(node.matches("%#{value}", nil, false))
             end
-          end
+          }
 
     scope :_search_string_starts,
-          ->(node:, value:) do
+          lambda { |node:, value:|
             node = _search_cast(node: node, type: :text)
             value = _search_cast_string(value)
 
@@ -662,6 +665,6 @@ module Search
             else
               where(node.matches("#{value}%", nil, false))
             end
-          end
+          }
   end
 end

data/package-lock.json

@@ -1,14 +1,14 @@
 {
-  "name": "code-ruby",
+  "name": "search_rails",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "license": "MIT",
       "engines": {
-        "node": "23.11.0",
-        "npm": "11.2.0"
+        "node": "26.3.1",
+        "npm": "11.17.0"
       }
     }
   }
-}
+}

data/package.json

@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "engines": {
-    "node": "23.11.0",
-    "npm": "11.2.0"
+    "node": "26.3.1",
+    "npm": "11.17.0"
   }
-}
+}

data/search_rails.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/dorianmariecom/search_rails"
   s.license = "MIT"
 
-  s.add_dependency "rails"
+  s.add_dependency "chronic"
   s.add_dependency "query-ruby"
+  s.add_dependency "rails"
   s.add_dependency "zeitwerk"
-  s.add_dependency "chronic"
 
   s.metadata["rubygems_mfa_required"] = "true"
 
-  s.required_ruby_version = ">= 3.0"
+  s.required_ruby_version = ">= 4.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: search_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Dorian Marié
 bindir: bin
 cert_chain: []
-date: 2025-05-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,6 +87,12 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/bundle
+- bin/bundle-audit
+- bin/bundler-audit
+- bin/dorian
+- bin/rubocop
+- bin/test
 - lib/search.rb
 - lib/search/version.rb
 - lib/search_rails.rb
@@ -105,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.15
 specification_version: 4
 summary: a powerful search for rails
 test_files: []