volt 0.9.0.pre3 → 0.9.0.pre4

data/lib/volt/utils/volt_user_error.rb

@@ -0,0 +1,4 @@
+# VoltUserError is a base class for Volt errors that you don't need backtraces on.
+# These are errors that you simply need to communicate something to developer with.
+class VoltUserError < RuntimeError
+end

data/lib/volt/volt/users.rb

@@ -24,7 +24,7 @@ module Volt
           # TODO: We could cache the digest generation for even faster comparisons
           if hash != Digest::SHA256.hexdigest("#{Volt.config.app_secret}::#{user_id}")
             # user id has been tampered with, reject
-            fail 'user id or hash has been tampered with'
+            fail VoltUserError, 'user id or hash is incorrectly signed.  It may have been tampered with, the app secret changed, or generated in a different app.'
           end
 
         end
@@ -80,7 +80,7 @@ module Volt
 
     # Login the user, return a promise for success
     def login(username, password)
-      UserTasks.login(username, password).then do |result|
+      UserTasks.login({login: username, password: password}).then do |result|
         # Assign the user_id cookie for the user
         $page.cookies._user_id = result
 

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -6,6 +6,7 @@ client '/store', action: 'store'
 client '/cookie_test', action: 'cookie_test'
 client '/flash', action: 'flash'
 client '/yield', action: 'yield'
+client '/first_last', action: 'first_last'
 client '/todos', controller: 'todos'
 
 # Signup/login routes

data/spec/apps/kitchen_sink/app/main/controllers/server/simple_http_controller.rb

@@ -9,7 +9,7 @@ module Main
     end
 
     def upload
-      uploaded = params[:file][:tempfile]
+      uploaded = params._file._tempfile
       File.open('tmp/uploaded_file', 'wb') { |f| f.write(uploaded.read) }
       render text: 'Thanks for uploading'
     end

data/spec/apps/kitchen_sink/app/main/views/main/first_last.html

@@ -0,0 +1,13 @@
+<:Title>
+  Last
+
+<:Body>
+  <h1>First Last Test</h1>
+
+  {{ store._messages.first.inspect }}
+
+  ---
+
+  {{ store._messages.each do |message| }}
+    <p>{{ message._body }}</p>
+  {{ end }}

data/spec/apps/kitchen_sink/app/main/views/main/main.html

@@ -1,5 +1,5 @@
 <:Title>
-  {{ template main_path, 'title', {controller_group: 'main'} }} - KitchenSink
+  {{ view main_path, 'title', {controller_group: 'main'} }} - KitchenSink
 
 <:Body>
   <div class="container">
@@ -19,7 +19,7 @@
 
     <:volt:notices />
 
-    {{ template main_path, 'body', {controller_group: 'main'} }}
+    {{ view main_path, 'body', {controller_group: 'main'} }}
 
     <div class="footer">
       <p>&copy; Company {{ Time.now.year }}</p>

data/spec/controllers/http_controller_spec.rb

@@ -61,8 +61,8 @@ if RUBY_PLATFORM != 'opal'
       controller = TestHttpController.new(
         { another: 'params', 'and_a' => 'string' }, request)
       expect(controller.params.size).to eq(4)
-      expect(controller.params[:and_a]).to eq('string')
-      expect(controller.params[:this]).to eq('is_a')
+      expect(controller.params._and_a).to eq('string')
+      expect(controller.params._this).to eq('is_a')
     end
 
     it 'should perform the correct action' do

data/spec/integration/bindings_spec.rb

@@ -1,206 +1,204 @@
-if ENV['BROWSER']
-  require 'spec_helper'
+require 'spec_helper'
 
-  describe 'bindings test', type: :feature, sauce: true do
-    it 'should load the page' do
-      visit '/'
+describe 'bindings test', type: :feature, sauce: true do
+  it 'should load the page' do
+    visit '/'
 
-      expect(page).to have_content('Kitchen Sink')
-    end
+    expect(page).to have_content('Kitchen Sink')
+  end
 
-    describe 'text/fields' do
-      it 'should load the bindings page and update bindings' do
-        visit '/'
+  describe 'text/fields' do
+    it 'should load the bindings page and update bindings' do
+      visit '/'
 
-        click_link 'Bindings'
+      click_link 'Bindings'
 
-        # Fill in one field and see if it updates the rest
-        fill_in('pageName1', with: 'Page bindings')
-        expect(find('#pageName1').value).to eq('Page bindings')
-        expect(find('#pageName2').value).to eq('Page bindings')
-        expect(find('#pageName3')).to have_content('Page bindings')
+      # Fill in one field and see if it updates the rest
+      fill_in('pageName1', with: 'Page bindings')
+      expect(find('#pageName1').value).to eq('Page bindings')
+      expect(find('#pageName2').value).to eq('Page bindings')
+      expect(find('#pageName3')).to have_content('Page bindings')
 
-        fill_in('pageName2', with: 'Update everywhere')
-        expect(find('#pageName1').value).to eq('Update everywhere')
-        expect(find('#pageName2').value).to eq('Update everywhere')
-        expect(find('#pageName3')).to have_content('Update everywhere')
-      end
+      fill_in('pageName2', with: 'Update everywhere')
+      expect(find('#pageName1').value).to eq('Update everywhere')
+      expect(find('#pageName2').value).to eq('Update everywhere')
+      expect(find('#pageName3')).to have_content('Update everywhere')
+    end
 
-      it 'should update params bindings and the url' do
-        visit '/'
+    it 'should update params bindings and the url' do
+      visit '/'
 
-        click_link 'Bindings'
+      click_link 'Bindings'
 
-        # phantom does not support the html5 history api
-        # TODO: We could probably polyfill this in phantom
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_path).to eq('/bindings')
-        end
+      # phantom does not support the html5 history api
+      # TODO: We could probably polyfill this in phantom
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_path).to eq('/bindings')
+      end
 
-        # Fill in one field and see if it updates the rest
-        fill_in('paramsName1', with: 'Params bindings')
-        expect(find('#paramsName1').value).to eq('Params bindings')
-        expect(find('#paramsName2').value).to eq('Params bindings')
-        expect(find('#paramsName3')).to have_content('Params bindings')
+      # Fill in one field and see if it updates the rest
+      fill_in('paramsName1', with: 'Params bindings')
+      expect(find('#paramsName1').value).to eq('Params bindings')
+      expect(find('#paramsName2').value).to eq('Params bindings')
+      expect(find('#paramsName3')).to have_content('Params bindings')
 
-        fill_in('paramsName2', with: 'Update everywhere')
-        expect(find('#paramsName1').value).to eq('Update everywhere')
-        expect(find('#paramsName2').value).to eq('Update everywhere')
-        expect(find('#paramsName3')).to have_content('Update everywhere')
+      fill_in('paramsName2', with: 'Update everywhere')
+      expect(find('#paramsName1').value).to eq('Update everywhere')
+      expect(find('#paramsName2').value).to eq('Update everywhere')
+      expect(find('#paramsName3')).to have_content('Update everywhere')
 
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_url).to match(/\/bindings[?]name[=]Update%20everywhere$/)
-        end
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_url).to match(/\/bindings[?]name[=]Update%20everywhere$/)
       end
+    end
 
-      it 'should update the url and fields when bound to a param in the route' do
-        visit '/'
+    it 'should update the url and fields when bound to a param in the route' do
+      visit '/'
 
-        click_link 'Bindings'
+      click_link 'Bindings'
 
-        # phantom does not support the html5 history api
-        # TODO: We could probably polyfill this in phantom
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_path).to eq('/bindings')
-        end
+      # phantom does not support the html5 history api
+      # TODO: We could probably polyfill this in phantom
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_path).to eq('/bindings')
+      end
 
