super_tools 2.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 248f805a4956e73dcc11f4623ebfeb7f124c0d49
-  data.tar.gz: f24028ac4d9d1a4f80f8bd0e5552174fc735f4da
+SHA256:
+  metadata.gz: 4e679f4b41ffa1f04baee132e45b854efa2317e03b6300d747968f858caab6a6
+  data.tar.gz: 4e635e119e9dfd2bcf058be7db40418e0874eaef755b3892048ec7c54bda3011
 SHA512:
-  metadata.gz: 9ec67d9425ff7fa208a0cadd4682eb4a0e1b63dde2eb3e22b9715f679d9a3bd22534b56e65a7f8e792061a8e97686ceccd7f2b78b21afabcfb5e1cacfd93a59d
-  data.tar.gz: 6447defbdd74912a56d187406c3d80e0890b037062c96d06a3d02ac7f6c4074949772321d24ad85b8147908e5def0ff5cdd5340a387c085bd3cabcadaac16847
+  metadata.gz: 32a411a0cd5e85fb222c5d1224e6e67b22fabdc2a3918ff757a4f816ff3c1e705ac79d8d83f753eb6256852f9286e6c7debb20a260e598bdb6ec5719dc5020be
+  data.tar.gz: d7c222e501cd6d8877cadaf6b2524428b5c478d02f61572fc6ec063a0d5243db1b36fee4181050e4dd68628c44447023af68995616b497dca71d35cd72241f84

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: Test
+on:
+  push:
+    branches:
+      - 'fix-**'
+      - 'feat-**'
+      - develop
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bundle
+      - run: bundle exec rake t

data/.gitignore

@@ -6,3 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+vendor
+*.*.sw?
+.DS_Store
+db/
+log/

data/.ruby-version

@@ -0,0 +1 @@
+3.0.4

data/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in super_tools.gemspec
 gemspec
+
+gem "reform-rails", github: "superlanding/reform-rails", branch: "fix-infinite-parent-loop"

data/Gemfile.lock

@@ -1,18 +1,26 @@
+GIT
+  remote: https://github.com/superlanding/reform-rails
+  revision: 66240539260e6969dc01a77cf181b39109ebb941
+  branch: fix-infinite-parent-loop
+  specs:
+    reform-rails (0.2.2)
+      activemodel (>= 5.0)
+      reform (>= 2.3.1, < 3.0.0)
+
 PATH
   remote: .
   specs:
-    super_tools (0.0.8)
-      dry-logic (~> 0.4.2)
-      dry-types (~> 0.13.2)
+    super_tools (3.0.0)
+      dry-logic (= 1.2.0)
+      dry-types (= 1.5.1)
       fast_excel
       forwardable
-      iconv
-      nokogiri (>= 1.6, <= 1.9.1)
-      rails (>= 4)
-      reform (~> 2.2.4)
+      nokogiri (>= 1.6)
+      rails (> 6, < 7)
+      reform (= 2.6.2)
       reform-rails
       roo
-      roo-xls
+      roo-xls (= 1.2.0)
       searchkick
       spreadsheet
       virtus (~> 1.0.5)
