super_tools 0.0.15 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37be0626d7ebf5618e509581d4493e001ddf95ca
-  data.tar.gz: fe0ef27a8c0e9c3e68f8219a23bf8912a3c32bc1
+SHA256:
+  metadata.gz: 322fbf567fd072ca0f6179bf982130730ce2e40922a900c2a1281c0887268de7
+  data.tar.gz: 042ab308449ea31fda56b40c620862a206abcd04353df18923702d19d36f17d4
 SHA512:
-  metadata.gz: b704f4409c86eef79d88cf4cc0461dcb30facf45f743a4faf9d024e0054c0024bb67344b77edd196e5580c15b0bf48074e6a4b2fc47f5884e92f648de2874b78
-  data.tar.gz: be2a3df596dbda74630634eedbf863aea5c03294187be6007d73e282955b73354b176826c2b3f3f650b6d38a0daf21a624fee1e4ff828a4544bf4d210ea40e07
+  metadata.gz: 2066127e56a36c72e20d5958fa9a55fb077263f7e4819a32fa6c4c50443ca2bc97294b422f99bdc30a30416b0519245e432f5358ae05ba9c675cb6a7da3a5131
+  data.tar.gz: 00276c75db7fdaa0d228edfb1dd503fac914670dfb1f2ce02a1a16764596b448100a86f60b48a23fbacb78665af38aa66dfeff736ce95b5c2034dedf5b465d6a

data/lib/super_interaction/command.rb

@@ -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: { bs_modal_size: size, title: title, desc: desc })
       cmd("$(function() { $.modal.show('#{helpers.j(modal_html)}'); });")
     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/{interaction_modal.html.haml → modal_bs3.haml}

@@ -8,10 +8,14 @@
     .modal-content
       .modal-header
         %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
-          = fa_icon('times')
+          - if respond_to?(:fa_icon)
+            = fa_icon('times')
+          - else
+            = fas_icon('times')
         = 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
+  - bs_modal_size = local_assigns[:bs_modal_size]
+  - title = local_assigns[:title]
+  - desc = local_assigns[:desc]
+.modal
+  = yield :wrapper
+  .modal-dialog{ class: "modal-#{bs_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,6 +42,7 @@ 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'

data/lib/super_tools/version.rb

@@ -1,3 +1,3 @@
 module SuperTools
-  VERSION = '0.0.15'
+  VERSION = '0.0.26'
 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.15
+  version: 0.0.26
 platform: ruby
 authors:
 - eddie
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2021-01-25 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
@@ -319,7 +313,9 @@ files:
 - lib/super_interaction/command.rb
 - lib/super_interaction/controller_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/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
@@ -338,7 +334,7 @@ homepage: https://github.com/superlanding/super_tools
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -353,9 +349,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Rails 開發環境常用工具 Forms/Process/Spreadsheet
 test_files: []