unobtrusive_flash 3.1.0 → 3.2.0

data/lib/assets/javascripts/unobtrusive_flash_ui.js

@@ -4,8 +4,7 @@
 // Shows flash messages as translucent bars on top of the page
 window.UnobtrusiveFlash.flashOptions = {type: 'notice', timeout: 0};
 
-$(function() {
-  $('<div id="unobtrusive-flash-messages"></div>').prependTo('body');
+(function(){
 
   function hideFlash($flash) {
     $flash.slideUp(100,function(){
@@ -17,8 +16,11 @@ $(function() {
     options = $.extend(UnobtrusiveFlash.flashOptions, options);
 
     var $flash = $('<div class="unobtrusive-flash-message-wrapper unobtrusive-flash-'+options.type+'"><div class="unobtrusive-flash-message">'+message+'</div></div>');
-
-    $('#unobtrusive-flash-messages').prepend($flash);
+    var $flashContainer  = $('#unobtrusive-flash-messages');
+    if ($flashContainer.length==0) {
+      $flashContainer = $('<div/>').attr('id', 'unobtrusive-flash-messages').prependTo('body');
+    }
+    $flashContainer.prepend($flash);
     $flash.hide().delay(300).slideDown(100);
 
     $flash.click(function() {
@@ -37,4 +39,5 @@ $(function() {
   };
 
   $(window).bind('rails:flash', flashHandler);
-});
+
+})();

data/lib/unobtrusive_flash/version.rb

@@ -1,3 +1,3 @@
 module UnobtrusiveFlash
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/spec/integration/api_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "api spec", type: :feature, js: true do
+  it 'should invoke the API for each flash message' do
+    visit '/test/api'
+    expect(page).to have_content 'Page loaded'
+    expect(evaluate_script('window.flashMessages')).to eq [
+      {'type' => 'notice', 'message' => 'Inline Notice'},
+      {'type' => 'error', 'message' => 'Ajax Error'}
+    ]
+  end
+end

data/spec/integration/bootstrap_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "bootstrap spec", type: :feature, js: true do
+  it 'should show each flash message' do
+    visit '/test/bootstrap'
+    expect(page).to have_content 'Page loaded'
+    expect(page).to have_content 'Inline Notice', count: 1
+    expect(page).to have_content 'Ajax Error', count: 1
+  end
+
+  it 'should translate rails message types into bootstrap alert classes' do
+    visit '/test/bootstrap'
+    expect(page).to have_content 'Page loaded'
+    within('.alert.alert-info') { expect(page).to have_content 'Inline Notice' }
+  end
+
+  it 'should bind close buttons for the messages' do
+    visit '/test/bootstrap'
+    expect(page).to have_content 'Inline Notice'
+    find('.alert.alert-info .close').click
+    expect(page).to have_no_content 'Inline Notice'
+  end
+end

data/spec/integration/turbolinks_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+if Rails.version =~ /^4\./ and Capybara.javascript_driver == :selenium
+  describe "turbolinks spec", type: :feature, js: true do
+    it 'should invoke the API for each flash message' do
+      visit '/test/turbolinks'
+      click_link 'This is a turbolink'
+      expect(page).to have_content 'Turbolink content'
+      expect(evaluate_script('window.flashMessages')).to eq [
+        {'type' => 'notice', 'message' => 'Inline Notice'},
+        {'type' => 'notice', 'message' => 'Turbolink Notice'}
+      ]
+    end
+
+    it 'should not duplicate messages when using the jquery.turbolinks plugin' do
+      visit '/test/jquery_turbolinks'
+      click_link 'This is a turbolink'
+      click_link 'One more turbolink'
+      expect(page).to have_content 'Turbolink content'
+      expect(page).to have_content 'Turbolink Notice', count: 1
+    end
+  end
+end

data/spec/integration/ui_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "ui spec", type: :feature, js: true do
+  it 'should show each flash message' do
+    visit '/test/ui'
+    expect(page).to have_content 'Page loaded'
+    expect(page).to have_content 'Inline Notice', count: 1
+    expect(page).to have_content 'Ajax Error', count: 1
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,20 @@
 require 'bundler'
 require 'rspec'
-require 'unobtrusive_flash'
+require 'capybara/rspec'
+
+ENV['JQUERY_VERSION'] ||= '2.1.1'
+
+require 'rails'
+require 'unobtrusive_flash'
+require 'support/rails_app'
+
+Capybara.app = TestApp
+
+if ENV['TRAVIS']
+  # Selenium not available on TraviS CI without many pains.
+  require 'capybara/poltergeist'
+  Capybara.javascript_driver = :poltergeist
+else
+  # But Selenium supports turbolinks and PhantomJS does not
+  Capybara.javascript_driver = :selenium
+end

data/spec/support/assets/javascripts/ajax_caller.js

@@ -0,0 +1,4 @@
+$(function() {
+  $.get('/test/ajax_flash');
+  $('<span>Page loaded</span>').appendTo('body');
+});

data/spec/support/assets/javascripts/api.js

@@ -0,0 +1,12 @@
+//=require jquery_ujs
+//=require unobtrusive_flash
+//=require ajax_caller
+//=require_self
+
+// simple handler to log all flashes into a variable accessible from the test suite
+loggingFlashHandler = function(e, params) {
+  if (typeof(window.flashMessages) == 'undefined') window.flashMessages = [];
+  window.flashMessages.push(params);
+};
+
+$(window).bind('rails:flash', loggingFlashHandler);

data/spec/support/assets/javascripts/bootstrap.js

@@ -0,0 +1,4 @@
+//=require jquery_ujs
+//=require unobtrusive_flash
+//=require unobtrusive_flash_bootstrap
+//=require ajax_caller

data/spec/support/assets/javascripts/jquery_turbolinks_application.js

@@ -0,0 +1,5 @@
+//=require jquery.turbolinks
+//=require jquery_ujs
+//=require unobtrusive_flash
+//=require unobtrusive_flash_bootstrap
+//=require turbolinks

data/spec/support/assets/javascripts/turbolinks_application.js

@@ -0,0 +1,11 @@
+//=require turbolinks
+//=require unobtrusive_flash
+//=require_self
+
+// simple handler to log all flashes into a variable accessible from the test suite
+loggingFlashHandler = function(e, params) {
+  if (typeof(window.flashMessages) == 'undefined') window.flashMessages = [];
+  window.flashMessages.push(params);
+};
+
+$(window).bind('rails:flash', loggingFlashHandler);

data/spec/support/assets/javascripts/ui.js

@@ -0,0 +1,4 @@
+//=require jquery_ujs
+//=require unobtrusive_flash
+//=require unobtrusive_flash_ui
+//=require ajax_caller

data/spec/support/rails_app.rb

@@ -0,0 +1,57 @@
+# From https://gist.github.com/josevalim/1942658
+
+require 'rails'
+require 'action_controller/railtie'
+require 'sprockets/railtie'
+require 'jquery-rails'
+if Rails.version =~ /^4\./
+  require 'turbolinks'
+  require 'jquery-turbolinks'
+end
+
+
+class TestApp < Rails::Application
+  routes.append do
+    %w(api ui bootstrap ajax_flash turbolinks jquery_turbolinks turbolinks_target).each do |action|
+      get "/test/#{action}" => "test##{action}"
+    end
+  end
+
+  # Enable cache classes. Production style.
+  config.cache_classes = true
+  config.eager_load = false
+
+  config.logger = Logger.new(STDOUT)
+  config.action_controller.view_paths = [ File.expand_path(__FILE__ + '/../views') ]
+  config.assets.paths = [ File.expand_path(__FILE__ + '/../assets/javascripts') ]
+  config.assets.enabled = true
+  config.assets.compile = true
+
+  config.middleware.delete "Rack::Lock"
+  config.middleware.delete "ActionDispatch::BestStandardsSupport"
+
+  # We need a secret token for session, cookies, etc.
+  config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+end
+
+class TestController < ActionController::Base
+  layout false
+  before_filter :set_inline_flash, except: %w(ajax_flash turbolinks_target)
+  after_filter :prepare_unobtrusive_flash
+
+  def turbolinks_target
+    flash[:notice] = 'Turbolink Notice'
+  end
+
+  def ajax_flash
+    flash[:error] = 'Ajax Error'
+    head :ok
+  end
+
+  def set_inline_flash
+    flash[:notice] = 'Inline Notice'
+  end
+end
+
+# Initialize the app (originally in config/environment.rb)
+TestApp.initialize!

data/spec/support/views/test/api.html.erb

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <%=javascript_include_tag "http://code.jquery.com/jquery-#{ENV['JQUERY_VERSION']}.min.js" %>
+    <%=javascript_include_tag "api" %>
+  </head>
+  <body>
+  </body>
+</html>

data/spec/support/views/test/bootstrap.html.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <%=javascript_include_tag "http://code.jquery.com/jquery-#{ENV['JQUERY_VERSION']}.min.js" %>
+    <%=javascript_include_tag "http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" %>
+    <%=javascript_include_tag "bootstrap" %>
+  </head>
+  <body>
+  </body>
+</html>

data/spec/support/views/test/jquery_turbolinks.html.erb

@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <%=javascript_include_tag "http://code.jquery.com/jquery-#{ENV['JQUERY_VERSION']}.min.js" %>
+    <%=javascript_include_tag "http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" %>
+    <%=javascript_include_tag "jquery_turbolinks_application" %>
+  </head>
+  <body>
+    <a href="/test/turbolinks_target">This is a turbolink</a>
+  </body>
+</html>

data/spec/support/views/test/turbolinks.html.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <%=javascript_include_tag "http://code.jquery.com/jquery-#{ENV['JQUERY_VERSION']}.min.js" %>
+    <%=javascript_include_tag "turbolinks_application" %>
+  </head>
+  <body>
+    <a href="/test/turbolinks_target">This is a turbolink</a>
+  </body>
+</html>

data/spec/support/views/test/turbolinks_target.html.erb

@@ -0,0 +1,3 @@
+Turbolink content
+
+<a href="/test/turbolinks_target">One more turbolink</a>

data/spec/support/views/test/ui.html.erb

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <%=javascript_include_tag "http://code.jquery.com/jquery-#{ENV['JQUERY_VERSION']}.min.js" %>
+    <%=javascript_include_tag "ui" %>
+  </head>
+  <body>
+  </body>
+</html>

data/unobtrusive_flash.gemspec

@@ -25,6 +25,12 @@ EOT
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", '>=3'
-  spec.add_development_dependency "rspec-mocks", '>=3'
+  spec.add_development_dependency "rspec", '~>3'
+  spec.add_development_dependency "rspec-mocks", '~>3'
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "capybara", '>=2.5'
+  # for local tests
+  spec.add_development_dependency 'selenium-webdriver'
+  # for Travis CI
+  spec.add_development_dependency 'poltergeist'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unobtrusive_flash
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Leonid Shevtsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -56,30 +56,86 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   unobtrusive_flash takes your flash messages for the backend and automagically passes them to the frontend via HTTP cookies.
   This works with both regular page loads and AJAX requests, does not tamper with the page body and requires about 3 extra
@@ -92,10 +148,19 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - README.markdown
 - Rakefile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_3.2.gemfile.lock
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.0.gemfile.lock
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.1.gemfile.lock
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2.gemfile.lock
 - lib/assets/javascripts/unobtrusive_flash.js
 - lib/assets/javascripts/unobtrusive_flash_bootstrap.js
 - lib/assets/javascripts/unobtrusive_flash_ui.js
@@ -105,8 +170,25 @@ files:
 - lib/unobtrusive_flash/engine.rb
 - lib/unobtrusive_flash/version.rb
 - spec/domain_spec.rb
+- spec/integration/api_spec.rb
+- spec/integration/bootstrap_spec.rb
+- spec/integration/turbolinks_spec.rb
+- spec/integration/ui_spec.rb
 - spec/sanitize_flash_spec.rb
 - spec/spec_helper.rb
+- spec/support/assets/javascripts/ajax_caller.js
+- spec/support/assets/javascripts/api.js
+- spec/support/assets/javascripts/bootstrap.js
+- spec/support/assets/javascripts/jquery_turbolinks_application.js
+- spec/support/assets/javascripts/turbolinks_application.js
+- spec/support/assets/javascripts/ui.js
+- spec/support/rails_app.rb
+- spec/support/views/test/api.html.erb
+- spec/support/views/test/bootstrap.html.erb
+- spec/support/views/test/jquery_turbolinks.html.erb
+- spec/support/views/test/turbolinks.html.erb
+- spec/support/views/test/turbolinks_target.html.erb
+- spec/support/views/test/ui.html.erb
 - unobtrusive_flash.gemspec
 homepage: https://github.com/leonid-shevtsov/unobtrusive_flash
 licenses: []
@@ -127,11 +209,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Unobtrusive flash messages for Rails
 test_files:
 - spec/domain_spec.rb
+- spec/integration/api_spec.rb
+- spec/integration/bootstrap_spec.rb
+- spec/integration/turbolinks_spec.rb
+- spec/integration/ui_spec.rb
 - spec/sanitize_flash_spec.rb
 - spec/spec_helper.rb
+- spec/support/assets/javascripts/ajax_caller.js
+- spec/support/assets/javascripts/api.js
+- spec/support/assets/javascripts/bootstrap.js
+- spec/support/assets/javascripts/jquery_turbolinks_application.js
+- spec/support/assets/javascripts/turbolinks_application.js
+- spec/support/assets/javascripts/ui.js
+- spec/support/rails_app.rb
+- spec/support/views/test/api.html.erb
+- spec/support/views/test/bootstrap.html.erb
+- spec/support/views/test/jquery_turbolinks.html.erb
+- spec/support/views/test/turbolinks.html.erb
+- spec/support/views/test/turbolinks_target.html.erb
+- spec/support/views/test/ui.html.erb