unpoly-rails 0.56.7 → 0.57.0

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.56.7'
+    VERSION = '0.57.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unpoly",
-  "version": "0.56.7",
+  "version": "0.57.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.56.6)
+    unpoly-rails (0.56.7)
       rails (>= 3)
 
 GEM

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

@@ -3,7 +3,3 @@
 #= require es6-promise.auto
 #= require helpers/knife
 #= require unpoly
-
-up.compiler '.compiler', ($element) ->
-  console.error('*** Compiler called for %o', $element.get(0))
-  -> console.error('*** Destructor called for %o', $element.get(0))

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

@@ -11,6 +11,7 @@ $block-spacing: 25px
 body
   margin: 0
   background: image-url('grid.png') repeat
+
   font-family: arial, sans-serif
 
 h1, h2, h3, h4, p
@@ -29,7 +30,8 @@ a
   height: 150px
   content: 'Free space'
 
-.fixed-top-bar
+.fixed-top-bar,
+.fixed-bottom-bar
   position: fixed
   z-index: 9999999
   top: 0
@@ -38,6 +40,10 @@ a
   background-color: transparentize(blue, 0.5)
   padding: 50px
 
+.fixed-bottom-bar
+  top: auto
+  bottom: 0
+
 .example
   margin: 50px
   +clear-after

data/spec_app/app/controllers/pages_controller.rb

@@ -2,4 +2,8 @@ class PagesController < ApplicationController
 
   layout 'integration_test'
 
+  # def start
+  #   cookies['baram'] = { value: 'baz;bam', expires: 2.days.from_now }
+  # end
+
 end

data/spec_app/app/views/form_test/basics/new.erb

@@ -5,17 +5,46 @@
   <%= form_tag "/form_test/basic", method: :post, 'up-target' => '.result' do %>
 
     <p>
-      <input type="text" name="text-param" value="text-value" />
+      <label>
+        input[type=text]
+        <input type="text" name="text-param" value="text-value" />
+      </label>
     </p>
 
     <p>
-      <input type="password" name="password-param" value="password-value" />
+      <label>
+        input[type=password]
+        <input type="password" name="password-param" value="password-value" />
+      </label>
     </p>
 
     <p>
-      <select name="select-param">
-        <option value="select-value">select-label</option>
-      </select>
+      <label>
+        input[type=checkbox]
+        <select name="checkbox-param">
+          <option value="checkbox-value">checkbox-label</option>
+        </select>
+      </label>
+    </p>
+
+    <p>
+      <label>
+        select
+        <select name="select-param">
+          <option value="select-value">select-label</option>
+        </select>
+      </label>
+    </p>
+
+    <p>
+      <label>
+        select[multiple]
+        <select name="multiple-select-param[]" multiple>
+          <option value="multiple-select-value-1">multiple-select-label-1</option>
+          <option value="multiple-select-value-2">multiple-select-label-2</option>
+          <option value="multiple-select-value-3">multiple-select-label-3</option>
+        </select>
+      </label>
     </p>
 
     <p>

data/spec_app/app/views/form_test/submission_result.erb

@@ -11,7 +11,7 @@
       <dt><code><%= key %></code></dt>
       <dd>
         <% if value.is_a?(String) %>
-          <pre><code><%= value %></code></pre>
+          <code><%= value %></code>
         <% elsif value.is_a?(ActionDispatch::Http::UploadedFile) %>
           <% if value.original_filename.ends_with?('.jpg') %>
             <img src="data:image/jpeg;base64,<%= Base64.encode64(value.read) %>">
@@ -21,7 +21,7 @@
             <%= value.original_filename %> (<%= value.size %> bytes)
           <% end %>
         <% else %>
-          <%= value.inspect %>
+          <code><%= value.inspect %></code>
         <% end %>
       </dd>
     <% end %>

data/spec_app/app/views/form_test/uploads/new.erb

@@ -5,11 +5,24 @@
   <%= form_tag "/form_test/upload", method: :post, multipart: true, 'up-target' => '.result' do %>
 
     <p>
-      <input type="text" name="text-param" value="text-value" />
+      <label>
+        input[type=text]
+        <input type="text" name="text-param" value="text-value" />
+      </label>
     </p>
 
     <p>
-      <input type="file" name="file-param" />
+      <label>
+        input[type=file]
+       <input type="file" name="file-param" />
+      </label>
+    </p>
+
+    <p>
+      <label>
+        input[type=file][multiple]
+       <input type="file" name="multiple-file-param" multiple />
+      </label>
     </p>
 
     <p>

data/spec_app/app/views/hash_test/unpoly.erb

@@ -0,0 +1,30 @@
+<div class="fixed-top-bar" up-fixed="top" style="background-color: rgba(40, 40, 40, 0.85)">
+  Obstruction
+</div>
+
+<div class="spacer">
+</div>
+
+<h1 style="margin: 0">Hash links (with Unpoly)</h1>
+
+<div class="example" id="one" style="height: 1000px; background-color: yellow; margin: 0">
+  <h2 style="margin: 0">This is #one</h2>
+
+  <a href="#two" up-target=".page">Scroll down to #two</a>
+</div>
+
+<div class="example" id="two" style="height: 200px; background-color: green; margin: 0">
+  <h2 style="margin: 0">This is #two</h2>
+
+  <a href="#three" up-target=".page">Scroll down to #three</a>
+</div>
+
+<div class="example" id="three" style="height: 1000px; background-color: cyan; margin: 0">
+  <h2 style="margin: 0">This is #three</h2>
+
+  <a href="#one" up-target=".page">Scroll up to #one</a>
+</div>
+
+<div class="fixed-bottom-bar" up-fixed="bottom" style="background-color: rgba(40, 40, 40, 0.85)">
+  Obstruction
+</div>

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

@@ -60,7 +60,8 @@
     <li><%= link_to 'Error', '/error_test/trigger' %></li>
     <li><%= link_to 'Booting with non-GET method', '/method_test/page1' %></li>
     <li><%= link_to 'Fragment update', '/replace_test/page1' %></li>
-    <li><%= link_to 'Hash links (without Unpoly)', '/hash_test/vanilla' %></li>
+    <li><%= link_to 'Hash links (without Unpoly)', '/hash_test/vanilla#one' %></li>
+    <li><%= link_to 'Hash links (with Unpoly)', '/hash_test/unpoly#one' %></li>
     <li><%= link_to 'Revealing long pages', '/reveal_test/long1' %></li>
     <li><%= link_to 'Animations', '/motion_test/animations' %></li>
     <li><%= link_to 'Transitions', '/motion_test/transitions' %></li>

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

@@ -5,5 +5,20 @@ beforeEach ->
       up.util.isFormData(xhr.params)
 
     parse: (params) ->
-      # Just return it
-      params
+      if up.browser.canInspectFormData()
+        array = up.params.toArray(params)
+      else if params.originalArray
+        # In browser that don't support FormData#entries(),
+        # up.params.toArray() stores the original array with the generated
+        # FormData object.
+        array = params.originalArray
+      else
+        throw "Cannot parse FormData for inspection in tests"
+
+      obj = {}
+
+      for entry in array
+        obj[entry.name] ||= []
+        obj[entry.name].push(entry.value)
+
+      obj

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

@@ -1,10 +1,15 @@
 afterEach (done) ->
+  # If the spec has installed the Jasmine clock, uninstall it so
+  # the timeout below will actually happen.
+  jasmine.clock().uninstall()
+
   # Wait one more frame so pending callbacks have a chance to run.
   # Pending callbacks might change the URL or cause errors that bleed into
   # the next example.
 
   up.util.nextFrame =>
     up.reset()
+    up.browser.popCookie(up.protocol.config.methodCookie)
 
     # Give async reset behavior another frame to play out,
     # then start the next example.

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

@@ -2,4 +2,4 @@ beforeEach ->
   jasmine.addMatchers
     toBeError: (util, customEqualityTesters) ->
       compare: (actual, message) ->
-        pass: (actual instanceof Error) && (!message || (message instanceof RegExp && actual.message =~ message) || actual.message == message)
+        pass: (actual instanceof Error) && (!message || (message instanceof RegExp && message.test(actual.message)) || actual.message == message)

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

@@ -0,0 +1,5 @@
+beforeEach ->
+  jasmine.addMatchers
+    toMatchSelector: (util, customEqualityTesters) ->
+      compare: (actualElement, expectedSelector) ->
+        pass: $(actualElement).is(expectedSelector)

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

@@ -13,9 +13,9 @@ describe 'up.browser', ->
 
       describe "for GET requests", ->
 
-        it "creates a GET form, adds all { data } params as hidden fields and submits the form", ->
+        it "creates a GET form, adds all { params } as hidden fields and submits the form", ->
           submitForm = spyOn(up.browser, 'submitForm')
-          up.browser.navigate('/foo', method: 'GET', data: { param1: 'param1 value', param2: 'param2 value' })
+          up.browser.navigate('/foo', method: 'GET', params: { param1: 'param1 value', param2: 'param2 value' })
           expect(submitForm).toHaveBeenCalled()
           $form = $('form.up-page-loader')
           expect($form).toExist()
@@ -25,9 +25,9 @@ describe 'up.browser', ->
           expect($form.find('input[name="param1"][value="param1 value"]')).toExist()
           expect($form.find('input[name="param2"][value="param2 value"]')).toExist()
 
-        it 'merges params from the given URL and the { data } option', ->
+        it 'merges params from the given URL and the { params } option', ->
           submitForm = spyOn(up.browser, 'submitForm')
-          up.browser.navigate('/foo?param1=param1%20value', method: 'GET', data: { param2: 'param2 value' })
+          up.browser.navigate('/foo?param1=param1%20value', method: 'GET', params: { param2: 'param2 value' })
           expect(submitForm).toHaveBeenCalled()
           $form = $('form.up-page-loader')
           expect($form).toExist()
@@ -39,9 +39,9 @@ describe 'up.browser', ->
 
       describe "for POST requests", ->
 
-        it "creates a POST form, adds all { data } params as hidden fields and submits the form", ->
+        it "creates a POST form, adds all { params } params as hidden fields and submits the form", ->
           submitForm = spyOn(up.browser, 'submitForm')
-          up.browser.navigate('/foo', method: 'POST', data: { param1: 'param1 value', param2: 'param2 value' })
+          up.browser.navigate('/foo', method: 'POST', params: { param1: 'param1 value', param2: 'param2 value' })
           expect(submitForm).toHaveBeenCalled()
           $form = $('form.up-page-loader')
           expect($form).toExist()
@@ -50,9 +50,9 @@ describe 'up.browser', ->
           expect($form.find('input[name="param1"][value="param1 value"]')).toExist()
           expect($form.find('input[name="param2"][value="param2 value"]')).toExist()
 
-        it 'merges params from the given URL and the { data } option', ->
+        it 'merges params from the given URL and the { params } option', ->
           submitForm = spyOn(up.browser, 'submitForm')
-          up.browser.navigate('/foo?param1=param1%20value', method: 'POST', data: { param2: 'param2 value' })
+          up.browser.navigate('/foo?param1=param1%20value', method: 'POST', params: { param2: 'param2 value' })
           expect(submitForm).toHaveBeenCalled()
           $form = $('form.up-page-loader')
           expect($form).toExist()

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

@@ -31,30 +31,68 @@ describe 'up.bus', ->
         next =>
           expect(clickSpy.calls.count()).toEqual(1)
 
-      it 'parses an up-data attribute as JSON and passes the parsed object as a third argument to the initializer', asyncSpec (next) ->
-        $child = affix('.child')
-        observeArgs = jasmine.createSpy()
-        up.on 'click', '.child', (event, $element, data) ->
-          observeArgs($element.attr('class'), data)
+      it 'throws an error when trying to register the same callback multiple times', ->
+        callback = ->
+        register = -> up.on 'foo', callback
+        register()
+        expect(register).toThrowError(/cannot be registered more than once/i)
+
+      it 'does not throw an error if a callback is registered, unregistered and registered a second time', ->
+        callback = ->
+        register = -> up.on 'foo', callback
+        unregister = -> up.off 'foo', callback
+        register()
+        unregister()
+        expect(register).not.toThrowError()
+
+      describe 'passing of [up-data]', ->
+
+        it 'parses an [up-data] attribute as JSON and passes the parsed object as a third argument to the listener', asyncSpec (next) ->
+          $child = affix('.child')
+          observeArgs = jasmine.createSpy()
+          up.on 'click', '.child', (event, $element, data) ->
+            observeArgs($element.attr('class'), data)
+
+          data = { key1: 'value1', key2: 'value2' }
+          $tag = affix(".child").attr('up-data', JSON.stringify(data))
 
-        data = { key1: 'value1', key2: 'value2' }
-        $tag = affix(".child").attr('up-data', JSON.stringify(data))
+          Trigger.click($('.child'))
 
-        Trigger.click($('.child'))
+          next =>
+            expect(observeArgs).toHaveBeenCalledWith('child', data)
 
-        next =>
-          expect(observeArgs).toHaveBeenCalledWith('child', data)
+        it 'passes an empty object as a second argument to the listener if there is no [up-data] attribute', asyncSpec (next) ->
+          $child = affix('.child')
+          observeArgs = jasmine.createSpy()
+          up.on 'click', '.child', (event, $element, data) ->
+            observeArgs($element.attr('class'), data)
 