-        # Fill in one field and see if it updates the rest
-        fill_in('routesName1', with: 'Routes bindings')
-        expect(find('#routesName1').value).to eq('Routes bindings')
-        expect(find('#routesName2').value).to eq('Routes bindings')
-        expect(find('#routesName3')).to have_content('Routes bindings')
+      # Fill in one field and see if it updates the rest
+      fill_in('routesName1', with: 'Routes bindings')
+      expect(find('#routesName1').value).to eq('Routes bindings')
+      expect(find('#routesName2').value).to eq('Routes bindings')
+      expect(find('#routesName3')).to have_content('Routes bindings')
 
-        fill_in('routesName2', with: 'bound_url')
-        expect(find('#routesName1').value).to eq('bound_url')
-        expect(find('#routesName2').value).to eq('bound_url')
-        expect(find('#routesName3')).to have_content('bound_url')
+      fill_in('routesName2', with: 'bound_url')
+      expect(find('#routesName1').value).to eq('bound_url')
+      expect(find('#routesName2').value).to eq('bound_url')
+      expect(find('#routesName3')).to have_content('bound_url')
 
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_path).to eq('/bindings/bound_url')
-        end
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_path).to eq('/bindings/bound_url')
       end
+    end
 
-      it 'should go from a url and query to params' do
-        visit '/bindings/testing?name=cool'
+    it 'should go from a url and query to params' do
+      visit '/bindings/testing?name=cool'
 
-        expect(find('#paramsName3')).to have_content('cool')
-        expect(find('#routesName3')).to have_content('testing')
-      end
+      expect(find('#paramsName3')).to have_content('cool')
+      expect(find('#routesName3')).to have_content('testing')
+    end
 
-      it 'should load the bindings page and update bindings' do
-        visit '/'
+    it 'should load the bindings page and update bindings' do
+      visit '/'
 
-        click_link 'Bindings'
+      click_link 'Bindings'
 
-        # Fill in one field and see if it updates the rest
-        fill_in('textareaName1', with: 'Page bindings')
-        expect(find('#textareaName1').value).to eq('Page bindings')
-        expect(find('#textareaName2').value).to eq('Page bindings')
-        expect(find('#textareaName3')).to have_content('Page bindings')
+      # Fill in one field and see if it updates the rest
+      fill_in('textareaName1', with: 'Page bindings')
+      expect(find('#textareaName1').value).to eq('Page bindings')
+      expect(find('#textareaName2').value).to eq('Page bindings')
+      expect(find('#textareaName3')).to have_content('Page bindings')
 
-        fill_in('textareaName2', with: 'Update everywhere')
-        expect(find('#textareaName1').value).to eq('Update everywhere')
-        expect(find('#textareaName2').value).to eq('Update everywhere')
-        expect(find('#textareaName3')).to have_content('Update everywhere')
-      end
-
-      it 'should update local_store bindings' do
-        visit '/'
+      fill_in('textareaName2', with: 'Update everywhere')
+      expect(find('#textareaName1').value).to eq('Update everywhere')
+      expect(find('#textareaName2').value).to eq('Update everywhere')
+      expect(find('#textareaName3')).to have_content('Update everywhere')
+    end
 
-        click_link 'Bindings'
+    it 'should update local_store bindings' do
+      visit '/'
 
-        # Fill in one field and see if it updates the rest
-        fill_in('localstoreName1', with: 'Page bindings')
-        expect(find('#localstoreName1').value).to eq('Page bindings')
-        expect(find('#localstoreName2').value).to eq('Page bindings')
-        expect(find('#localstoreName3')).to have_content('Page bindings')
+      click_link 'Bindings'
 
-        fill_in('localstoreName2', with: 'Update everywhere')
-        expect(find('#localstoreName1').value).to eq('Update everywhere')
-        expect(find('#localstoreName2').value).to eq('Update everywhere')
-        expect(find('#localstoreName3')).to have_content('Update everywhere')
-      end
+      # Fill in one field and see if it updates the rest
+      fill_in('localstoreName1', with: 'Page bindings')
+      expect(find('#localstoreName1').value).to eq('Page bindings')
+      expect(find('#localstoreName2').value).to eq('Page bindings')
+      expect(find('#localstoreName3')).to have_content('Page bindings')
 
