upjs-rails 0.3.0 → 0.3.2

data/lib/assets/stylesheets/up/modal.css.sass

@@ -4,6 +4,11 @@ $stratum: 10000
 $close-height: 24px
 $close-width: 36px
 
+=transform($transform)
+  transform: $transform
+  -ms-transform: $transform // IE9
+  -webkit-transform: $transform // Safari, Some Android
+
 .up-modal
   position: fixed
   top: 0
@@ -17,7 +22,7 @@ $close-width: 36px
   position: absolute
   top: 50%
   left: 50%
-  transform: translate(-50%, -50%)
+  +transform(translate(-50%, -50%))
   max-width: 100%
   max-height: 100%
   background-color: #fff
@@ -40,7 +45,7 @@ $close-width: 36px
   font-weight: bold
   text-transform: uppercase
   cursor: pointer
-  transform: translateY(-100%)
+  +transform(translateY(-100%))
 
 .up-modal-content
   overflow-x: hidden

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

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

@@ -3,5 +3,5 @@ beforeEach ->
   @previousTitle = document.title
   
 afterEach ->
-  window.history.replaceState({}, @previousTitle, @previousHref)
+  history.replaceState?({}, @previousTitle, @previousHref)
  

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

@@ -1,58 +1,69 @@
 describe 'up.flow', ->
   
-  describe 'Javascript functions', -> 
-  
+  describe 'Javascript functions', ->
+
+    beforeEach ->
+      jasmine.Ajax.install()
+    
     describe 'up.replace', ->
-      
-      beforeEach ->
-        jasmine.Ajax.install()
-  
-        affix('.before').text('old-before')
-        affix('.middle').text('old-middle')
-        affix('.after').text('old-after')
-  
-        @respond = ->
-          jasmine.Ajax.requests.mostRecent().respondWith
-            status: 200
-            contentType: 'text/html'
-            responseText:
-              """
-              <div class="before">new-before</div>
-              <div class="middle">new-middle</div>
-              <div class="after">new-after</div>
-              """      
-      
-      it 'replaces the given selector with the same selector from a freshly fetched page', (done) ->
-        @request = up.replace('.middle', '/path')
-        @respond()
-        @request.then ->
-          expect($('.before')).toHaveText('old-before')
-          expect($('.middle')).toHaveText('new-middle')
-          expect($('.after')).toHaveText('old-after')
-          done()      
+
+      if up.browser.canPushState()
+
+        beforeEach ->
+
+          affix('.before').text('old-before')
+          affix('.middle').text('old-middle')
+          affix('.after').text('old-after')
+    
+          @respond = ->
+            jasmine.Ajax.requests.mostRecent().respondWith
+              status: 200
+              contentType: 'text/html'
+              responseText:
+                """
+                <div class="before">new-before</div>
+                <div class="middle">new-middle</div>
+                <div class="after">new-after</div>
+                """      
         
-      it 'should set the browser location to the given URL', (done) ->
-        @request = up.replace('.middle', '/path')
-        @respond()
-        @request.then ->
-          expect(window.location.pathname).toBe('/path')
-          done()
-          
-      it 'marks the element with the URL from which it was retrieved', (done) ->
-        @request = up.replace('.middle', '/path')
-        @respond()
-        @request.then ->
-          expect($('.middle').attr('up-source')).toMatch(/\/path$/)
-          done()
+        it 'replaces the given selector with the same selector from a freshly fetched page', (done) ->
+          @request = up.replace('.middle', '/path')
+          @respond()
+          @request.then ->
+            expect($('.before')).toHaveText('old-before')
+            expect($('.middle')).toHaveText('new-middle')
+            expect($('.after')).toHaveText('old-after')
+            done()      
           
-      it 'replaces multiple selectors separated with a comma', (done) ->
-        @request = up.replace('.middle, .after', '/path')
-        @respond()
-        @request.then ->
-          expect($('.before')).toHaveText('old-before')
-          expect($('.middle')).toHaveText('new-middle')
-          expect($('.after')).toHaveText('new-after')
-          done()
+        it 'should set the browser location to the given URL', (done) ->
+          @request = up.replace('.middle', '/path')
+          @respond()
+          @request.then ->
+            expect(window.location.pathname).toBe('/path')
+            done()
+            
+        it 'marks the element with the URL from which it was retrieved', (done) ->
+          @request = up.replace('.middle', '/path')
+          @respond()
+          @request.then ->
+            expect($('.middle').attr('up-source')).toMatch(/\/path$/)
+            done()
+            
+        it 'replaces multiple selectors separated with a comma', (done) ->
+          @request = up.replace('.middle, .after', '/path')
+          @respond()
+          @request.then ->
+            expect($('.before')).toHaveText('old-before')
+            expect($('.middle')).toHaveText('new-middle')
+            expect($('.after')).toHaveText('new-after')
+            done()
+            
+      else
+        
+        it 'makes a full page load', ->
+          spyOn(up.browser, 'loadPage')
+          up.replace('.selector', '/path')
+          expect(up.browser.loadPage).toHaveBeenCalledWith('/path', jasmine.anything())
           
     describe 'up.implant', ->
       
@@ -74,25 +85,36 @@ describe 'up.flow', ->
         
     describe 'up.reload', ->
       
-      it 'reloads the given selector from the closest known source URL', (done) ->
-        affix('.container[up-source="/source"] .element').find('.element').text('old text')
-  
-        up.reload('.element').then ->
-          expect($('.element')).toHaveText('new text')
-          done()
+      if up.browser.canPushState()
+      
+        it 'reloads the given selector from the closest known source URL', (done) ->
+          affix('.container[up-source="/source"] .element').find('.element').text('old text')
+    
+          up.reload('.element').then ->
+            expect($('.element')).toHaveText('new text')
+            done()
+            
+          request = jasmine.Ajax.requests.mostRecent()
+          expect(request.url).toMatch(/\/source$/)
+    
+          request.respondWith
+            status: 200
+            contentType: '/text/html'
+            responseText:
+              """
+              <div class="container">
+                <div class="element">new text</div>
+              </div>
+              """
+            
+      else
+        
+        it 'makes a page load from the closest known source URL', ->
+          affix('.container[up-source="/source"] .element').find('.element').text('old text')
+          spyOn(up.browser, 'loadPage')
+          up.reload('.element')
+          expect(up.browser.loadPage).toHaveBeenCalledWith('/source', jasmine.anything())
           
-        request = jasmine.Ajax.requests.mostRecent()
-        expect(request.url).toMatch(/\/source$/)
-  
-        request.respondWith
-          status: 200
-          contentType: '/text/html'
-          responseText:
-            """
-            <div class="container">
-              <div class="element">new text</div>
-            </div>
-            """
   
     describe 'up.reset', ->
   

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

@@ -8,84 +8,97 @@ describe 'up.form', ->
 
     describe 'up.submit', ->
       
-      beforeEach ->
-        jasmine.Ajax.install()
-  
-        $form = affix('form[action="/path/to"][method="put"][up-target=".response"]')
-        $form.append('<input name="field1" value="value1">')
-        $form.append('<input name="field2" value="value2">')
-  
-        affix('.response').text('old-text')
-  
-        @promise = up.submit($form)
-  
-        @request = jasmine.Ajax.requests.mostRecent()
-        expect(@request.url).toMatch /\/path\/to$/
-        expect(@request.method).toBe 'PUT'
-        expect(@request.data()).toEqual
-          field1: ['value1']
-          field2: ['value2']
-      
-      it 'submits the given form and replaces the target with the response', (done) ->
-  
-        @request.respondWith
-          status: 200
-          contentType: 'text/html'
-          responseText:
-            """
-            text-before
-  
-            <div class="response">
-              new-text
-            </div>
-  
-            text-after
-            """
-  
-        @promise.then ->
-          expect($('.response')).toHaveText('new-text')
-          expect($('body')).not.toHaveText('text-before')
-          expect($('body')).not.toHaveText('text-after')
-          done()
+      if up.browser.canPushState()
       
-      it 'places the response into the form if the submission returns a 5xx status code', (done) ->
-        @request.respondWith
-          status: 500
-          contentType: 'text/html'
-          responseText:
-            """
-            text-before
-  
-            <form>
-              error-messages
-            </form>
-  
-            text-after
-            """
-  
-        @promise.always ->
-          expect($('.response')).toHaveText('old-text')
-          expect($('form')).toHaveText('error-messages')
-          expect($('body')).not.toHaveText('text-before')
-          expect($('body')).not.toHaveText('text-after')
-          done()
-      
-      it 'respects a X-Up-Current-Location header that the server sends in case of a redirect', (done) ->
-  
-        @request.respondWith
-          status: 200
-          contentType: 'text/html'
-          responseHeaders: { 'X-Up-Current-Location': '/other/path' }
-          responseText:
-            """
-            <div class="response">
-              new-text
-            </div>
-            """
-  
-        @promise.then ->
-          expect(up.browser.url()).toMatch(/\/other\/path$/)
-          done()
+        beforeEach ->
+          jasmine.Ajax.install()
+    
+          $form = affix('form[action="/path/to"][method="put"][up-target=".response"]')
+          $form.append('<input name="field1" value="value1">')
+          $form.append('<input name="field2" value="value2">')
+    
+          affix('.response').text('old-text')
+    
+          @promise = up.submit($form)
+    
+          @request = jasmine.Ajax.requests.mostRecent()
+          expect(@request.url).toMatch /\/path\/to$/
+          expect(@request.method).toBe 'PUT'
+          expect(@request.data()).toEqual
+            field1: ['value1']
+            field2: ['value2']
+        
+        it 'submits the given form and replaces the target with the response', (done) ->
+    
+          @request.respondWith
+            status: 200
+            contentType: 'text/html'
+            responseText:
+              """
+              text-before
+    
+              <div class="response">
+                new-text
+              </div>
+    
+              text-after
+              """
+    
+          @promise.then ->
+            expect($('.response')).toHaveText('new-text')
+            expect($('body')).not.toHaveText('text-before')
+            expect($('body')).not.toHaveText('text-after')
+            done()
+        
+        it 'places the response into the form if the submission returns a 5xx status code', (done) ->
+          @request.respondWith
+            status: 500
+            contentType: 'text/html'
+            responseText:
+              """
+              text-before
+    
+              <form>
+                error-messages
+              </form>
+    
+              text-after
+              """
+    
+          @promise.always ->
+            expect($('.response')).toHaveText('old-text')
+            expect($('form')).toHaveText('error-messages')
+            expect($('body')).not.toHaveText('text-before')
+            expect($('body')).not.toHaveText('text-after')
+            done()
+        
+        it 'respects a X-Up-Current-Location header that the server sends in case of a redirect', (done) ->
+    
+          @request.respondWith
+            status: 200
+            contentType: 'text/html'
+            responseHeaders: { 'X-Up-Current-Location': '/other/path' }
+            responseText:
+              """
+              <div class="response">
+                new-text
+              </div>
+              """
+    
+          @promise.then ->
+            expect(up.browser.url()).toMatch(/\/other\/path$/)
+            done()
+            
+      else
+        
+        it 'submits the given form', ->
+          $form = affix('form[action="/path/to"][method="put"][up-target=".response"]')
+          form = $form.get(0)
+          spyOn(form, 'submit')
+          
+          up.submit($form)
+          expect(form.submit).toHaveBeenCalled()
+          
 
   describe 'unobtrusive behavior', ->
     

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

@@ -4,31 +4,42 @@ describe 'up.link', ->
   
     describe 'up.follow', ->
       
-      it 'loads the given link via AJAX and replaces the response in the given target', (done) ->
-        jasmine.Ajax.install()
-  
-        affix('.before').text('old-before')
-        affix('.middle').text('old-middle')
-        affix('.after').text('old-after')
-        $link = affix('a[href="/path"][up-target=".middle"]')
-  
-        promise = up.follow($link)
-  
-        jasmine.Ajax.requests.mostRecent().respondWith
-          status: 200
-          contentType: 'text/html'
-          responseText:
-            """
-            <div class="before">new-before</div>
-            <div class="middle">new-middle</div>
-            <div class="after">new-after</div>
-            """      
+      if up.browser.canPushState()
+      
+        it 'loads the given link via AJAX and replaces the response in the given target', (done) ->
+          jasmine.Ajax.install()
+    
+          affix('.before').text('old-before')
+          affix('.middle').text('old-middle')
+          affix('.after').text('old-after')
+          $link = affix('a[href="/path"][up-target=".middle"]')
+    
+          promise = up.follow($link)
+    
+          jasmine.Ajax.requests.mostRecent().respondWith
+            status: 200
+            contentType: 'text/html'
+            responseText:
+              """
+              <div class="before">new-before</div>
+              <div class="middle">new-middle</div>
+              <div class="after">new-after</div>
+              """      
+          
+          promise.then ->
+            expect($('.before')).toHaveText('old-before')
+            expect($('.middle')).toHaveText('new-middle')
+            expect($('.after')).toHaveText('old-after')
+            done()
+            
+      else
         
-        promise.then ->
-          expect($('.before')).toHaveText('old-before')
-          expect($('.middle')).toHaveText('new-middle')
-          expect($('.after')).toHaveText('old-after')
-          done()
+        it 'follows the given link', ->
+          $link = affix('a[href="/path"][up-target=".middle"]')
+          spyOn(up.browser, 'loadPage')
+          up.follow($link)
+          expect(up.browser.loadPage).toHaveBeenCalledWith('/path', jasmine.anything())
+          
 
     describe 'up.visit', ->