@@ -21,194 +29,191 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
+      mail (>= 2.7.1)
+    actionmailer (6.1.6)
+      actionpack (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.6)
+      actionpack (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.6)
+      activesupport (= 6.1.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activemodel (6.1.6)
+      activesupport (= 6.1.6)
+    activerecord (6.1.6)
+      activemodel (= 6.1.6)
+      activesupport (= 6.1.6)
+    activestorage (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activesupport (= 6.1.6)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
+    builder (3.2.4)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    declarative (0.0.10)
-    declarative-builder (0.1.0)
-      declarative-option (< 0.2.0)
-    declarative-option (0.1.0)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    declarative (0.0.20)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    disposable (0.4.5)
+    disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
-      declarative-builder (< 0.2.0)
-      declarative-option (< 0.2.0)
-      representable (>= 2.4.0, <= 3.1.0)
-      uber (< 0.2.0)
-    dry-configurable (0.7.0)
+      representable (>= 3.1.1, < 4)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
-    dry-container (0.6.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.2)
-    dry-inflector (0.1.2)
-    dry-logic (0.4.2)
-      dry-container (~> 0.2, >= 0.2.6)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (0.13.4)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 0.4, >= 0.4.2)
-    elasticsearch (7.0.0)
-      elasticsearch-api (= 7.0.0)
-      elasticsearch-transport (= 7.0.0)
-    elasticsearch-api (7.0.0)
-      multi_json
-    elasticsearch-transport (7.0.0)
-      faraday
-      multi_json
+      dry-logic (~> 1.0, >= 1.0.2)
     equalizer (0.0.11)
-    erubi (1.8.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    fast_excel (0.2.6)
+    erubi (1.10.0)
+    fast_excel (0.4.0)
       ffi (> 1.9, < 2)
-    ffi (1.10.0)
-    forwardable (1.2.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashie (3.6.0)
-    i18n (1.5.1)
+    ffi (1.15.5)
+    forwardable (1.3.2)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    hashie (5.0.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    iconv (1.0.8)
-    loofah (2.2.3)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    nio4r (2.3.1)
-    nokogiri (1.9.1)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.8)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
-      bundler (>= 1.3.0)
-      railties (= 5.2.3)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.16.2)
+    nio4r (2.5.8)
+    nokogiri (1.13.6-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.6-x86_64-linux)
+      racc (~> 1.4)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.6)
+      actioncable (= 6.1.6)
+      actionmailbox (= 6.1.6)
+      actionmailer (= 6.1.6)
+      actionpack (= 6.1.6)
+      actiontext (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activemodel (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.4.3)
+      loofah (~> 2.3)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    reform (2.2.4)
-      disposable (>= 0.4.1)
-      representable (>= 2.4.0, < 3.1.0)
-    reform-rails (0.1.7)
-      activemodel (>= 3.2)
-      reform (>= 2.2.0)
-    representable (3.0.4)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rake (13.0.6)
+    reform (2.6.2)
+      disposable (>= 0.5.0, < 1.0.0)
+      representable (>= 3.1.1, < 4)
+      uber (< 0.2.0)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    roo (2.7.1)
+    roo (2.9.0)
       nokogiri (~> 1)
-      rubyzip (~> 1.1, < 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0.0)
     roo-xls (1.2.0)
       nokogiri
       roo (>= 2.0.0, < 3)
       spreadsheet (> 0.9.0)
     ruby-ole (1.2.12.2)
-    rubyzip (1.2.2)
-    searchkick (3.1.3)
-      activemodel (>= 4.2)
-      elasticsearch (>= 5)
+    rubyzip (2.3.2)
+    searchkick (5.0.4)
+      activemodel (>= 5.2)
       hashie
-    shoulda-context (1.2.2)
-    spreadsheet (1.2.3)
-      ruby-ole (>= 1.0)
-    sprockets (3.7.2)
+    shoulda-context (2.0.0)
+    spreadsheet (1.3.0)
+      ruby-ole
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    sqlite3 (1.4.4)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    trailblazer-option (0.1.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -217,19 +222,25 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
     warehouse_items (0.3.0)
       activesupport
-    websocket-driver (0.7.0)
+    warning (1.2.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (>= 2, < 3)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (>= 12.2)
+  reform-rails!
   shoulda-context
+  sqlite3 (= 1.4.4)
   super_tools!
+  warning
 
 BUNDLED WITH
-   1.17.1
+   2.3.16

data/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    target-branch: "feat-rails-6.1.6"
+    schedule:
+      interval: "daily"

data/lib/super_form/basic.rb

@@ -1,4 +1,5 @@
-require 'virtus'
+require "virtus"
+
 module SuperForm
   class Basic
     include ActiveModel::Model
@@ -7,12 +8,6 @@ module SuperForm
     include ActiveModel::Validations
     include Virtus.model
 
-    def sync_params(params)
-      params.each do |attr, value|
-        public_send("#{attr}=", value) if respond_to?("#{attr}=")
-      end
-    end
-
     class << self
       def form_name(name)
         # 定義 form name (給 form 用的)

data/lib/super_form/concerns/atomic_save.rb

@@ -60,17 +60,17 @@ module SuperForm
             # 1. do validate data
             run_callbacks :validations do
               if validate(params) == false
-                raise ReformAtomicSaveError, "Not Validate => #{self.errors.full_messages.inspect}"
+                raise ReformAtomicSaveError, "Not Validate => #{self.errors.full_messages}"
               end
             end
 
             # 2. sync to model
             sync
 
-            # 2. define how to store data in block
+            # 3. define how to store data in block
             yield if block_given?
 
-            # 3. save all data
+            # 4. save all data
             save!
           end
         end

data/lib/super_form/reform.rb

@@ -1,10 +1,11 @@
-require 'super_form/concerns/atomic_save'
-require 'reform'
-require 'reform/form'
-require 'reform/active_record'
+require "super_form/concerns/atomic_save"
+require "reform"
+require "reform/rails"
+require "reform/form"
+require "reform/active_record"
 require "reform/form/coercion"
-require 'disposable'
-require 'disposable/twin/parent'
+require "disposable"
+require "disposable/twin/parent"
 
 class SuperForm::Reform < Reform::Form
   include SuperForm::AtomicSave
@@ -25,6 +26,27 @@ class SuperForm::Reform < Reform::Form
     define_singleton_method :model_name do
       active_model_name_for(name.to_s.camelize) # Reform::Form::ActiveModel
     end
+    # NOTE: 這行很可能沒有作用
     model(name)
   end
 end
+
+# Hack Dry::Type 升級 0.15 以後
+# 變成強制型別，會造成 params input 空字串時的錯誤
+# 這裡是 hack
+# https://github.com/apotonick/disposable/blob/master/lib/disposable/twin/coercion.rb
+# https://github.com/dry-rb/dry-types/blob/a4983c88299b6f323a769f783cf956629e61f8ed/lib/dry/types/coercions/params.rb#L86
+
+Dry::Types::Coercions::Params.module_eval do
+  def self.to_int(input, &block)
+    if input.is_a? String
+      Integer(input, 10)
+    else
+      Integer(input)
+    end
+  rescue ArgumentError, TypeError => e
+    return input.to_i if input.respond_to?(:to_i)
+
+    CoercionError.handle(e, &block)
+  end
+end

data/lib/super_formatter/ecan/head.rb

@@ -3,11 +3,11 @@ module SuperFormatter
     Head = Struct.new(:data) do
       def indexes
         @indexes ||= {
-          global_order_id: data.index('客戶單號'),
-          recipient: data.index('收件人'),
-          tracking_code: data.index('宅配單號')
+          global_order_id: data.index("客戶單號"),
+          recipient: data.index("收件人"),
+          tracking_code: data.index("宅配單號")
         }
       end
     end
   end
-end
+end

data/lib/super_formatter/ecan/import.rb

@@ -1,6 +1,7 @@
-require 'super_formatter/import'
-require 'super_formatter/hct/head'
-require 'super_formatter/hct/row'
+require "super_formatter/import"
+require "super_formatter/hct/head"
+require "super_formatter/hct/row"
+
 module SuperFormatter
   module Ecan
     class Import < SuperFormatter::Import

data/lib/super_formatter/ecan/row.rb

@@ -1,11 +1,12 @@
-require 'super_formatter/row'
+require "super_formatter/row"
+
 module SuperFormatter
   module Ecan
     class Row < ::SuperFormatter::Row
 
       def global_order_id
         order_id = (find(:global_order_id) || "")
-        if order_id[0] == 'C'
+        if order_id[0] == "C"
           order_id[1, order_id.length - 1]
         else
           order_id

data/lib/super_formatter/hct/head.rb

@@ -3,12 +3,12 @@ module SuperFormatter
     Head = Struct.new(:data) do
       def indexes
         @indexes ||= {
-          global_order_id: data.index('訂單號碼') || data.index('清單編號'),
-          mobile: data.index('收貨人電話') || data.index('收貨人電話1'),
-          recipient: data.index('收貨人') || data.index('收貨人名稱'),
-          tracking_code: data.index('查貨號碼') || data.index('十碼貨號')
+          global_order_id: data.index("訂單號碼") || data.index("清單編號"),
+          mobile: data.index("收貨人電話") || data.index("收貨人電話1"),
+          recipient: data.index("收貨人") || data.index("收貨人名稱"),
+          tracking_code: data.index("查貨號碼") || data.index("十碼貨號")
         }
       end
     end
   end
-end
+end

data/lib/super_formatter/hct/import.rb

@@ -1,6 +1,7 @@
-require 'super_formatter/import'
-require 'super_formatter/hct/head'
-require 'super_formatter/hct/row'
+require "super_formatter/import"
+require "super_formatter/hct/head"
+require "super_formatter/hct/row"
+
 module SuperFormatter
   module Hct
     class Import < ::SuperFormatter::Import

data/lib/super_formatter/hct/row.rb

@@ -1,16 +1,17 @@
-require 'super_formatter/row'
+require "super_formatter/row"
+
 module SuperFormatter
   module Hct
     class Row < ::SuperFormatter::Row
 
       def tracking_code
-        (find(:tracking_code) || "").gsub("'", '')
+        (find(:tracking_code) || "").gsub("'", "")
       end
 
       def mobile
         @mobile ||= begin
           text = (find(:mobile) || "").gsub("'", "")
-          if text[0] == '9' && text.length == 9
+          if text[0] == "9" && text.length == 9
             "0#{text}"
           else
             text