volt 0.8.27.beta3 → 0.8.27.beta4

data/spec/router/routes_spec.rb

@@ -9,18 +9,18 @@ end
 describe Volt::Routes do
   it 'should setup direct routes' do
     routes do
-      get '/', _view: 'index'
-      get '/page1', _view: 'first_page'
+      get '/', view: 'index'
+      get '/page1', view: 'first_page'
     end
 
     direct_routes = @routes.instance_variable_get(:@direct_routes)
-    expect(direct_routes).to eq('/' => { _view: 'index' }, '/page1' => { _view: 'first_page' })
+    expect(direct_routes).to eq('/' => { view: 'index' }, '/page1' => { view: 'first_page' })
   end
 
   it 'should setup indirect routes' do
     routes do
-      get '/blog/{{ _id }}/edit', _view: 'blog/edit'
-      get '/blog/{{ _id }}', _view: 'blog/show'
+      get '/blog/{{ id }}/edit', view: 'blog/edit'
+      get '/blog/{{ id }}', view: 'blog/show'
     end
 
     indirect_routes = @routes.instance_variable_get(:@indirect_routes)
@@ -28,9 +28,9 @@ describe Volt::Routes do
       'blog' => {
         '*' => {
           'edit' => {
-            nil => { _view: 'blog/edit', _id: 1 }
+            nil => { view: 'blog/edit', id: 1 }
           },
-          nil => { _view: 'blog/show', _id: 1 }
+          nil => { view: 'blog/show', id: 1 }
         }
       }
     )
@@ -38,31 +38,31 @@ describe Volt::Routes do
 
   it 'should match routes' do
     routes do
-      get '/blog', _view: 'blog'
-      get '/blog/{{ _id }}', _view: 'blog/show'
-      get '/blog/{{ _id }}/draft', _view: 'blog/draft', _action: 'draft'
-      get '/blog/{{ _id }}/edit', _view: 'blog/edit'
-      get '/blog/tags/{{ _tag }}', _view: 'blog/tag'
-      get '/login/{{ _name }}/user/{{ _id }}', _view: 'login', _action: 'user'
+      get '/blog', view: 'blog'
+      get '/blog/{{ id }}', view: 'blog/show'
+      get '/blog/{{ id }}/draft', view: 'blog/draft', action: 'draft'
+      get '/blog/{{ id }}/edit', view: 'blog/edit'
+      get '/blog/tags/{{ _tag }}', view: 'blog/tag'
+      get '/login/{{ name }}/user/{{ id }}', view: 'login', action: 'user'
     end
 
     params = @routes.url_to_params('/blog')
-    expect(params).to eq(_view: 'blog')
+    expect(params).to eq(view: 'blog')
 
     params = @routes.url_to_params('/blog/55/edit')
-    expect(params).to eq(_view: 'blog/edit', _id: '55')
+    expect(params).to eq(view: 'blog/edit', id: '55')
 
     params = @routes.url_to_params('/blog/55')
-    expect(params).to eq(_view: 'blog/show', _id: '55')
+    expect(params).to eq(view: 'blog/show', id: '55')
 
     params = @routes.url_to_params('/blog/tags/good')
-    expect(params).to eq(_view: 'blog/tag', _tag: 'good')
+    expect(params).to eq(view: 'blog/tag', _tag: 'good')
 
     params = @routes.url_to_params('/blog/55/draft')
-    expect(params).to eq(_view: 'blog/draft', _id: '55', _action: 'draft')
+    expect(params).to eq(view: 'blog/draft', id: '55', action: 'draft')
 
     params = @routes.url_to_params('/login/jim/user/10')
-    expect(params).to eq(_view: 'login', _action: 'user', _name: 'jim', _id: '10')
+    expect(params).to eq(view: 'login', action: 'user', name: 'jim', id: '10')
 
     params = @routes.url_to_params('/login/cool')
     expect(params).to eq(false)
