unpoly-rails 0.25.2 → 0.26.0

data/lib/assets/stylesheets/unpoly/error.css.sass

@@ -1,15 +1,21 @@
 .up-error
-  background-color: #e10
+  background-color: #c30
   color: white
-  padding: 5px
+  padding: 10px
   font-family: arial, helvetica, sans-serif
-  font-weight: bold
   font-size: 14px
   line-height: 18px
   position: fixed
   left: 0
-  top: 0
+  bottom: 0
   max-width: 100%
   box-sizing: border-box
   z-index: 99999999
-  
+
+.up-error-variable
+  background-color: rgba(0, 0, 0, 0.3)
+  padding: 1px 3px
+  border-radius: 2px
+  font-weight: normal
+  max-width: 100px
+  overflow: hidden

data/lib/assets/stylesheets/unpoly/tooltip.css.sass

@@ -10,6 +10,7 @@ $background-color: #111
   color: white
   padding: 6px 9px
   white-space: nowrap
+  pointer-events: none
 
   &:after
     content: ''
@@ -23,7 +24,8 @@ $background-color: #111
     margin-top: -$distance-from-trigger
     &:after
       border-top-color: $background-color
-      bottom: -$corner-size * 2
+      border-bottom-width: 0
+      bottom: -$corner-size
       left: 50%
       margin-left: -$corner-size
 
@@ -31,7 +33,8 @@ $background-color: #111
     margin-left: -$distance-from-trigger
     &:after
       border-left-color: $background-color
-      right: -$corner-size * 2
+      border-right-width: 0
+      right: -$corner-size
       top: 50%
       margin-top: -$corner-size
 
@@ -39,7 +42,8 @@ $background-color: #111
     margin-left: $distance-from-trigger
     &:after
       border-right-color: $background-color
-      left: -$corner-size * 2
+      border-left-width: 0
+      left: -$corner-size
       top: 50%
       margin-top: -$corner-size
 
@@ -47,6 +51,7 @@ $background-color: #111
     margin-top: $distance-from-trigger
     &:after
       border-bottom-color: $background-color
-      top: -$corner-size * 2
+      border-top-width: 0
+      top: -$corner-size
       left: 50%
       margin-left: -$corner-size

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.25.2'
+    VERSION = '0.26.0'
   end
 end

data/spec_app/Gemfile.lock

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

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

@@ -0,0 +1,2 @@
+beforeEach ->
+  up.log.enable()

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

@@ -2,7 +2,6 @@ beforeEach ->
   jasmine.addMatchers
     toHaveRequestMethod: (util, customEqualityTesters) ->
       compare: (request, expectedMethod) ->
-        console.log("real is %o, wrapped is %o", request.method, request.data()['_method'])
         realMethodMatches = (request.method == expectedMethod)
         wrappedMethodMatches = util.equals(request.data()['_method'], [expectedMethod], customEqualityTesters)
         pass: realMethodMatches || wrappedMethodMatches

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

@@ -0,0 +1,3 @@
+beforeAll (done) ->
+  $(done)
+  

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

@@ -0,0 +1,46 @@
+describe 'up.log', ->
+
+  describe 'Javascript functions', ->
+
+    describe 'up.log.puts', ->
+
+      it 'sends a log message to the developer console iff the log is enabled', ->
+        spyOn(up.browser, 'puts')
+
+        up.log.disable()
+        up.log.puts('message')
+        expect(up.browser.puts).not.toHaveBeenCalled()
+
+        up.log.enable()
+        up.log.puts('message')
+        expect(up.browser.puts).toHaveBeenCalledWith('log', '[UP] message')
+
+    describe 'up.log.debug', ->
+
+      it 'sends a debug message to the developer console iff the log is enabled', ->
+        spyOn(up.browser, 'puts')
+
+        up.log.disable()
+        up.log.debug('message')
+        expect(up.browser.puts).not.toHaveBeenCalled()
+
+        up.log.enable()
+        up.log.debug('message')
+        expect(up.browser.puts).toHaveBeenCalledWith('debug', '[UP] message')
+
+    describe 'up.log.error', ->
+
+      it 'sends an error message to the developer console regardless whether the log is enabled or not', ->
+        spyOn(up.browser, 'puts')
+
+        up.log.disable()
+        up.log.error('message1')
+        expect(up.browser.puts).toHaveBeenCalledWith('error', '[UP] message1')
+
+        up.log.enable()
+        up.log.error('message2')
+        expect(up.browser.puts.calls.allArgs()).toEqual [
+          ['error', '[UP] message1'],
+          ['error', '[UP] message2']
+        ]
+        

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

@@ -6,13 +6,25 @@ describe 'up.popup', ->
 
     describe 'up.popup.attach', ->
 
-      it "loads this link's destination in a popup when clicked", ->
-        $link = affix('a[href="/path/to"][up-popup=".middle"]').text('link')
-        $link.css
-          position: 'fixed'
+      beforeEach ->
+        jasmine.addMatchers
+          toSitBelow: (util, customEqualityTesters) ->
+            compare: ($popup, $link) ->
+              pass: ->
+                popupDims = u.measure($popup, full: true)
+                linkDims = u.measure($link, full: true)
+                expect(popupDims.right).toBeAround(linkDims.right, 1)
+                expect(popupDims.top).toBeAround(linkDims.top + linkDims.height, 1)
+
+      it "loads this link's destination in a popup positioned under the given link", ->
+        $container = affix('.container')
+        $container.css
+          position: 'absolute'
           left: '100px'
           top: '50px'
 
