volt 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cb6fdeeaa6a10b0a3d1c81805a3feda5df1f60d
-  data.tar.gz: b833be5d63e7db1d7b8f9a1af8afee11d526e8d5
+  metadata.gz: d6c8120ac8ce1215c7a6f6b0b8df7c204096d62c
+  data.tar.gz: d02edaf4a739538d391a9258f33f71fbba3a8d67
 SHA512:
-  metadata.gz: 29913c4b065abdc2960154fbace2edb83a8ea92e6f7955d538541b05227875770d327136d9d2e02e3d6c00642894545d0b917b63f085456dacbd5f1a37f11275
-  data.tar.gz: 1a73d3935e08f24fc64aa2f7dbca692d4cd27aeda930e9d1045c4e47938fea9ef47badd3ffeebbbea8b4fc004efd6d1a7d5e8dea69bc5a6496c06f0522df023e
+  metadata.gz: f2ecb0bfc7ddd045d837ff0144b272d4791a6e60e3e15ff370cbfdcdb5a48f009823f4bdc0f0a53405dfe234b56d2acab41ff3fa2359c3ea79d80c51195d8216
+  data.tar.gz: beb777e469522b093ee1453145d9a4256ff661e4503639a2eb95bb835f714e67e02e267ca017ae0b1c7665732b023e64c80b1a2c06bb685fd4aa0e785c35896d

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.6

data/lib/volt/cli/asset_compile.rb

@@ -36,14 +36,14 @@ class CLI
     def write_component_js
       component_paths = ComponentPaths.new(Volt.root)
 
-      code = ComponentCode.new('home', component_paths).code
+      code = ComponentCode.new('main', component_paths).code
 
       javascript_code = Opal.compile(code)
 
       components_folder = File.join(Volt.root, '/public/components')
       puts "CF: #{components_folder}"
       FileUtils.mkdir_p(components_folder)
-      File.open(File.join(components_folder, '/home.js'), 'w') do |file|
+      File.open(File.join(components_folder, '/main.js'), 'w') do |file|
         file.write(javascript_code)
       end
     end

data/lib/volt/models/url.rb

@@ -49,6 +49,8 @@ class URL
 
     scroll
 
+    trigger_for_methods!('changed', :path)
+
     return true
   end
 

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

@@ -1,5 +1,6 @@
 require 'volt/page/bindings/base_binding'
 require 'volt/page/template_renderer'
+require 'volt/page/bindings/template_binding/grouped_controllers'
 
 class TemplateBinding < BaseBinding
   def initialize(page, target, context, binding_name, binding_in_path, getter)
@@ -22,6 +23,12 @@ class TemplateBinding < BaseBinding
       @arguments = section
     end
 
+    # Sometimes we want multiple template bindings to share the same controller (usually
+    # when displaying a :Title and a :Body), this instance tracks those.
+    if @options && (controller_group = @options[:controller_group])
+      @grouped_controller = GroupedControllers.new(controller_group)
+    end
+
     # Run the initial render
     update
 
@@ -58,15 +65,15 @@ class TemplateBinding < BaseBinding
   # until a file is either found or the component level is reached.
   #
   # The defaults are as follows:
-  # 1. component - home
-  # 2. controller - index
-  # 3. view - index
+  # 1. component - main
+  # 2. controller - main
+  # 3. view - main
   # 4. section - body
   def path_for_template(lookup_path, force_section=nil)
     parts = lookup_path.split('/')
     parts_size = parts.size
 
-    default_parts = ['home', 'index', 'index', 'body']
+    default_parts = ['main', 'main', 'index', 'body']
 
     # When forcing a sub template, we can default the sub template section
     default_parts[-1] = force_section if force_section
@@ -106,6 +113,14 @@ class TemplateBinding < BaseBinding
     return nil, nil
   end
 
+  # Called when the path changes.  If we are sharing a controller, clear the cached
+  # controller before we queue
+  def queue_update
+    @grouped_controller.clear if @grouped_controller
+
+    super
+  end
+
   def update
     full_path, controller_path = path_for_template(@path.cur, @section.cur)
     # puts "UPDATE: #{@path.inspect} - #{full_path.inspect}"
@@ -128,61 +143,36 @@ class TemplateBinding < BaseBinding
   def render_template(full_path, controller_path)
     args = @arguments ? [@arguments] : []
 
-    # TODO: at the moment a :body section and a :title will both initialize different
-    # controllers.  Maybe we should have a way to tie them together?
-    controller_class, action = get_controller(controller_path)
+    @controller = nil
 
-    if controller_class
-      # Setup the controller
-      current_context = controller_class.new(*args)
-    else
-      current_context = ModelController.new(*args)
-    end
-    @controller = current_context
+    # Fetch grouped controllers if we're grouping
+    @controller = @grouped_controller.get if @grouped_controller
 
-    # Trigger the action
-    @controller.send(action) if @controller.respond_to?(action)
+    # Otherwise, make a new controller
+    unless @controller
+      controller_class, action = get_controller(controller_path)
 
-    @current_template = TemplateRenderer.new(@page, @target, current_context, @binding_name, full_path)
+      if controller_class
+        # Setup the controller
+        @controller = controller_class.new(*args)
+      else
+        @controller = ModelController.new(*args)
+      end
 
-    call_ready
-  end
+      # Trigger the action
+      @controller.send(action) if @controller.respond_to?(action)
 
+      # Track the grouped controller
+      @grouped_controller.set(@controller) if @grouped_controller
+    end
 
+    @current_template = TemplateRenderer.new(@page, @target, @controller, @binding_name, full_path)
 
-  # # The context for templates can be either a controller, or the original context.
-  # def render_template(full_path, controller_path)
-  #   # TODO: at the moment a :body section and a :title will both initialize different
-  #   # controllers.  Maybe we should have a way to tie them together?
-  #   controller_class, action = get_controller(controller_path)
-  #   if controller_class
-  #     args = []
-  #     puts "MODEL: #{@arguments.inspect}"
-  #     args << SubContext.new(@arguments) if @arguments
-  #
-  #     # Setup the controller
-  #     current_context = controller_class.new(*args)
-  #     @controller = current_context
-  #
-  #     # Trigger the action
-  #     @controller.send(action) if @controller.respond_to?(action)
-  #   else
-  #     # Pass the context directly
-  #     current_context = @context
-  #     @controller = nil
-  #   end
-  #
-  #   @current_template = TemplateRenderer.new(@page, @target, current_context, @binding_name, full_path)
-  #
-  #   call_ready
-  # end
+    call_ready
+  end
 
   def call_ready
     if @controller
-      if @controller.respond_to?(:section=)
-        @controller.section = @current_template.section
-      end
-
       if @controller.respond_to?(:dom_ready)
         @controller.dom_ready
       end
@@ -190,6 +180,8 @@ class TemplateBinding < BaseBinding
   end
 
   def remove
+    @grouped_controller.clear if @grouped_controller
+
     if @path_changed_listener
       @path_changed_listener.remove
       @path_changed_listener = nil
@@ -230,7 +222,7 @@ class TemplateBinding < BaseBinding
       parts = controller_path[0..-2].map {|v| v.gsub('-', '_').camelize }
 
       # Home doesn't get namespaced
-      if parts.first == 'Home'
+      if parts.first == 'Main'
         parts.shift
       end
 

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

@@ -0,0 +1,21 @@
+# Some template bindings share the controller with other template bindings based
+# on a name.  This class stores those and provides helper methods to clear/set/get.
+class GroupedControllers
+  @@controllers = {}
+
+  def initialize(name)
+    @name = name
+  end
+
+  def get
+    @@controllers[@name]
+  end
+
+  def set(controller)
+    @@controllers[@name] = controller
+  end
+
+  def clear
+    @@controllers.delete(@name)
+  end
+end

data/lib/volt/page/page.rb

@@ -43,8 +43,6 @@ class Page
   attr_reader :url, :params, :page, :templates, :routes, :draw_cycle, :events
 
   def initialize
-    # debugger
-    puts "------ Page Loaded -------"
     @model_classes = {}
 
     # Run the code to setup the page
@@ -163,10 +161,10 @@ class Page
     # Do the initial url params parse
     @url_tracker.url_updated(true)
 
-    main_controller = IndexController.new
+    main_controller = MainController.new
 
     # Setup main page template
-    TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'home/index/index/body')
+    TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
 
     # Setup title listener template
     title_target = AttributeTarget.new
@@ -175,7 +173,7 @@ class Page
       # puts "SET TITLE: #{title.inspect}: #{title_target.inspect}"
       `document.title = title;`
     end
-    TemplateRenderer.new(self, title_target, main_controller, "main", "home/index/index/title")
+    TemplateRenderer.new(self, title_target, main_controller, "main", "main/main/main/title")
 
     # TODO: this dom ready should really happen in the template renderer
     main_controller.dom_ready if main_controller.respond_to?(:dom_ready)

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

@@ -83,7 +83,7 @@ class AssetFiles
     else
       opal_js_files << '/assets/volt/page/page.js'
     end
-    opal_js_files << '/components/home.js'
+    opal_js_files << '/components/main.js'
 
     javascript_files += opal_js_files
 

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

@@ -10,8 +10,8 @@ class ComponentHtmlRenderer
     req = Rack::Request.new(env)
     path = req.path
 
-    # For now just assume home
-    component_name = 'home'
+    # For now just assume main
+    component_name = 'main'
 
     page = Page.new
 

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

@@ -10,7 +10,7 @@ class IndexFiles
 
     @@router ||= Routes.new.define do
       # Find the route file
-      home_path = component_paths.component_path('home')
+      home_path = component_paths.component_path('main')
       route_file = File.read("#{home_path}/config/routes.rb")
       eval(route_file)
     end
@@ -41,11 +41,11 @@ class IndexFiles
 
   def javascript_files
     # TODO: Cache somehow, this is being loaded every time
-    AssetFiles.new('home', @component_paths).javascript_files(@opal_files)
+    AssetFiles.new('main', @component_paths).javascript_files(@opal_files)
   end
 
   def css_files
-    AssetFiles.new('home', @component_paths).css_files
+    AssetFiles.new('main', @component_paths).css_files
   end
 
 

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

@@ -0,0 +1,3 @@
+class MainController < ModelController
+  model :page
+end

data/spec/page/bindings/content_binding_spec.rb

