subroutine 2.3.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3571693a24dd9d341127e6de4d29cd242d2afc31e5e569728d4dc9101dcd11d
-  data.tar.gz: 72efb048aa00d5ba7be9c8a5c48fa6dd84c69ca71a6e1544373c96e85b3b0869
+  metadata.gz: e6530220e9e104f3eb840fc5ad28514e4e9bb29f6831f1c8cefa96e3d511454b
+  data.tar.gz: 0bfaf68aae3bd5f5887c2da31b3cc1b8f8fe9c8e12b88f1365c03836bd4615cf
 SHA512:
-  metadata.gz: 97c717c09a9b7a2e8fcc76240c0cb1a928bb9a3407e5442e126a3cf0aa147f03d747c43ed44da1efa8258b0ade53242c3bf064141d51fe612769fe446b87ec5d
-  data.tar.gz: ee2f52b5c450828495d2e5d5f11458edec8243487768570b6dcd09e5606a40637290222187c79344284353baaee206cf4833022d8983c5b5eb909809f037b1b3
+  metadata.gz: 2c7e809eac6e059bed7029907f4a153b388d564c0ac93b9dde0397a6ef15c5cb57fe816b2b31fdd4d2547dafbbc8d12d52493aebe61aa550afa6c430f2db820a
+  data.tar.gz: 74d0b0c8c647e3f97fa0899c18a33fbddf7aa7b88a878f22740cd0edacbaf873f7181a164347b88425c1a891662565433d3e6c5dfd5a35f602b785c9b4f7341c

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+.github/workflows     @guideline-tech/engineering

data/.github/dependabot.yml

@@ -0,0 +1,24 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    open-pull-requests-limit: 20
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "America/New_York"
+    commit-message:
+      prefix: "[github-actions] "      
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "08:30"
+      timezone: "America/New_York"
+    versioning-strategy: increase
+    open-pull-requests-limit: 20
+    insecure-external-code-execution: deny
+    allow:
+      - dependency-type: "all"    
+    commit-message:
+      prefix: "[bundler] "      

data/.github/workflows/build.yml

@@ -1,5 +1,9 @@
 name: build
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+      branches:
+        - main
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -7,17 +11,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.5, 2.7.6]
+        ruby-version: [2.7.8]
         experimental: [false]
         include:
           - ruby-version: 3.0
             experimental: true
           - ruby-version: 3.1
             experimental: true
+          - ruby-version: 3.2
+            experimental: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          show-progress: 'false'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs `bundle install` and caches installed gems automatically
-      - run: bundle exec rake test
+      - run: bundle exec appraisal install
+      - run: bundle exec appraisal rake test

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+2.7.8

data/Appraisals

@@ -0,0 +1,9 @@
+appraise "rails-6.1" do
+  gem 'activemodel', '~> 6.1.0'
+  gem 'actionpack', '~> 6.1.0'
+end
+
+appraise "rails-7.0" do
+  gem 'activemodel', '~> 7.0.0'
+  gem 'actionpack', '~> 7.0.0'
+end

data/CHANGELOG.MD

@@ -1,3 +1,7 @@
+## Subroutine 3.0
+
+Add support for Rails 6.1. Drop support for Rails 6.0 and lower.
+
 ## Subroutine 2.2
 
 Add `type` validation for Output.

data/Gemfile

@@ -5,4 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in subroutine.gemspec
 gemspec
 
-eval_gemfile "gemfiles/am60.gemfile"
+# Locking to specific git sha to work around
+# https://github.com/thoughtbot/appraisal/issues/211
+# until appraisal v3 is released
+gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"

data/README.md

@@ -62,3 +62,21 @@ end
 - [Using an Op](https://github.com/guideline-tech/subroutine/wiki/Using-an-Op)
 - [Errors](https://github.com/guideline-tech/subroutine/wiki/Errors)
 - [Basic Usage in Rails](https://github.com/guideline-tech/subroutine/wiki/Rails-Usage)
+
+## Development
+
+Run the test suite against current Rails version:
+
+```
+bundle exec rake test
+```
+
+Run the test suite against all supported Rails versions using `appraisal`:
+
+```
+bundle exec appraisal rake test
+```
+
+For help updating the `Gemfile` or changing supported Rails versions, see the `appraisal` gem [README](https://github.com/thoughtbot/appraisal#usage).
+
+Note that the gemfiles in `gemfiles/*` are auto-generated by `appraisal` and should not be modified directly.

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"
+gem "activemodel", "~> 6.1.0"
+gem "actionpack", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile.lock

@@ -0,0 +1,102 @@
+GIT
+  remote: https://github.com/thoughtbot/appraisal.git
+  revision: b200e636903700098bef25f4f51dbc4c46e4c04c
+  ref: b200e636903
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+
+PATH
+  remote: ..
+  specs:
+    subroutine (3.0.0)
+      activemodel (>= 6.1)
+      activesupport (>= 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.1.7.4)
+      actionview (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.7.4)
+      activesupport (= 6.1.7.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activesupport (6.1.7.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ansi (1.5.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    erubi (1.12.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    m (1.6.1)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
+    method_source (1.0.0)
+    minitest (5.18.1)
+    minitest-reporters (1.6.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mocha (2.0.4)
+      ruby2_keywords (>= 0.0.5)
+    nokogiri (1.15.2-arm64-darwin)
+      racc (~> 1.4)
+    racc (1.7.1)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rake (13.0.6)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    thor (1.2.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.8)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  actionpack (~> 6.1.0)
+  activemodel (~> 6.1.0)
+  appraisal!
+  bundler
+  byebug
+  m
+  minitest
+  minitest-reporters
+  mocha
+  rake
+  subroutine!
+
+BUNDLED WITH
+   2.4.7

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"
+gem "activemodel", "~> 7.0.0"
+gem "actionpack", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile.lock

@@ -0,0 +1,100 @@
+GIT
+  remote: https://github.com/thoughtbot/appraisal.git
+  revision: b200e636903700098bef25f4f51dbc4c46e4c04c
+  ref: b200e636903
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+
+PATH
+  remote: ..
+  specs:
+    subroutine (3.0.0)
+      activemodel (>= 6.1)
+      activesupport (>= 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.0.5.1)
+      actionview (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
+      rack (~> 2.0, >= 2.2.4)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (7.0.5.1)
+      activesupport (= 7.0.5.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (7.0.5.1)
+      activesupport (= 7.0.5.1)
+    activesupport (7.0.5.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ansi (1.5.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    erubi (1.12.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    m (1.6.1)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
+    method_source (1.0.0)
+    minitest (5.18.1)
+    minitest-reporters (1.6.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mocha (2.0.4)
+      ruby2_keywords (>= 0.0.5)
+    nokogiri (1.15.2-arm64-darwin)
+      racc (~> 1.4)
+    racc (1.7.1)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rake (13.0.6)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    thor (1.2.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  actionpack (~> 7.0.0)
+  activemodel (~> 7.0.0)
+  appraisal!
+  bundler
+  byebug
+  m
+  minitest
+  minitest-reporters
+  mocha
+  rake
+  subroutine!
+
+BUNDLED WITH
+   2.4.7

data/lib/subroutine/op.rb

@@ -112,9 +112,10 @@ module Subroutine
     end
 
     def inherit_errors(error_object, prefix: nil)
-      error_object = error_object.errors if error_object.respond_to?(:errors)
+      error_object = error_object.errors if error_object.respond_to?(:errors) && !error_object.is_a?(ActiveModel::Errors)
 
-      error_object.each do |field_name, error|
+      error_object.each do |error|
+        field_name = error.attribute
         field_name = "#{prefix}#{field_name}" if prefix
         field_name = field_name.to_sym
 
@@ -125,9 +126,9 @@ module Subroutine
         end
 
         if field_config
-          errors.add(field_config.field_name, error)
+          errors.add(field_config.field_name, error.message)
         else
-          errors.add(:base, error_object.full_message(field_name, error))
+          errors.add(:base, error_object.full_message(field_name, error.message))
         end
       end
 

data/lib/subroutine/type_caster.rb

@@ -56,7 +56,17 @@ end
 end
 
 ::Subroutine::TypeCaster.register :decimal, :big_decimal do |value, _options = {}|
-  ::Subroutine::TypeCaster.cast(value, type: :number, methods: [:to_d, :to_f])
+  next nil if value.blank?
+
+  if value.respond_to?(:to_d)
+    begin
+      next BigDecimal(value.to_s, 0)
+    rescue ArgumentError
+      next BigDecimal(0)
+    end
+  end
+
+  ::Subroutine::TypeCaster.cast(value, type: :number, methods: [:to_f])
 end
 
 ::Subroutine::TypeCaster.register :string, :text do |value, _options = {}|
@@ -65,10 +75,10 @@ end
 
 ::Subroutine::TypeCaster.register :foreign_key do |value, options = {}|
   next nil if value.blank?
-  
+
   calculated_type = options[:foreign_key_type].respond_to?(:call)
   calculated_value = calculated_type ? options[:foreign_key_type].call : options[:foreign_key_type]
-  
+
   next ::Subroutine::TypeCaster.cast(value, type: calculated_value) if calculated_value
   next ::Subroutine::TypeCaster.cast(value, type: :integer) if options[:name] && options[:name].to_s.end_with?("_id")
 

data/lib/subroutine/version.rb

@@ -2,9 +2,9 @@
 
 module Subroutine
 
-  MAJOR = 2
-  MINOR = 3
-  PATCH = 2
+  MAJOR = 3
+  MINOR = 0
+  PATCH = 1
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

data/subroutine.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(gemfiles|test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activemodel", ">= 4.0.0"
-  spec.add_dependency "activesupport", ">= 4.0.0"
+  spec.add_dependency "activemodel", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
 
-  spec.add_development_dependency "actionpack", ">= 4.0"
+  spec.add_development_dependency "actionpack", ">= 6.1"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "m"

data/test/subroutine/type_caster_test.rb

@@ -42,6 +42,33 @@ module Subroutine
       assert_equal 0.0, op.number_input
     end
 
+    def test_decimal_inputs
+      op.decimal_input = nil
+      assert_nil op.decimal_input
+
+      op.decimal_input = 4
+      assert_equal 4.0, op.decimal_input
+      assert op.decimal_input.is_a?(BigDecimal)
+
+      op.decimal_input = 0.5
+      assert_equal 0.5, op.decimal_input
+
+      op.decimal_input = 'foo'
+      assert_equal 0.0, op.decimal_input
+    end
+
+    def test_decimal_inputs_use_16_precision
+      op.decimal_input = 0.07
+      expected_bd_value = BigDecimal('0.07', 0)
+      assert_equal expected_bd_value, op.decimal_input
+      assert op.decimal_input.is_a?(BigDecimal)
+
+      # Ruby 3+
+      if op.decimal_input.respond_to?(:precision)
+        assert_equal expected_bd_value.precision, op.decimal_input.precision
+      end
+    end
+
     def test_string_inputs
       op.string_input = nil
       assert_nil op.string_input

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 3.0.1
 platform: ruby
 authors:
 - Mike Nelson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,21 +157,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/build.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- Appraisals
 - CHANGELOG.MD
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/am41.gemfile
-- gemfiles/am42.gemfile
-- gemfiles/am50.gemfile
-- gemfiles/am51.gemfile
-- gemfiles/am52.gemfile
-- gemfiles/am60.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_6.1.gemfile.lock
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0.gemfile.lock
 - lib/subroutine.rb
 - lib/subroutine/association_fields.rb
 - lib/subroutine/association_fields/association_type_mismatch_error.rb
@@ -205,7 +206,7 @@ homepage: https://github.com/mnelson/subroutine
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,17 +221,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Feature-driven operation objects.
 test_files:
-- gemfiles/am41.gemfile
-- gemfiles/am42.gemfile
-- gemfiles/am50.gemfile
-- gemfiles/am51.gemfile
-- gemfiles/am52.gemfile
-- gemfiles/am60.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_6.1.gemfile.lock
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0.gemfile.lock
 - test/subroutine/association_test.rb
 - test/subroutine/auth_test.rb
 - test/subroutine/base_test.rb

data/gemfiles/am41.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'rack'
-gem 'activemodel', '~> 4.1.0'
-gem 'actionpack', '~> 4.1.0'

data/gemfiles/am42.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'rack'
-gem 'activemodel', '~> 4.2.0'
-gem 'actionpack', '~> 4.2.0'

data/gemfiles/am50.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'activemodel', '~> 5.0.0'
-gem 'actionpack', '~> 5.0.0'

data/gemfiles/am51.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'activemodel', '~> 5.1.0'
-gem 'actionpack', '~> 5.1.0'

data/gemfiles/am52.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'activemodel', '~> 5.2.0'
-gem 'actionpack', '~> 5.2.0'

data/gemfiles/am60.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'activemodel', '~> 6.0.0'
-gem 'actionpack', '~> 6.0.0'