-      it 'passes an empty object as a second argument to the listener if there is no up-data attribute', asyncSpec (next) ->
-        $child = affix('.child')
-        observeArgs = jasmine.createSpy()
-        up.on 'click', '.child', (event, $element, data) ->
-          observeArgs($element.attr('class'), data)
+          Trigger.click($('.child'))
 
-        Trigger.click($('.child'))
+          next =>
+            expect(observeArgs).toHaveBeenCalledWith('child', {})
 
-        next =>
-          expect(observeArgs).toHaveBeenCalledWith('child', {})
+        it 'does not parse an [up-data] attribute if the listener function only takes one argument', asyncSpec (next) ->
+          parseDataSpy = spyOn(up.syntax, 'data').and.returnValue({})
+
+          $child = affix('.child')
+          up.on 'click', '.child', (event) -> # no-op
+
+          Trigger.click($('.child'))
+
+          next =>
+            expect(parseDataSpy).not.toHaveBeenCalled()
+
+        it 'does not parse an [up-data] attribute if the listener function only takes two arguments', asyncSpec (next) ->
+          parseDataSpy = spyOn(up.syntax, 'data').and.returnValue({})
+
+          $child = affix('.child')
+          up.on 'click', '.child', (event, $element) -> # no-op
+
+          Trigger.click($('.child'))
+
+          next =>
+            expect(parseDataSpy).not.toHaveBeenCalled()
 
     describe 'up.off', ->
 
@@ -132,10 +170,10 @@ describe 'up.bus', ->
 
           expect(emittedEvent.$element).toEqual($element)
 
-    describe 'up.bus.renamedEvent', ->
+    describe 'up.bus.deprecateRenamedEvent', ->
 
       it 'prints a warning and registers the event listener for the new event name', ->
-        warnSpy = spyOn(up.log, 'warn')
+        warnSpy = spyOn(up, 'warn')
         listener = jasmine.createSpy('listener')
 
         # Reister listener for the old event name

data/spec_app/spec/javascripts/up/classes/cache_spec.js.coffee

@@ -1 +1,79 @@
 describe 'up.Cache', ->
+
+  describe '#get', ->
+
+    it 'returns an item that was previously set', ->
+      store = new up.Cache()
+      store.set('foo', 'value of foo')
+      store.set('bar', 'value of bar')
+
+      expect(store.get('foo')).toEqual('value of foo')
+      expect(store.get('bar')).toEqual('value of bar')
+
+    it 'returns undefined if no item with that key was set', ->
+      store = new up.Cache()
+      store.set('foo', 'value of foo')
+
+      expect(store.get('bar')).toBeUndefined()
+
+    it 'returns undefined if the item has expired', ->
+      jasmine.clock().install()
+      jasmine.clock().mockDate(new Date())
+
+      store = new up.Cache(expiry: 100, logPrefix: 'cache')
+      store.set('foo', 'value of foo')
+
+      jasmine.clock().tick(80)
+      expect(store.get('foo')).toEqual('value of foo')
+
+      jasmine.clock().tick(40)
+      expect(store.get('foo')).toBeUndefined()
+
+  describe '#set', ->
+
+    it 'removes the oldest item if setting a new item would exceed the cache size', ->
+      jasmine.clock().install()
+      store = new up.Cache(size: 2, logPrefix: 'cache')
+
+      store.set('foo', 'value of foo')
+      jasmine.clock().tick(10)
+      store.set('bar', 'value of bar')
+      jasmine.clock().tick(10)
+      store.set('baz', 'value of baz')
+
+      expect(store.get('foo')).toBeUndefined()
+      expect(store.get('bar')).toEqual('value of bar')
+      expect(store.get('baz')).toEqual('value of baz')
+
+  describe '#keys', ->
+
+    it 'returns an array of keys in the store', ->
+      store = new up.Cache()
+      store.set('foo', 'value of foo')
+      store.set('bar', 'value of bar')
+
+      expect(store.keys().sort()).toEqual ['bar', 'foo']
+
+  describe '#clear', ->
+
+    it 'removes all keys from the store', ->
+      store = new up.Cache()
+      store.set('foo', 'value of foo')
+      store.set('bar', 'value of bar')
+
+      store.clear()
+
+      expect(store.get('foo')).toBeUndefined()
+      expect(store.get('bar')).toBeUndefined()
+
+  describe '#remove', ->
+
+    it 'removes the given key from the store', ->
+      store = new up.Cache()
+      store.set('foo', 'value of foo')
+      store.set('bar', 'value of bar')
+
+      store.remove('foo')
+
+      expect(store.get('foo')).toBeUndefined()
+      expect(store.get('bar')).toEqual('value of bar')