subroutine 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d089cc45475bdb88ee182f34ef6cbfc2fcb4c77d039fce887fd3bd420a2f210
-  data.tar.gz: 454b7650e82cccfe16af31d8bb7ca5739763cacdcd1cab4ef810a25634dab480
+  metadata.gz: e6530220e9e104f3eb840fc5ad28514e4e9bb29f6831f1c8cefa96e3d511454b
+  data.tar.gz: 0bfaf68aae3bd5f5887c2da31b3cc1b8f8fe9c8e12b88f1365c03836bd4615cf
 SHA512:
-  metadata.gz: 43420206b0becfd866a4ec01aa757d20c780bb939ed666c94878c8c73645561672646b230850aa199652776204f50562c0b675b37973d6efcb9ce831fc3b4d9c
-  data.tar.gz: dc313998225594aac7480cbf9df3e5b539589c13ef041adccb39ef97c583f0608d8a5b7b7e55245d58816b98db159a8d4fedd42d39f6b72317add6670a3ac7cc
+  metadata.gz: 2c7e809eac6e059bed7029907f4a153b388d564c0ac93b9dde0397a6ef15c5cb57fe816b2b31fdd4d2547dafbbc8d12d52493aebe61aa550afa6c430f2db820a
+  data.tar.gz: 74d0b0c8c647e3f97fa0899c18a33fbddf7aa7b88a878f22740cd0edacbaf873f7181a164347b88425c1a891662565433d3e6c5dfd5a35f602b785c9b4f7341c

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
@@ -14,10 +18,15 @@ jobs:
             experimental: true
           - ruby-version: 3.1
             experimental: true
+          - ruby-version: 3.2
+            experimental: true
     steps:
-      - uses: actions/checkout@v3
+      - 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/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/Gemfile

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

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

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: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mike Nelson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -163,12 +163,16 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- Appraisals
 - CHANGELOG.MD
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/am61.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
@@ -202,7 +206,7 @@ homepage: https://github.com/mnelson/subroutine
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,11 +222,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Feature-driven operation objects.
 test_files:
-- gemfiles/am61.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/am61.gemfile

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