-      # it 'should update local_store bindings' do
-      #   visit '/'
-      #
-      #   click_link 'Bindings'
-      #
-      #   within '#pageSelect1' do
-      #     find("option[value='two']").click
-      #   end
-      #
-      #   # Fill in one field and see if it updates the rest
-      #   expect(find('#pageSelect1').value).to eq('two')
-      #   expect(find('#pageSelect2').value).to eq('two')
-      #   expect(find('#pageSelect3')).to have_content('two')
-      #
-      #   # Fill in one field and see if it updates the rest
-      #   fill_in('pageSelect2', :with => 'three')
-      #   expect(find('#pageSelect1').value).to eq('three')
-      #   expect(find('#pageSelect2').value).to eq('three')
-      #   expect(find('#pageSelect3')).to have_content('three')
-      # end
+      fill_in('localstoreName2', with: 'Update everywhere')
+      expect(find('#localstoreName1').value).to eq('Update everywhere')
+      expect(find('#localstoreName2').value).to eq('Update everywhere')
+      expect(find('#localstoreName3')).to have_content('Update everywhere')
     end
 
-    describe 'check boxes' do
-      it 'should load the bindings page and update checkboxes' do
-        visit '/'
+    # it 'should update local_store bindings' do
+    #   visit '/'
+    #
+    #   click_link 'Bindings'
+    #
+    #   within '#pageSelect1' do
+    #     find("option[value='two']").click
+    #   end
+    #
+    #   # Fill in one field and see if it updates the rest
+    #   expect(find('#pageSelect1').value).to eq('two')
+    #   expect(find('#pageSelect2').value).to eq('two')
+    #   expect(find('#pageSelect3')).to have_content('two')
+    #
+    #   # Fill in one field and see if it updates the rest
+    #   fill_in('pageSelect2', :with => 'three')
+    #   expect(find('#pageSelect1').value).to eq('three')
+    #   expect(find('#pageSelect2').value).to eq('three')
+    #   expect(find('#pageSelect3')).to have_content('three')
+    # end
+  end
 
-        click_link 'Bindings'
+  describe 'check boxes' do
+    it 'should load the bindings page and update checkboxes' do
+      visit '/'
 
-        expect(find('#pageCheck3')).to have_content('')
-        # Fill in one field and see if it updates the rest
-        check('pageCheck1')
-        expect(find('#pageCheck1')).to be_checked
-        expect(find('#pageCheck2')).to be_checked
-        expect(find('#pageCheck3')).to have_content('true')
+      click_link 'Bindings'
 
-        uncheck('pageCheck1')
-        expect(find('#pageCheck1')).to_not be_checked
-        expect(find('#pageCheck2')).to_not be_checked
-        expect(find('#pageCheck3')).to have_content('')
-      end
+      expect(find('#pageCheck3')).to have_content('')
+      # Fill in one field and see if it updates the rest
+      check('pageCheck1')
+      expect(find('#pageCheck1')).to be_checked
+      expect(find('#pageCheck2')).to be_checked
+      expect(find('#pageCheck3')).to have_content('true')
 
-      it 'should load the bindings page and update checkboxes bound to params' do
-        visit '/'
+      uncheck('pageCheck1')
+      expect(find('#pageCheck1')).to_not be_checked
+      expect(find('#pageCheck2')).to_not be_checked
+      expect(find('#pageCheck3')).to have_content('')
+    end
 
-        click_link 'Bindings'
+    it 'should load the bindings page and update checkboxes bound to params' do
+      visit '/'
+
+      click_link 'Bindings'
 
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_path).to eq('/bindings')
-        end
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_path).to eq('/bindings')
+      end
 
