decanter 4.0.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855c0c38fda4543f1542a7519ff4234544d696a910f39fe195cf99f50ad6a780
-  data.tar.gz: 28b8bb87ee97e7a0c371124cbb8a04319b35df6c2ee642f75290d822a2015186
+  metadata.gz: 740cf6eead3d1c13d1af276f12bd8f1e54e6052ff8791fffa3a9b133dde61b7c
+  data.tar.gz: 86eb37227ce42cf1dddfc7676b298f4de0681178b4540800fc6a67d682568542
 SHA512:
-  metadata.gz: 523f731eb6580679bc32699b6ae473220dabf8840124657bd0bfbfbbfd2c892affdcf44ba33c9435f51366c83bb8d86ebe467f7b2a98ae0da32211b525d062ca
-  data.tar.gz: 9923cf90108899c59990687ace8b0e23bad06dfb01b52d8c28594ba1f657a687007f33c4aacad4981dd2391106114df3098121a74e845ee967cccb52a94405c2
+  metadata.gz: aec4940ffc2ede503acf8ea757eeaf528bc65e0cc1282cc6fe6fc42c1e1a1f6cc27b9292c62946bca1939b7714cf4cf3e53d1da5093318068c95f349e5e77e88
+  data.tar.gz: 1af26f35262236b5efe518eea6cfc2b9f8716627f136c96f850233d1d34b7c08e7a5c252706e6cf98fe7544a28082f0774b231d7775f8b16a993b243968088b0

data/.github/CODEOWNERS

@@ -1,2 +1,3 @@
 # These owners will be the default owners for everything in the repo.
-* @chawes13
+
+- @nicoledow

data/.github/workflows/versionci.yml

@@ -0,0 +1,20 @@
+name: Version CI
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.2.0", "3.2.7", "3.3.0", "3.3.7"]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.3.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.5

data/Gemfile.lock

@@ -1,68 +1,184 @@
 PATH
   remote: .
   specs:
-    decanter (4.0.4)
-      actionpack (>= 4.2.10)
+    decanter (5.0.0)
+      actionpack (>= 7.1.3.2)
       activesupport
+      rails (>= 7.1.3.2)
       rails-html-sanitizer (>= 1.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4.4)
-      actionview (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
-      rack (~> 2.0, >= 2.0.8)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.4)
-      activesupport (= 5.2.4.4)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.4.4)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
+      globalid (>= 0.3.6)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      timeout (>= 0.4.0)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      marcel (~> 1.0)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     builder (3.2.4)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    date (3.4.1)
+    diff-lcs (1.5.1)
     docile (1.1.5)
-    dotenv (2.2.1)
-    erubi (1.9.0)
-    i18n (1.8.5)
+    dotenv (3.1.1)
+    drb (2.2.1)
+    erubi (1.12.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    loofah (2.7.0)
+    io-console (0.7.2)
+    irb (1.13.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
+    net-imap (0.5.6)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.16.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.4-x86_64-linux)
+      racc (~> 1.4)
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
+    rack (3.0.10)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      bundler (>= 1.15.0)
+      railties (= 7.1.3.2)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.2.4.4)
-      actionpack (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rake (12.3.3)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    reline (0.5.5)
+      io-console (~> 0.5)
     rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -82,16 +198,25 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    stringio (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    webrick (1.8.1)
+    websocket-driver (0.7.7)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.13)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
+  arm64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.9)
+  bundler (~> 2.4.22)
   decanter!
   dotenv
   rake (~> 12.0)
@@ -99,4 +224,4 @@ DEPENDENCIES
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   1.17.3
+   2.4.22

data/README.md

@@ -3,7 +3,7 @@
 Decanter is a Ruby gem that makes it easy to transform incoming data before it hits the model. You can think of Decanter as the opposite of Active Model Serializers (AMS). While AMS transforms your outbound data into a format that your frontend consumes, Decanter transforms your incoming data into a format that your backend consumes.
 
 ```ruby
-gem 'decanter', '~> 4.0'
+gem 'decanter', '~> 5.0'
 ```
 
 ## Migration Guides
@@ -77,6 +77,7 @@ end
 ```
 
 #### Parsers
+
 ```
 rails g parser TruncatedString
 
@@ -133,8 +134,8 @@ You can use the `is_collection` option for explicit control over decanting colle
 If this option is not provided, autodetect logic is used to determine if the providing incoming params holds a single object or collection of objects.
 
 - `nil` or not provided: will try to autodetect single vs collection
-- `true` will always treat the incoming params args as *collection*
-- `false` will always treat incoming params args as *single object*
+- `true` will always treat the incoming params args as _collection_
+- `false` will always treat incoming params args as _single object_
 - `truthy` will raise an error
 
 ### Nested resources
@@ -178,10 +179,11 @@ Some parsers can receive options that modify their behavior. These options are p
 ```ruby
 input :start_date, :date, parse_format: '%Y-%m-%d'
 ```
+
 **Available Options:**
-| Parser      | Option      | Default    | Notes
+| Parser | Option | Default | Notes
 | ----------- | ----------- | -----------| -----------
-| `ArrayParser`   | `parse_each`| N/A | Accepts a parser type, then uses that parser to parse each element in the array. If this option is not defined, each element is simply returned.
+| `ArrayParser` | `parse_each`| N/A | Accepts a parser type, then uses that parser to parse each element in the array. If this option is not defined, each element is simply returned.
 | `DateParser`| `parse_format` | `'%m/%d/%Y'`| Accepts any format string accepted by Ruby's `strftime` method
 | `DateTimeParser` | `parse_format` | `'%m/%d/%Y %I:%M:%S %p'` | Accepts any format string accepted by Ruby's `strftime` method
 
@@ -299,7 +301,6 @@ end
 
 _Note: we recommend using [Active Record validations](https://guides.rubyonrails.org/active_record_validations.html) to check for presence of an attribute, rather than using the `required` option. This method is intended for use in non-RESTful routes or cases where Active Record validations are not available._
 
-
 ### Default values
 
 If you provide the option `:default_value` for an input in your decanter, the input key will be initialized with the given default value. Input keys not found in the incoming data parameters will be set to the provided default rather than ignoring the missing key. Note: `nil` and empty keys will not be overridden.

data/decanter.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'decanter/version'
 
@@ -9,29 +8,29 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Ryan Francis', 'David Corwin']
   spec.email         = ['ryan@launchpadlab.com']
 
-  spec.summary       = %q{Form Parser for Rails}
-  spec.description   = %q{Decanter aims to reduce complexity in Rails controllers by creating a place for transforming data before it hits the model and database.}
+  spec.summary       = 'Form Parser for Rails'
+  spec.description   = 'Decanter aims to reduce complexity in Rails controllers by creating a place for transforming data before it hits the model and database.'
   spec.homepage      = 'https://github.com/launchpadlab/decanter'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 3.2.0'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
-  end
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
+
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'actionpack', '>= 4.2.10'
+  spec.add_dependency 'rails', '>= 7.1.3.2'
+  spec.add_dependency 'actionpack', '>= 7.1.3.2'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'rails-html-sanitizer', '>= 1.0.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'bundler', '~> 2.4.22'
   spec.add_development_dependency 'dotenv'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.9'

data/lib/decanter/core.rb

@@ -1,3 +1,5 @@
+require 'action_controller'
+
 module Decanter
   module Core
     DEFAULT_VALUE_KEY = :default_value
@@ -8,40 +10,42 @@ module Decanter
     end
 
     module ClassMethods
-      def input(name, parsers=nil, **options)
+      def input(name, parsers = nil, **options)
         # Convert all input names to symbols to correctly calculate handled vs. unhandled keys
         input_names = [name].flatten.map(&:to_sym)
 
         if input_names.length > 1 && parsers.blank?
-          raise ArgumentError.new("#{self.name} no parser specified for input with multiple values.")
+          raise ArgumentError, "#{self.name} no parser specified for input with multiple values."
         end
 
         handlers[input_names] = {
-          key:     options.fetch(:key, input_names.first),
-          name:    input_names,
-          options: options,
-          parsers:  parsers,
-          type:    :input
+          key: options.fetch(:key, input_names.first),
+          name: input_names,
+          options:,
+          parsers:,
+          type: :input
         }
       end
 
+      # Adjusting has_many to explicitly define keyword arguments
       def has_many(assoc, **options)
         handlers[assoc] = {
-          assoc:   assoc,
-          key:     options.fetch(:key, assoc),
-          name:    assoc,
-          options: options,
-          type:    :has_many
+          assoc:,
+          key: options.fetch(:key, assoc),
+          name: assoc,
+          options:,
+          type: :has_many
         }
       end
 
+      # Adjusting has_one similarly
       def has_one(assoc, **options)
         handlers[assoc] = {
-          assoc:   assoc,
-          key:     options.fetch(:key, assoc),
-          name:    assoc,
-          options: options,
-          type:    :has_one
+          assoc:,
+          key: options.fetch(:key, assoc),
+          name: assoc,
+          options:,
+          type: :has_one
         }
       end
 
@@ -50,12 +54,15 @@ module Decanter
       end
 
       def strict(mode)
-        raise(ArgumentError, "#{self.name}: Unknown strict value #{mode}") unless [:ignore, true, false].include? mode
+        raise(ArgumentError, "#{name}: Unknown strict value #{mode}") unless [:ignore, true, false].include? mode
+
         @strict_mode = mode
       end
 
       def log_unhandled_keys(mode)
-        raise(ArgumentError, "#{self.name}: Unknown log_unhandled_keys value #{mode}") unless [true, false].include? mode
+        raise(ArgumentError, "#{name}: Unknown log_unhandled_keys value #{mode}") unless [true,
+                                                                                          false].include? mode
+
         @log_unhandled_keys_mode = mode
       end
 
@@ -65,16 +72,16 @@ module Decanter
 
         # Convert all params passed to a decanter to a hash with indifferent access to mitigate accessor ambiguity
         accessible_args = to_indifferent_hash(args)
-        {}.merge( default_keys )
-          .merge( unhandled_keys(accessible_args) )
-          .merge( handled_keys(accessible_args) )
+        {}.merge(default_keys)
+          .merge(unhandled_keys(accessible_args))
+          .merge(handled_keys(accessible_args))
       end
 
       def default_keys
         # return keys with provided default value when key is not defined within incoming args
         default_result = default_value_inputs
-          .map { |input| [input[:key], input[:options][DEFAULT_VALUE_KEY]] }
-          .to_h
+                         .map { |input| [input[:key], input[:options][DEFAULT_VALUE_KEY]] }
+                         .to_h
 
         # parse handled default values, including keys
         # with defaults not already managed by handled_keys
@@ -100,8 +107,9 @@ module Decanter
         end
       end
 
-      def required_input_keys_present?(args={})
+      def required_input_keys_present?(args = {})
         return true unless any_inputs_required?
+
         compact_inputs = required_inputs.compact
         compact_inputs.all? do |input|
           args.keys.map(&:to_sym).include?(input) && !args[input].nil?
@@ -109,7 +117,8 @@ module Decanter
       end
 
       def empty_required_input_error
-        raise(MissingRequiredInputValue, 'Required inputs have been declared, but no values for those inputs were passed.')
+        raise(MissingRequiredInputValue,
+              'Required inputs have been declared, but no values for those inputs were passed.')
       end
 
       def empty_args_error
@@ -120,20 +129,20 @@ module Decanter
 
       def unhandled_keys(args)
         unhandled_keys = args.keys.map(&:to_sym) -
-          handlers.keys.flatten.uniq -
-          keys_to_ignore -
-          handlers.values
-            .select { |handler| handler[:type] != :input }
-            .map { |handler| "#{handler[:name]}_attributes".to_sym }
+                         handlers.keys.flatten.uniq -
+                         keys_to_ignore -
+                         handlers.values
+                                 .select { |handler| handler[:type] != :input }
+                                 .map { |handler| "#{handler[:name]}_attributes".to_sym }
 
         return {} unless unhandled_keys.any?
 
         case strict_mode
         when :ignore
-          p "#{self.name} ignoring unhandled keys: #{unhandled_keys.join(', ')}." if log_unhandled_keys_mode
+          p "#{name} ignoring unhandled keys: #{unhandled_keys.join(', ')}." if log_unhandled_keys_mode
           {}
         when true
-          raise(UnhandledKeysError, "#{self.name} received unhandled keys: #{unhandled_keys.join(', ')}.")
+          raise(UnhandledKeysError, "#{name} received unhandled keys: #{unhandled_keys.join(', ')}.")
         else
           args.select { |key| unhandled_keys.include? key.to_sym }
         end
@@ -155,22 +164,22 @@ module Decanter
       def handle(handler, args)
         values = args.values_at(*handler[:name])
         values = values.length == 1 ? values.first : values
-        self.send("handle_#{handler[:type]}", handler, values)
+        send("handle_#{handler[:type]}", handler, values)
       end
 
       def handle_input(handler, args)
-         values = args.values_at(*handler[:name])
-         values = values.length == 1 ? values.first : values
-         parse(handler[:key], handler[:parsers], values, handler[:options])
+        values = args.values_at(*handler[:name])
+        values = values.length == 1 ? values.first : values
+        parse(handler[:key], handler[:parsers], values, handler[:options])
       end
 
       def handle_association(handler, args)
         assoc_handlers = [
           handler,
           handler.merge({
-            key:   handler[:options].fetch(:key, "#{handler[:name]}_attributes").to_sym,
-            name:  "#{handler[:name]}_attributes".to_sym
-          })
+                          key: handler[:options].fetch(:key, "#{handler[:name]}_attributes").to_sym,
+                          name: "#{handler[:name]}_attributes".to_sym
+                        })
         ]
 
         assoc_handler_names = assoc_handlers.map { |_handler| _handler[:name] }
@@ -180,20 +189,21 @@ module Decanter
           {}
         when 1
           _handler = assoc_handlers.detect { |_handler| args.has_key?(_handler[:name]) }
-          self.send("handle_#{_handler[:type]}", _handler, args[_handler[:name]])
+          send("handle_#{_handler[:type]}", _handler, args[_handler[:name]])
         else
-          raise ArgumentError.new("Handler #{handler[:name]} matches multiple keys: #{assoc_handler_names}.")
+          raise ArgumentError, "Handler #{handler[:name]} matches multiple keys: #{assoc_handler_names}."
         end
       end
 
       def handle_has_many(handler, values)
         decanter = decanter_for_handler(handler)
         if values.is_a?(Hash)
-          parsed_values = values.map do |index, input_values|
+          parsed_values = values.map do |_index, input_values|
             next if input_values.nil?
+
             decanter.decant(input_values)
           end
-          return { handler[:key] => parsed_values }
+          { handler[:key] => parsed_values }
         else
           {
             handler[:key] => values.compact.map { |value| decanter.decant(value) }
@@ -207,17 +217,16 @@ module Decanter
 
       def decanter_for_handler(handler)
         if specified_decanter = handler[:options][:decanter]
-          Decanter::decanter_from(specified_decanter)
+          Decanter.decanter_from(specified_decanter)
         else
-          Decanter::decanter_for(handler[:assoc])
+          Decanter.decanter_for(handler[:assoc])
         end
       end
 
       def parse(key, parsers, value, options)
         return { key => value } unless parsers
-        if options[:required] && value_missing?(value)
-          raise ArgumentError.new("No value for required argument: #{key}")
-        end
+        raise ArgumentError, "No value for required argument: #{key}" if options[:required] && value_missing?(value)
+
         parser_classes = Parser.parsers_for(parsers)
         Parser.compose_parsers(parser_classes).parse(key, value, options)
       end
@@ -235,7 +244,8 @@ module Decanter
       end
 
       def log_unhandled_keys_mode
-        return !!(Decanter.configuration.log_unhandled_keys) if @log_unhandled_keys_mode.nil?
+        return !!Decanter.configuration.log_unhandled_keys if @log_unhandled_keys_mode.nil?
+
         !!@log_unhandled_keys_mode
       end
 
@@ -244,11 +254,12 @@ module Decanter
       private
 
       def value_missing?(value)
-        value.nil? || value == ""
+        value.nil? || value == ''
       end
 
       def to_indifferent_hash(args)
-        return args.to_unsafe_h if args.class.name == ACTION_CONTROLLER_PARAMETERS_CLASS_NAME
+        return args.to_unsafe_h if args.instance_of?(ActionController::Parameters)
+
         args.to_h.with_indifferent_access
       end
     end

data/lib/decanter/parser/array_parser.rb

@@ -1,6 +1,6 @@
 module Decanter
   module Parser
-    class ArrayParser < ValueParser
+    class ArrayParser < Base
 
       DUMMY_VALUE_KEY = '_'.freeze
 
@@ -10,8 +10,8 @@ module Decanter
         # Fetch parser classes for provided keys
         parse_each = options.fetch(:parse_each, :pass)
         item_parsers = Parser.parsers_for(Array.wrap(parse_each))
-        unless item_parsers.all? { |parser| parser <= ValueParser }
-          raise Decanter::ParseError.new 'parser(s) for array items must subclass ValueParser'
+        unless item_parsers.all? { |parser| parser <= ValueParser || parser <= PassParser } 
+          raise Decanter::ParseError.new 'parser(s) for array items must subclass either ValueParser or PassParser'
         end
         # Compose supplied parsers
         item_parser = Parser.compose_parsers(item_parsers)

data/lib/decanter/parser/boolean_parser.rb

@@ -5,7 +5,6 @@ module Decanter
       allow TrueClass, FalseClass
 
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         [1, '1'].include?(val) || !!/^true$/i.match?(val.to_s)
       end

data/lib/decanter/parser/core.rb

@@ -8,6 +8,10 @@ module Decanter
 
       module ClassMethods
 
+        def _parse(name, value, options={})
+          { name => @parser.call(value, options) }
+        end
+
         # Check if allowed, parse if not
         def parse(name, value, options={})
           if allowed?(value)

data/lib/decanter/parser/date_parser.rb

@@ -5,7 +5,6 @@ module Decanter
       allow Date
 
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         parse_format = options.fetch(:parse_format, '%m/%d/%Y')
         ::Date.strptime(val, parse_format)

data/lib/decanter/parser/datetime_parser.rb

@@ -5,7 +5,6 @@ module Decanter
       allow DateTime
 
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         parse_format = options.fetch(:parse_format, '%m/%d/%Y %I:%M:%S %p')
         ::DateTime.strptime(val, parse_format)

data/lib/decanter/parser/float_parser.rb

@@ -6,7 +6,6 @@ module Decanter
       allow Float, Integer
 
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         val.scan(REGEX).join.try(:to_f)
       end

data/lib/decanter/parser/integer_parser.rb

@@ -6,7 +6,6 @@ module Decanter
       allow Integer
 
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         val.is_a?(Float) ?
           val.to_i :

data/lib/decanter/parser/pass_parser.rb

@@ -1,6 +1,6 @@
 module Decanter
   module Parser
-    class PassParser < ValueParser
+    class PassParser < Base
 
       parser do |val, options|
         next if (val.nil? || val == '')

data/lib/decanter/parser/phone_parser.rb

@@ -6,7 +6,6 @@ module Decanter
       allow Integer
 
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         val.scan(REGEX).join.to_s
       end

data/lib/decanter/parser/string_parser.rb

@@ -2,7 +2,6 @@ module Decanter
   module Parser
     class StringParser < ValueParser
       parser do |val, options|
-        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
         next if (val.nil? || val === '')
         next val if val.is_a? String
         val.to_s

data/lib/decanter/parser/value_parser.rb

@@ -3,8 +3,16 @@ require_relative 'core'
 module Decanter
   module Parser
     class ValueParser < Base
+
       def self._parse(name, value, options={})
-        { name => @parser.call(value, options) }
+        self.validate_singularity(value)
+        super(name, value, options)
+      end
+
+      private
+
+      def self.validate_singularity(value)
+        raise Decanter::ParseError.new 'Expects a single value' if value.is_a? Array
       end
     end
   end

data/lib/decanter/version.rb

@@ -1,3 +1,3 @@
 module Decanter
-  VERSION = '4.0.4'.freeze
+  VERSION = '5.0.0'.freeze
 end

data/migration-guides/v5.0.0.md

@@ -0,0 +1,11 @@
+# v5.0.0 Migration Guide
+
+_Note: this guide assumes you are upgrading from decanter v4 to v5._
+
+This version contains major updates including the upgrade to Ruby version 3.3.0. Ensure your environment is compatible with this Ruby version before proceeding.
+
+## Major Changes
+
+- **Ruby Version Update**: Decanter now requires Ruby 3.3.0. This update brings several language [improvements and performance enhancements](https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/).
+
+- **Rails Dependency Update**: Decanter now requires Rails 7.1.3.2.

metadata

@@ -1,30 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: decanter
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Ryan Francis
 - David Corwin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.3.2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 7.1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 7.1.3.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 2.4.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 2.4.22
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -136,9 +150,11 @@ files:
 - ".github/ISSUE_TEMPLATE/BUG_REPORT.md"
 - ".github/ISSUE_TEMPLATE/FEATURE_REQUEST.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/versionci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -184,12 +200,13 @@ files:
 - lib/generators/rails/templates/parser.rb.erb
 - migration-guides/v3.0.0.md
 - migration-guides/v4.0.0.md
+- migration-guides/v5.0.0.md
 homepage: https://github.com/launchpadlab/decanter
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,15 +214,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Form Parser for Rails
 test_files: []