normalizy 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7f65965cec5c289729431b01fcf23be051784ec7b18bf9b71ae00c698d9d93
-  data.tar.gz: ad9ce5473030dec2eae92783feecf6895e8e5e841bee48b5af46f4b6579dcc12
+  metadata.gz: 7fbc57100ff4a77fb63503844a16059b78537836f4df58f0f64127d2bcfe3270
+  data.tar.gz: f0ac58e5e468721dc2ab116a0550b542c495e073d9315b420f8bddb754b327c2
 SHA512:
-  metadata.gz: c2c043c42e3627fb56b02defc6a0081311da5b72dfb1da0ecda255abca81a734b4a47c4c25054f24d5c4dec75059862fa250482e54d84f79a6905ecde4e5a7cc
-  data.tar.gz: eec956c476590a3a521f33ed58e657add31f52d391cb29362856d9dce14968f8d55df4f38b7d030071283da2d236ee1ec87654c5b6598a181ea45c227ef32216
+  metadata.gz: f92bae33a40563537d7b6637118dbdf5b960b979a2941e6aa0859ad738a9dda2db74e1b444de3853ff61c2a4695866ad46efc96d3b34b3088bf16a6e6c87d124
+  data.tar.gz: cbf6c06467360321fa144d1800258d4af50215b1b661e9e2056ab1d0c17b712e137a4167d82bb9534030a9f35605faa4af2a140c09e6b2121f42e38d3b7a7560

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v2.0.0
+
+### Break Changes
+
+- Drops support for Ruby < 3.3;
+
+### Fixes
+
+- `date` filter now returns `nil` explicitly on invalid date to avoid Rails 8 compatibility issue where `errors.add` returns the added `ActiveModel::Error` object instead of `nil`;
+
 ## v1.7.0
 
 ### Features

data/README.md

@@ -1,10 +1,10 @@
 # Normalizy
 
