super_tools 2.1.0 → 4.0.0

data/bin/test_all

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "=== Testing all Ruby versions with Rails 6 & 7 ==="
+echo ""
+
+# Check if appraisal is installed
+if ! bundle exec appraisal -h > /dev/null 2>&1; then
+  echo "Error: appraisal gem not found. Please run 'bundle install' first."
+  exit 1
+fi
+
+# Test each combination
+combinations=(
+  "ruby-2.7-rails-6:Ruby 2.7.6 + Rails 6"
+  "ruby-2.7-rails-7:Ruby 2.7.6 + Rails 7"
+  "ruby-3.0-rails-6:Ruby 3.0.7 + Rails 6"
+  "ruby-3.0-rails-7:Ruby 3.0.7 + Rails 7"
+  "ruby-3.1-rails-6:Ruby 3.1.7 + Rails 6"
+  "ruby-3.1-rails-7:Ruby 3.1.7 + Rails 7"
+)
+
+for combo in "${combinations[@]}"; do
+  IFS=':' read -r appraisal_name display_name <<< "$combo"
+  echo "===================================="
+  echo "Testing: $display_name"
+  echo "===================================="
+  bundle exec appraisal $appraisal_name rake t
+  echo ""
+done
+
+echo "===================================="
+echo "All tests completed!"
+echo "===================================="

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/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/ruby_2.7_rails_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "reform-rails", tag: "v0.2.6.f", git: "https://github.com/superlanding/reform-rails"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/ruby_2.7_rails_7.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "reform-rails", tag: "v0.2.6.f", git: "https://github.com/superlanding/reform-rails"
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/ruby_3.0_rails_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "reform-rails", tag: "v0.2.6.f", git: "https://github.com/superlanding/reform-rails"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/ruby_3.0_rails_7.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "reform-rails", tag: "v0.2.6.f", git: "https://github.com/superlanding/reform-rails"
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/ruby_3.1_rails_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "reform-rails", tag: "v0.2.6.f", git: "https://github.com/superlanding/reform-rails"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/ruby_3.1_rails_7.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "reform-rails", tag: "v0.2.6.f", git: "https://github.com/superlanding/reform-rails"
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"

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

data/lib/super_formatter/shopline/head.rb

@@ -3,22 +3,22 @@ module SuperFormatter
     Head = Struct.new(:data) do
       def indexes
         @indexes ||= {
-          order_id: data.index('訂單號碼'),
-          order_created: data.index('訂單日期'),
-          shipping_method: data.index('送貨方式'),
-          payment_method: data.index('付款方式'),
-          payment_status: data.index('付款狀態'),
-          recipient: data.index('收件人'),
-          mobile:  data.index('收件人電話號碼'),
-          store_id: data.index('全家服務編號 / 7-11 店號'),
-          address: data.index('完整地址'),
-          total_order_amount: data.index('訂單合計'),
-          note: data.index('送貨備註'),
-          item_title: data.index('商品名稱'),
-          item_option: data.index('選項'),
-          item_code: data.index('商品貨號'),
-          item_qty: data.index('數量'),
-          item_cost: data.index('商品成本')
+          order_id: data.index("訂單號碼"),
+          order_created: data.index("訂單日期"),
+          shipping_method: data.index("送貨方式"),
+          payment_method: data.index("付款方式"),
+          payment_status: data.index("付款狀態"),
+          recipient: data.index("收件人"),
+          mobile:  data.index("收件人電話號碼"),
+          store_id: data.index("全家服務編號 / 7-11 店號"),
+          address: data.index("完整地址"),
+          total_order_amount: data.index("訂單合計"),
+          note: data.index("送貨備註"),
+          item_title: data.index("商品名稱"),
+          item_option: data.index("選項"),
+          item_code: data.index("商品貨號"),
+          item_qty: data.index("數量"),
+          item_cost: data.index("商品成本")
         }
       end
     end

data/lib/super_formatter/shopline/import.rb

@@ -1,16 +1,15 @@
-require 'super_formatter/import'
-require 'super_formatter/shopline/head'
-require 'super_formatter/shopline/row'
-require 'super_formatter/shopline/order'
+require "super_formatter/import"
+require "super_formatter/shopline/head"
+require "super_formatter/shopline/row"
+require "super_formatter/shopline/order"
+
 module SuperFormatter
   module Shopline
     class Import < ::SuperFormatter::Import
 
       callable do
         build_rows!(Head, Row)
-
         self.orders = merged_orders!.values
-
         self.orders
       end
 

data/lib/super_formatter/shopline/order.rb

@@ -1,4 +1,5 @@
-require 'warehouse'
+require "warehouse"
+
 module SuperFormatter
   module Shopline
     class Order
@@ -13,7 +14,7 @@ module SuperFormatter
       delegate :complete?, to: :row
 
       def order_id
-        row.order_id.gsub("#", '')
+        row.order_id.gsub("#", "")
       end
 
       def initialize(row)
@@ -23,13 +24,13 @@ module SuperFormatter
 
       def provider
         @provider ||= case
-        when row.shipping_method.include?('7-11')
+        when row.shipping_method.include?("7-11")
           :UNIMART
-        when row.shipping_method.include?('全家')
+        when row.shipping_method.include?("全家")
           :FAMI
-        when row.shipping_method.include?('新竹')
+        when row.shipping_method.include?("新竹")
           :HCT
-        when row.shipping_method.include?('黑貓')
+        when row.shipping_method.include?("黑貓")
           :TCAT
         else
           nil
@@ -58,7 +59,7 @@ module SuperFormatter
       end
 
       def cash_on_delivery?
-        if row.payment_method.include?('取貨付款')
+        if row.payment_method.include?("取貨付款")
           true
         else
           false
@@ -70,7 +71,7 @@ module SuperFormatter
       end
 
       def paid?
-        row.payment_status == '已付款'
+        row.payment_status == "已付款"
       end
 
       def items

data/lib/super_formatter/shopline/row.rb

@@ -1,8 +1,8 @@
-require 'super_formatter/row'
+require "super_formatter/row"
+
 module SuperFormatter
   module Shopline
     class Row < ::SuperFormatter::Row
-
     end
   end
 end

data/lib/super_formatter/tcat/head.rb

@@ -3,10 +3,10 @@ module SuperFormatter
     Head = Struct.new(:data) do
       def indexes
         @indexes ||= {
-          global_order_id: data.index('訂單編號'),
-          mobile: data.index('手機(收)'),
-          recipient: data.index('收件人'),
-          tracking_code: data.index('託運單號')
+          global_order_id: data.index("訂單編號"),
+          mobile: data.index("手機(收)"),
+          recipient: data.index("收件人"),
+          tracking_code: data.index("託運單號")
         }
       end
     end

data/lib/super_formatter/tcat/import.rb

@@ -1,10 +1,10 @@
-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 Tcat
     class Import < SuperFormatter::Import
-
       callable do
         build_rows!(Head, Row)
       end

data/lib/super_formatter/tcat/row.rb

@@ -1,16 +1,17 @@
-require 'super_formatter/row'
+require "super_formatter/row"
+
 module SuperFormatter
   module Tcat
     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

data/lib/super_interaction/beyond.rb

@@ -65,7 +65,7 @@ module SuperInteraction
     end
 
     def b_alert(class_type, text)
-      cmd("if (typeof($.alert) == undefined) { alert('#{helpers.j(text)}'); } else { $.alert.#{class_type}('#{helpers.j(text)}'); }")
+      cmd("if (typeof($.alert) === 'undefined') { alert('#{helpers.j(text)}'); } else { $.alert.#{class_type}('#{helpers.j(text)}'); }")
     end
 
     def cmd(js_code)

data/lib/super_interaction/engine.rb

@@ -3,6 +3,8 @@ module SuperInteraction
     class Engine < Rails::Engine
       paths["app/views"] = "lib/super_interaction/views"
 
+      # NOTE: 需要確認底下的程式有無作用
+      # lib/super_interaction 底下並沒有 javascripts 目錄
       initializer 'beyond.assets.precompile' do |app|
         app.config.assets.paths << root.join('lib', 'super_interaction', 'javascripts').to_s
       end

data/lib/super_process/basic.rb

@@ -0,0 +1,12 @@
+module SuperProcess
+  module Basic
+
+    def method_missing(m, *args, &block)
+      if block_given?
+        new.public_send(m, *args, &block)
+      else
+        new.public_send(m, *args)
+      end
+    end
+  end
+end

data/lib/super_process/core.rb

@@ -1,4 +1,5 @@
-require 'virtus'
+require "virtus"
+
 module SuperProcess
   class Core
     include ActiveModel::Validations
@@ -7,30 +8,38 @@ module SuperProcess
 
     ValidError = Class.new(StandardError)
 
-    define_callbacks :validations, :task
+    CALLBACK_CALL = :"__super_process__call"
+    CALLBACK_TASK = :"__super_process__task"
+
+    # https://github.com/rails/rails/blob/v6.1.6/activesupport/lib/active_support/callbacks.rb#L97
+    # 這裡透過 define_callbacks define 了 CALLBACK_CALL 與 CALLBACK_TASK
+    # 卻沒有 set_callbacks，所以在 run_callbacks 時
+    # 會因為找不到儲存的 callback 而直接執行 block
+    # 這裡的用法必須注意 rails 內部或是使用此 class 的開發者
+    # 不可以使用 CALLBACK_CALL 與 CALLBACK_TASK 相同命名的 callback
+    # 否則會有不可預期的副作用
+    define_callbacks CALLBACK_CALL, CALLBACK_TASK
 
     def self.before_call(method_name)
-      set_callback :validations, :before, method_name
+      set_callback CALLBACK_CALL, :before, method_name
     end
 
     def self.after_call(method_name)
-      set_callback :validations, :after, method_name
+      set_callback CALLBACK_CALL, :after, method_name
     end
 
     def self.before_task(method_name)
-      set_callback :task, :before, method_name
+      set_callback CALLBACK_TASK, :before, method_name
     end
 
     def self.after_task(method_name)
-      set_callback :task, :after, method_name
+      set_callback CALLBACK_TASK, :after, method_name
     end
 
-    def self.init(model_name, &block)
+    def self.init(model_name)
       attr_accessor model_name
-
-      class_eval(&block) if block_given?
-
       define_method :initialize do |model|
+        super({})
         self.send("#{model_name}=", model)
       end
     end
@@ -40,10 +49,9 @@ module SuperProcess
         params.each do |attr, value|
           public_send("#{attr}=", value) if respond_to?("#{attr}=")
         end
-        run_callbacks :validations do
+        run_callbacks CALLBACK_CALL do
           raise ValidError, "Validation Error" if valid? == false
-
-          run_callbacks :task do
+          run_callbacks CALLBACK_TASK do
             instance_eval(&block)
           end
         end
@@ -63,20 +71,13 @@ module SuperProcess
       @result
     end
 
-    def error_messages
-      if errors.messages.values.present?
-        errors.messages.values.first.first
-      else
-        ""
-      end
+    def error_message
+      errors.messages.values.first.first if errors.messages.values.present?
     end
 
-    def self.method_missing(m, *args, &block)
-      if block_given?
-        new.public_send(m, *args, &block)
-      else
-        new.public_send(m, *args)
-      end
+    def error_messages
+      errors.messages.values.flatten
     end
+
   end
 end

data/lib/super_search/scroll.rb

@@ -1,11 +1,13 @@
-require 'searchkick'
+# NOTE: 這個 class 完全沒有在 landing 或 xdelivery 出現過
+require "searchkick"
+
 module SuperSearch
   class Scroll
     attr_accessor :expire_time, :size, :query
 
-    # ScrollSearch.new(Member, '*', where: {}, order: {}, scroll: '5m', size: 10000)
-    def initialize(model, term: '*', options: {})
-      self.expire_time = options.delete(:scroll) || '5m'
+    # ScrollSearch.new(Member, "*", where: {}, order: {}, scroll: "5m", size: 10000)
+    def initialize(model, term: "*", options: {})
+      self.expire_time = options.delete(:scroll) || "5m"
 
       # 單次筆數不得超過 10000
       self.size = options.delete(:size).to_i
@@ -48,7 +50,7 @@ module SuperSearch
         # searchkick/query line: 104
         def handle_response(response)
           # 從 response 設定 scroll ID
-          @scroll_id = response['_scroll_id']
+          @scroll_id = response["_scroll_id"]
           super
         end
 
@@ -66,9 +68,10 @@ module SuperSearch
 
     # 開始遍歷搜尋
     def search(&block)
-      while r = query.execute and not r.response['hits']['hits'].empty? do
-          block.call(r.results, r.total_count) if block
-        end
+      while r = query.execute and not r.response["hits"]["hits"].empty? do
+        block.call(r.results, r.total_count) if block
       end
     end
+
   end
+end