volt 0.9.0.pre3 → 0.9.0.pre4

data/spec/integration/first_last_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'first, last', type: :feature, sauce: true do
+  # Currently failing, fixing
+  # it 'should render first with a number argument' do
+  #   store._messages << {body: 'hey, sup?'}
+  #   store._messages << {body: 'not much'}
+  #   store._messages << {body: 'you?'}
+  #   store._messages << {body: 'just being awesome?'}
+  #   store._messages << {body: 'writing some specs'}
+  #
+  #   visit '/first_last'
+  # end
+end

data/spec/integration/http_endpoints_spec.rb

@@ -1,29 +1,27 @@
-if ENV['BROWSER']
-  require 'spec_helper'
+require 'spec_helper'
 
-  describe 'http endpoints', type: :feature, sauce: true do
-    it 'should show the page' do
-      visit '/simple_http'
-      expect(page).to have_content('this is just some text')
-    end
+describe 'http endpoints', type: :feature, sauce: true do
+  it 'should show the page' do
+    visit '/simple_http'
+    expect(page).to have_content('this is just some text')
+  end
 
-    it 'should have access to the store' do
-      DataStore.new.drop_database
-      $page.store._simple_http_tests << { name: 'hello' }
-      visit '/simple_http/store'
-      expect(page).to have_content('You had me at hello')
-      DataStore.new.drop_database
-    end
+  it 'should have access to the store' do
+    DataStore.new.drop_database
+    $page.store._simple_http_tests << { name: 'hello' }
+    visit '/simple_http/store'
+    expect(page).to have_content('You had me at hello')
+    DataStore.new.drop_database
+  end
 
-    it 'should upload and store a file' do
-      file = 'tmp/uploaded_file'
-      FileUtils.rm(file) if File.exist?(file)
-      visit '/upload'
-      attach_file('file', __FILE__)
-      find('#submit_file_upload').click
-      expect(page).to have_content('successfully uploaded')
-      expect(File.exist?(file)).to be(true)
-      FileUtils.rm(file) if File.exist?(file)
-    end
+  it 'should upload and store a file' do
+    file = 'tmp/uploaded_file'
+    FileUtils.rm(file) if File.exist?(file)
+    visit '/upload'
+    attach_file('file', __FILE__)
+    find('#submit_file_upload').click
+    expect(page).to have_content('successfully uploaded')
+    expect(File.exist?(file)).to be(true)
+    FileUtils.rm(file) if File.exist?(file)
   end
 end

data/spec/integration/templates_spec.rb

@@ -1,14 +1,12 @@
-if ENV['BROWSER']
-  require 'spec_helper'
+require 'spec_helper'
 
-  describe 'bindings test', type: :feature, sauce: true do
-    it 'should change the title when changing pages' do
-      visit '/'
+describe 'bindings test', type: :feature, sauce: true do
+  it 'should change the title when changing pages' do
+    visit '/'
 
-      expect(page).to have_title 'KitchenSink - KitchenSink'
-      click_link 'Bindings'
+    expect(page).to have_title 'KitchenSink - KitchenSink'
+    click_link 'Bindings'
 
-      expect(page).to have_title 'Bindings - KitchenSink'
-    end
+    expect(page).to have_title 'Bindings - KitchenSink'
   end
 end

data/spec/integration/user_spec.rb

@@ -1,78 +1,75 @@
-if ENV['BROWSER']
-  require 'spec_helper'
+require 'spec_helper'
 
-  describe 'user accounts', type: :feature, sauce: true do
-    before(:each) do
-      # Clear out db
-      DataStore.new.drop_database
-    end
+describe 'user accounts', type: :feature, sauce: true do
+  before(:each) do
+    # Clear out db
+    DataStore.new.drop_database
+  end
 
-    after(:each) do
-      # Clear out db
-      DataStore.new.drop_database
-    end
+  after(:each) do
+    # Clear out db
+    DataStore.new.drop_database
+  end
 
-    it 'should create an account' do
-      visit '/'
+  it 'should create an account' do
+    visit '/'
 
-      # sleep 300
+    # sleep 300
 
-      click_link 'Login'
+    click_link 'Login'
 
-      click_link 'Signup here'
+    click_link 'Signup here'
 
-      fields = all(:css, 'form .form-control')
+    fields = all(:css, 'form .form-control')
 
-      fields[0].set('test@test.com')
-      fields[1].set('awes0mesEcRet')
-      fields[2].set('Test Account 9550')
+    fields[0].set('test@test.com')
+    fields[1].set('awes0mesEcRet')
+    fields[2].set('Test Account 9550')
 
-      click_button 'Signup'
+    click_button 'Signup'
 
-      expect(page).to have_content('Test Account 9550')
-    end
+    expect(page).to have_content('Test Account 9550')
+  end
 
-    it 'should login and logout' do
-      visit '/'
+  it 'should login and logout' do
+    visit '/'
 
-      # Add the user
-      store._users! << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
+    # Add the user
+    store._users! << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
 
-      click_link 'Login'
+    click_link 'Login'
 
-      fields = all(:css, 'form .form-control')
-      fields[0].set('test@test.com')
-      fields[1].set('awes0mesEcRet')
-      click_button 'Login'
+    fields = all(:css, 'form .form-control')
+    fields[0].set('test@test.com')
+    fields[1].set('awes0mesEcRet')
+    click_button 'Login'
 
-      expect(page).to have_content('Test Account 9550')
+    expect(page).to have_content('Test Account 9550')
 
-      # Click the logout link
-      click_link 'Test Account 9550'
-      click_link 'Logout'
+    # Click the logout link
+    click_link 'Test Account 9550'
+    click_link 'Logout'
 
-      expect(page).to_not have_content('Test Account 9550')
-    end
+    expect(page).to_not have_content('Test Account 9550')
+  end
 
-    it 'should fail to create an account without a valid email and password' do
-      visit '/'
+  it 'should fail to create an account without a valid email and password' do
+    visit '/'
 
-      click_link 'Login'
-      click_link 'Signup here'
+    click_link 'Login'
+    click_link 'Signup here'
 
-      expect(page).to_not have_content('must be at least 8 characters')
+    expect(page).to_not have_content('must be at least 8 characters')
 
-      fields = all(:css, 'form .form-control')
+    fields = all(:css, 'form .form-control')
 
-      fields[0].set('test')
-      fields[1].set('awe')
-      fields[2].set('Tes')
+    fields[0].set('test')
+    fields[1].set('awe')
+    fields[2].set('Tes')
 
-      # some capybara drivers don't trigger blur correctly
-      page.execute_script("$('.form-control').blur()")
+    # some capybara drivers don't trigger blur correctly
+    page.execute_script("$('.form-control').blur()")
 
-      expect(page).to have_content('must be at least 8 characters')
-    end
+    expect(page).to have_content('must be at least 8 characters')
   end
-
 end

data/spec/integration/yield_spec.rb

@@ -1,18 +1,16 @@
-if ENV['BROWSER']
-  require 'spec_helper'
+require 'spec_helper'
 
-  describe 'yield binding', type: :feature, sauce: true do
-    before do
-      visit '/yield'
-    end
+describe 'yield binding', type: :feature, sauce: true do
+  before do
+    visit '/yield'
+  end
 
-    it 'should render the yielded content multiple times' do
-      expect(page).to have_content("My yielded content 1")
-      expect(page).to have_content("My yielded content 2")
-    end
+  it 'should render the yielded content multiple times' do
+    expect(page).to have_content("My yielded content 1")
+    expect(page).to have_content("My yielded content 2")
+  end
 
-    it 'should render the content from the tag\'s controller when yielding' do
-      expect(page).to have_content('This is my content')
-    end
+  it 'should render the content from the tag\'s controller when yielding' do
+    expect(page).to have_content('This is my content')
   end
-end
+end

data/spec/page/bindings/template_binding/view_lookup_for_path_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'volt/page/bindings/template_binding'
+require 'volt/page/bindings/view_binding'
 
 # Setup page stub
 
@@ -7,7 +7,7 @@ class Volt::Page
   attr_accessor :templates
 end
 
-describe Volt::TemplateBinding do
+describe Volt::ViewBinding do
   before do
     @page = double('volt/page')
     expect(@page).to receive(:templates).at_least(1).times { @templates }

data/spec/server/html_parser/view_parser_spec.rb

@@ -164,7 +164,7 @@ describe Volt::ViewParser do
 
   it 'should parse a template' do
     html = <<-END
-    {{ template "/home/temp/path" }}
+    {{ view "/home/temp/path" }}
     END
 
     view = Volt::ViewParser.new(html, 'main/main/main')
@@ -173,7 +173,7 @@ describe Volt::ViewParser do
                                    'html' => "    <!-- $0 --><!-- $/0 -->\n",
                                    'bindings' => {
                                      0 => [
-                                       "lambda { |__p, __t, __c, __id| Volt::TemplateBinding.new(__p, __t, __c, __id, \"main/main/main/body\", Proc.new { [\"/home/temp/path\"] }) }"
+                                       "lambda { |__p, __t, __c, __id| Volt::ViewBinding.new(__p, __t, __c, __id, \"main/main/main/body\", Proc.new { [\"/home/temp/path\"] }) }"
                                      ]
                                    }
                                  })

data/spec/server/rack/http_resource_spec.rb

@@ -19,8 +19,8 @@ if RUBY_PLATFORM != 'opal'
       end
 
       def show
-        render text: "show with id #{params[:stuff_id]} " \
-                      "and #{params[:test]} called"
+        render text: "show with id #{params._stuff_id} " \
+                      "and #{params._test} called"
       end
     end
 

data/spec/utils/task_argument_filtererer_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+if RUBY_PLATFORM != 'opal'
+  describe TaskArgumentFilterer do
+    it 'should filter arguments' do
+      filtered_args = TaskArgumentFilterer.new({login: 'jim@jim.com', password: 'some password no one should see'}).run
+
+      expect(filtered_args).to eq({:login=>"jim@jim.com", :password=>"[FILTERED]"})
+    end
+
+    it 'should filter in nested args' do
+      filtered_args = TaskArgumentFilterer.new([:login, {login: 'jim@jim.com', password: 'some password'}]).run
+
+      expect(filtered_args).to eq([:login, {:login=>"jim@jim.com", :password=>"[FILTERED]"}])
+    end
+  end
+end

data/templates/component/config/routes.rb

@@ -1,6 +1 @@
 # See https://github.com/voltrb/volt#routes for more info on routes
-
-client '/about', action: 'about'
-
-# The main route, this should be last.  It will match any params not previously matched.
-client '/', {}

data/templates/controller/http_controller.rb.tt

@@ -2,4 +2,4 @@ module <%= config[:component_module] %>
   class <%= config[:http_controller_name] %> < Volt::HttpController
 
   end
-end
+end

data/templates/controller/http_controller_spec.rb.tt

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe <%= config[:component_module] %>::<%= config[:http_controller_name] %>, type: :http_controller do
+  # Specs here
+end

data/templates/controller/model_controller.rb.tt

@@ -2,4 +2,4 @@ module <%= config[:component_module] %>
   class <%= config[:model_controller_name] %> < Volt::ModelController
 
   end
-end
+end

data/templates/controller/model_controller_spec.rb.tt

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe '<%= config[:name] %>', type: :feature do
+  # Specs here
+end

data/templates/model/model.rb.tt

@@ -1,3 +1,3 @@
 class <%= config[:model_name] %> < Volt::Model
 
-end
+end

data/templates/model/model_spec.rb.tt

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe <%= config[:model_name] %> do
+  # Specs here
+end

data/templates/newgem/lib/newgem.rb.tt

@@ -1,5 +1,5 @@
 <%- config[:constant_array].each_with_index do |c,i| -%>
-<%= '  '*i %><% if c == 'Volt' %>module<% else %>class<% end %> <%= c %>
+<%= '  '*i %>module <%= c %>
 <%- end -%>
 <%= '  '*config[:constant_array].size %># Your code goes here...
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>

data/templates/project/app/main/views/main/main.html.tt

@@ -1,5 +1,5 @@
 <:Title>
-  {{ template main_path, "title", {controller_group: 'main'} }}
+  {{ view main_path, "title", {controller_group: 'main'} }}
 
 <:Body>
   <div class="container">
@@ -14,7 +14,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/templates/project/config/app.rb.tt

@@ -12,6 +12,11 @@ Volt.configure do |config|
   #
   config.app_secret = '<%= SecureRandom.urlsafe_base64(50) %>'
 
+  # Data updates from the client come in via Tasks.  The task dispatcher logs all calls to tasks.
+  # By default hashes in the arguments can be filtered based on keys.  So any hash with a key of
+  # password will be filtered.  You can add more fields to filter below:
+  config.filter_keys = [:password]
+
   # Database config all start with db_ and can be set either in the config
   # file or with an environment variable (DB_NAME for example).
 

data/templates/project/spec/app/main/controllers/server/sample_http_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'sample http controller test', type: :http_controller do
+  # Specs here
+end

data/templates/project/spec/app/main/tasks/sample_task_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "sample task", type: :task do
+  # Specs here
+end

data/templates/task/task.rb.tt

@@ -1,4 +1,3 @@
 class <%= config[:task_name] %> < Volt::Task
 
 end
-