rails-sweetalert2-confirm 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eeb4081353a69ee10a183653fd4e7075f89fd20023fe27f3efe174468035736
-  data.tar.gz: 67a6c67e158a6bd5f5f5960d3ea6bfa83d6a91edd36f74af054e336a2b57cba8
+  metadata.gz: d5bf640acac05705af83e22b000f8c7089122fed38c1826463ddf770c18c3ee1
+  data.tar.gz: 614e66aa79624a8f744d1f843437270c7abdc1a28d60f564bddb5792c95924f8
 SHA512:
-  metadata.gz: 85e0cf7c29017a3b5622080d49977a2f3bac352e85ea8fe6b5d5333a4650e52d58352d89a685d8db09f1c55de72a5157537f705c430f23c0d0abb787fdd33852
-  data.tar.gz: 4936068d2d56909404cad014ed46c9df661069961f562a3bf197d01d47b1ecbaec67aeb83c89d4fabd2e1ef2ccd6ec8a2ecced86b601b32f83f43a5fdda90cad
+  metadata.gz: 2cb5b3cd4c5a65e8c3b55b8500d7bce4a913d341469f5fc6d03a2ff601fd9d089621508cffc6d9cc655dab8cc44b38201db9df6aafaf78d74a93abbc89b46461
+  data.tar.gz: c8fbf9c8220b1e9175be9766874445f380e185102215b29a66c4797d5842f9efb6dba2e329239b8cc5005aadd792ba7642c53d9351d2a5101ce1f176b15b4f94

data/lib/rails-sweetalert2-confirm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_sweetalert2_confirm/version'
 require 'rails_sweetalert2_confirm/railtie'
 require 'rails_sweetalert2_confirm/rails/engine'

data/lib/rails_sweetalert2_confirm/rails/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsSweetAlert2Confirm
   module Rails
     class Engine < ::Rails::Engine

data/lib/rails_sweetalert2_confirm/railtie.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'rails_sweetalert2_confirm/view_helpers'
+
 module RailsSweetAlert2Confirm
   class Railtie < Rails::Railtie
     initializer 'rails_sweetalert2_confirm.view_helpers' do

data/lib/rails_sweetalert2_confirm/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsSweetAlert2Confirm
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/lib/rails_sweetalert2_confirm/view_helpers.rb

@@ -1,10 +1,6 @@
-module RailsSweetAlert2Confirm
-  SWAL_OPTIONS_MAPPINGS = {
-    confirm: :title,
-    remote:  :remote,
-    method: :method
-  }
+# frozen_string_literal: true
 
+module RailsSweetAlert2Confirm
   module ViewHelpers
     def link_to(*args, &block)
       options = args[block_given? ? 1 : 2] || {}
@@ -23,37 +19,38 @@ module RailsSweetAlert2Confirm
       super(*args, &block)
     end
 
-    protected
-
-    def merge_options_into_swal(options)
-      options = merge_confirm_into_swal(options)
-      options = merge_remote_into_swal(options)
-      merge_method_into_swal(options)
-    end
-
-    %w(remote method confirm).each do |option|
-      define_method("merge_#{option}_into_swal") do |options|
-        return if %w(remote method).include?(option) && !options_has_confirm?
-        if send("options_has_#{option}?", options)
-          options[:data] ||= {}
-          options[:data][:swal] ||= {}
-          option = option.to_sym
-          options[:data][:swal][SWAL_OPTIONS_MAPPINGS[option]] =
-            if option == :method
-              options[option] ||
-                options[:data][option]
-            else
-              options.delete(option) ||
-                options[:data].delete(option)
-            end
-        end
-        options
-      end
-
-      define_method("options_has_#{option}?") do |options|
-        option = option.to_sym
-        (options[option] || options[:data].try(:[], option)).present?
-      end
+    private def merge_options_into_swal(options)
+      return options unless options_have_confirm?(options)
+      options = configure_swal_options(options)
+      options = merge_swal_remote_options(options)
+      options = merge_swal_confirm_options(options)
+    end
+
+    private def configure_swal_options(options)
+      options[:data] ||= {}
+      options[:data][:swal] ||= {}
+    end
+
+    private def merge_swal_remote_options(options)
+      return options unless options_have_remote?(options)
+      options[:data][:swal][:remote] = fetch_option(:remote, options)
+    end
+
+    private def merge_swal_confirm_options(options)
+      return options unless options_have_confirm?(options)
+      options[:data][:swal][:title] = fetch_option(:confirm, options)
+    end
+
+    private def fetch_option(option, options)
+      options.delete(option) || options[:data].delete(option)
+    end
+
+    private def options_have_confirm?(options)
+      (options[:confirm] || options.dig(:data, :confirm)).present?
+    end
+
+    private def options_have_remote?(options)
+      (options[:remote] || options.dig(:data, :remote)).present?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-sweetalert2-confirm
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Joe Woodward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails