unpoly-rails 0.34.0 → 0.34.1

data/lib/assets/javascripts/unpoly/history.coffee

@@ -49,8 +49,10 @@ up.history = (($) ->
     previousUrl = undefined
     nextPreviousUrl = undefined
 
-  normalizeUrl = (url) ->
-    u.normalizeUrl(url, hash: true)
+  normalizeUrl = (url, normalizeOptions) ->
+    normalizeOptions ||= {}
+    normalizeOptions.hash = true
+    u.normalizeUrl(url, normalizeOptions)
 
   ###*
   Returns a normalized URL for the current history entry.
@@ -58,11 +60,12 @@ up.history = (($) ->
   @function up.history.url
   @experimental
   ###
-  currentUrl = ->
-    normalizeUrl(up.browser.url())
+  currentUrl = (normalizeOptions) ->
+    normalizeUrl(up.browser.url(), normalizeOptions)
   
   isCurrentUrl = (url) ->
-    normalizeUrl(url) == currentUrl()
+    normalizeOptions = { stripTrailingSlash: true }
+    normalizeUrl(url, normalizeOptions) == currentUrl(normalizeOptions)
 
   ###*
   Remembers the given URL so we can offer `up.history.previousUrl()`.
@@ -238,6 +241,7 @@ up.history = (($) ->
   push: push
   replace: replace
   url: currentUrl
+  isUrl: isCurrentUrl
   previousUrl: -> previousUrl
   normalizeUrl: normalizeUrl
 

data/lib/assets/javascripts/unpoly/link.coffee

@@ -5,7 +5,7 @@ Linking to fragments
 In a traditional web application, the entire page is destroyed and re-created when the
 user follows a link:
 
-![Traditional page flow](/images/tutorial/fragment_flow_vanilla.svg){:width="620px" class="picture has_border is_sepia has_padding"}
+![Traditional page flow](/images/tutorial/fragment_flow_vanilla.svg){:width="620" class="picture has_border is_sepia has_padding"}
 
 This makes for an unfriendly experience:
 
@@ -22,7 +22,7 @@ attribute. The value of this attribute is a CSS selector that indicates which pa
 fragment to update. The server **still renders full HTML pages**, but we only use
 the targeted ragments and discard the rest:
 
-![Unpoly page flow](/images/tutorial/fragment_flow_unpoly.svg){:width="620px" class="picture has_border is_sepia has_padding"}
+![Unpoly page flow](/images/tutorial/fragment_flow_unpoly.svg){:width="620" class="picture has_border is_sepia has_padding"}
 
 With this model, following links feel smooth. All transient DOM changes outside the updated fragment are preserved.
 Pages also load much faster since the DOM, CSS and Javascript environments do not need to be
@@ -107,7 +107,7 @@ up.link = (($) ->
       var $link = $('a:first'); // select link with jQuery
       up.follow($link);
 
-  The UJS variant of this are the [`a[up-target]`](/a-up-target) and [`a[up-follow]`](/a-up-follow) selectors.
+  The unobtrusive variant of this are the [`a[up-target]`](/a-up-target) and [`a[up-follow]`](/a-up-follow) selectors.
 
   @function up.follow
   @param {Element|jQuery|String} linkOrSelector

data/lib/assets/javascripts/unpoly/tooltip.coffee

@@ -34,7 +34,7 @@ up.tooltip = (($) ->
   u = up.util
 
   ###*
-  Sets default options for future tooltips.
+  Configures defaults for future tooltips.
 
   @property up.tooltip.config
   @param {String} [config.position]
@@ -119,8 +119,14 @@ up.tooltip = (($) ->
   ###*
   Opens a tooltip over the given element.
 
+  The unobtrusive variant of this is the [`[up-tooltip]`](/up-tooltip) selector.
+
+  \#\#\# Examples
+
+  In order to attach a tooltip to a `<span class="help">?</span>`:
+
       up.tooltip.attach('.help', {
-        html: 'Enter multiple words or phrases'
+        text: 'Enter multiple words or phrases'
       });
 
   @function up.tooltip.attach
@@ -139,7 +145,7 @@ up.tooltip = (($) ->
     The position of the tooltip.
     Can be `'top'`, `'right'`, `'bottom'` or `'left'`.
   @param {String} [options.animation]
-    The animation to use when opening the tooltip.
+    The [animation](/up.motion) to use when opening the tooltip.
   @return {Promise}
     A promise that will be resolved when the tooltip's opening animation has finished.
   @stable
@@ -171,6 +177,7 @@ up.tooltip = (($) ->
 
   ###*
   Closes a currently shown tooltip.
+
   Does nothing if no tooltip is currently shown.
 
   @function up.tooltip.close
@@ -208,7 +215,9 @@ up.tooltip = (($) ->
     state.phase == 'opening' || state.phase == 'opened'
 
   ###*
-  Displays a tooltip with text content when hovering the mouse over this element:
+  Displays a tooltip with text content when hovering the mouse over this element.
+
+  \#\#\# Example
 
       <a href="/decks" up-tooltip="Show all decks">Decks</a>
 

data/lib/assets/javascripts/unpoly/util.coffee

@@ -71,7 +71,7 @@ up.util = (($) ->
     # We have seen this in IE11 and W3Schools claims it happens in IE9 or earlier
     # http://www.w3schools.com/jsref/prop_anchor_pathname.asp
     pathname = "/#{pathname}" unless pathname[0] == '/'
-    pathname = pathname.replace(/\/$/, '') unless options?.stripTrailingSlash == false
+    pathname = pathname.replace(/\/$/, '') if options?.stripTrailingSlash == true
     normalized += pathname
     normalized += anchor.hash if options?.hash == true
     normalized += anchor.search unless options?.search == false

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.34.0'
+    VERSION = '0.34.1'
   end
 end

data/package.json

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

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.33.0)
+    unpoly-rails (0.34.0)
       rails (>= 3)
 
 GEM

data/spec_app/spec/javascripts/helpers/knife.js.coffee

@@ -40,7 +40,7 @@
 
     mock = (symbol) ->
       oldImpl = get(symbol)
-      spy = jasmine.createSpy(symbol)
+      spy = jasmine.createSpy(symbol, oldImpl)
       set(symbol, spy)
       cleaner = -> set(symbol, oldImpl)
       Knife.cleaners.push(cleaner)

data/spec_app/spec/javascripts/up/dom_spec.js.coffee

@@ -971,7 +971,7 @@ describe 'up.dom', ->
             promise = up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 30)
             promise.then(resolution)
             expect(resolution).not.toHaveBeenCalled()
-            u.setTimer 70, ->
+            u.setTimer 80, ->
               expect(resolution).toHaveBeenCalled()
               done()
 

data/spec_app/spec/javascripts/up/form_spec.js.coffee

@@ -703,3 +703,43 @@ describe 'up.form', ->
           expect($target).toBeVisible()
           @$textInput.val('bar').change()
           expect($target).toBeHidden()
+
+      describe 'when an [up-show-for] element is dynamically inserted later', ->
+
+        it "shows the element iff it matches the [up-switch] control's value", ->
+          $select = affix('select[up-switch=".target"]')
+          $select.affix('option[value="foo"]').text('Foo')
+          $select.affix('option[value="bar"]').text('Bar')
+          $select.val('foo')
+          up.hello($select)
+
+          # New target enters the DOM after [up-switch] has been compiled
+          $target = affix('.target[up-show-for="bar"]')
+          up.hello($target)
+
+          expect($target).toBeHidden()
+
+          # Check that the new element will notify subsequent changes
+          $select.val('bar').change()
+          expect($target).toBeVisible()
+
+        it "doesn't re-switch targets that were part of the original compile run", ->
+          $container = affix('.container')
+
+          $select = $container.affix('select[up-switch=".target"]')
+          $select.affix('option[value="foo"]').text('Foo')
+          $select.affix('option[value="bar"]').text('Bar')
+          $select.val('foo')
+          $existingTarget = $container.affix('.target.existing[up-show-for="bar"]')
+
+          switchTargetSpy = up.form.knife.mock('switchTarget').and.callThrough()
+
+          up.hello($container)
+
+          # New target enters the DOM after [up-switch] has been compiled
+          $lateTarget = $container.affix('.target.late[up-show-for="bar"]')
+          up.hello($lateTarget)
+
+          expect(switchTargetSpy.calls.count()).toBe(2)
+          expect(switchTargetSpy.calls.argsFor(0)[0]).toEqual($existingTarget)
+          expect(switchTargetSpy.calls.argsFor(1)[0]).toEqual($lateTarget)

data/spec_app/spec/javascripts/up/history_spec.js.coffee

@@ -7,10 +7,38 @@ describe 'up.history', ->
     describe 'up.history.replace', ->
 
       it 'should have tests'
-      
-    describe 'up.history.push', ->
 
-      it 'should have tests'
+    describe 'up.history.url', ->
+
+      describeCapability 'canPushState', ->
+
+        it 'does not strip a trailing slash from the current URL', ->
+          history.replaceState?({}, 'title', '/host/path/')
+          expect(up.history.url()).toEndWith('/host/path/')
+
+    describe 'up.history.isUrl', ->
+
+      describeCapability 'canPushState', ->
+
+        it 'returns true if the given path is the current URL', ->
+          history.replaceState?({}, 'title', '/host/path/')
+          expect(up.history.isUrl('/host/path/')).toBe(true)
+
+        it 'returns false if the given path is not the current URL', ->
+          history.replaceState?({}, 'title', '/host/path/')
+          expect(up.history.isUrl('/host/other-path/')).toBe(false)
+
+        it 'returns true if the given full URL is the current URL', ->
+          history.replaceState?({}, 'title', '/host/path/')
+          expect(up.history.isUrl("http://#{location.host}/host/path/")).toBe(true)
+
+        it 'returns true if the given path is the current URL, but without a trailing slash', ->
+          history.replaceState?({}, 'title', '/host/path/')
+          expect(up.history.isUrl('/host/path')).toBe(true)
+
+        it 'returns true if the given path is the current URL, but with a trailing slash', ->
+          history.replaceState?({}, 'title', '/host/path')
+          expect(up.history.isUrl('/host/path/')).toBe(true)
 
   describe 'unobtrusive behavior', ->
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails