volt 0.8.27.beta7 → 0.8.27.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f7ccdc9801cf342901b77cf83b2091af34975f
-  data.tar.gz: a4f0dd2b28f09f2423fa602eb45c9935d422840c
+  metadata.gz: 12a30dfcdd14af504ac6f848776b93e18074123e
+  data.tar.gz: 9729fd4c76c577c9bc8ace4fba5c816060b5b70a
 SHA512:
-  metadata.gz: 94607eb5080e4809be8a505e2a6e0c2602a887346de86c335e7177b1230ed75048091a9d1751d1b3d30e1960bb242b385966c58eb1b13bd52f03a05b253f3069
-  data.tar.gz: bb4d64bc6781e697e646f53054c305499fcd4434e10c8bfde661c46fb0fef31a3a0bda791818c783bc5631aacfadd156486baddb0537a4868dd597056f91708c
+  metadata.gz: 7d9bc05ab9bdce64f2a38e900cc362c81ae026b8038c11160a6a15e1134a50d4bcbda4aec36cc157aef8f4eaf1d08188d5f710604dce51414779dfd35697ec18
+  data.tar.gz: 84da2e64eab8a4b8b7bf5db5a5a4bd1e95892b41bd59da5a3e3ae52d6106742f2a318f0c0c4c13824b4248e5c82e1941ae8f924692ab4cd3f4297378da6baf37

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 ### Added
 - added has_many and belongs_to on models.  See docs.
 - you can now serve http/rest from Volt.  Thanks to @jfahrer for his great work.  Docs coming soon.
+- there is now a generator for controllers and HttpControllers.
+- the following were renamed to follow gem naming conventions:
+  - volt-user-templates (now volt-user_templates)
+  - volt-bootstrap-jumbotron-theme (now volt-bootstrap_jumbotron_theme)
 - fixed generated component code
 - added .order for sorting on the data store (since .sort is a ruby Enum method)
 - calling .then on ArrayModels has been changed to calling .fetch and .fetch_first.  These both return a promise, and take an optional block
@@ -22,6 +26,8 @@
 - ```the_page``` is a shortcut to the page collection inside of specs.  (Unfortunately, ```page``` is used by capybara, so for now we're using ```the_page```, we'll find a better solution in the future.)
 
 ### Changed
+- main_path in generated projects now includes the a component param that can be used to easily point at controllers/views in other components.
+- previously the main component's controllers were not namespaced.  We changed it so all controllers (including those in main) are namespaced.  This is makes things more consistent and keeps expectations when working with components.
 - model attributes no longer return NilModels.  Instead they just return nil.  You can however add an ! to the end to "expand" the model to an empty model.
 
 ```page._new_todo # => now returns nil```
@@ -35,6 +41,9 @@ So if you wanted to use a property on ```_new_todo``` without initializing ```_n
 - changed .find to .where to not conflict with ruby Enum's .find
 - Volt::TaskHandler is now Volt::Task
 
+### Removed
+- .false?, .true?, .or, and .and were removed since NilModels were removed.  This means you get back a real nil value when accessing an undefined model attribute.
+
 ## 0.8.24 - 2014-12-05
 ### Added
 - Fix bug with validation inheritance

data/Gemfile

@@ -8,13 +8,13 @@ group :development do
   gem 'volt-bootstrap'
 
   # Simple theme for bootstrap, remove to theme yourself.
-  gem 'volt-bootstrap-jumbotron-theme'
+  gem 'volt-bootstrap_jumbotron_theme'
 
   # For testing
   gem 'volt-fields'
 
   # For testing
-  gem 'volt-user-templates'
+  gem 'volt-user_templates'
 
   # For running rubocop
   gem 'rubocop', require: false

data/VERSION

@@ -1 +1 @@
-0.8.27.beta7
+0.8.27.beta8

data/app/volt/tasks/user_tasks.rb

@@ -6,7 +6,7 @@ class UserTasks < Volt::Task
 
     # During login we need access to the user's info even though we aren't the user
     Volt.skip_permissions do
-      store._users.find(query).fetch_first do |user|
+      store._users.where(query).fetch_first do |user|
         fail 'User could not be found' unless user
 
         match_pass = BCrypt::Password.new(user._hashed_password)
@@ -29,4 +29,4 @@ class UserTasks < Volt::Task
   def salty_user_id(user_id)
     "#{Volt.config.app_secret}::#{user_id}"
   end
-end
+end

data/lib/volt/cli/generate.rb

@@ -36,4 +36,21 @@ class Generate < Thor
   def self.source_root
     File.expand_path(File.join(File.dirname(__FILE__), '../../../templates'))
   end
+
+  desc 'http_controller NAME COMPONENT', 'Creates an HTTP Controller named NAME in the .'
+  method_option :name, type: :string, banner: 'The name of the HTTP Controller.'
+  method_option :component, type: :string, default: 'main', banner: 'The component the http_controller should be created in.', required: false
+  def http_controller(name, component = 'main')
+    output_file = Dir.pwd + "/app/#{component}/controllers/#{name.underscore.singularize}.rb"
+    template('controller/http_controller.rb.tt', output_file, component_module: component.camelize, http_controller_name: name.camelize.singularize)
+  end
+
+  desc 'controller NAME COMPONENT', 'Creates a model controller named NAME in the app folder of the component named COMPONENT.'
+  method_option :name, type: :string, banner: 'The name of the model controller.'
+  method_option :component, type: :string, default: 'main', banner: 'The component the controller should be created in.', required: false
+  def controller(name, component = 'main')
+    output_file = Dir.pwd + "/app/#{component}/controllers/#{name.underscore.singularize}.rb"
+    template('controller/model_controller.rb.tt', output_file, component_module: component.camelize, model_controller_name: name.camelize.singularize)
+  end
+
 end

data/lib/volt/extra_core/extra_core.rb

@@ -4,7 +4,6 @@ require 'volt/extra_core/object'
 require 'volt/extra_core/blank'
 require 'volt/extra_core/stringify_keys'
 require 'volt/extra_core/string'
-require 'volt/extra_core/true_false'
 require 'volt/extra_core/hash'
 require 'volt/extra_core/class'
 if RUBY_PLATFORM == 'opal'

data/lib/volt/extra_core/object.rb

@@ -6,24 +6,6 @@ class Object
     Hash[instance_variables.map { |name| [name[1..-1], instance_variable_get(name)] }]
   end
 
-  # Provides the same functionality as ||, but treats a nil model as falsy
-  def or(other)
-    if self && !self.nil?
-      self
-    else
-      other
-    end
-  end
-
-  # Provides the same functionality as &&, treats a nil model as falsy
-  def and(other)
-    if self && !self.nil?
-      other
-    else
-      self
-    end
-  end
-
   def html_inspect
     inspect.gsub('<', '&lt;').gsub('>', '&gt;')
   end

data/lib/volt/models/array_model.rb

@@ -94,13 +94,14 @@ module Volt
             trigger_size_change!
             #
             # re-raise, err might not be an Error object, so we use a rejected promise to re-raise
+
             Promise.new.reject(err)
           end
         end
-      else
-        # Return this model
-        model
       end
+
+      # Return this model
+      Promise.new.resolve(model)
     end
 
     # Works like << except it always returns a promise

data/lib/volt/models/buffer.rb

@@ -61,6 +61,9 @@ module Volt
     def promise_for_errors(errors)
       mark_all_fields!
 
+      # Wrap in an Errors class unless it already is one
+      errors = errors.is_a?(Errors) ? errors : Errors.new(errors)
+
       Promise.new.reject(errors)
     end
 

data/lib/volt/models/errors.rb

@@ -17,5 +17,16 @@ module Volt
         end
       end
     end
+
+    # Generate a string version of all of the errors
+    def to_s
+      str = []
+
+      each_pair do |field, error|
+        str << "#{field} #{error}"
+      end
+
+      str.join
+    end
   end
 end

data/lib/volt/models/model_hash_behaviour.rb

@@ -45,14 +45,6 @@ module Volt
       !@attributes || @attributes.size == 0
     end
 
-    def false?
-      @attributes.false?
-    end
-
-    def true?
-      @attributes.true?
-    end
-
     def clear
       @attributes.each_pair do |key, _|
         delete(key)

data/lib/volt/models/persistors/array_store.rb

@@ -140,7 +140,7 @@ module Volt
 
           parent.persistor.ensure_setup if parent.persistor
 
-          if parent && (attrs = parent.attributes) && attrs[:_id].true?
+          if parent && (attrs = parent.attributes) && attrs[:_id]
             query = query.dup
 
             query << [:find, {:"#{@model.path[-3].singularize}_id" => attrs[:_id]}]

data/lib/volt/page/bindings/content_binding.rb

@@ -20,7 +20,7 @@ module Volt
     end
 
     def update(value)
-      value            = value.or('')
+      value            = value || ''
 
       # Exception values display the exception as a string
       value            = value.to_s

data/lib/volt/page/bindings/template_binding.rb

@@ -195,11 +195,6 @@ module Volt
       # Get the constant parts
       parts  = controller_path[0..-2].map { |v| v.tr('-', '_').camelize }
 
-      # Home doesn't get namespaced
-      if parts.first == 'Main'
-        parts.shift
-      end
-
       # Do const lookups starting at object and working our way down.
       # So Volt::ProgressBar would lookup Volt, then ProgressBar on Volt.
       obj = Object

data/lib/volt/page/page.rb

@@ -167,7 +167,7 @@ module Volt
       # Do the initial url params parse
       @url_tracker.url_updated(true)
 
-      main_controller = MainController.new
+      main_controller = Main::MainController.new
 
       # Setup main page template
       TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')

data/lib/volt/reactive/reactive_array.rb

@@ -35,7 +35,7 @@ module Volt
         count = 0
 
         size.times do |index|
-          if block.call(self[index]).true?
+          if block.call(self[index])
             count += 1
           end
         end
@@ -50,7 +50,7 @@ module Volt
       result = []
       size.times do |index|
         val = self[index]
-        if yield(val).true?
+        if yield(val)
           result << val
         end
       end
@@ -63,7 +63,7 @@ module Volt
         size.times do |index|
           val = self[index]
 
-          if yield(val).true?
+          if yield(val)
             return true
           end
         end
@@ -79,7 +79,7 @@ module Volt
         size.times do |index|
           val = self[index]
 
-          unless yield(val).true?
+          unless yield(val)
             return false
           end
         end

data/lib/volt/server/rack/http_resource.rb

@@ -31,9 +31,13 @@ module Volt
     # The controller name and actions need to be set as params for the
     # matching route
     def dispatch_to_controller(params, request)
+      namespace = params[:component] || 'main'
+
       controller_name = params[:controller] + '_controller'
       action = params[:action]
-      klass = Object.const_get(controller_name.camelize.to_sym)
+
+      namespace_module = Object.const_get(namespace.camelize.to_sym)
+      klass = namespace_module.const_get(controller_name.camelize.to_sym)
       controller = klass.new(params, request)
       controller.perform(action)
     end

data/lib/volt/tasks/dispatcher.rb

@@ -19,7 +19,7 @@ module Volt
       start_time = Time.now.to_f
 
       # Check that we are calling on a Task class and a method provide at
-      # Task or above in the ancestor chain.
+      # Task or above in the ancestor chain. (so no :send or anything)
       if safe_method?(klass, method_name)
         promise.resolve(nil)
 

data/lib/volt/volt/users.rb

@@ -64,7 +64,7 @@ module Volt
 
     # Put in a deprecation placeholder
     def user
-      Volt.logger.warning("deprication: Volt.user has been renamed to Volt.current_user (to be more clear about what it returns).  Volt.user will be deprecated in the future.")
+      Volt.logger.warn("deprication: Volt.user has been renamed to Volt.current_user (to be more clear about what it returns).  Volt.user will be deprecated in the future.")
       current_user
     end
 

data/spec/apps/kitchen_sink/Gemfile

@@ -8,10 +8,10 @@ gem 'volt', path: '../../../'
 gem 'volt-bootstrap'
 
 # Simple theme for bootstrap, remove to theme yourself.
-gem 'volt-bootstrap-jumbotron-theme'
+gem 'volt-bootstrap_jumbotron_theme'
 
 gem 'volt-fields'
-gem 'volt-user-templates', path: '/Users/ryanstout/Sites/volt/apps/volt-user-templates'
+gem 'volt-user_templates'
 
 gem 'opal'
 

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

@@ -5,10 +5,10 @@
 component 'bootstrap'
 
 # a default theme for the bootstrap framework
-component 'bootstrap-jumbotron-theme'
+component 'bootstrap_jumbotron_theme'
 
 # For testing user
 component 'fields'
 
 # For testing
-component 'user-templates'
+component 'user_templates'

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

@@ -9,8 +9,8 @@ client '/yield', action: 'yield'
 client '/todos', controller: 'todos'
 
 # Signup/login routes
-client '/signup', controller: 'user-templates', action: 'signup'
-client '/login', controller: 'user-templates', action: 'login'
+client '/signup', component: 'user_templates', controller: 'signup'
+client '/login', component: 'user_templates', controller: 'login'
 
 # HTTP endpoints
 get '/simple_http', controller: 'simple_http', action: 'index'

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -1,53 +1,55 @@
-class MainController < Volt::ModelController
-  model :page
+module Main
+  class MainController < Volt::ModelController
+    model :page
 
-  def index
-    a = {}
-    a[{}] = 5
-  end
+    def index
+      a = {}
+      a[{}] = 5
+    end
 
-  def flash_notice
-    flash._notices << 'A notice message'
-  end
+    def flash_notice
+      flash._notices << 'A notice message'
+    end
 
-  def flash_success
-    flash._successes << 'A success message'
-  end
+    def flash_success
+      flash._successes << 'A success message'
+    end
 
-  def flash_warning
-    flash._warnings << 'A warning message'
-  end
+    def flash_warning
+      flash._warnings << 'A warning message'
+    end
 
-  def flash_error
-    flash._errors << 'An error message'
-  end
+    def flash_error
+      flash._errors << 'An error message'
+    end
 
-  def cookie_test
-    self.model = page._new_cookie!.buffer
-  end
+    def cookie_test
+      self.model = page._new_cookie!.buffer
+    end
 
-  def add_cookie
-    cookies.send(:"_#{_name.to_s}=", _value)
+    def add_cookie
+      cookies.send(:"_#{_name.to_s}=", _value)
 
-    self.model = page._new_cookie!.buffer
-  end
+      self.model = page._new_cookie!.buffer
+    end
 
-  def content_string
-    'content'
-  end
+    def content_string
+      'content'
+    end
 
-  private
+    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
+    # 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._component || 'main'}/#{params._controller || 'main'}/#{params._action || 'index'}"
+    end
 
-  # Determine if the current nav component is the active one by looking
-  # at the first part of the url against the href attribute.
-  def active_tab?
-    url.path.split('/')[1] == attrs.href.split('/')[1]
+    # Determine if the current nav component is the active one by looking
+    # at the first part of the url against the href attribute.
+    def active_tab?
+      url.path.split('/')[1] == attrs.href.split('/')[1]
+    end
   end
-end
+end

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

@@ -1,15 +1,17 @@
-class SimpleHttpController < Volt::HttpController
-  def index
-    render text: 'this is just some text'
-  end
+module Main
+  class SimpleHttpController < Volt::HttpController
+    def index
+      render text: 'this is just some text'
+    end
 
-  def show
-    render text: "You had me at #{store._simple_http_tests.first._name}"
-  end
+    def show
+      render text: "You had me at #{store._simple_http_tests.first._name}"
+    end
 
-  def upload
-    uploaded = params[:file][:tempfile]
-    File.open('tmp/uploaded_file', 'wb') { |f| f.write(uploaded.read) }
-    render text: 'Thanks for uploading'
+    def upload
+      uploaded = params[:file][:tempfile]
+      File.open('tmp/uploaded_file', 'wb') { |f| f.write(uploaded.read) }
+      render text: 'Thanks for uploading'
+    end
   end
-end
+end

data/spec/apps/kitchen_sink/app/main/controllers/todos_controller.rb

@@ -1,16 +1,18 @@
-class TodosController < Volt::ModelController
-  model :page
+module Main
+  class TodosController < Volt::ModelController
+    model :page
 
-  def add_todo
-    _todos << { name: _new_todo }
-    self._new_todo = ''
-  end
+    def add_todo
+      _todos << { name: _new_todo }
+      self._new_todo = ''
+    end
 
-  def remove_todo(todo)
-    _todos.delete(todo)
-  end
+    def remove_todo(todo)
+      _todos.delete(todo)
+    end
 
-  def completed
-    _todos.count(&:_completed)
+    def completed
+      _todos.count(&:_completed)
+    end
   end
-end
+end

data/spec/apps/kitchen_sink/app/main/controllers/upload_controller.rb

@@ -1,22 +1,24 @@
-class UploadController < Volt::ModelController
-  model :page
+module Main
+  class UploadController < Volt::ModelController
+    model :page
 
-  def index
-    # Nothing to setup here
-  end
+    def index
+      # Nothing to setup here
+    end
 
-  def upload
-    `form_data = new FormData();
-     form_data.append("file", $('#file')[0].files[0]);
-     $.ajax({
-       url: '/simple_http/upload',
-       data: form_data,
-       processData: false,
-       contentType: false,
-       type: 'POST',
-       success: function(data){
-        $('#status').html("successfully uploaded");
-      }
-    });`
+    def upload
+      `form_data = new FormData();
+       form_data.append("file", $('#file')[0].files[0]);
+       $.ajax({
+         url: '/simple_http/upload',
+         data: form_data,
+         processData: false,
+         contentType: false,
+         type: 'POST',
+         success: function(data){
+          $('#status').html("successfully uploaded");
+        }
+      });`
+    end
   end
-end
+end

data/spec/apps/kitchen_sink/app/main/controllers/yield_component_controller.rb

@@ -1,5 +1,7 @@
-class YieldComponentController < Volt::ModelController
-  def content_string
-    'wrong'
+module Main
+  class YieldComponentController < Volt::ModelController
+    def content_string
+      'wrong'
+    end
   end
 end

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

@@ -12,7 +12,7 @@
         <:nav href="/cookie_test" text="Cookies" />
         <:nav href="/store" text="Store" />
         <:nav href="/yield" text="Yield" />
-        <:user-templates:menu />
+        <:user_templates:menu />
       </ul>
       <h3 class="text-muted">Project name</h3>
     </div>

data/spec/extra_core/object_spec.rb

@@ -3,12 +3,12 @@ require 'volt/extra_core/blank'
 
 describe Object do
   it 'should add blank? to all objects' do
-    expect(Object.new.blank?).to be_false
-    expect(nil.blank?).to be_true
+    expect(Object.new.blank?).to eq(false)
+    expect(nil.blank?).to eq(true)
   end
 
   it 'should add present? to all objects' do
-    expect(Object.new.present?).to be_true
-    expect(nil.present?).to be_false
+    expect(Object.new.present?).to eq(true)
+    expect(nil.present?).to eq(false)
   end
 end

data/spec/integration/user_spec.rb

@@ -5,13 +5,11 @@ if ENV['BROWSER']
     before(:each) do
       # Clear out db
       DataStore.new.drop_database
-      # Volt::Persistors::ArrayStore.query_pool.clear
     end
 
     after(:each) do
       # Clear out db
       DataStore.new.drop_database
-      # Volt::Persistors::ArrayStore.query_pool.clear
     end
 
     it 'should create an account' do

data/spec/models/buffer_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 
+class ::TestSaveFailure < Volt::Model
+  validate :name, length: 5
+end
+
 describe Volt::Buffer do
   it 'should let you pass a block that evaluates to the then of the promise' do
     buffer = the_page._items!.buffer
@@ -12,4 +16,28 @@ describe Volt::Buffer do
     expect(count).to eq(1)
     expect(result.class).to eq(Promise)
   end
+
+  if RUBY_PLATFORM != 'opal'
+    it 'should reject a failed save! with the errors object' do
+      buffer = the_page._test_save_failures.buffer
+
+      buffer._name = 'Ryan'
+
+      then_count = 0
+      fail_count = 0
+      error = nil
+
+      buffer.save!.then do
+        then_count += 1
+      end.fail do |err|
+        fail_count += 1
+        error = err
+      end
+
+      expect(then_count).to eq(0)
+      expect(fail_count).to eq(1)
+      expect(error.class).to eq(Volt::Errors)
+      expect(error).to eq({:name=>["must be at least 5 characters"]})
+    end
+  end
 end

data/spec/models/model_spec.rb

@@ -518,10 +518,6 @@ describe Volt::Model do
       a.attributes = {first: 'Jimmy', last: 'Dean'}
       expect(a.new?).to eq(false)
     end
-
-    it 'should load store models ' do
-
-    end
   end
 
 
@@ -544,9 +540,5 @@ describe Volt::Model do
 
       expect(count).to eq(1)
     end
-
-    it 'should skip read permissions when checking create/update' do
-
-    end
   end
 end

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

@@ -14,7 +14,7 @@ module <%= config[:component_name].camelize %>
     # 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')
+      "#{params._component || 'main'}/#{params._controller || 'main'}/#{params._action || 'index'}"
     end
   end
 end

data/templates/controller/http_controller.rb.tt

@@ -0,0 +1,5 @@
+module <%= config[:component_module] %>
+  class <%= config[:http_controller_name] %> < Volt::HttpController
+
+  end
+end

data/templates/controller/model_controller.rb.tt

@@ -0,0 +1,5 @@
+module <%= config[:component_module] %>
+  class <%= config[:model_controller_name] %> < Volt::ModelController
+
+  end
+end

data/templates/model/model.rb.tt

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

data/templates/project/Gemfile.tt

@@ -7,10 +7,10 @@ gem 'volt', '<%= config[:version] %>'
 gem 'volt-bootstrap', '~> 0.0.10'
 
 # Simple theme for bootstrap, remove to theme yourself.
-gem 'volt-bootstrap-jumbotron-theme', '~> 0.0.5'
+gem 'volt-bootstrap_jumbotron_theme', '~> 0.0.5'
 
 # User templates for login, signup, and logout menu.
-gem 'volt-user-templates', '~> 0.1.0'
+gem 'volt-user_templates', '~> 0.1.0'
 
 # Server for MRI
 platform :mri do

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

@@ -5,7 +5,7 @@
 component 'bootstrap'
 
 # a default theme for the bootstrap framework
-component 'bootstrap-jumbotron-theme'
+component 'bootstrap_jumbotron_theme'
 
 # provides templates for login, signup, and logout
-component 'user-templates'
+component 'user_templates'

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

@@ -2,9 +2,9 @@
 
 client '/about', action: 'about'
 
-# Routes for login and signup, provided by user-templates component gem
-client '/signup', controller: 'user-templates', action: 'signup'
-client '/login', controller: 'user-templates', action: 'login'
+# Routes for login and signup, provided by user_templates component gem
+client '/signup', component: 'user_templates', controller: 'signup'
+client '/login', component: 'user_templates', controller: 'login'
 
 # The main route, this should be last. It will match any params not
 # previously matched.

data/templates/project/app/main/controllers/main_controller.rb

@@ -1,25 +1,27 @@
 # By default Volt generates this controller for your Main component
-class MainController < Volt::ModelController
-  def index
-    # Add code for when the index view is loaded
-  end
+module Main
+  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
+    def about
+      # Add code for when the about view is loaded
+    end
 
-  private
+    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
+    # 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._component, params._controller, and params._action values.
+    def main_path
+      "#{params._component || 'main'}/#{params._controller || 'main'}/#{params._action || 'index'}"
+    end
 
-  # Determine if the current nav component is the active one by looking
-  # at the first part of the url against the href attribute.
-  def active_tab?
-    url.path.split('/')[1] == attrs.href.split('/')[1]
+    # Determine if the current nav component is the active one by looking
+    # at the first part of the url against the href attribute.
+    def active_tab?
+      url.path.split('/')[1] == attrs.href.split('/')[1]
+    end
   end
-end
+end

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

@@ -7,7 +7,7 @@
       <ul class="nav nav-pills pull-right">
         <:nav href="/">Home</:nav>
         <:nav href="/about">About</:nav>
-        <:user-templates:menu />
+        <:user_templates:menu />
       </ul>
       <h3 class="text-muted"><%= config[:name] %></h3>
     </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.8.27.beta7
+  version: 0.8.27.beta8
 platform: ruby
 authors:
 - Ryan Stout
@@ -498,7 +498,6 @@ files:
 - lib/volt/extra_core/string.rb
 - lib/volt/extra_core/stringify_keys.rb
 - lib/volt/extra_core/symbol.rb
-- lib/volt/extra_core/true_false.rb
 - lib/volt/models.rb
 - lib/volt/models/array_model.rb
 - lib/volt/models/associations.rb
@@ -731,6 +730,8 @@ files:
 - templates/component/models/.empty_directory
 - templates/component/tasks/.empty_directory
 - templates/component/views/main/index.html.tt
+- templates/controller/http_controller.rb.tt
+- templates/controller/model_controller.rb.tt
 - templates/model/model.rb.tt
 - templates/newgem/Gemfile.tt
 - templates/newgem/LICENSE.txt.tt

data/lib/volt/extra_core/true_false.rb

@@ -1,44 +0,0 @@
-# The true?/false? predicates are convience methods since if ..reactive_value.. does
-# not correctly evaluate.  The reason for this is that ruby currently does not allow
-# anything besides nil and false to be falsy.
-
-class Object
-  def true?
-    true
-  end
-
-  def false?
-    false
-  end
-end
-
-class FalseClass
-  def true?
-    false
-  end
-
-  def false?
-    true
-  end
-end
-
-class NilClass
-  def true?
-    false
-  end
-
-  def false?
-    true
-  end
-end
-
-# Opal only has a single class for true/false
-class Boolean
-  def true?
-    self
-  end
-
-  def false?
-    self
-  end
-end