sweet-alert-confirm 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e2fbc7775fcd8b3351f57e8710c229431b13095
-  data.tar.gz: 737b14b9f91318bbacf6c40738f941184dcb77de
+  metadata.gz: 7f32a1c64a0fe20d527652b4879cece6514479b5
+  data.tar.gz: 3b5004d07c472c9903f7053e0fcb22c06a2958bd
 SHA512:
-  metadata.gz: b75eb40ed8c40a128f99a094e38ad272b14ed4b93f4b3aa447dd2e7bb333288025a0b208998e363f4563120409972c85fedb5191d9636305f079997bd68430e4
-  data.tar.gz: c4706c97f9bd255833c949661c0887f5debc2a5178ea866ac596c7f1aac4e3f60fc7843e9d15550057b91c712b8a5bb6801ecc87d5dcf9f84b562aad6d8189e4
+  metadata.gz: 629817d1a61d64c6fc837123663fba57bebef58d31c6ca8a7f46eb599530d1a70dc0bf92b6d6e19d6555594a9a71e84735cc7ebeab6691647c2895e1973d13ac
+  data.tar.gz: 24e1b28b9df196793cc9a339f68fb06277fce0813a03b6afb219fb6960c9d789f519e8b3f7aa23c3fd32411668f64951739709a31aec9ade6abff9e4c8543028

data/.travis.yml

@@ -1,9 +1,11 @@
 env:
-  - "RAILS_VERSION=3.2.15"
-  - "RAILS_VERSION=3.2.19"
-  - "RAILS_VERSION=4.0.8"
-  - "RAILS_VERSION=4.1.4"
-  - "RAILS_VERSION=master"
+  - RAILS_VERSION=3.2.15
+  - RAILS_VERSION=3.2.15
+  - RAILS_VERSION=3.2.19 USE_TURBOLINKS=true
+  - RAILS_VERSION=4.0.8
+  - RAILS_VERSION=4.1.4
+  - RAILS_VERSION=4.1.4 USE_TURBOLINKS=true
+  - RAILS_VERSION=master
  
 rvm:
  - 1.9.3

data/Gemfile

@@ -25,6 +25,7 @@ rails = case rails_version
         end
 
 gem "rails", rails
+gem "turbolinks"
 
 group :development, :test do
   gem "jquery-rails"
@@ -35,6 +36,6 @@ group :development, :test do
   end
   gem "sweet-alert"
   gem "capybara"
-  gem "poltergeist", git: 'https://github.com/teampoltergeist/poltergeist.git'
+  gem "poltergeist" #, git: 'https://github.com/teampoltergeist/poltergeist.git'
   gem "rake"
 end

data/README.md

@@ -6,20 +6,41 @@ sweet-alert-rails-confirm
 
 A Rails confirm replacement with SweetAlert
 
-depends on http://github.com/Najtmare/sweet-alert-rails
+depends on https://github.com/t4t5/sweetalert
+
+So you need to Install:
+    gem 'sweet-alert'
+
+Or the latest with:
+    gem 'rails-assets-sweetalert' # Using https://rails-assets.org/ 
 
-Install:
-    gem 'sweet-alert-confirm'
-    
 ## Requirements
 Rails >= 3.1
 
 ## Usage
 
+Using ```gem 'rails-assets-sweetalert'```
+
+application.js:
+
+```javascript
+//= require sweetalert
+//= require sweet-alert-confirm
+```
+application.css:
+
+```css
+/*
+ *= require sweetalert
+ */
+```
+
+Using ```gem 'sweet-alert'```
 
 application.js:
 
 ```javascript
+//= require sweet-alert
 //= require sweet-alert-confirm
 ```
 application.css:
@@ -36,15 +57,14 @@ application.css:
 You can pass options in `data:`
 ```Ruby
  data: {
-	      confirm: 'Are you ready?'
-	      :'confirm-button-text' => 'Im ready',
-	      :'cancel-button-text' => 'No way',
-	      :'confirm-button-color' => '#66CD00',
-	      :'sweet-alert-type' => 'info',
-	      text: 'This is a subtitle',
-	      :'image-url' => '/pic.png'
-
-        } 
+  confirm: 'Are you ready?'
+  :'confirm-button-text' => 'Im ready',
+  :'cancel-button-text' => 'No way',
+  :'confirm-button-color' => '#66CD00',
+  :'sweet-alert-type' => 'info',
+  text: 'This is a subtitle',
+  :'image-url' => '/pic.png'
+}
 ```
 
 ![Custom confirm](https://cloud.githubusercontent.com/assets/5833678/4653700/14389916-54b0-11e4-9850-14ee970e9345.png)
@@ -56,4 +76,3 @@ Fork the repo & pull request you fix/feature
 append `RAILS_VERSION=4.1.2` or whichever you target before your `bundle` command ex: `RAILS_VERSION=4.1.2 bundle install`
 
 please add/modify test examples on fix or features
-

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

@@ -1,4 +1,3 @@
-//= require sweet-alert
 (function( $ ) {
   var sweetAlertConfirm = function(event) {
     swalDefaultOptions = {
@@ -10,7 +9,6 @@
 
     }
 
-    //this.click(function(event) {
       $linkToVerify = $(this)
       var swalOptions = swalDefaultOptions;
       var optionKeys = [
@@ -57,7 +55,6 @@
           }
         }
         else {
-          //[FIXME]Check this im not sure about this
           if (r === false) {
             return false;
           } else {
@@ -76,15 +73,16 @@
       });
 
       return false;
-    //});
-    //return this;
   }
   $(document).on('ready page:load ajaxComplete', function() {
     $('[data-sweet-alert-confirm]').on('click', sweetAlertConfirm)
   });
+
   $(document).on('ready page:load', function() {
     //To avoid "Uncaught TypeError: Cannot read property 'querySelector' of null" on turbolinks
-    window.sweetAlertInitialize();
+    if (typeof window.sweetAlertInitialize === 'function') {
+      window.sweetAlertInitialize();
+    }
   });
 
 

data/lib/assets/stylesheets/sweet-alert-confirm.css

@@ -1,3 +1,2 @@
 /*
- *= require sweet-alert
 */

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

@@ -1,7 +1,7 @@
 require 'sweet-alert-confirm/view_helpers'
 module SweetAlertConfirm
   class Railtie < Rails::Railtie
-    initializer "sweet_alert_confirm.view_helpers" do
+    initializer 'sweet_alert_confirm.view_helpers' do
       ActionView::Base.send :include, ViewHelpers
     end
   end

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

@@ -1,3 +1,3 @@
 module SweetAlertConfirm
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

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

@@ -10,7 +10,7 @@ module SweetAlertConfirm
       super *args, &block
     end
 
-    def submit_tag(value = "Save changes", options = {})
+    def submit_tag(value = 'Save changes', options = {})
       options['data-sweet-alert-confirm'] = options.delete(:confirm) || options[:data].delete(:confirm) if options_has_confirm?(options)
       super value, options
     end
@@ -23,7 +23,7 @@ module SweetAlertConfirm
                   html_options[:data].delete(:confirm)
     end
     super *args, &block
-  end 
+  end
 
     protected
     def options_has_confirm?(options)

data/lib/sweet-alert-confirm.rb

@@ -1,6 +1,7 @@
-require 'sweet-alert'
-require "sweet-alert-confirm/version"
+# require 'sweet-alert'
+require 'sweet-alert-confirm/version'
 require 'sweet-alert-confirm/railtie'
 require 'sweet-alert-confirm/rails/engine'
+
 module SweetAlertConfirm
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -14,4 +14,4 @@
 //= require jquery_ujs
 //= require sweet-alert
 //= require sweet-alert-confirm
-//= require_tree .
+// require_tree .

data/spec/dummy/app/assets/javascripts/application_turbolinks.js

@@ -0,0 +1,18 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require sweet-alert
+//= require sweet-alert-confirm
+// require_tree .

data/spec/dummy/app/controllers/confirms_controller.rb

@@ -6,4 +6,8 @@ class ConfirmsController < ApplicationController
       format.js {}
     end
   end
+
+  def pre_index
+    
+  end
 end

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

@@ -0,0 +1 @@
+<%= link_to 'Index', confirms_page_path %>

data/spec/dummy/app/views/layouts/application.html.erb

@@ -3,7 +3,11 @@
 <head>
   <title>Dummy</title>
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application' %>
+  <% if ENV['USE_TURBOLINKS'] %>
+    <%= javascript_include_tag 'application_turbolinks', "data-turbolinks-track" => true %>
+  <% else %>
+    <%= javascript_include_tag 'application', "data-turbolinks-track" => false %>
+  <% end %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/spec/dummy/config/initializers/assets.rb

@@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( application_turbolinks.js )

data/spec/dummy/config/routes.rb

@@ -53,6 +53,7 @@ Rails.application.routes.draw do
   #     # (app/controllers/admin/products_controller.rb)
   #     resources :products
   #   end
+  root 'confirms#pre_index'
   get :confirms_page, to: 'confirms#index'
   get :get_cow,    to: 'confirms#get_cow'
   delete :delete_cow,    to: 'confirms#delete_cow'

data/spec/dummy-rails3/app/assets/javascripts/application.js

@@ -14,4 +14,3 @@
 //= require jquery_ujs
 //= require sweet-alert
 //= require sweet-alert-confirm
-//= require_tree .

data/spec/dummy-rails3/app/assets/javascripts/application_turbolinks.js

@@ -0,0 +1,18 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require sweet-alert
+//= require sweet-alert-confirm
+// require_tree .

data/spec/dummy-rails3/app/controllers/confirms_controller.rb

@@ -6,4 +6,8 @@ class ConfirmsController < ApplicationController
       format.js {}
     end
   end
+
+  def pre_index
+    
+  end
 end

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

@@ -0,0 +1 @@
+<%= link_to 'Index', confirms_page_path %>

data/spec/dummy-rails3/app/views/layouts/application.html.erb

@@ -3,7 +3,11 @@
 <head>
   <title>Dummy</title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
+  <% if ENV['USE_TURBOLINKS'] %>
+    <%= javascript_include_tag 'application_turbolinks', "data-turbolinks-track" => true %>
+  <% else %>
+    <%= javascript_include_tag 'application', "data-turbolinks-track" => false %>
+  <% end %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/spec/dummy-rails3/config/routes.rb

@@ -55,6 +55,7 @@ Dummy::Application.routes.draw do
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
   # match ':controller(/:action(/:id))(.:format)'
+  root to: 'confirms#pre_index'
   get :confirms_page, to: 'confirms#index'
   get :get_cow,    to: 'confirms#get_cow'
   delete :delete_cow,    to: 'confirms#delete_cow'

data/spec/features/sweet_alert_confirm_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 describe 'basic confirms', js: true, type: :feature do
+  before do
+    if ENV['USE_TURBOLINKS']
+      visit root_path
+      page.execute_script('Turbolinks.visit("/confirms_page");') 
+      #find_link('Index').trigger('click')
+    else
+      visit root_path
+      click_link 'Index'
+    end
+  end
 
   shared_examples 'Confirm shows correctly' do |is_cow_deleted, is_remote|
     let(:got_cow) { 'You got a pretty cow' }
@@ -8,13 +18,11 @@ describe 'basic confirms', js: true, type: :feature do
     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(message)
     end
 
-    it 'dont follow the link when click on cancel' do
+    it 'doesnt follow the link when click on cancel' do
       sleep 1
       expect(page).to_not have_content(message)
       click_button('Cancel')
@@ -35,7 +43,7 @@ describe 'basic confirms', js: true, type: :feature do
 
   describe 'normal links' do
     before do
-      visit confirms_page_path
+      #visit confirms_page_path
       find_link("Basic confirm").trigger('click')
     end
 
@@ -44,8 +52,8 @@ describe 'basic confirms', js: true, type: :feature do
 
   describe 'methods links' do
     before do
-      visit confirms_page_path
       find_link("Delete confirm").trigger('click')
+      sleep 2
     end
 
    it_behaves_like 'Confirm shows correctly', true
@@ -53,8 +61,8 @@ describe 'basic confirms', js: true, type: :feature do
 
   describe 'remote links' do
     before do
-      visit confirms_page_path
       find_link("Remote confirm").trigger('click')
+      sleep 3
     end
 
     it_behaves_like 'Confirm shows correctly', true, true
@@ -62,8 +70,9 @@ describe 'basic confirms', js: true, type: :feature do
 
     it 'ajax change content in the page after accept confirm' do
       #click_on '.confirm'
+      sleep 3
       expect(page).to_not have_content('You murdered a silly cow with ajax')
-      sleep 1
+      sleep 3
       click_button('Ok')
       expect(page).to have_content('You murdered a silly cow with ajax')
     end
@@ -87,7 +96,7 @@ describe 'basic confirms', js: true, type: :feature do
 
   describe 'Submit confirm' do
     before do
-      visit confirms_page_path
+      #visit confirms_page_path
       find("#submit-delete").trigger('click')
     end
     it_behaves_like 'Confirm shows correctly', true
@@ -95,7 +104,7 @@ describe 'basic confirms', js: true, type: :feature do
 
   describe 'button_tag links' do
     before do
-      visit confirms_page_path
+      #visit confirms_page_path
       find_button("Button_tag confirm").trigger('click')
     end
 

data/sweet-alert-confirm.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.description = ""
   s.license     = "MIT"
 
-  #s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
-  s.add_dependency "jquery-rails"
-  s.add_dependency "sweet-alert"
+  # s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
+  # s.add_dependency "jquery-rails"
+  # s.add_dependency "sweet-alert"
   s.add_development_dependency "rails", ">=3.1"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara", "~> 2.1"

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sweet-alert-confirm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Moises Viloria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sweet-alert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +106,7 @@ files:
 - spec/dummy-rails3/app/.DS_Store
 - spec/dummy-rails3/app/assets/.DS_Store
 - spec/dummy-rails3/app/assets/javascripts/application.js
+- spec/dummy-rails3/app/assets/javascripts/application_turbolinks.js
 - spec/dummy-rails3/app/assets/stylesheets/application.css
 - spec/dummy-rails3/app/assets/stylesheets/application.scss.css
 - spec/dummy-rails3/app/controllers/application_controller.rb
@@ -145,6 +118,7 @@ files:
 - spec/dummy-rails3/app/views/confirms/delete_cow.js.erb
 - spec/dummy-rails3/app/views/confirms/get_cow.html.erb
 - spec/dummy-rails3/app/views/confirms/index.html.erb
+- spec/dummy-rails3/app/views/confirms/pre_index.html.erb
 - spec/dummy-rails3/app/views/layouts/application.html.erb
 - spec/dummy-rails3/config.ru
 - spec/dummy-rails3/config/application.rb
@@ -204,6 +178,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/application_turbolinks.js
 - spec/dummy/app/assets/javascripts/confirms.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/stylesheets/application.scss.css
@@ -218,6 +193,7 @@ files:
 - spec/dummy/app/views/confirms/delete_cow.js.erb
 - spec/dummy/app/views/confirms/get_cow.html.erb
 - spec/dummy/app/views/confirms/index.html.erb
+- spec/dummy/app/views/confirms/pre_index.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails