unpoly-rails 0.37.0 → 0.50.0

data/lib/assets/javascripts/unpoly.coffee

@@ -1,5 +1,6 @@
 #= require ./unpoly/namespace
 #= require ./unpoly/util
+#= require_tree ./unpoly/classes
 #= require ./unpoly/protocol
 #= require ./unpoly/browser
 #= require ./unpoly/bus
@@ -9,7 +10,6 @@
 #= require ./unpoly/history
 #= require ./unpoly/layout
 #= require ./unpoly/dom
-#= require_tree ./unpoly/dom
 #= require ./unpoly/motion
 #= require ./unpoly/proxy
 #= require ./unpoly/link

data/lib/unpoly/rails/inspector.rb

@@ -22,21 +22,35 @@ module Unpoly
       alias_method :unpoly?, :up?
 
       ##
-      # If the current request is a [fragment update](https://unpoly.com/up.replace),
-      # this returns the CSS selector of the page fragment that should be updated.
+      # Returns the CSS selector for a fragment that Unpoly will update in
+      # case of a successful response (200 status code).
       #
       # The Unpoly frontend will expect an HTML response containing an element
-      # that matches this selector. If no such element is found, an error is shown
-      # to the user.
+      # that matches this selector.
       #
-      # Server-side code is free to optimize its response by only returning HTML
+      # Server-side code is free to optimize its successful response by only returning HTML
       # that matches this selector.
       def target
         request.headers['X-Up-Target']
       end
 
       ##
-      # Tests whether the given CSS selector is targeted by the current fragment update.
+      # Returns the CSS selector for a fragment that Unpoly will update in
+      # case of an failed response. Server errors or validation failures are
+      # all examples for a failed response (non-200 status code).
+      #
+      # The Unpoly frontend will expect an HTML response containing an element
+      # that matches this selector.
+      #
+      # Server-side code is free to optimize its response by only returning HTML
+      # that matches this selector.
+      def fail_target
+        request.headers['X-Up-Fail-Target']
+      end
+
+      ##
+      # Returns whether the given CSS selector is targeted by the current fragment
+      # update in case of a successful response (200 status code).
       #
       # Note that the matching logic is very simplistic and does not actually know
       # how your page layout is structured. It will return `true` if
@@ -45,31 +59,46 @@ module Unpoly
       #
       # Always returns `true` if the current request is not an Unpoly fragment update.
       def target?(tested_target)
-        if up?
-          actual_target = target
-          if actual_target == tested_target
-            true
-          elsif actual_target == 'html'
-            true
-          elsif actual_target == 'body'
-            not ['head', 'title', 'meta'].include?(tested_target)
-          else
-            false
-          end
-        else
-          true
-        end
+        query_target(target, tested_target)
+      end
+
+      ##
+      # Returns whether the given CSS selector is targeted by the current fragment
+      # update in case of a failed response (non-200 status code).
+      #
+      # Note that the matching logic is very simplistic and does not actually know
+      # how your page layout is structured. It will return `true` if
+      # the tested selector and the requested CSS selector matches exactly, or if the
+      # requested selector is `body` or `html`.
+      #
+      # Always returns `true` if the current request is not an Unpoly fragment update.
+      def fail_target?(tested_target)
+        query_target(fail_target, tested_target)
+      end
+
+      ##
+      # Returns whether the given CSS selector is targeted by the current fragment
+      # update for either a success or a failed response.
+      #
+      # Note that the matching logic is very simplistic and does not actually know
+      # how your page layout is structured. It will return `true` if
+      # the tested selector and the requested CSS selector matches exactly, or if the
+      # requested selector is `body` or `html`.
+      #
+      # Always returns `true` if the current request is not an Unpoly fragment update.
+      def any_target?(tested_target)
+        target?(tested_target) || fail_target?(tested_target)
       end
 
       ##
       # Returns whether the current form submission should be
-      # [validated](https://unpoly.com/up-validate) (and not be saved to the database).
+      # [validated](https://unpoly.com/input-up-validate) (and not be saved to the database).
       def validate?
         validate_name.present?
       end
 
       ##
-      # If the current form submission is a [validation](https://unpoly.com/up-validate),
+      # If the current form submission is a [validation](https://unpoly.com/input-up-validate),
       # this returns the name attribute of the form field that has triggered
       # the validation.
       def validate_name
@@ -99,6 +128,22 @@ module Unpoly
         @controller.response
       end
 
+      def query_target(actual_target, tested_target)
+        if up?
+          if actual_target == tested_target
+            true
+          elsif actual_target == 'html'
+            true
+          elsif actual_target == 'body'
+            not ['head', 'title', 'meta'].include?(tested_target)
+          else
+            false
+          end
+        else
+          true
+        end
+      end
+
     end
   end
 end

data/lib/unpoly/rails/version.rb

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '0.37.0'
+    VERSION = '0.50.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unpoly",
-  "version": "0.37.0",
+  "version": "0.50.0",
   "description": "Unobtrusive JavaScript framework",
   "main": "dist/unpoly.js",
   "files": [

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.36.2)
+    unpoly-rails (0.37.0)
       rails (>= 3)
 
 GEM
@@ -86,14 +86,14 @@ GEM
       haml (>= 4.0.0.rc.1)
       hpricot (~> 0.8.6)
       ruby_parser (~> 3.1.1)
-    i18n (0.7.0)
-    jasmine-core (2.5.2)
+    i18n (0.8.6)
+    jasmine-core (2.8.0)
     jasmine-rails (0.14.1)
       jasmine-core (>= 1.3, < 3.0)
       phantomjs (>= 1.9)
       railties (>= 3.2.0)
       sprockets-rails
-    jquery-rails (4.2.2)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -104,13 +104,13 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
     multi_json (1.12.1)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     phantomjs (2.1.1.0)
-    rack (1.6.5)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
@@ -180,10 +180,10 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.4)
-    thread_safe (0.3.5)
+    thor (0.20.0)
+    thread_safe (0.3.6)
     tilt (1.4.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.6.0)
       execjs (>= 0.3.0)
@@ -218,4 +218,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.15.1
+   1.16.0

data/spec_app/app/assets/javascripts/integration_test.coffee

@@ -1,5 +1,6 @@
 #= require jquery
 #= require jquery_ujs
+#= require es6-promise.auto
 #= require unpoly
 
 up.compiler '.compiler', ($element) ->

data/spec_app/app/assets/javascripts/jasmine_specs.coffee

@@ -1,7 +1,7 @@
-#= require jquery2
 #= require jquery_ujs
 #= require jasmine-jquery
 #= require jasmine-fixture
 #= require jasmine-ajax
 #= require helpers/knife
+#= require es6-promise.auto
 #= require unpoly

data/spec_app/app/assets/stylesheets/jasmine_specs.sass

@@ -4,3 +4,13 @@
 .up-modal-backdrop
   background-color: rgba(90, 90, 90, 0.05)
 
+.default-fallback
+  position: fixed
+  top: 0
+  left: 0
+  width: 500px
+  height: 300px
+  background-color: rgba(255, 255, 255, 0.7)
+
+  &:empty
+    display: none

data/spec_app/app/controllers/binding_test_controller.rb

@@ -8,12 +8,22 @@ class BindingTestController < ActionController::Base
     render :text => up.target
   end
 
+  def up_fail_target
+    render :text => up.fail_target
+  end
+
   def up_is_target
-    tested_target = params[:tested_target].presence
-    tested_target or raise "No target given"
     render :text => up.target?(tested_target).to_s
   end
 
+  def up_is_fail_target
+    render :text => up.fail_target?(tested_target).to_s
+  end
+
+  def up_is_any_target
+    render :text => up.any_target?(tested_target).to_s
+  end
+
   def is_up_validate
     render :text => up.validate?.to_s
   end
@@ -31,4 +41,11 @@ class BindingTestController < ActionController::Base
     render :text => 'text from controller'
   end
 
+  private
+
+  def tested_target
+    tested_target = params[:tested_target].presence
+    tested_target or raise "No target given"
+  end
+
 end

data/spec_app/app/controllers/method_test_controller.rb

@@ -0,0 +1,16 @@
+class MethodTestController < ApplicationController
+
+  layout false
+
+  skip_before_filter :verify_authenticity_token
+
+  def page1
+  end
+
+  def page2
+  end
+
+  def form_target
+  end
+
+end

data/spec_app/app/views/layouts/jasmine_rails/spec_runner.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
+    <title>Unpoly Specs</title>
+
+    <%= stylesheet_link_tag *jasmine_css_files %>
+    <%=
+      jquery_suffix = params[:jquery].presence || '3'
+      jquery_asset = "jquery#{jquery_suffix}"
+      jquery_asset = "jquery" if jquery_asset == "jquery1"
+      javascript_include_tag jquery_asset
+    %>
+    <%= javascript_include_tag *jasmine_js_files %>
+  </head>
+  <body>
+    <div id="jasmine_content"></div>
+    <%= yield %>
+  </body>
+</html>

data/spec_app/app/views/method_test/form_target.erb

@@ -0,0 +1,17 @@
+<html>
+<body>
+
+<h1>form_target (<%= request.method %>)</h1>
+
+<p>
+  <a href="javascript:history.pushState({}, 'page 2 title', 'page2')">Add history entry to page2</a>
+</p>
+
+<p>
+  <a href="javascript:location.reload()">Reload the page</a>
+  <br>
+  Do you see a "retry form submission" prompt? If yes, this browser is affected by the issue.
+</p>
+
+</body>
+</html>

data/spec_app/app/views/method_test/page1.erb

@@ -0,0 +1,11 @@
+<html>
+<body>
+
+<h1>page1 (<%= request.method %>)</h1>
+
+<form method="post" action="form_target">
+  <input type="submit" value="load form_target with POST">
+</form>
+
+</body>
+</html>

data/spec_app/app/views/method_test/page2.erb

@@ -0,0 +1,6 @@
+<html>
+<body>
+<h1>page2 (<%= request.method %>)</h1>
+
+</body>
+</html>

data/spec_app/app/views/pages/start.erb

@@ -5,7 +5,38 @@
   <h2>Unit tests</h2>
 
   <ul>
-    <li><%= link_to 'Jasmine specs', '/specs' %></li>
+    <li>
+      <%= link_to 'Jasmine specs with jQuery 3', '/specs?jquery=3' %>
+      <ul>
+        <% %w[
+          up.dom
+          up.feedback
+          up.form
+          up.history
+          up.layout
+          up.link
+          up.log
+          up.modal
+          up.motion
+          up.popup
+          up.protocol
+          up.proxy
+          up.rails
+          up.syntax
+          up.toast
+          up.tooltip
+          up.util
+        ].each do |mod| %>
+          <li><%= link_to mod, "/specs?spec=#{mod}" %></li>
+        <% end %>
+      </ul>
+    </li>
+    <li>
+      <%= link_to 'Jasmine specs with jQuery 2', '/specs?jquery=2' %>
+    </li>
+    <li>
+      <%= link_to 'Jasmine specs with jQuery 1', '/specs?jquery=1' %>
+    </li>
   </ul>
 
   <h2>Integration tests</h2>
@@ -15,35 +46,18 @@
       <%= link_to 'Tooltip', '/css_test/tooltip' %>
       (<%= link_to 'with Bootstrap', '/css_test/tooltip?bootstrap=1' %>)
     </li>
-  </ul>
-
-  <ul>
     <li>
       <%= link_to 'Popup', '/css_test/popup' %>
       (<%= link_to 'with Bootstrap', '/css_test/popup?bootstrap=1' %>)
     </li>
-  </ul>
-
-  <ul>
     <li>
       <%= link_to 'Modal', '/css_test/modal' %>
       (<%= link_to 'with Bootstrap', '/css_test/modal?bootstrap=1' %>)
     </li>
-  </ul>
-
-  <ul>
     <li><%= link_to 'Form (basic)', '/form_test/basic/new' %></li>
-  </ul>
-
-  <ul>
     <li><%= link_to 'Form (upload)', '/form_test/upload/new' %></li>
-  </ul>
-
-  <ul>
     <li><%= link_to 'Error', '/error_test/trigger' %></li>