-        expect(find('#paramsCheck3')).to have_content('')
-        # Fill in one field and see if it updates the rest
-        check('paramsCheck1')
-        expect(find('#paramsCheck1')).to be_checked
-        expect(find('#paramsCheck2')).to be_checked
-        expect(find('#paramsCheck3')).to have_content('true')
+      expect(find('#paramsCheck3')).to have_content('')
+      # Fill in one field and see if it updates the rest
+      check('paramsCheck1')
+      expect(find('#paramsCheck1')).to be_checked
+      expect(find('#paramsCheck2')).to be_checked
+      expect(find('#paramsCheck3')).to have_content('true')
 
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_url).to match(/\/bindings[?]check[=]true$/)
-        end
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_url).to match(/\/bindings[?]check[=]true$/)
+      end
 
-        uncheck('paramsCheck1')
-        expect(find('#paramsCheck1')).to_not be_checked
-        expect(find('#paramsCheck2')).to_not be_checked
-        expect(find('#paramsCheck3')).to have_content('')
+      uncheck('paramsCheck1')
+      expect(find('#paramsCheck1')).to_not be_checked
+      expect(find('#paramsCheck2')).to_not be_checked
+      expect(find('#paramsCheck3')).to have_content('')
 
-        if ENV['BROWSER'] != 'phantom'
-          expect(current_url).to match(/\/bindings[?]check[=]false$/)
-        end
+      if ENV['BROWSER'] != 'phantom'
+        expect(current_url).to match(/\/bindings[?]check[=]false$/)
       end
     end
+  end
 
-    describe 'content escaping' do
-      it 'should escape in a tripple stash' do
-        visit '/'
+  describe 'content escaping' do
+    it 'should escape in a tripple stash' do
+      visit '/'
 
-        click_link 'Bindings'
+      click_link 'Bindings'
 
-        expect(find('#escapeContent')).to have_content('this is {{escaped}}')
-      end
+      expect(find('#escapeContent')).to have_content('this is {{escaped}}')
     end
   end
 end

data/spec/integration/cookies_spec.rb

@@ -1,47 +1,45 @@
-if ENV['BROWSER']
-  require 'spec_helper'
+require 'spec_helper'
 
-  describe 'cookies collection', type: :feature, sauce: true do
-    if ENV['BROWSER'] != 'phantom'
-      # TODO: fails in phantom for some reason
-      it 'should add' do
-        visit '/'
+describe 'cookies collection', type: :feature, sauce: true do
+  if ENV['BROWSER'] != 'phantom'
+    # TODO: fails in phantom for some reason
+    it 'should add' do
+      visit '/'
 
-        click_link 'Cookies'
+      click_link 'Cookies'
 
-        fill_in('cookieName', with: 'one')
-        fill_in('cookieValue', with: 'one')
-        click_button 'Add Cookie'
+      fill_in('cookieName', with: 'one')
+      fill_in('cookieValue', with: 'one')
+      click_button 'Add Cookie'
 
-        expect(page).to have_content('one: one')
+      expect(page).to have_content('one: one')
 
-        # Reload the page
-        page.evaluate_script('document.location.reload()')
+      # Reload the page
+      page.evaluate_script('document.location.reload()')
 
-        # Check again
-        expect(page).to have_content('one: one')
-      end
+      # Check again
+      expect(page).to have_content('one: one')
     end
+  end
 
-    it 'should delete cookies' do
-      visit '/'
+  it 'should delete cookies' do
+    visit '/'
 
-      click_link 'Cookies'
+    click_link 'Cookies'
 
-      fill_in('cookieName', with: 'two')
-      fill_in('cookieValue', with: 'two')
-      click_button 'Add Cookie'
+    fill_in('cookieName', with: 'two')
+    fill_in('cookieValue', with: 'two')
+    click_button 'Add Cookie'
 
-      expect(page).to have_content('two: two')
+    expect(page).to have_content('two: two')
 
-      find('.cookieDelete').click
+    find('.cookieDelete').click
 
-      expect(page).to_not have_content('two: two')
+    expect(page).to_not have_content('two: two')
 
-      # Reload the page
-      page.evaluate_script('document.location.reload()')
+    # Reload the page
+    page.evaluate_script('document.location.reload()')
 
-      expect(page).to_not have_content('two: two')
-    end
+    expect(page).to_not have_content('two: two')
   end
 end