super_tools 0.0.11 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e34e17b82e30a51a756740e454d87c0fb0491bd3
-  data.tar.gz: 1809323aff509afd47a2cf09c0e3a899745e3877
+  metadata.gz: e8f4cea2632f6d8712a085a3448aa82fef714b9b
+  data.tar.gz: 6aab879d3139d822467fab9d16307f3b639d07ab
 SHA512:
-  metadata.gz: 7fb48009b23ad83f0993f8e84cddffd3ab63dd451a771a1cc960dc20415dfeeb68c1279fdac112f4a99c4560dcd91952c1cd65dab8c4ba7b0b26fec652ab5f75
-  data.tar.gz: 147f196d541b7a54f6b9b36efe7c850acd43f9a518f71ba257bdc44fafaa3c185105da9fb4cc6864af0afdd420c66c85a0678a4b68921ef69e2f8c773a2ee0d5
+  metadata.gz: ae7a3bb6e1bfb1ee93898a27586610f7c8fdad296660370fd83788e214ba9154e3139c6bbd77238536125646dc83ff96c97e38ebb1ed304871f77026fccea64d
+  data.tar.gz: a06f5b4c11240c3fdc6a684cc500c8e78ac39de06deac9e5a622a8a8dd6b8eb73e4d8b2b08708cff3ef1b9514f6d0abdf0ab24cec6b38acb85271414e8b1483e

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: "interaction_modal.html.haml", 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/views/layouts/interaction_modal.html.haml

@@ -0,0 +1,27 @@
+- 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_tools.rb

@@ -42,6 +42,7 @@ require 'super_search/scroll'
 # ZIP CODE
 require 'super_zipcode/taiwan'
 # INTERACTION
+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.11'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.17
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -318,6 +318,8 @@ 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/views/layouts/interaction_modal.html.haml
 - lib/super_logger/formatter.rb
 - lib/super_process/core.rb
 - lib/super_search/scroll.rb