super_tools 0.0.25 → 3.0.1

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

@@ -0,0 +1,77 @@
+module SuperInteraction
+  class Beyond < Struct.new(:context)
+
+    attr_accessor :commands
+
+    delegate :helpers, to: :context
+
+    def run
+      context.render js: (commands || []).join(";"), layout: false
+    end
+
+    def b_notice(message)
+      b_alert('info', message)
+      self
+    end
+
+    def b_danger(message)
+      b_alert('danger', message)
+      self
+    end
+
+    def b_success(message)
+      b_alert('success', message)
+    end
+
+    def alert(message)
+      cmd("alert('#{helpers.j(message)}');")
+    end
+
+    # modal 裡如果有 javascript 需寫在 .modal 層
+    # size: sm / md / lg / xl / xxl
+    # 注意：不要包 respond_to :js 會有問題
+    def modal(partial: nil, size: 'md', title: '', desc: '', classname: '')
+      partial ||= context.action_name
+      locals = { size: size, title: title, desc: desc, classname: classname }
+      modal_html = context.render_to_string(partial, layout: "beyond.haml", locals: locals)
+      cmd("$(function() { $.uniqModal().modal('show', '#{helpers.j(modal_html)}'); });")
+    end
+
+    # 關閉 Modal
+    def close
+      cmd("$.uniqModal().modal('hide');")
+    end
+
+    # 重新讀取頁面
+    def reload
+      cmd("Turbolinks.visit(location.toString());");
+    end
+
+    # 導入頁面
+    def redirect_to(url)
+      cmd("Turbolinks.visit('#{url}');");
+    end
+
+    def modal_saved_rediret_to(message, redirect_url)
+      close.alert(message).redirect_to(redirect_url)
+    end
+
+    def modal_saved_reload(message)
+      close.alert(message).reload
+    end
+
+    def ajax_get(url)
+      cmd("$.get('#{url}');")
+    end
+
+    def b_alert(class_type, text)
+      cmd("if (typeof($.alert) === 'undefined') { alert('#{helpers.j(text)}'); } else { $.alert.#{class_type}('#{helpers.j(text)}'); }")
+    end
+
+    def cmd(js_code)
+      self.commands ||= []
+      self.commands.push(js_code)
+      self
+    end
+  end
+end

data/lib/super_interaction/beyond_helper.rb

@@ -0,0 +1,13 @@
+module SuperInteraction
+  module BeyondHelper
+    def srj(&block)
+      i = Beyond.new(self)
+      if block_given?
+        yield(i)
+        i.run
+      else
+        i
+      end
+    end
+  end
+end

data/lib/super_interaction/{command.rb → bootstrap.rb}

@@ -1,5 +1,5 @@
 module SuperInteraction
-  class Command < Struct.new(:context)
+  class Bootstrap < Struct.new(:context)
 
     attr_accessor :commands
 
@@ -32,7 +32,7 @@ module SuperInteraction
     # 注意：不要包 respond_to :js 會有問題
     def modal(partial: nil, size: 'md', title: '', desc: '')
       partial ||= context.action_name
-      modal_html = context.render_to_string(partial, layout: ::SuperInteraction::Layout.modal_layout, locals: { bs_modal_size: size, title: title, desc: desc })
+      modal_html = context.render_to_string(partial, layout: ::SuperInteraction::Layout.modal_layout, locals: { size: size, title: title, desc: desc })
       cmd("$(function() { $.modal.show('#{helpers.j(modal_html)}'); });")
     end
 

data/lib/super_interaction/{controller_helper.rb → bootstrap_helper.rb}

@@ -1,7 +1,7 @@
 module SuperInteraction
-  module ControllerHelper
+  module BootstrapHelper
     def js(&block)
-      i = Command.new(self)
+      i = Bootstrap.new(self)
       yield(i) if block_given?
       i
     end

data/lib/super_interaction/engine.rb

@@ -2,6 +2,12 @@ module SuperInteraction
   if defined?(Rails::Engine)
     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
     end
   end
 end

data/lib/super_interaction/views/layouts/beyond.haml

@@ -0,0 +1,27 @@
+- if Rails.version[0].to_i >= 5
+  - size = local_assigns[:size]
+  - title = local_assigns[:title]
+  - desc = local_assigns[:desc]
+  - classname = local_assigns[:classname]
+
+.modal{"aria-labelledby" => "modalLabel", "data-modal" => "box-modal", :role => "dialog", :tabindex => "-1"}
+  .modal-dialog{ role: 'document', class: "modal-#{size} #{classname}" }
+    .modal-content
+      .modal-header
+        = yield :header
+        - if title.present?
+          %h4.modal-title
+            = title
+            %small= desc if desc
+        %button.btn-close{'aria-label': 'Close', 'data-close': true, 'type': 'button'}
+          = b_icon('cross')
+      = yield
+      = yield :before_body
+      - body_html = capture { yield :body }
+      - if body_html.present?
+        .modal-body.bg-content= body_html
+      = yield :after_body
+      - footer_html = capture { yield :footer }
+      - if footer_html.present?
+        .modal-footer
+          = footer_html

data/lib/super_interaction/views/layouts/modal_bs3.haml

@@ -1,10 +1,10 @@
 - if Rails.version[0].to_i >= 5
-  - bs_modal_size = local_assigns[:bs_modal_size]
+  - size = local_assigns[:size]
   - title = local_assigns[:title]
   - desc = local_assigns[:desc]
 .modal
   = yield :wrapper
-  .modal-dialog{ class: "modal-#{bs_modal_size}" }
+  .modal-dialog{ class: "modal-#{size}" }
     .modal-content
       .modal-header
         %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}

data/lib/super_interaction/views/layouts/modal_bs4.haml

@@ -1,10 +1,10 @@
 - if Rails.version[0].to_i >= 5
-  - bs_modal_size = local_assigns[:bs_modal_size]
+  - size = local_assigns[:size]
   - title = local_assigns[:title]
   - desc = local_assigns[:desc]
 .modal
   = yield :wrapper
-  .modal-dialog{ class: "modal-#{bs_modal_size}" }
+  .modal-dialog{ class: "modal-#{size}" }
     .modal-content
       .modal-header
         = yield :header

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

data/lib/super_spreadsheet/loader.rb

@@ -1,7 +1,7 @@
-require 'iconv'
-require 'csv'
-require 'roo'
-require 'roo-xls'
+require "csv"
+require "roo"
+require "roo-xls"
+
 module SuperSpreadsheet
   class Loader < SuperProcess::Core
     attr_accessor :file_path
@@ -20,14 +20,14 @@ module SuperSpreadsheet
     end
 
     def extension
-      ::File.extname(file_path).split('.').last.force_encoding('utf-8').downcase
+      ::File.extname(file_path).split(".").last.force_encoding("utf-8").downcase
     end
 
     def valid_format
       if rows == false
-        errors.add(:file, '檔案格式錯誤')
+        errors.add(:file, "檔案格式錯誤")
       elsif rows.flatten.empty?
-        errors.add(:file, '檔案內容錯誤，空白檔案')
+        errors.add(:file, "檔案內容錯誤，空白檔案")
       end
     end
 
@@ -39,11 +39,11 @@ module SuperSpreadsheet
 
     def rows!
       case extension
-      when 'xls'
+      when "xls"
         ::Roo::Excel.new(file_path).map { |row| convert_float_to_integer(row) }
-      when 'xlsx'
+      when "xlsx"
         ::Roo::Excelx.new(file_path).map { |row| convert_float_to_integer(row) }
-      when 'csv'
+      when "csv"
         ::CSV.parse(csv_content!)
       else
         false
@@ -55,10 +55,10 @@ module SuperSpreadsheet
     def csv_content!
       @decode_csv_content ||= begin
         csv_content_big5!
-      rescue Iconv::IllegalSequence
+      rescue
         begin
           csv_content_big5_hkscs!
-        rescue Iconv::IllegalSequence
+        rescue
           csv_content
         end
       end
@@ -71,11 +71,11 @@ module SuperSpreadsheet
     private
 
     def csv_content_big5!
-      Iconv.new("utf-8", "Big5//TRANSLIT//IGNORE").iconv(csv_content)
+      csv_content.encode!(Encoding::UTF_8, Encoding::BIG5)
     end
 
     def csv_content_big5_hkscs!
-      Iconv.new("utf-8", "Big5-HKSCS//TRANSLIT//IGNORE").iconv(csv_content)
+      csv_content.encode!(Encoding::UTF_8, Encoding::BIG5_HKSCS)
     end
 
     def convert_float_to_integer(row)

data/lib/super_table/action_view.rb

@@ -1,4 +1,4 @@
-require 'super_table/builder'
+require "super_table/builder"
 
 module SuperTable
   module ActionView
@@ -10,15 +10,15 @@ module SuperTable
       table_responsive = options.delete(:responsive)
       table_size = options.delete(:size).to_s
 
-      classes = ['table']
+      classes = ["table"]
       classes << options[:class] if options[:class]
       classes.push("table-hover") if is_hover && table.collection.present?
-      classes.push("table-sm") if table_size == 'sm'
+      classes.push("table-sm") if table_size == "sm"
 
       options[:class] = classes.join(" ")
 
       case table_responsive.to_s
-      when 'sm', 'md', 'lg', 'xl'
+      when "sm", "md", "lg", "xl"
         content_tag(:div, class: "table-responsive-#{table_responsive}") do
           render_table(table, options, &block)
         end

data/lib/super_table/builder.rb

@@ -1,4 +1,5 @@
-require 'super_table/view_helpers'
+require "super_table/view_helpers"
+
 module SuperTable
   class Builder
     include ViewHelpers
@@ -16,7 +17,7 @@ module SuperTable
     def heads(*args, &block)
       options = args.extract_options!
 
-      classes = ['table-secondary']
+      classes = ["table-secondary"]
       classes << options[:class] if options[:class]
       options[:class] = classes.join(" ")
 
@@ -54,7 +55,7 @@ module SuperTable
 
       th(column_options) do
         concat(title)
-        concat content_tag(:div, desc, class: 'small text-primary') if desc
+        concat content_tag(:div, desc, class: "small text-primary") if desc
       end
     end
 
@@ -99,7 +100,7 @@ module SuperTable
     def placeholder_row
       tr do
         content = table.placeholder || "尚無資料"
-        td(content, colspan: table.columns.length, class: 'text-center')
+        td(content, colspan: table.columns.length, class: "text-center")
       end
     end
 

data/lib/super_table/record.rb

@@ -1,4 +1,4 @@
-require 'forwardable'
+require "forwardable"
 
 module SuperTable
   class Record < Struct.new(:model)

data/lib/super_tools/version.rb

@@ -1,3 +1,3 @@
 module SuperTools
-  VERSION = '0.0.25'
-end
+  VERSION = "3.0.1"
+end