-[![CI](https://github.com/wbotelhos/normalizy/workflows/CI/badge.svg)](https://github.com/wbotelhos/normalizy/actions)
+[![Tests](https://github.com/wbotelhos/normalizy/workflows/Tests/badge.svg)](https://github.com/wbotelhos/normalizy/actions/workflows/tests.yml)
 [![Gem Version](https://badge.fury.io/rb/normalizy.svg)](https://badge.fury.io/rb/normalizy)
-[![Maintainability](https://api.codeclimate.com/v1/badges/3896d0a11bee012c818c/maintainability)](https://codeclimate.com/github/wbotelhos/normalizy/maintainability)
-[![codecov](https://codecov.io/gh/wbotelhos/normalizy/branch/master/graph/badge.svg?token=0XTRFDFHDq)](https://codecov.io/gh/wbotelhos/normalizy)
-[![Sponsor](https://img.shields.io/badge/sponsor-%3C3-green)](https://www.patreon.com/wbotelhos)
+[![Maintainability](https://qlty.sh/gh/wbotelhos/projects/normalizy/maintainability.svg)](https://qlty.sh/gh/wbotelhos/projects/normalizy)
+[![Coverage](https://codecov.io/gh/wbotelhos/normalizy/branch/master/graph/badge.svg?token=0XTRFDFHDq)](https://codecov.io/gh/wbotelhos/normalizy)
+[![Sponsor](https://img.shields.io/badge/sponsor-%3C3-green)](https://github.com/sponsors/wbotelhos)
 
 Attribute normalizer for Rails.
 

data/lib/normalizy/config.rb

@@ -20,7 +20,7 @@ module Normalizy
     end
 
     def initialize
-      @default_filters   = {}
+      @default_filters = {}
       @normalizy_aliases = {}
 
       @filters = {

data/lib/normalizy/extensions.rb

@@ -8,11 +8,11 @@ module Normalizy
       private
 
       def extract_filter(rule, rule_options, attribute, filters: Normalizy.config.filters)
-        options = rule_options.merge(attribute: attribute, object: self)
+        options = rule_options.merge(attribute:, object: self)
 
         return [filters[rule] || rule, options] unless rule.is_a?(Hash)
 
-        filter  = filters[rule.keys.first] || rule
+        filter = filters[rule.keys.first] || rule
         options = (rule.values.first || {}).merge(options)
 
         [filter, options]
@@ -58,7 +58,7 @@ module Normalizy
 
           unalias_for(rule_name).each do |unaliased_rule|
             filter, filter_options = extract_filter(unaliased_rule, rule_options, attribute)
-            result                 = extract_value(result, filter, filter_options, block)
+            result = extract_value(result, filter, filter_options, block)
           end
         end
 
@@ -75,36 +75,38 @@ module Normalizy
 
       def normalizy(*args, &block)
         options = args.extract_options!
-        rules   = options[:with]
+        rules = options[:with]
 
         self.normalizy_rules ||= {}
 
         args.each do |field|
           normalizy_rules[field] ||= []
-          normalizy_rules[field] << { block: block, options: options.except(:with), rules: rules }
+          normalizy_rules[field] << { block:, options: options.except(:with), rules: }
         end
 
-        prepend Module.new {
-          args.each do |attribute|
-            define_method :"#{attribute}=" do |value|
-              result = normalizy!(
-                attribute: attribute,
-                block:     block,
-                options:   options.except(:with),
-                rules:     rules,
-                value:     value
-              )
-
-              if rules.is_a?(Hash) && rules.dig(:slug, :to).present?
-                write_attribute rules.dig(:slug, :to), result
-
-                super value
-              else
-                super result
+        prepend(
+          Module.new do
+            args.each do |attribute|
+              define_method :"#{attribute}=" do |value|
+                result = normalizy!(
+                  attribute:,
+                  block:,
+                  options:   options.except(:with),
+                  rules:,
+                  value:
+                )
+
+                if rules.is_a?(Hash) && rules.dig(:slug, :to).present?
+                  write_attribute rules.dig(:slug, :to), result
+
+                  super(value)
+                else
+                  super(result)
+                end
               end
             end
           end
-        }
+        )
       end
     end
   end

data/lib/normalizy/filters/date.rb

@@ -14,11 +14,13 @@ module Normalizy
           end
 
           input = input.beginning_of_day if options[:adjust] == :begin && input.respond_to?(:beginning_of_day)
-          input = input.end_of_day       if options[:adjust] == :end   && input.respond_to?(:end_of_day)
+          input = input.end_of_day if options[:adjust] == :end && input.respond_to?(:end_of_day)
 
           input
         rescue ArgumentError
-          options[:object].errors.add options[:attribute], error_message(input, options)
+          options[:object].errors.add(options[:attribute], error_message(input, options))
+
+          nil
         end
 
         private

data/lib/normalizy/filters/number.rb

@@ -8,7 +8,7 @@ module Normalizy
 
         value = input.gsub(/\D/, '')
 
-        return nil                        if value.blank?
+        return nil if value.blank?
         return value.send(options[:cast]) if options[:cast]
 
         value

data/lib/normalizy/filters/strip.rb

@@ -12,7 +12,7 @@ module Normalizy
           right: '\s*\z',
         }[options[:side] || :both]
 
-        input.gsub Regexp.new(/#{regex}/), ''
+        input.gsub(/#{regex}/, '')
       end
     end
   end

data/lib/normalizy/rspec/matcher.rb

@@ -43,7 +43,7 @@ module Normalizy
 
           return false if options.blank?
 
-          options = default_rules if options.map { |option| option[:rules] }.compact.blank?
+          options = default_rules if options.filter_map { |option| option[:rules] }.blank?
 
           return false if options.blank?
 
@@ -98,6 +98,14 @@ module Normalizy
         @to.nil? ? :nil : %("#{@to}")
       end
 
+      def format_hash(hash)
+        pairs = hash.map do |k, v|
+          "#{k}: #{v.is_a?(Hash) ? format_hash(v) : v.inspect}"
+        end
+
+        "{#{pairs.join(', ')}}"
+      end
+
       def with_expected
         @with
       end
@@ -105,7 +113,7 @@ module Normalizy
       def with_value
         options = @subject.class.normalizy_rules[@attribute]
 
-        return :nil            if options.nil?
+        return :nil if options.nil?
         return %("#{options}") if options.blank?
 
         result = options.map do |option|
@@ -113,7 +121,7 @@ module Normalizy
 
           return :nil if rules.nil?
 
-          rules.presence || %("#{rules}")
+          rules.is_a?(Hash) ? format_hash(rules) : rules.presence || %("#{rules}")
         end
 
         result.join ', '

data/lib/normalizy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Normalizy
-  VERSION = '1.7.0'
+  VERSION = '2.0.0'
 end

data/lib/normalizy.rb

@@ -17,4 +17,4 @@ require 'normalizy/config'
 require 'normalizy/extensions'
 require 'normalizy/rspec/matcher'
 
-ActiveRecord::Base.include Normalizy::Extension
+ActiveSupport.on_load(:active_record) { include Normalizy::Extension }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: normalizy
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Washington Botelho
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,104 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  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: debug
-  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-rails
-  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: rubocop-rails
-  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: 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'
 description: Attribute normalizer for Rails.
 email: wbotelhos@gmail.com
 executables: []
@@ -154,7 +55,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.12
 specification_version: 4
 summary: Attribute normalizer for Rails.
 test_files: []