subroutine 2.3.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a85a75ee28c2c27b1d144059b1af01681aee27987ca2fdad9a0736b2270c824
-  data.tar.gz: 73bf392120764aa30da22c18b756ea8483f35b34e14e473fae6f7d495a4cbc9f
+  metadata.gz: 1d089cc45475bdb88ee182f34ef6cbfc2fcb4c77d039fce887fd3bd420a2f210
+  data.tar.gz: 454b7650e82cccfe16af31d8bb7ca5739763cacdcd1cab4ef810a25634dab480
 SHA512:
-  metadata.gz: ea38c80c4bbf80eb1763f1052b5f0a906268b1eb6416bcd6e4f2f39a678af16395555ddc02b56867671413076680fb65343d7462974e594f112e8cdb2136f52b
-  data.tar.gz: b5590640ea893a227ef850fb052fb04cac6d46ccc0af2cb33b7b86972518c1b5b7988114fab0faa6472b215f8f927825c9699a08266fd6713ed8c84a88846065
+  metadata.gz: 43420206b0becfd866a4ec01aa757d20c780bb939ed666c94878c8c73645561672646b230850aa199652776204f50562c0b675b37973d6efcb9ce831fc3b4d9c
+  data.tar.gz: dc313998225594aac7480cbf9df3e5b539589c13ef041adccb39ef97c583f0608d8a5b7b7e55245d58816b98db159a8d4fedd42d39f6b72317add6670a3ac7cc

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

@@ -7,7 +7,7 @@ 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
@@ -15,7 +15,7 @@ jobs:
           - ruby-version: 3.1
             experimental: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}

data/.ruby-version

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

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,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in subroutine.gemspec
 gemspec
 
-eval_gemfile "gemfiles/am60.gemfile"
+eval_gemfile "gemfiles/am61.gemfile"

data/gemfiles/am61.gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 6.1.0'
+gem 'actionpack', '~> 6.1.0'

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

@@ -65,9 +65,11 @@ end
 
 ::Subroutine::TypeCaster.register :foreign_key do |value, options = {}|
   next nil if value.blank?
-
-  next ::Subroutine::TypeCaster.cast(value, type: options[:foreign_key_type].call) if options[:foreign_key_type].respond_to?(:call)
-  next ::Subroutine::TypeCaster.cast(value, type: options[:foreign_key_type]) if options[:foreign_key_type]
+  
+  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")
 
   value

data/lib/subroutine/version.rb

@@ -2,9 +2,9 @@
 
 module Subroutine
 
-  MAJOR = 2
-  MINOR = 3
-  PATCH = 1
+  MAJOR = 3
+  MINOR = 0
+  PATCH = 0
   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/association_test.rb

@@ -231,6 +231,11 @@ module Subroutine
       assert_equal true, op.field_provided?(:admin_id)
       assert_equal true, op.field_provided?(:admin_type)
 
+      op = PolymorphicAssociationOp.new admin_type: doug.class.name, admin_id: doug.id.to_s
+      assert_equal true, op.field_provided?(:admin)
+      assert_equal true, op.field_provided?(:admin_id)
+      assert_equal true, op.field_provided?(:admin_type)
+
       op = PolymorphicAssociationOp.new admin_id: doug.id
       assert_equal false, op.field_provided?(:admin)
       assert_equal true, op.field_provided?(:admin_id)
@@ -293,6 +298,18 @@ module Subroutine
       assert_equal({ "admin_id" => 1, "admin_type" => "User" }, op.params)
     end
 
+    def test_params_id_type_as_integer_for_polymorphic_associations
+      user = ::User.new(id: 1)
+
+      op = PolymorphicAssociationOp.new(admin_id: user.id)
+      op.admin
+      assert_equal({ "admin_id" => 1 }, op.params)
+
+      op = PolymorphicAssociationOp.new(admin_id: user.id.to_s)
+      op.admin
+      assert_equal({ "admin_id" => 1 }, op.params)
+    end
+
     def test_params_can_be_accessed_with_associations_loaded
       user = User.new(id: 1)
       op = SimpleAssociationOp.new(user: user)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-06-29 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,6 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/build.yml"
 - ".gitignore"
 - ".ruby-gemset"
@@ -166,12 +168,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/am41.gemfile
-- gemfiles/am42.gemfile
-- gemfiles/am50.gemfile
-- gemfiles/am51.gemfile
-- gemfiles/am52.gemfile
-- gemfiles/am60.gemfile
+- gemfiles/am61.gemfile
 - lib/subroutine.rb
 - lib/subroutine/association_fields.rb
 - lib/subroutine/association_fields/association_type_mismatch_error.rb
@@ -220,17 +217,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
+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/am61.gemfile
 - 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'