+        $link = $container.affix('a[href="/path/to"][up-popup=".middle"]').text('link')
+
         up.popup.attach($link)
 
         expect(@lastRequest().url).toMatch /\/path\/to$/
@@ -29,11 +41,21 @@ describe 'up.popup', ->
         expect($popup.find('.before')).not.toExist()
         expect($popup.find('.after')).not.toExist()
 
-        popupDims = u.measure($popup, full: true)
-        linkDims = u.measure($link, full: true)
+        expect($popup.css('position')).toEqual('absolute')
+        expect($popup).toSitBelow($link)
 
-        expect(popupDims.right).toBeAround(linkDims.right, 1)
-        expect(popupDims.top).toBeAround(linkDims.top + linkDims.height, 1)
+      it 'gives the popup { position: "fixed" } if the given link is fixed', ->
+        $container = affix('.container')
+        $container.css
+          position: 'fixed'
+          left: '100px'
+          top: '50px'
+        $link = $container.affix('a[href="/path/to"][up-popup=".content"]').text('link')
+        up.popup.attach($link)
+        @respondWith('<div class="content">popup-content</div>')
+        $popup = $('.up-popup')
+        expect($popup.css('position')).toEqual('fixed')
+        expect($popup).toSitBelow($link)
 
       it 'does not explode if the popup was closed before the response was received', ->
         $span = affix('span')

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

@@ -2,6 +2,23 @@ describe 'up.util', ->
   
   describe 'Javascript functions', ->
 
+    describe 'up.util.isFixed', ->
+
+      it 'returns true if the given element or one of its ancestors has a "fixed" CSS position', ->
+        $grandGrandParent = affix('.grand-parent')
+        $grandParent = $grandGrandParent.affix('.grand-parent')
+        $parent = $grandParent.affix('.parent')
+        $child = $parent.affix('.child')
+        $grandParent.css(position: 'fixed')
+        expect(up.util.isFixed($child)).toBe(true)
+        expect(up.util.isFixed($parent)).toBe(true)
+        expect(up.util.isFixed($grandParent)).toBe(true)
+        expect(up.util.isFixed($grandGrandParent)).toBe(false)
+
+      it 'returns false if the given element and its ancestors all have a non-"fixed" CSS position', ->
+        $element = affix('.element')
+        expect(up.util.isFixed($element)).toBe(false)
+
     describe 'up.util.setTimer', ->
 
       it 'calls the given function after waiting the given milliseconds', ->
@@ -20,7 +37,7 @@ describe 'up.util', ->
         up.util.setTimer(0, callback)
         expect(callback).toHaveBeenCalled()
 
-    #    describe 'up.util.argNames', ->
+#    describe 'up.util.argNames', ->
 #
 #      it 'returns an array of argument names for the given function', ->
 #        fun = ($element, data) ->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,7 +101,7 @@ files:
 - lib/assets/javascripts/unpoly/link.js.coffee
 - lib/assets/javascripts/unpoly/log.js.coffee
 - lib/assets/javascripts/unpoly/modal.js.coffee
-- lib/assets/javascripts/unpoly/module.js.coffee
+- lib/assets/javascripts/unpoly/module.js.coffee.erb
 - lib/assets/javascripts/unpoly/motion.js.coffee
 - lib/assets/javascripts/unpoly/navigation.js.coffee
 - lib/assets/javascripts/unpoly/popup.js.coffee
@@ -195,6 +195,7 @@ files:
 - spec_app/spec/controllers/binding_test_controller_spec.rb
 - spec_app/spec/javascripts/helpers/append_fixture.js.coffee
 - spec_app/spec/javascripts/helpers/browser_switches.js.coffee
+- spec_app/spec/javascripts/helpers/enable_logging.js.coffee
 - spec_app/spec/javascripts/helpers/index.js.coffee
 - spec_app/spec/javascripts/helpers/knife.js.coffee
 - spec_app/spec/javascripts/helpers/last_request.js.coffee
@@ -216,6 +217,7 @@ files:
 - spec_app/spec/javascripts/helpers/to_equal_jquery.js.coffee
 - spec_app/spec/javascripts/helpers/to_have_request_method.js.coffee
 - spec_app/spec/javascripts/helpers/trigger.js.coffee
+- spec_app/spec/javascripts/helpers/wait_until_dom_ready.js.coffee
 - spec_app/spec/javascripts/support/jasmine.yml
 - spec_app/spec/javascripts/up/bus_spec.js.coffee
 - spec_app/spec/javascripts/up/flow_spec.js.coffee
@@ -223,6 +225,7 @@ files:
 - spec_app/spec/javascripts/up/history_spec.js.coffee
 - spec_app/spec/javascripts/up/layout_spec.js.coffee
 - spec_app/spec/javascripts/up/link_spec.js.coffee
+- spec_app/spec/javascripts/up/log_spec.js.coffee
 - spec_app/spec/javascripts/up/modal_spec.js.coffee
 - spec_app/spec/javascripts/up/motion_spec.js.coffee
 - spec_app/spec/javascripts/up/navigation_spec.js.coffee

data/lib/assets/javascripts/unpoly/module.js.coffee

@@ -1,4 +0,0 @@
-###*
-@module up
-###
-window.up = {}