super_tools 0.0.14 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4629c593e7e200633427dd00312a6796f89214f0
-  data.tar.gz: 44f7a6c84dec5dbcf3684063a822f3505dea8bc8
+  metadata.gz: af3ee2961bfd642dbdefa9f348ac6170641954b3
+  data.tar.gz: 4b4138e6842c4579768b7f2025989c07b1a6ab23
 SHA512:
-  metadata.gz: 748d60139166797eeef6b99493e162d411eb27a8b0600d19cc0bece66024236e8f7f2f5b2086a91eba306fbb86ce9b0585dcc0cd62fbe74342d5ff7e3dfe2af8
-  data.tar.gz: 4f07b57896dd2fc6a1c59554365dae3c33b7d1b9756622c4fa380ba75d84731a1f4f66a7b04fbe87afd04e3a43a18dee401837364919f4d03c28ffb4bb5c8d7d
+  metadata.gz: 3ce3520f560f7f10d557b2cd96cbcf3670b29149d806f810547bfcc496049adbf67f2b5c6f689bc4a67b44ac89a45d82f5ce749e1fa4278eeb7501e220a6781f
+  data.tar.gz: 797bf949ca35a2bf9d7aa63cfea0194ae7b22317f0791c535b22f057d5ec20162d7d03cfcfe31930f28a16e0f2c8ad5ab0086140b6db560be43da30a1ecf129c

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

@@ -1,5 +1,7 @@
 module SuperInteraction
-  class Engine < Rails::Engine
-    paths["app/views"] = "lib/super_interaction/views"
+  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,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.14'
+  VERSION = '0.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.25
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -319,7 +319,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