super_tools 0.0.10 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 83dab08d6ebdef75d55a9c4c6ba07eebc2bec3c13bd2a6da97d324066a88456b
-  data.tar.gz: 4d7748ecce72a934e8817b988d9a21c504cefd31c3f76cae1f11508aece7f3bd
+SHA1:
+  metadata.gz: 37be0626d7ebf5618e509581d4493e001ddf95ca
+  data.tar.gz: fe0ef27a8c0e9c3e68f8219a23bf8912a3c32bc1
 SHA512:
-  metadata.gz: ab9eebf8b163797d6eaec83af87653fdb9cbe9d3dcf03dd2cb5adf16ab79068856de8745707865ae162aacc4b51baa161ce4c51723471b602176da5b64b92d7d
-  data.tar.gz: 96c5324e833dd115f528e8cfdab59d455d73d0b0f21fa510c266c7f97069f4967733eedb659016d32e0c333f545986b18153d74cd4f3891753241d1feabf04f4
+  metadata.gz: b704f4409c86eef79d88cf4cc0461dcb30facf45f743a4faf9d024e0054c0024bb67344b77edd196e5580c15b0bf48074e6a4b2fc47f5884e92f648de2874b78
+  data.tar.gz: be2a3df596dbda74630634eedbf863aea5c03294187be6007d73e282955b73354b176826c2b3f3f650b6d38a0daf21a624fee1e4ff828a4544bf4d210ea40e07

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,24 @@
+- 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"}
+          = fa_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.10'
+  VERSION = '0.0.15'
 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.9.1"
+  spec.add_dependency "nokogiri", ">= 1.6", "<= 1.10.7"
   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.10
+  version: 0.0.15
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ dependencies:
         version: '1.6'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '1.6'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.7
 - !ruby/object:Gem::Dependency
   name: fast_excel
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -352,7 +354,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