@@ -19,7 +19,7 @@ describe ContentBinding do
     binding = lambda {|page, target, context, id| ContentBinding.new(page, target, context, id, Proc.new { self[:name] }) }
 
     templates = {
-      'home/index' => {
+      'main/main' => {
         'html' => 'hello <!-- $1 --><!-- $/1 -->',
         'bindings' => {1 => [binding]}
       }
@@ -30,7 +30,7 @@ describe ContentBinding do
 
     dom = AttributeTarget.new(0)
 
-    TemplateRenderer.new(page, dom, context, 'main', 'home/index')
+    TemplateRenderer.new(page, dom, context, 'main', 'main/main')
 
     expect(dom.to_html).to eq('hello jimmy')
   end

data/spec/page/bindings/template_binding_spec.rb

@@ -16,7 +16,7 @@ describe TemplateBinding do
     # TODO: We should decouple things so we don't need to allocate
     @template_binding = TemplateBinding.allocate
     @template_binding.instance_variable_set('@page', @page)
-    @template_binding.setup_path('home/index/index')
+    @template_binding.setup_path('main/main/main')
   end
 
   def set_template(templates)
@@ -29,33 +29,33 @@ describe TemplateBinding do
 
   it "should lookup nested controller action" do
     @templates = {
-      'home/index/blog/nav' => '',
-      'home/comments/new/body' => '',
+      'main/main/blog/nav' => '',
+      'main/comments/new/body' => '',
     }
 
     result = @template_binding.path_for_template('comments/new').last
-    expect(result).to eq(['home', 'comments_controller', 'new'])
+    expect(result).to eq(['main', 'comments_controller', 'new'])
   end
 
   it "it should not look in the local component/controller for a specified controller/action" do
     @templates = {
-      'home/comments/new/body' => ''
+      'main/comments/new/body' => ''
     }
 
     path, result = @template_binding.path_for_template('comments/new')
-    expect(path).to eq('home/comments/new/body')
-    expect(result).to eq(['home', 'comments_controller', 'new'])
+    expect(path).to eq('main/comments/new/body')
+    expect(result).to eq(['main', 'comments_controller', 'new'])
   end
 
 
   it "should handle a tripple lookup" do
     @templates = {
-      'home/comments/new/errors' => '',
+      'main/comments/new/errors' => '',
       'comments/new/errors/body' => ''
     }
 
     path, result = @template_binding.path_for_template('comments/new/errors')
-    expect(path).to eq('home/comments/new/errors')
+    expect(path).to eq('main/comments/new/errors')
     expect(result).to eq(nil)
   end
 
@@ -72,75 +72,75 @@ describe TemplateBinding do
 
   it "should find a matching component" do
     @templates = {
-      'comments/new/index/body' => ''
+      'comments/new/main/body' => ''
     }
 
     path, result = @template_binding.path_for_template('comments/new')
-    expect(path).to eq('comments/new/index/body')
-    expect(result).to eq(['comments', 'new_controller', 'index'])
+    expect(path).to eq('comments/new/main/body')
+    expect(result).to eq(['comments', 'new_controller', 'main'])
   end
 
   it "should lookup sub-templates within its own file" do
     @templates = {
-      'home/index/blog/nav' => '',
-      'home/index/index/nav' => '',
+      'main/main/blog/nav' => '',
+      'main/main/main/nav' => '',
     }
 
-    expect(@template_binding.path_for_template('nav').first).to eq('home/index/index/nav')
+    expect(@template_binding.path_for_template('nav').first).to eq('main/main/main/nav')
   end
 
   it "should lookup sub-templates within another local view" do
     @templates = {
-      'home/index/blog/nav' => '',
-      'home/index/index/nav' => '',
+      'main/main/blog/nav' => '',
+      'main/main/main/nav' => '',
     }
 
-    expect(@template_binding.path_for_template('blog/nav').first).to eq('home/index/blog/nav')
+    expect(@template_binding.path_for_template('blog/nav').first).to eq('main/main/blog/nav')
   end
 
   it "should lookup in another view" do
     @templates = {
-      'home/index/nav/body' => '',
+      'main/main/nav/body' => '',
     }
 
-    expect(@template_binding.path_for_template('nav').first).to eq('home/index/nav/body')
+    expect(@template_binding.path_for_template('nav').first).to eq('main/main/nav/body')
   end
 
   it "should lookup in a controller" do
     @templates = {
-      'home/nav/index/body' => ''
+      'main/nav/main/body' => ''
     }
 
-    expect(@template_binding.path_for_template('nav').first).to eq('home/nav/index/body')
+    expect(@template_binding.path_for_template('nav').first).to eq('main/nav/main/body')
   end
 
   it "should lookup in a controller/view" do
     @templates = {
-      'home/blog/nav/body' => ''
+      'main/blog/nav/body' => ''
     }
 
-    expect(@template_binding.path_for_template('blog/nav').first).to eq('home/blog/nav/body')
+    expect(@template_binding.path_for_template('blog/nav').first).to eq('main/blog/nav/body')
   end
 
   it "should lookup in a controller" do
     @templates = {
-      'home/nav/index/body' => ''
+      'main/nav/main/body' => ''
     }
 
-    expect(@template_binding.path_for_template('nav').first).to eq('home/nav/index/body')
+    expect(@template_binding.path_for_template('nav').first).to eq('main/nav/main/body')
   end
 
   it "should lookup in a component" do
     @templates = {
-      'nav/index/index/body' => ''
+      'nav/main/main/body' => ''
     }
 
-    expect(@template_binding.path_for_template('nav').first).to eq('nav/index/index/body')
+    expect(@template_binding.path_for_template('nav').first).to eq('nav/main/main/body')
   end
 
   it "should lookup in a component/controller/view" do
     @templates = {
-      'nav/index/index/body' => '',
+      'nav/main/main/body' => '',
       'auth/login/new/body' => ''
     }
 
@@ -149,10 +149,10 @@ describe TemplateBinding do
 
   it "should let you force a sub template" do
     @templates = {
-      'nav/index/index/title' => '',
+      'nav/main/main/title' => '',
       'auth/login/new/title' => ''
     }
 
-    expect(@template_binding.path_for_template('nav', 'title').first).to eq('nav/index/index/title')
+    expect(@template_binding.path_for_template('nav', 'title').first).to eq('nav/main/main/title')
   end
 end

data/spec/server/html_parser/view_parser_spec.rb

@@ -7,10 +7,10 @@ describe ViewParser do
   it "should parse content bindings" do
     html = "<p>Some {content} binding, {name}</p>"
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      'home/index/index/body' => {
+      'main/main/main/body' => {
         'html' => '<p>Some <!-- $0 --><!-- $/0 --> binding, <!-- $1 --><!-- $/1 --></p>',
         'bindings' => {
           0 => ["lambda { |__p, __t, __c, __id| ContentBinding.new(__p, __t, __c, __id, Proc.new { content }) }"],
@@ -34,23 +34,23 @@ describe ViewParser do
     </p>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq(    {
-      "home/index/index/body/__ifg0/__if0" => {
+      "main/main/main/body/__ifg0/__if0" => {
         "html" => "\n        text\n      "
       },
-      "home/index/index/body/__ifg0/__if1" => {
+      "main/main/main/body/__ifg0/__if1" => {
         "html" => "\n        <button>Button</button>\n      "
       },
-      "home/index/index/body/__ifg0/__if2" => {
+      "main/main/main/body/__ifg0/__if2" => {
         "html" => "\n        <a href=\"\">link</a>\n      "
       },
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "    <p>\n      Some\n      <!-- $0 --><!-- $/0 -->\n    </p>\n",
         "bindings" => {
           0 => [
-            "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [[Proc.new { showing == :text }, \"home/index/index/body/__ifg0/__if0\"], [Proc.new { showing == :button }, \"home/index/index/body/__ifg0/__if1\"], [nil, \"home/index/index/body/__ifg0/__if2\"]]) }"
+            "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [[Proc.new { showing == :text }, \"main/main/main/body/__ifg0/__if0\"], [Proc.new { showing == :button }, \"main/main/main/body/__ifg0/__if1\"], [nil, \"main/main/main/body/__ifg0/__if2\"]]) }"
           ]
         }
       }
@@ -73,28 +73,28 @@ describe ViewParser do
     </p>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq(    {
-      "home/index/index/body/__ifg0/__if0/__ifg0/__if0" => {
+      "main/main/main/body/__ifg0/__if0/__ifg0/__if0" => {
         "html"=>"\n          sub item text\n        "
       },
-      "home/index/index/body/__ifg0/__if0" => {
+      "main/main/main/body/__ifg0/__if0" => {
         "html" => "\n        <!-- $0 --><!-- $/0 -->\n      ",
         "bindings" => {
           0 => [
-            "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [[Proc.new { sub_item }, \"home/index/index/body/__ifg0/__if0/__ifg0/__if0\"]]) }"
+            "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [[Proc.new { sub_item }, \"main/main/main/body/__ifg0/__if0/__ifg0/__if0\"]]) }"
           ]
         }
       },
-      "home/index/index/body/__ifg0/__if1" => {
+      "main/main/main/body/__ifg0/__if1" => {
         "html" => "\n        other\n      "
       },
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "    <p>\n      Some\n      <!-- $0 --><!-- $/0 -->\n    </p>\n",
         "bindings" => {
           0 => [
-            "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [[Proc.new { showing == :text }, \"home/index/index/body/__ifg0/__if0\"], [nil, \"home/index/index/body/__ifg0/__if1\"]]) }"
+            "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [[Proc.new { showing == :text }, \"main/main/main/body/__ifg0/__if0\"], [nil, \"main/main/main/body/__ifg0/__if1\"]]) }"
           ]
         }
       }
@@ -111,10 +111,10 @@ describe ViewParser do
       </div>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      "home/index/index/body/__template/0" => {
+      "main/main/main/body/__template/0" => {
         "html" => "\n          <p><!-- $0 --><!-- $/0 --></p>\n        ",
         "bindings" => {
           0 => [
@@ -122,11 +122,11 @@ describe ViewParser do
           ]
         }
       },
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "      <div class=\"main\">\n        <!-- $0 --><!-- $/0 -->\n      </div>\n",
         "bindings" => {
           0 => [
-            "lambda { |__p, __t, __c, __id| EachBinding.new(__p, __t, __c, __id, Proc.new { _items }, \"item\", \"home/index/index/body/__template/0\") }"
+            "lambda { |__p, __t, __c, __id| EachBinding.new(__p, __t, __c, __id, Proc.new { _items }, \"item\", \"main/main/main/body/__template/0\") }"
           ]
         }
       }
@@ -141,10 +141,10 @@ describe ViewParser do
       </div>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "      <div id=\"id0\">\n      </div>\n",
         "bindings" => {
           "id0" => [
@@ -161,10 +161,10 @@ describe ViewParser do
       </div>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      "home/index/index/body/_rv1" => {
+      "main/main/main/body/_rv1" => {
         "html" => "start <!-- $0 --><!-- $/0 --> <!-- $1 --><!-- $/1 --> string",
         "bindings" => {
           0 => [
@@ -175,11 +175,11 @@ describe ViewParser do
           ]
         }
       },
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "      <div id=\"id0\">\n      </div>\n",
         "bindings" => {
           "id0" => [
-            "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, \"class\", Proc.new { ReactiveTemplate.new(__p, __c, \"home/index/index/body/_rv1\") }) }"
+            "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, \"class\", Proc.new { ReactiveTemplate.new(__p, __c, \"main/main/main/body/_rv1\") }) }"
           ]
         }
       }
@@ -191,14 +191,14 @@ describe ViewParser do
     {#template "/home/temp/path"}
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "    <!-- $0 --><!-- $/0 -->\n",
         "bindings" => {
           0 => [
-            "lambda { |__p, __t, __c, __id| TemplateBinding.new(__p, __t, __c, __id, \"home/index/index/body\", Proc.new { [\"/home/temp/path\"] }) }"
+            "lambda { |__p, __t, __c, __id| TemplateBinding.new(__p, __t, __c, __id, \"main/main/main/body\", Proc.new { [\"/home/temp/path\"] }) }"
           ]
         }
       }
@@ -211,7 +211,7 @@ describe ViewParser do
     <a href="/{link_name}">Link</a>
     END
 
-    view = ViewParser.new(html, "home/index/index/body")
+    view = ViewParser.new(html, "main/main/main/body")
 
     # puts view.templates.inspect
   end
@@ -220,7 +220,7 @@ describe ViewParser do
     <a href="{link_name}">Link</a>
     END
 
-    view = ViewParser.new(html, "home/index/index/body")
+    view = ViewParser.new(html, "main/main/main/body")
 
     # puts view.templates.inspect
   end
@@ -238,13 +238,13 @@ describe ViewParser do
       <p>This text goes in the body</p>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq(    {
-      "home/index/index/title" => {
+      "main/main/main/title" => {
         "html" => "\n      This text goes in the title\n\n    "
       },
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "\n      <p>This text goes in the body</p>\n"
       }
     })
@@ -257,10 +257,10 @@ describe ViewParser do
     <textarea name="cool">some text in a textarea</textarea>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "    <textarea name=\"cool\">some text in a textarea</textarea>\n"
       }
     })
@@ -271,10 +271,10 @@ describe ViewParser do
     <textarea name="cool">{awesome}</textarea>
     END
 
-    view = ViewParser.new(html, "home/index/index")
+    view = ViewParser.new(html, "main/main/main")
 
     expect(view.templates).to eq({
-      "home/index/index/body" => {
+      "main/main/main/body" => {
         "html" => "    <textarea name=\"cool\" id=\"id1\"></textarea>\n",
         "bindings" => {
           "id1" => [

data/spec/server/rack/asset_files_spec.rb

@@ -19,7 +19,7 @@ if RUBY_PLATFORM != 'opal'
     it "should list all JS files" do
       main = AssetFiles.new("main", @component_paths)
 
-      expect(main.javascript_files(nil)).to eq(["/assets/js/jquery-2.0.3.js", "/assets/js/sockjs-0.3.4.min.js", "/assets/js/vertxbus.js", "/assets/js/bootstrap.js", "/assets/js/test2.js", "/assets/js/test3.js", "/assets/js/test1.js", "/assets/volt/page/page.js", "/components/home.js"])
+      expect(main.javascript_files(nil)).to eq(["/assets/js/jquery-2.0.3.js", "/assets/js/sockjs-0.3.4.min.js", "/assets/js/vertxbus.js", "/assets/js/bootstrap.js", "/assets/js/test2.js", "/assets/js/test3.js", "/assets/js/test1.js", "/assets/volt/page/page.js", "/components/main.js"])
     end
   end
 end

data/spec/templates/targets/binding_document/component_node_spec.rb

@@ -23,7 +23,7 @@ describe ComponentNode do
   #
   #   page = Page.new
   #
-  #   template = ViewParser.new(view, 'home/index/index/title')
+  #   template = ViewParser.new(view, main/main/main/index/index/title')
   #
   #   page.add_template
   # end

data/templates/newgem/app/newgem/controllers/main_controller.rb.tt

@@ -0,0 +1,4 @@
+module <%=config[:name].gsub(/^volt[-]/, '').gsub('-', '_').split("_").map {|s| s.capitalize }.join("") %>
+  class MainController < ModelController
+  end
+end

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

@@ -0,0 +1,17 @@
+class MainController < 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

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

@@ -0,0 +1,29 @@
+<:Title>
+  {#template main_path, "title", {controller_group: 'main'}}
+
+<:Body>
+  <div class="container">
+    <div class="header">
+      <ul class="nav nav-pills pull-right">
+        <:nav href="/" text="Home" />
+        <:nav href="/blog" text="Blog" />
+        <:nav href="/about" text="About" />
+      </ul>
+      <h3 class="text-muted">Project name</h3>
+    </div>
+
+    <:volt:notices />
+
+    {#template main_path, 'body', {controller_group: 'main'}}
+
+    <div class="footer">
+      <p>&copy; Company 2014</p>
+    </div>
+
+  </div>
+
+<:Nav>
+  <li class="{#if url.path.split('/')[1] == @href.split('/')[1]}active{/}">
+    <a href="{@href}">{@text}</a>
+  </li>
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Ryan Stout
@@ -408,6 +408,7 @@ files:
 - lib/volt/page/bindings/event_binding.rb
 - lib/volt/page/bindings/if_binding.rb
 - lib/volt/page/bindings/template_binding.rb
+- lib/volt/page/bindings/template_binding/grouped_controllers.rb
 - lib/volt/page/channel.rb
 - lib/volt/page/channel_stub.rb
 - lib/volt/page/document.rb
@@ -478,9 +479,9 @@ files:
 - spec/apps/file_loading/app/slideshow/assets/js/test3.js
 - spec/apps/kitchen_sink/.gitignore
 - spec/apps/kitchen_sink/Gemfile
-- spec/apps/kitchen_sink/app/home/config/routes.rb
-- spec/apps/kitchen_sink/app/home/controllers/index_controller.rb
-- spec/apps/kitchen_sink/app/home/views/index/index.html
+- spec/apps/kitchen_sink/app/main/config/routes.rb
+- spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
+- spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
 - spec/extra_core/inflector_spec.rb
@@ -526,8 +527,8 @@ files:
 - templates/newgem/app/newgem/assets/js/.empty_directory
 - templates/newgem/app/newgem/config/dependencies.rb
 - templates/newgem/app/newgem/config/routes.rb
-- templates/newgem/app/newgem/controllers/index_controller.rb.tt
-- templates/newgem/app/newgem/views/index/index.html
+- templates/newgem/app/newgem/controllers/main_controller.rb.tt
+- templates/newgem/app/newgem/views/main/main.html
 - templates/newgem/bin/newgem.tt
 - templates/newgem/gitignore.tt
 - templates/newgem/lib/newgem.rb.tt
@@ -542,15 +543,15 @@ files:
 - templates/project/Gemfile.tt
 - templates/project/README.md.tt
 - templates/project/app/.empty_directory
-- templates/project/app/home/assets/css/.empty_directory
-- templates/project/app/home/assets/js/.empty_directory
-- templates/project/app/home/config/dependencies.rb
-- templates/project/app/home/config/routes.rb
-- templates/project/app/home/controllers/index_controller.rb
-- templates/project/app/home/models/.empty_directory
-- templates/project/app/home/views/index/about.html
-- templates/project/app/home/views/index/home.html
-- templates/project/app/home/views/index/index.html
+- templates/project/app/main/assets/css/.empty_directory
+- templates/project/app/main/assets/js/.empty_directory
+- templates/project/app/main/config/dependencies.rb
+- templates/project/app/main/config/routes.rb
+- templates/project/app/main/controllers/main_controller.rb
+- templates/project/app/main/models/.empty_directory
+- templates/project/app/main/views/main/about.html
+- templates/project/app/main/views/main/index.html
+- templates/project/app/main/views/main/main.html
 - templates/project/config.ru
 - templates/project/public/index.html
 - templates/project/spec/spec_helper.rb
@@ -589,9 +590,9 @@ test_files:
 - spec/apps/file_loading/app/slideshow/assets/js/test3.js
 - spec/apps/kitchen_sink/.gitignore
 - spec/apps/kitchen_sink/Gemfile
-- spec/apps/kitchen_sink/app/home/config/routes.rb
-- spec/apps/kitchen_sink/app/home/controllers/index_controller.rb
-- spec/apps/kitchen_sink/app/home/views/index/index.html
+- spec/apps/kitchen_sink/app/main/config/routes.rb
+- spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
+- spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
 - spec/extra_core/inflector_spec.rb

data/spec/apps/kitchen_sink/app/home/controllers/index_controller.rb

@@ -1,3 +0,0 @@
-class IndexController < ModelController
-  model :page
-end

data/templates/newgem/app/newgem/controllers/index_controller.rb.tt

@@ -1,11 +0,0 @@
-module <%=config[:name].gsub(/^volt[-]/, '').gsub('-', '_').split("_").map {|s| s.capitalize }.join("") %>
-  class IndexController < ModelController
-    model :page
-    
-    attr_accessor :data
-    
-    def initialize(data)
-      @data = data
-    end
-  end
-end

data/templates/project/app/home/controllers/index_controller.rb

@@ -1,9 +0,0 @@
-class IndexController < ModelController
-  def index
-    # Add code for when the main page is loaded
-  end
-
-  def home
-    # Add code for when the home view is loaded
-  end
-end

data/templates/project/app/home/views/index/index.html

@@ -1,29 +0,0 @@
-<:Title>
-  {#template params._controller.or('index') + '/' + params._action.or('home'), "title"}
-
-<:Body>
-  <div class="container">
-    <div class="header">
-      <ul class="nav nav-pills pull-right">
-        <:nav action="" text="Home" />
-        <:nav action="about" text="About" />
-      </ul>
-      <h3 class="text-muted">Project name</h3>
-    </div>
-
-    <:volt:notices />
-
-    {#template params._controller.or('index') + '/' + params._action.or('home')}
-
-    <div class="footer">
-      <p>&copy; Company 2014</p>
-    </div>
-
-  </div>
-
-
-<:Nav>
-  <li class="{#if params._action.or('') == @action}active{/}">
-    <a href="/{@action}">{@text}</a>
-  </li>
-