-  </ul>
-
-  <ul>
+    <li><%= link_to 'Booting with non-GET method', '/method_test/page1' %></li>
     <li><%= link_to 'Fragment update', '/replace_test/page1' %></li>
   </ul>
 

data/spec_app/config/initializers/assets.rb

@@ -11,4 +11,9 @@ Rails.application.config.assets.precompile += %w( application.js application.css
 Rails.application.config.assets.precompile += %w( jasmine_specs.js jasmine_specs.css )
 Rails.application.config.assets.precompile += %w( integration_test.js integration_test.css )
 Rails.application.config.assets.precompile += %w( bootstrap_manifest.js bootstrap_manifest.css )
+
+# Precompile jQuery versions from jquery-rails individually, so we can include them as individual <script> tags
+Rails.application.config.assets.precompile += %w( jquery.js jquery2.js jquery3.js )
+
+# Precompile Bootstrap bindings individually, so we can include them as individual <script> tags
 Rails.application.config.assets.precompile += %w( unpoly-bootstrap3.js unpoly-bootstrap3.css )

data/spec_app/config/routes.rb

@@ -3,6 +3,9 @@ Rails.application.routes.draw do
   mount JasmineRails::Engine => '/specs' if defined?(JasmineRails)
   root to: 'pages#start'
 
+  get 'method_test/:action', controller: 'method_test'
+  post 'method_test/:action', controller: 'method_test'
+
   get 'binding_test/:action', controller: 'binding_test'
   get 'css_test/:action', controller: 'css_test'
   get 'error_test/:action', controller: 'error_test'

data/spec_app/spec/controllers/binding_test_controller_spec.rb

@@ -19,7 +19,7 @@ describe BindingTestController do
 
     describe '#target' do
 
-      it 'returns the CSS selector that is requested via Unpoly' do
+      it 'returns the CSS selector that Unpoly requested for a sucessful response' do
         request.headers['X-Up-Target'] = '.foo'
         get :up_target
         expect(response.body).to eq('.foo')
@@ -27,87 +27,142 @@ describe BindingTestController do
 
     end
 
-    describe '#target?' do
+    describe '#fail_target' do
 
-      it 'returns true if the tested CSS selector is requested via Unpoly' do
+      it 'returns the CSS selector that Unpoly requested for an error response' do
         request.headers['X-Up-Target'] = '.foo'
-        get :up_is_target, tested_target: '.foo'
+        request.headers['X-Up-Fail-Target'] = '.bar'
+        get :up_fail_target
+        expect(response.body).to eq('.bar')
+      end
+
+    end
+
+    shared_examples_for 'target query' do |opts|
+
+      let(:header) { opts.fetch(:header) }
+
+      let (:action) { opts.fetch(:action)}
+
+      def set_header(value)
+        request.headers[header] = value
+        if header != 'X-Up-Target'
+          # Make sure that it's considered a fragment update
+          request.headers['X-Up-Target'] = '.other-selector'
+        end
+      end
+
+      it 'returns true if the tested CSS selector is requested via Unpoly' do
+        set_header '.foo'
+        get action, tested_target: '.foo'
         expect(response.body).to eq('true')
       end
 
       it 'returns false if Unpoly is requesting another CSS selector' do
-        request.headers['X-Up-Target'] = '.bar'
-        get :up_is_target, tested_target: '.foo'
+        set_header '.bar'
+        get action, tested_target: '.foo'
         expect(response.body).to eq('false')
       end
 
       it 'returns true if the request is not an Unpoly request' do
-        get :up_is_target, tested_target: '.foo'
+        get action, tested_target: '.foo'
         expect(response.body).to eq('true')
       end
 
       it 'returns true if testing a custom selector, and Unpoly requests "body"' do
-        request.headers['X-Up-Target'] = 'body'
-        get :up_is_target, tested_target: '.foo'
+        set_header 'body'
+        get action, tested_target: '.foo'
         expect(response.body).to eq('true')
       end
 
       it 'returns true if testing a custom selector, and Unpoly requests "html"' do
-        request.headers['X-Up-Target'] = 'html'
-        get :up_is_target, tested_target: '.foo'
+        set_header 'html'
+        get action, tested_target: '.foo'
         expect(response.body).to eq('true')
       end
 
       it 'returns true if testing "body", and Unpoly requests "html"' do
-        request.headers['X-Up-Target'] = 'html'
-        get :up_is_target, tested_target: 'body'
+        set_header 'html'
+        get action, tested_target: 'body'
         expect(response.body).to eq('true')
       end
 
       it 'returns true if testing "head", and Unpoly requests "html"' do
-        request.headers['X-Up-Target'] = 'html'
-        get :up_is_target, tested_target: 'head'
+        set_header 'html'
+        get action, tested_target: 'head'
         expect(response.body).to eq('true')
       end
 
       it 'returns false if the tested CSS selector is "head" but Unpoly requests "body"' do
-        request.headers['X-Up-Target'] = 'body'
-        get :up_is_target, tested_target: 'head'
+        set_header 'body'
+        get action, tested_target: 'head'
         expect(response.body).to eq('false')
       end
 
       it 'returns false if the tested CSS selector is "title" but Unpoly requests "body"' do
-        request.headers['X-Up-Target'] = 'body'
-        get :up_is_target, tested_target: 'title'
+        set_header 'body'
+        get action, tested_target: 'title'
         expect(response.body).to eq('false')
       end
 
       it 'returns false if the tested CSS selector is "meta" but Unpoly requests "body"' do
-        request.headers['X-Up-Target'] = 'body'
-        get :up_is_target, tested_target: 'meta'
+        set_header 'body'
+        get action, tested_target: 'meta'
         expect(response.body).to eq('false')
       end
 
       it 'returns true if the tested CSS selector is "head", and Unpoly requests "html"' do
-        request.headers['X-Up-Target'] = 'html'
-        get :up_is_target, tested_target: 'head'
+        set_header 'html'
+        get action, tested_target: 'head'
         expect(response.body).to eq('true')
       end
 
       it 'returns true if the tested CSS selector is "title", Unpoly requests "html"' do
-        request.headers['X-Up-Target'] = 'html'
-        get :up_is_target, tested_target: 'title'
+        set_header 'html'
+        get action, tested_target: 'title'
         expect(response.body).to eq('true')
       end
 
       it 'returns true if the tested CSS selector is "meta", and Unpoly requests "html"' do
-        request.headers['X-Up-Target'] = 'html'
-        get :up_is_target, tested_target: 'meta'
+        set_header 'html'
+        get action, tested_target: 'meta'
         expect(response.body).to eq('true')
       end
 
     end
 
+    describe '#target?' do
+      it_behaves_like 'target query', action: :up_is_target, header: 'X-Up-Target'
+    end
+
+    describe '#fail_target?' do
+      it_behaves_like 'target query', action: :up_is_fail_target, header: 'X-Up-Fail-Target'
+    end
+
+    describe '#any_target?' do
+
+      before :each do
+        request.headers['X-Up-Target'] = '.success'
+        request.headers['X-Up-Fail-Target'] = '.failure'
+      end
+
+      it 'returns true if the tested CSS selector is the target for a successful response' do
+        get :up_is_any_target, tested_target: '.success'
+        expect(response.body).to eq('true')
+      end
+
+      it 'returns true if the tested CSS selector is the target for a failed response' do
+        get :up_is_any_target, tested_target: '.failure'
+        expect(response.body).to eq('true')
+      end
+
+      it 'returns false if the tested CSS selector is a target for neither successful nor failed response' do
+        get :up_is_any_target, tested_target: '.other'
+        expect(response.body).to eq('false')
+      end
+
+    end
+
     describe '#validate?' do
 
       it 'returns true the request is an Unpoly validation call' do

data/spec_app/spec/javascripts/helpers/agent_detector.coffee

@@ -0,0 +1,17 @@
+@AgentDetector = do ->
+
+  match = (regexp) ->
+    navigator.userAgent.match(regexp)
+
+  isIE = ->
+    match(/\bTrident\b/)
+
+  isEdge = ->
+    match(/\bEdge\b/)
+
+  isSafari = ->
+    match(/\bSafari\b/) && !match(/\bChrome\b/)
+
+  isIE: isIE
+  isEdge: isEdge
+  isSafari: isSafari