super_tools 0.0.13 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0335c45c48a1df81df191c9f0b0ee4f4d7529af6407fdb8aeecca380847e5675
-  data.tar.gz: 149c4a2c0118d5cce4df3ca6d16a8ef53ac4e8c4ff994172c964887ad689a461
+SHA1:
+  metadata.gz: 6be00d675e4acb60dfe108767a76d81adf7c6abe
+  data.tar.gz: 6a4746a52d0f6642fa2c62756171c0b8fa9868c7
 SHA512:
-  metadata.gz: c59b31cf7a51ae06c595f958cad780fc36169290cc4be478ecee84aaa15cd84fcc34fd665f83858cb977d52104c3efa43f99b78f0f685f3047add33ff30bee69
-  data.tar.gz: 42d10f4c9a3cd07527f64fb962c032a74b869d4d5b6965284bb3186b3ec0d16a7321b2061dcfa7b64d6693a2f5d3911761c556e27554a095ffe13f32f5ab3c2a
+  metadata.gz: 9c21b893f721de909aec9dfe8884045e42870bb228e9bc67ea1b59ae52ad03bc82030195a805e7ca558506ff52e26b4940ed9a7ad5981b530e3ae7ebe01469a0
+  data.tar.gz: 13bb0a158189a27e3252a8663ac71ce84b41e297f20f20563ad588d105f5d6c0949d3b5668aa43f3873d7939240cc51562303d428fb7b40f2ec8f6d4daf8126c

data/Gemfile.lock

@@ -144,7 +144,7 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.9.1)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)

data/lib/super_form/concerns/atomic_save.rb

@@ -7,28 +7,39 @@ module SuperForm
 
       define_callbacks :transaction, :queries, :validations
 
-      def self.before_transaction(method_name)
-        set_callback :transaction, :before, method_name
+      def self.before_transaction(method_name=nil, &block)
+        set_defined_callback(:transaction, :before, method_name, &block)
       end
 
-      def self.before_queries(method_name)
-        set_callback :queries, :before, method_name
+      def self.before_queries(method_name=nil, &block)
+        set_defined_callback(:queries, :before, method_name, &block)
       end
 
-      def self.before_commit(method_name)
-        set_callback :queries, :after, method_name
+      def self.before_commit(method_name=nil, &block)
+        set_defined_callback(:queries, :after, method_name, &block)
       end
 
-      def self.after_commit(method_name)
-        set_callback :transaction, :after, method_name
+      def self.after_commit(method_name=nil, &block)
+        set_defined_callback(:transaction, :after, method_name, &block)
       end
 
-      def self.before_validations(method_name)
-        set_callback :validations, :after, method_name
+      def self.before_validations(method_name=nil, &block)
+        set_defined_callback(:validations, :before, method_name, &block)
       end
 
-      def self.after_validations(method_name)
-        set_callback :validations, :after, method_name
+      def self.after_validations(method_name=nil, &block)
+        set_defined_callback(:validations, :after, method_name, &block)
+      end
+
+      protected
+
+      def self.set_defined_callback(event, callback, method_name=nil, &block)
+        raise "wrong number of arguments ('method_name' or 'block' choose one)" if method_name.nil? == false && block.present?
+        if block_given?
+          set_callback event, callback, &block
+        else
+          set_callback event, callback, method_name
+        end
       end
     end
 

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: '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/engine.rb

@@ -0,0 +1,7 @@
+module SuperInteraction
+  if defined?(Rails::Engine)
+    class Engine < Rails::Engine
+      paths["app/views"] = "lib/super_interaction/views"
+    end
+  end
+end

data/lib/super_interaction/layout.rb

@@ -0,0 +1,17 @@
+module SuperInteraction
+  module Layout
+    mattr_accessor :framework
+    self.framework = :bootstrap3
+
+    def self.modal_layout
+      case framework
+      when :bootstrap3
+        "modal_bs3.haml"
+      when :bootstrap4
+        "modal_bs4.haml"
+      when :beyond
+        "modal_beyond.haml"
+      end
+    end
+  end
+end

data/lib/super_interaction/views/layouts/modal_bs3.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
+        %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
+          - 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 }
+      - 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_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,8 @@ 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'
 # FORMATTER

data/lib/super_tools/version.rb

@@ -1,3 +1,3 @@
 module SuperTools
-  VERSION = '0.0.13'
+  VERSION = '0.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.21
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -318,6 +318,10 @@ files:
 - lib/super_formatter/tcat/row.rb
 - lib/super_interaction/command.rb
 - lib/super_interaction/controller_helper.rb
+- lib/super_interaction/engine.rb
+- 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
@@ -352,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails 開發環境常用工具 Forms/Process/Spreadsheet