sweet-alert-confirm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d4562caf3b1e3cecbf4c9d92fe3384d416c318
-  data.tar.gz: 049049199569fe95b9594d134b4d6841e2795c89
+  metadata.gz: 062da72082efb99cea7919aa08d529cb8056033d
+  data.tar.gz: 8edd6e0c298c73abebafec9960d58b64f7791532
 SHA512:
-  metadata.gz: 5c65648175a8152da2da0dacf0e08d1386a8926f13e7d2f90398025db361919065cc095f2698990fa51874e8234928f9d2a19ab818a46ccb26c3ef13b6f4cc68
-  data.tar.gz: e6fc7263994d927fdd0b26b7f6f34a9b2face824aa12643f4bab822ba62c64801c7d22d39cc48a06d932ce3db48cb914a2b70eb4d05bb68dd9f65719c4e38e54
+  metadata.gz: c82c3281ade97c514d27985f2b70db34d5f26256a5c63a9b6ab1b1f166324824a2af0058b8d2ead039289f3246d028763da9fef996a793c2901fe56fc87c13b4
+  data.tar.gz: 3e1d5db6d9717d6d79ae7fbe0540f0452a454d78cbba3eeffb3384b191d1b7744d1acfec65f7161197d8341c52bea20dab64aa05f11fc5bf799cdd1ec437e98e

data/lib/assets/javascripts/sweet-alert-confirm.js

@@ -61,7 +61,7 @@
           if (r === false) {
             return false;
           } else {
-            if($linkToVerify.is('input')){
+            if($linkToVerify.attr('type') == 'submit'){
               var name = $linkToVerify.attr('name'),
               data = name ? {name: name, value:$linkToVerify.val()} : null;
               $linkToVerify.closest('form').data('ujs:submit-button', data);

data/lib/sweet-alert-confirm/version.rb

@@ -1,3 +1,3 @@
 module SweetAlertConfirm
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/sweet-alert-confirm/view_helpers.rb

@@ -15,6 +15,16 @@ module SweetAlertConfirm
       super value, options
     end
 
+  def button_tag(*args, &block)
+    html_options = args[block_given? ? 0 : 1] || {}
+
+    if options_has_confirm?(html_options)
+      html_options['data-sweet-alert-confirm'] = html_options.delete(:confirm) ||
+                  html_options[:data].delete(:confirm)
+    end
+    super *args, &block
+  end 
+
     protected
     def options_has_confirm?(options)
       if (options[:confirm] || (options[:data] && options[:data][:confirm]))

data/spec/dummy-rails3/app/views/confirms/index.html.erb

@@ -13,3 +13,7 @@
 <%= form_tag(delete_cow_path, method: :delete) do %>
   <%= submit_tag 'Submit to delete cow', id: 'submit-delete', data: {confirm: 'Are you sure?'} %>
 <% end %>
+
+<%= form_tag(delete_cow_path, method: :delete) do %>
+  <%= button_tag('Button_tag confirm', id: 'button-confirm', data: { text: 'nanana', confirm: 'Are you sure?' }) %>
+<% end %>

data/spec/dummy/app/views/confirms/index.html.erb

@@ -13,3 +13,7 @@
 <%= form_tag(delete_cow_path, method: :delete) do %>
   <%= submit_tag 'Submit to delete cow', id: 'submit-delete', data: {confirm: 'Are you sure?'} %>
 <% end %>
+
+<%= form_tag(delete_cow_path, method: :delete) do %>
+  <%= button_tag('Button_tag confirm', id: 'button-confirm', data: { text: 'nanana', confirm: 'Are you sure?' }) %>
+<% end %>

data/spec/features/sweet_alert_confirm_spec.rb

@@ -1,32 +1,45 @@
 require 'spec_helper'
 
 describe 'basic confirms', js: true, type: :feature do
-  describe 'normal links' do
-    before do
-      visit confirms_page_path
-      find_link("Basic confirm").trigger('click')
-    end
 
-    it 'doesnt follow the link when click', :js => true do
+  shared_examples 'Confirm shows correctly' do |is_cow_deleted, is_remote|
+    let(:got_cow) { 'You got a pretty cow' }
+    let(:deleted_cow) { 'You murdered a silly cow' }
+    let(:message) { is_cow_deleted ? deleted_cow : got_cow }
+
+    it 'doesnt follow the link when click' do
+    #  require 'pry'
+    #  binding.pry
       expect(page).to have_content('Are you sure?')
-      expect(page).not_to have_content('You got a pretty cow')
+      expect(page).not_to have_content(message)
     end
 
     it 'dont follow the link when click on cancel' do
       sleep 1
-      expect(page).to_not have_content('You got a pretty cow')
+      expect(page).to_not have_content(message)
       click_button('Cancel')
       sleep 1
-      expect(page).to_not have_content('You got a pretty cow')
+      expect(page).to_not have_content(message)
     end
 
     it 'goes to the link after accept confirm' do
       #click_on '.confirm'
-      expect(page).to_not have_content('You got a pretty cow')
+      expect(page).to_not have_content(message)
       sleep 1
       click_button('Ok')
-      expect(page).to have_content('You got a pretty cow')
+      expect(page).to have_content(message)
+    end unless is_remote
+  end
+
+
+
+  describe 'normal links' do
+    before do
+      visit confirms_page_path
+      find_link("Basic confirm").trigger('click')
     end
+
+   it_behaves_like 'Confirm shows correctly'
   end
 
   describe 'methods links' do
@@ -35,27 +48,7 @@ describe 'basic confirms', js: true, type: :feature do
       find_link("Delete confirm").trigger('click')
     end
 
-    it 'doesnt follow the link when click', :js => true do
-      sleep 1
-      expect(page).to have_content('Are you sure?')
-      expect(page).not_to have_content('You murdered a silly cow')
-    end
-    
-    it 'dont follow the link when click on cancel' do
-      sleep 1
-      expect(page).to_not have_content('You murdered a silly cow')
-      click_button('Cancel')
-      sleep 1
-      expect(page).to_not have_content('You murdered a silly cow')
-    end
-
-    it 'goes to the link after accept confirm' do
-      #click_on '.confirm'
-      expect(page).to_not have_content('You murdered a silly cow')
-      sleep 1
-      click_button('Ok')
-      expect(page).to have_content('You murdered a silly cow')
-    end
+   it_behaves_like 'Confirm shows correctly', true
   end
 
   describe 'remote links' do
@@ -64,20 +57,7 @@ describe 'basic confirms', js: true, type: :feature do
       find_link("Remote confirm").trigger('click')
     end
 
-    it 'doesnt follow the link when click', :js => true do
-      sleep 1
-      expect(page).to have_content('Are you sure?')
-      expect(page).not_to have_content('You murdered a silly cow')
-    end
-    
-    it 'doesnt follow the link when click on cancel' do
-      sleep 1
-      expect(page).to have_content('Are you sure?')
-      expect(page).not_to have_content('You murdered a silly cow')
-      click_button('Cancel')
-      sleep 1
-      expect(page).not_to have_content('You murdered a silly cow')
-    end
+    it_behaves_like 'Confirm shows correctly', true, true
 
 
     it 'ajax change content in the page after accept confirm' do
@@ -110,28 +90,18 @@ describe 'basic confirms', js: true, type: :feature do
       visit confirms_page_path
       find("#submit-delete").trigger('click')
     end
-    it 'show the alert when click the submit', :js => true do
-      sleep 1
-      expect(page).to have_content('Are you sure?')
-      expect(page).not_to have_content('You murdered a silly cow')
-    end
+    it_behaves_like 'Confirm shows correctly', true
+  end
 
-    it 'does not submit the form when click on cancel' do
-      sleep 1
-      expect(page).to_not have_content('You murdered a silly cow')
-      click_button('Cancel')
-      sleep 1
-      expect(page).to_not have_content('You murdered a silly cow')
+  describe 'button_tag links' do
+    before do
+      visit confirms_page_path
+      find_button("Button_tag confirm").trigger('click')
     end
 
-    it 'submit the form after accept confirm' do
-      #click_on '.confirm'
-      expect(page).to_not have_content('You murdered a silly cow')
-      sleep 1
-      click_button('Ok')
-      expect(page).to have_content('You murdered a silly cow')
-    end
+    it_behaves_like 'Confirm shows correctly', true
   end
 
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet-alert-confirm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Moises Viloria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails