super_tools 0.0.17 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f4cea2632f6d8712a085a3448aa82fef714b9b
-  data.tar.gz: 6aab879d3139d822467fab9d16307f3b639d07ab
+  metadata.gz: 248f805a4956e73dcc11f4623ebfeb7f124c0d49
+  data.tar.gz: f24028ac4d9d1a4f80f8bd0e5552174fc735f4da
 SHA512:
-  metadata.gz: ae7a3bb6e1bfb1ee93898a27586610f7c8fdad296660370fd83788e214ba9154e3139c6bbd77238536125646dc83ff96c97e38ebb1ed304871f77026fccea64d
-  data.tar.gz: a06f5b4c11240c3fdc6a684cc500c8e78ac39de06deac9e5a622a8a8dd6b8eb73e4d8b2b08708cff3ef1b9514f6d0abdf0ab24cec6b38acb85271414e8b1483e
+  metadata.gz: 9ec67d9425ff7fa208a0cadd4682eb4a0e1b63dde2eb3e22b9715f679d9a3bd22534b56e65a7f8e792061a8e97686ceccd7f2b78b21afabcfb5e1cacfd93a59d
+  data.tar.gz: 6447defbdd74912a56d187406c3d80e0890b037062c96d06a3d02ac7f6c4074949772321d24ad85b8147908e5def0ff5cdd5340a387c085bd3cabcadaac16847

data/README.md

@@ -84,7 +84,8 @@ SuperTable::Tableable.send(:include, ::Rails.application.routes.url_helpers)
 
 ```ruby
 class ApplicationController < ActionController::Base
-  include SuperInteraction::ControllerHelper
+  include SuperInteraction::BootstrapHelper
+  include SuperInteraction::BeyondrHelper
 end
 ```
 

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: "interaction_modal.html.haml", 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,10 @@ module SuperInteraction
   if defined?(Rails::Engine)
     class Engine < Rails::Engine
       paths["app/views"] = "lib/super_interaction/views"
+
+      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/layout.rb

@@ -0,0 +1,29 @@
+module SuperInteraction
+  module Layout
+
+    FRAMEWORKS = [ :bootstrap3, :bootstrap4, :beyond ]
+
+    def self.framework=(f)
+      raise "Not support framework: #{f}" if FRAMEWORKS.include?(f) == false
+      @@framework = f
+    end
+
+    def self.framework
+      @@framework
+    end
+
+    def self.modal_layout
+      case @@framework
+      when :bootstrap3
+        "modal_bs3.haml"
+      when :bootstrap4
+        "modal_bs4.haml"
+      when :beyond
+        "modal_beyond.haml"
+      else
+        # Default
+        "modal_bs3.haml"
+      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/{interaction_modal.html.haml → 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"}
@@ -15,6 +15,7 @@
         = yield :header
         - if title.present?
           %h4.modal-title= title
+
       = yield
       = yield :before_body
       - body_html = capture { yield :body }

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

@@ -0,0 +1,28 @@
+- if Rails.version[0].to_i >= 5
+  - size = local_assigns[:size]
+  - title = local_assigns[:title]
+  - desc = local_assigns[:desc]
+.modal
+  = yield :wrapper
+  .modal-dialog{ class: "modal-#{size}" }
+    .modal-content
+      .modal-header
+        = yield :header
+        - if title.present?
+          %h5.modal-title
+            = title
+            - if desc.present?
+              %small.text-secondary= desc
+        %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
+          = fas_icon('times')
+
+      = yield
+      = yield :before_body
+      - body_html = capture { yield :body }
+      - if body_html.present?
+        .modal-body= body_html
+      = yield :after_body
+
+      - footer_html = capture { yield :footer }
+      - if footer_html.present?
+        .modal-footer= footer_html

data/lib/super_tools.rb

@@ -42,9 +42,12 @@ require 'super_search/scroll'
 # ZIP CODE
 require 'super_zipcode/taiwan'
 # INTERACTION
+require 'super_interaction/layout'
 require 'super_interaction/engine'
-require 'super_interaction/command'
-require 'super_interaction/controller_helper'
+require 'super_interaction/beyond'
+require 'super_interaction/beyond_helper'
+require 'super_interaction/bootstrap'
+require 'super_interaction/bootstrap_helper'
 # FORMATTER
 require 'super_logger/formatter'
 # Values

data/lib/super_tools/version.rb

@@ -1,3 +1,3 @@
 module SuperTools
-  VERSION = '0.0.17'
+  VERSION = '2.1.0'
 end

data/super_tools.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "activemodel", '>= 4', '<= 6'
   # spec.add_dependency "activesupport", '>= 4', '<= 6'
   # spec.add_dependency "activeview"
-  spec.add_dependency "nokogiri", ">= 1.6", "<= 1.10.7"
+  spec.add_dependency "nokogiri", ">= 1.6"
   spec.add_dependency "fast_excel"
   spec.add_dependency "roo"
   spec.add_dependency "roo-xls"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 2.1.0
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,9 +87,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,9 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.10.7
 - !ruby/object:Gem::Dependency
   name: fast_excel
   requirement: !ruby/object:Gem::Requirement
@@ -316,10 +310,15 @@ files:
 - lib/super_formatter/tcat/head.rb
 - lib/super_formatter/tcat/import.rb
 - lib/super_formatter/tcat/row.rb
-- lib/super_interaction/command.rb
-- lib/super_interaction/controller_helper.rb
+- lib/super_interaction/beyond.rb
+- lib/super_interaction/beyond_helper.rb
+- lib/super_interaction/bootstrap.rb
+- lib/super_interaction/bootstrap_helper.rb
 - lib/super_interaction/engine.rb
-- lib/super_interaction/views/layouts/interaction_modal.html.haml
+- lib/super_interaction/layout.rb
+- lib/super_interaction/views/layouts/beyond.haml
+- lib/super_interaction/views/layouts/modal_bs3.haml
+- lib/super_interaction/views/layouts/modal_bs4.haml
 - lib/super_logger/formatter.rb
 - lib/super_process/core.rb
 - lib/super_search/scroll.rb