@@ -70,30 +70,30 @@ describe Volt::Routes do
 
   it 'should setup param matchers' do
     routes do
-      get '/blog', _view: 'blog'
-      get '/blog/{{ _id }}', _view: 'blog/show'
-      get '/blog/{{ _id }}/edit', _view: 'blog/edit'
-      get '/blog/tags/{{ _tag }}', _view: 'blog/tag'
-      get '/login/{{ _name }}/user/{{ _id }}', _view: 'login', _action: 'user'
+      get '/blog', view: 'blog'
+      get '/blog/{{ id }}', view: 'blog/show'
+      get '/blog/{{ id }}/edit', view: 'blog/edit'
+      get '/blog/tags/{{ _tag }}', view: 'blog/tag'
+      get '/login/{{ name }}/user/{{ id }}', view: 'login', action: 'user'
     end
 
     param_matches = @routes.instance_variable_get(:@param_matches)
     expect(param_matches.map { |v| v[0] }).to eq([
-      { _view: 'blog' },
-      { _view: 'blog/show', _id: nil },
-      { _view: 'blog/edit', _id: nil },
-      { _view: 'blog/tag', _tag: nil },
-      { _view: 'login', _action: 'user', _name: nil, _id: nil }
+      { view: 'blog' },
+      { view: 'blog/show', id: nil },
+      { view: 'blog/edit', id: nil },
+      { view: 'blog/tag', _tag: nil },
+      { view: 'login', action: 'user', name: nil, id: nil }
     ])
   end
 
   it 'should go from params to url' do
     routes do
-      get '/blog', _view: 'blog'
-      get '/blog/{{ _id }}', _view: 'blog/show'
-      get '/blog/{{ _id }}/edit', _view: 'blog/edit'
-      get '/blog/tags/{{ _tag }}', _view: 'blog/tag'
-      get '/login/{{ _name }}/user/{{ _id }}', _view: 'login', _action: 'user'
+      get '/blog', view: 'blog'
+      get '/blog/{{ id }}', view: 'blog/show'
+      get '/blog/{{ id }}/edit', view: 'blog/edit'
+      get '/blog/tags/{{ _tag }}', view: 'blog/tag'
+      get '/login/{{ name }}/user/{{ id }}', view: 'login', action: 'user'
     end
 
     url, params = @routes.params_to_url(view: 'blog/show', id: '55')
@@ -106,32 +106,32 @@ describe Volt::Routes do
 
     url, params = @routes.params_to_url(view: 'blog/edit', id: '100', other: 'should_pass')
     expect(url).to eq('/blog/100/edit')
-    expect(params).to eq(_other: 'should_pass')
+    expect(params).to eq(other: 'should_pass')
   end
 
   it 'should test that params match a param matcher' do
     routes = Volt::Routes.new
-    match, params = routes.send(:check_params_match, { _view: 'blog', _id: '55' }, _view: 'blog', _id: nil)
+    match, params = routes.send(:check_params_match, { view: 'blog', id: '55' }, view: 'blog', id: nil)
     expect(match).to eq(true)
-    expect(params).to eq(_id: '55')
+    expect(params).to eq(id: '55')
 
-    match, params = routes.send(:check_params_match, { _view: 'blog', _id: '55' }, _view: 'blog', _id: '20')
+    match, params = routes.send(:check_params_match, { view: 'blog', id: '55' }, view: 'blog', id: '20')
     expect(match).to eq(false)
 
-    match, params = routes.send(:check_params_match, { _view: 'blog', _name: { _title: 'Mr', _name: 'Bob' }, _id: '55' }, _view: 'blog', _id: nil, _name: { _title: 'Mr', _name: nil })
+    match, params = routes.send(:check_params_match, { view: 'blog', name: { _title: 'Mr', name: 'Bob' }, id: '55' }, view: 'blog', id: nil, name: { _title: 'Mr', name: nil })
     expect(match).to eq(true)
-    expect(params).to eq(_id: '55')
+    expect(params).to eq(id: '55')
 
-    # Check with an extra value _name._name
-    match, params = routes.send(:check_params_match, { _view: 'blog', _name: { _title: 'Mr', _name: 'Bob' }, _id: '55' }, _view: 'blog', _id: nil, _name: { _title: 'Mr' })
+    # Check with an extra value name.name
+    match, params = routes.send(:check_params_match, { view: 'blog', name: { _title: 'Mr', name: 'Bob' }, id: '55' }, view: 'blog', id: nil, name: { _title: 'Mr' })
     expect(match).to eq(true)
-    expect(params).to eq(_id: '55')
+    expect(params).to eq(id: '55')
 
-    match, params = routes.send(:check_params_match, { _view: 'blog', _name: { _title: 'Mr', _name: 'Bob' }, _id: '55' }, _view: 'blog', _id: nil, _name: { _title: 'Phd' })
+    match, params = routes.send(:check_params_match, { view: 'blog', name: { _title: 'Mr', name: 'Bob' }, id: '55' }, view: 'blog', id: nil, name: { _title: 'Phd' })
     expect(match).to eq(false)
 
     # Check to make sure extra values in the params pass it.
-    match, params = routes.send(:check_params_match, { _view: 'blog', _id: '55', _extra: 'some value' }, _view: 'blog', _id: '55')
+    match, params = routes.send(:check_params_match, { view: 'blog', id: '55', _extra: 'some value' }, view: 'blog', id: '55')
     expect(match).to eq(true)
     expect(params).to eq(_extra: 'some value')
   end
@@ -142,21 +142,21 @@ describe Volt::Routes do
     params._index = '5'
 
     routes do
-      get '/', _controller: 'index'
-      get '/blog', _controller: 'blog'
+      get '/', controller: 'index'
+      get '/blog', controller: 'blog'
     end
 
     path, cleaned_params = @routes.params_to_url(params.to_h)
     expect(path).to eq('/blog')
-    expect(cleaned_params).to eq(_index: '5')
+    expect(cleaned_params).to eq(index: '5')
   end
 
   it 'should handle routes with bindings in them' do
     params = Volt::Model.new({}, persistor: Volt::Persistors::Params)
 
     routes do
-      get '/', _controller: 'index'
-      get '/blog/{{ _id }}', _controller: 'blog'
+      get '/', controller: 'index'
+      get '/blog/{{ id }}', controller: 'blog'
     end
 
     params = @routes.url_to_params('/blog/20')

data/spec/server/html_parser/view_parser_spec.rb

@@ -186,7 +186,6 @@ describe Volt::ViewParser do
 
     view = Volt::ViewParser.new(html, 'main/main/main/body')
 
-    # puts view.templates.inspect
   end
   it 'should setup a href single attribute binding correctly' do
     html = <<-END
@@ -194,8 +193,6 @@ describe Volt::ViewParser do
     END
 
     view = Volt::ViewParser.new(html, 'main/main/main/body')
-
-    # puts view.templates.inspect
   end
 
   it 'should parse components' do

data/spec/server/rack/component_paths_spec.rb

@@ -24,5 +24,16 @@ if RUBY_PLATFORM != 'opal'
       main_path = @component_paths.component_paths('main').first
       expect(main_path).to match(/spec\/apps\/file_loading\/app\/main$/)
     end
+
+    it 'should not return paths to non-volt gems' do
+      Gem.loaded_specs['fake-gem'] = Gem::Specification.new do |s|
+        s.name = 'fake-gem'
+        s.version = Gem::Version.new('1.0')
+        s.full_gem_path = '/home/volt/projects/volt-app'
+      end
+      app_folders = @component_paths.app_folders { |f| f }
+      expect(app_folders).to_not include('/home/volt/projects/volt-app/app')
+      Gem.loaded_specs.delete 'fake-gem'
+    end
   end
 end

data/spec/server/rack/quite_common_logger_spec.rb

@@ -9,7 +9,6 @@ unless RUBY_PLATFORM == 'opal'
 
     before(:each) do
       allow(app).to receive(:call)
-      # puts "SUBJECT: #{subject.inspect}"
       subject.instance_variable_set :@app, app
     end
 
@@ -24,7 +23,7 @@ unless RUBY_PLATFORM == 'opal'
         allow(subject).to receive(:log)
       end
 
-      context 'when request path has no file extension and request run over web socket' do
+      describe 'when request path has no file extension and request run over web socket' do
         let(:env) { {'REQUEST_PATH' => '/file'} }
 
         it "calls 'log' method" do
@@ -33,7 +32,7 @@ unless RUBY_PLATFORM == 'opal'
         end
       end
 
-      context 'when request path has file extension' do
+      describe 'when request path has file extension' do
         let(:env) { {'REQUEST_PATH' => '/file.ext'} }
 
         it "doesn't call 'log' method" do
@@ -42,7 +41,7 @@ unless RUBY_PLATFORM == 'opal'
         end
       end
 
-      context 'when request run over web socket' do
+      describe 'when request run over web socket' do
         let(:env) { {'REQUEST_PATH' => '/channel'} }
 
         it "doesn't call 'log' method" do

data/spec/spec_helper.rb

@@ -2,10 +2,13 @@ require 'volt/spec/setup'
 
 unless RUBY_PLATFORM == 'opal'
   require 'pry-byebug'
-  # Specs are run against the kitchen sink app
-  kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), 'apps/kitchen_sink'))
-  Volt.spec_setup(kitchen_sink_path)
+end
+
+# Specs are run against the kitchen sink app
+kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), 'apps/kitchen_sink'))
+Volt.spec_setup(kitchen_sink_path)
 
+unless RUBY_PLATFORM == 'opal'
   RSpec.configure do |config|
     # config.before(:each) do
     #   DataStore.new.drop_database
@@ -21,4 +24,5 @@ unless RUBY_PLATFORM == 'opal'
     config.order = 'random'
     # config.seed = '31241'
   end
+
 end

data/templates/component/config/dependencies.rb

@@ -1,8 +1,2 @@
 # Specify which components you wish to include when
-# the "home" component loads.
-
-# bootstrap css framework
-component 'bootstrap'
-
-# a default theme for the bootstrap framework
-component 'bootstrap-jumbotron-theme'
+# this component loads.

data/templates/component/config/routes.rb

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

data/templates/component/controllers/main_controller.rb.tt

@@ -0,0 +1,20 @@
+module <%= config[:component_name].camelize %>
+  class MainController < Volt::ModelController
+    def index
+      # Add code for when the index view is loaded
+    end
+
+    def about
+      # Add code for when the about view is loaded
+    end
+
+    private
+
+    # the main template contains a #template binding that shows another
+    # template.  This is the path to that template.  It may change based
+    # on the params._controller and params._action values.
+    def main_path
+      params._controller.or('main') + '/' + params._action.or('index')
+    end
+  end
+end

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

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

data/templates/project/app/main/config/routes.rb

@@ -1,10 +1,10 @@
 # See https://github.com/voltrb/volt#routes for more info on routes
 
-get '/about', _action: 'about'
+get '/about', action: 'about'
 
 # Routes for login and signup, provided by user-templates component gem
-get '/signup', _controller: 'user-templates', _action: 'signup'
-get '/login', _controller: 'user-templates', _action: 'login'
+get '/signup', controller: 'user-templates', action: 'signup'
+get '/login', controller: 'user-templates', action: 'login'
 
 # The main route, this should be last. It will match any params not
 # previously matched.

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

@@ -5,8 +5,8 @@
   <div class="container">
     <div class="header">
       <ul class="nav nav-pills pull-right">
-        <:nav href="/" text="Home" />
-        <:nav href="/about" text="About" />
+        <:nav href="/">Home</:nav>
+        <:nav href="/about">About</:nav>
         <:user-templates:menu />
       </ul>
       <h3 class="text-muted"><%= config[:name] %></h3>
@@ -17,13 +17,13 @@
     {{ template main_path, 'body', {controller_group: 'main'} }}
 
     <div class="footer">
-      <p>&copy; Company 2014</p>
+      <p>&copy; Company {{ Time.now.year }}</p>
     </div>
 
   </div>
 
 <:Nav>
   <li class="{{ if active_tab? }}active{{ end }}">
-    <a href="{{ attrs.href }}">{{ attrs.text }}</a>
+    <a href="{{ attrs.href }}">{{ yield }}</a>
   </li>
 

data/templates/project/config/app.rb.tt

@@ -4,6 +4,12 @@ Volt.configure do |config|
   # Your app secret is used for signing things like the user cookie so it can't
   # be tampered with.  A random value is generated on new projects that will work
   # without the need to customize.  Make sure this value doesn't leave your server.
+  #
+  # For added security we reccomend moving the app secret into an enviromnet.  You can
+  # setup that like so:
+  #
+  # config.app_secret = ENV['APP_SECRET']
+  #
   config.app_secret = '<%= SecureRandom.urlsafe_base64(50) %>'
 
   # Database config all start with db_ and can be set either in the config

data/volt.gemspec

@@ -25,20 +25,18 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets-sass', '~> 1.0.0'
   spec.add_dependency 'sass', '~> 3.2.5'
   spec.add_dependency 'mongo', '~> 1.9.0'
-  spec.add_dependency 'rake', '~> 10.0.4'
   spec.add_dependency 'listen', '~> 2.8.0'
   spec.add_dependency 'uglifier', '>= 2.4.0'
-  spec.add_dependency 'configurations', '~> 2.0.0.pre'
-  spec.add_dependency 'yui-compressor', '>= 0.12.0'
-  spec.add_dependency 'opal', '~> 0.6.0'
-  spec.add_dependency 'opal-jquery', '~> 0.2.0'
+  spec.add_dependency "configurations", "~> 2.0.0.pre"
+  spec.add_dependency 'yui-compressor', '~> 0.12.0'
+  spec.add_dependency 'opal', '~> 0.7.0'
+  spec.add_dependency 'opal-jquery', '~> 0.3.0'
   spec.add_dependency 'rspec-core', '~> 3.1.0'
-  spec.add_dependency 'rspec-expectations', '~> 3.1.0'
   spec.add_dependency 'capybara', '~> 2.4.2'
   spec.add_dependency 'selenium-webdriver', '~> 2.43.0'
   spec.add_dependency 'chromedriver2-helper', '~> 0.0.8'
   spec.add_dependency 'poltergeist', '~> 1.5.0'
-  spec.add_dependency 'opal-rspec', '0.3.0.beta3'
+  spec.add_dependency 'opal-rspec', '0.4.0'
   spec.add_dependency 'bundler', '>= 1.5'
   spec.add_dependency 'volt-sockjs', '~> 0.3.4.4'
 
@@ -47,7 +45,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'guard', '2.6.0' # bug in current guard
   spec.add_development_dependency 'guard-rspec', '~> 4.3.0'
+  spec.add_development_dependency 'rake', '~> 10.0.4'
+
+  # Yard and formatting
   spec.add_development_dependency 'yard', '~> 0.8.7.0'
+  spec.add_development_dependency 'redcarpet', '~> 3.2.2'
+  spec.add_development_dependency 'github-markup', '~> 1.3.1'
+
   spec.add_development_dependency 'sauce', '~> 3.5.3'
   spec.add_development_dependency 'sauce-connect', '~> 3.5.0'
   spec.add_development_dependency 'pry-byebug', '~> 2.0.0'