volt 0.6.5 → 0.7.0

data/spec/tasks/query_tracker_spec.rb

@@ -3,7 +3,7 @@ if RUBY_PLATFORM != 'opal'
     before do
       load File.join(File.dirname(__FILE__), "../../app/volt/tasks/live_query/live_query.rb")
     end
-    
+
     # LiveQueryStub behaves as the front-end would with the changes to a
     # live query.  Instead of passing changes to the models to the front
     # end, the changes are applied locally, then can be checked to see if
@@ -15,50 +15,50 @@ if RUBY_PLATFORM != 'opal'
         @query = {}
         @items = []
       end
-      
+
       def notify_removed(ids, skip_channel)
         # Remove the id's that need to be removed
         @items.reject! {|item| ids.include?(item['_id']) }
       end
-      
+
       def notify_added(index, data, skip_channel)
         @items.insert(index, data)
       end
-      
+
       def notify_moved(id, index, skip_channel)
         item = @items.find {|item| item['_id'] == id }
         @items.delete(item)
-        
+
         @items.insert(index, item)
       end
     end
-    
+
     before do
       # Setup a live query stub
       @live_query = LiveQueryStub.new
       data_store = double('data store')
-      
+
       # return an empty collection
       @items = []
       expect(data_store).to receive(:query).at_least(:once) { @items.dup }
-      
+
       @query_tracker = QueryTracker.new(@live_query, data_store)
       @query_tracker.run
-      
+
     end
-    
+
     it "should add items" do
       @items = [
         {'_id' => 1, '_name' => 'one'}
       ]
-      
+
       expect(@live_query.items).to eq([])
 
       @query_tracker.run
 
       expect(@live_query.items).to eq(@items)
     end
-    
+
     it "should remove items" do
       @items = [
         {'_id' => 1, '_name' => 'one'},
@@ -66,14 +66,14 @@ if RUBY_PLATFORM != 'opal'
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
-      
+
       @items = [
         {'_id' => 2, '_name' => 'two'}
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
     end
-    
+
     it "should move items" do
       @items = [
         {'_id' => 1, '_name' => 'one'},
@@ -82,7 +82,7 @@ if RUBY_PLATFORM != 'opal'
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
-      
+
       @items = [
         {'_id' => 2, '_name' => 'two'},
         {'_id' => 3, '_name' => 'three'},
@@ -91,7 +91,7 @@ if RUBY_PLATFORM != 'opal'
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
     end
-    
+
     it "should handle complex transforms" do
       @items = [
         {'_id' => 1, '_name' => 'one'},
@@ -102,7 +102,7 @@ if RUBY_PLATFORM != 'opal'
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
-      
+
       @items = [
         {'_id' => 7, '_name' => 'seven'},
         {'_id' => 4, '_name' => 'four'},
@@ -113,8 +113,8 @@ if RUBY_PLATFORM != 'opal'
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
-      
+
     end
-    
+
   end
-end
+end

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

@@ -5,14 +5,14 @@ describe ComponentNode do
     html = <<-END
     <!-- $0 -->Before  <!-- $1 -->Inside<!-- $/1 -->  After<!-- $/0 -->
     END
-    
+
     @component = ComponentNode.new
     @component.html = html
   end
-  
+
   it "should find a component from a binding id" do
     expect(@component.find_by_binding_id(1).to_html).to eq('Inside')
     expect(@component.find_by_binding_id(0).to_html).to eq('Before  Inside  After')
-    
+
   end
-end
+end

data/spec/templates/template_binding_spec.rb

@@ -11,94 +11,94 @@ describe TemplateBinding do
   before do
     @page = double('page')
     expect(@page).to receive(:templates).at_least(1).times.and_return { @templates }
-    
+
     # 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')
   end
-  
+
   def set_template(templates)
     @page.instance_variable_set('@templates', templates)
   end
-  
+
   after do
     $page = nil
   end
-  
+
   it "should lookup sub-templates within its own file" do
     @templates = {
       'home/index/blog/nav' => '',
       'home/index/index/nav' => '',
     }
-    
+
     expect(@template_binding.path_for_template('nav').first).to eq('home/index/index/nav')
   end
-  
+
   it "should lookup sub-templates within another local view" do
     @templates = {
       'home/index/blog/nav' => '',
       'home/index/index/nav' => '',
     }
-    
+
     expect(@template_binding.path_for_template('blog/nav').first).to eq('home/index/blog/nav')
   end
-  
+
   it "should lookup in another view" do
     @templates = {
       'home/index/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('home/index/nav/body')
   end
-  
+
   it "should lookup in a controller" do
     @templates = {
       'home/nav/index/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('home/nav/index/body')
   end
-  
+
   it "should lookup in a controller/view" do
     @templates = {
       'home/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('home/blog/nav/body')
   end
-  
+
   it "should lookup in a controller" do
     @templates = {
       'home/nav/index/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('home/nav/index/body')
   end
-  
+
   it "should lookup in a component" do
     @templates = {
       'nav/index/index/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/index/index/body')
   end
-  
+
   it "should lookup in a component/controller/view" do
     @templates = {
       'nav/index/index/body' => '',
       'auth/login/new/body' => ''
     }
-    
+
     expect(@template_binding.path_for_template('auth/login/new').first).to eq('auth/login/new/body')
   end
-  
+
   it "should let you force a sub template" do
     @templates = {
       'nav/index/index/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/index/index/title')
   end
-end
+end

data/spec/utils/generic_counting_pool_spec.rb

@@ -10,17 +10,17 @@ describe GenericCountingPool do
   before do
     @count_pool = CountingPoolTest.new
   end
-  
+
   it "should lookup and retrieve" do
     item1 = @count_pool.find('one')
-    
+
     item2 = @count_pool.find('one')
     item3 = @count_pool.find('two')
-    
+
     expect(item1).to eq(item2)
     expect(item2).to_not eq(item3)
   end
-  
+
   it "should only remove items when the same number have been removed as have been added" do
     item1 = @count_pool.find('_items', 'one')
     item2 = @count_pool.find('_items', 'one')
@@ -31,6 +31,6 @@ describe GenericCountingPool do
 
     @count_pool.remove('_items', 'one')
     expect(@count_pool.instance_variable_get('@pool')).to eq({})
-    
+
   end
 end

data/spec/utils/generic_pool_spec.rb

@@ -11,40 +11,40 @@ describe GenericPool do
   before do
     @pool_test = PoolTest.new
   end
-  
+
   it "should insert nested for fast lookup at a path" do
     item1 = @pool_test.lookup('_items', 'one')
     expect(@pool_test.instance_variable_get('@pool')).to eq({'_items' => {'one' => item1}})
   end
-  
+
   it "should retrieve the same item both times" do
-    item1 = @pool_test.lookup('_items', {})    
+    item1 = @pool_test.lookup('_items', {})
     item2 = @pool_test.lookup('_items', {})
-    expect(item1.object_id).to eq(item2.object_id)    
+    expect(item1.object_id).to eq(item2.object_id)
   end
-  
+
   it "should recreate after being removed" do
-    item1 = @pool_test.lookup('_items', {})    
+    item1 = @pool_test.lookup('_items', {})
     item2 = @pool_test.lookup('_items', {})
     expect(item1.object_id).to eq(item2.object_id)
-    
+
     @pool_test.remove('_items', {})
     item3 = @pool_test.lookup('_items', {})
     expect(item3.object_id).to_not eq(item2.object_id)
   end
-  
+
   it "should remove all of the way down" do
     @pool_test.instance_variable_set('@pool', {:name => {:ok => true}, :yep => true})
-    
+
     @pool_test.remove(:name, :ok)
-    
+
     expect(@pool_test.instance_variable_get('@pool')).to eq({:yep => true})
   end
-  
+
   it "should lookup all items at a path" do
-    item1 = @pool_test.lookup('_items', '_some', {:name => 'bob'})    
+    item1 = @pool_test.lookup('_items', '_some', {:name => 'bob'})
     item2 = @pool_test.lookup('_items', '_some', {:name => 'jim'})
-    
+
     expect(@pool_test.lookup_all('_items', '_some')).to eq([item1, item2])
   end
-end
+end

data/templates/newgem/app/newgem/views/index/index.html

@@ -1,3 +1,2 @@
-<:body>
+<:Body>
 -- component --
-</:body>

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

@@ -1,4 +1,4 @@
-# Specify which components you wish to include when 
+# Specify which components you wish to include when
 # the "home" component loads.
 
 # bootstrap css framework

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

@@ -3,7 +3,7 @@ class IndexController < ModelController
 
   def initialize
     super
-    
+
     # Add controller setup code here
   end
 end

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

@@ -1,9 +1,7 @@
-<:title>
-About
-</:title>
+<:Title>
+  About
 
-<:body>
+<:Body>
   <h1>About</h1>
-  
+
   <p>About page...</p>
-</:body>

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

@@ -1,7 +1,6 @@
-<:title>
-Home
-</:title>
+<:Title>
+  Home
 
-<:body>
+<:Body>
   <h1>Home</h1>
-</:body>
+

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

@@ -1,8 +1,7 @@
-<:title>
+<:Title>
   {#template params._view.or('home'), "title"}
-</:title>
 
-<:body>
+<:Body>
   <div class="container">
     <div class="header">
       <ul class="nav nav-pills pull-right">
@@ -11,20 +10,20 @@
       </ul>
       <h3 class="text-muted">Project name</h3>
     </div>
-    
+
     <:volt:notices />
-    
+
     {#template params._view.or('home')}
-    
+
     <div class="footer">
       <p>&copy; Company 2014</p>
     </div>
 
   </div>
-</:body>
 
-<:nav>
+
+<:Nav>
   <li class="{#if params._view.or('') == view}active{/}">
     <a href="/{view}">{text}</a>
   </li>
-</:nav>
+

data/templates/project/spec/spec_helper.rb

@@ -15,6 +15,6 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-  
+
   config.enable_any_instance_mocks = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -425,6 +425,7 @@ files:
 - lib/volt/assets/test.rb
 - lib/volt/benchmark/benchmark.rb
 - lib/volt/cli.rb
+- lib/volt/cli/asset_compile.rb
 - lib/volt/cli/new_gem.rb
 - lib/volt/console.rb
 - lib/volt/controllers/model_controller.rb
@@ -498,19 +499,23 @@ files:
 - lib/volt/router/routes.rb
 - lib/volt/server.rb
 - lib/volt/server/banner.txt
-- lib/volt/server/binding_setup.rb
 - lib/volt/server/component_handler.rb
 - lib/volt/server/component_templates.rb
-- lib/volt/server/if_binding_setup.rb
+- lib/volt/server/html_parser/attribute_scope.rb
+- lib/volt/server/html_parser/each_scope.rb
+- lib/volt/server/html_parser/if_view_scope.rb
+- lib/volt/server/html_parser/sandlebars_parser.rb
+- lib/volt/server/html_parser/textarea_scope.rb
+- lib/volt/server/html_parser/view_handler.rb
+- lib/volt/server/html_parser/view_parser.rb
+- lib/volt/server/html_parser/view_scope.rb
 - lib/volt/server/rack/asset_files.rb
 - lib/volt/server/rack/component_paths.rb
 - lib/volt/server/rack/index_files.rb
 - lib/volt/server/rack/opal_files.rb
 - lib/volt/server/rack/source_map_server.rb
-- lib/volt/server/scope.rb
 - lib/volt/server/socket_connection_handler.rb
 - lib/volt/server/socket_connection_handler_stub.rb
-- lib/volt/server/template_parser.rb
 - lib/volt/store/mongo.rb
 - lib/volt/tasks/dispatcher.rb
 - lib/volt/utils/ejson.rb
@@ -542,9 +547,11 @@ files:
 - spec/page/bindings/content_binding_spec.rb
 - spec/page/sub_context_spec.rb
 - spec/router/routes_spec.rb
+- spec/server/html_parser/sample_page.html
+- spec/server/html_parser/sandlebars_parser_spec.rb
+- spec/server/html_parser/view_parser_spec.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
-- spec/server/template_parser_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/live_query_spec.rb
@@ -644,9 +651,11 @@ test_files:
 - spec/page/bindings/content_binding_spec.rb
 - spec/page/sub_context_spec.rb
 - spec/router/routes_spec.rb
+- spec/server/html_parser/sample_page.html
+- spec/server/html_parser/sandlebars_parser_spec.rb
+- spec/server/html_parser/view_parser_spec.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
-- spec/server/template_parser_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/live_query_spec.rb

data/lib/volt/server/binding_setup.rb

@@ -1,2 +0,0 @@
-class BindingSetup
-end

data/lib/volt/server/if_binding_setup.rb

@@ -1,31 +0,0 @@
-# With if bindings, we need to track each branch, which is on the
-# same scope level as the original if statement.  We use this class
-# to track each branch.
-
-require 'volt/server/binding_setup'
-class IfBindingSetup < BindingSetup
-  def initialize
-    @branches = []
-  end
-  
-  def add_branch(content, template_name)
-    @branches << [content, template_name]
-  end
-  
-  def to_setup_code
-    branches = @branches.map do |branch|
-      content = branch[0]
-      if content == nil
-        content = nil.inspect
-      else
-        content = "Proc.new { #{branch[0]} }"
-      end
-      
-      "[#{content}, #{branch[1].inspect}]"
-    end.join(', ')
-    
-    # variables are captured for branches, so we must prefix them so they don't conflict.
-    # page, target, context, id
-    "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [#{branches}]) }"
-  end
-end

data/lib/volt/server/scope.rb

@@ -1,43 +0,0 @@
-# Template parsing is fairly simple at the moment.  Basically we walk the dom and
-# do two types of replacements.
-# 1) replacement in text nodes
-# 2) attribute replacements
-
-class Scope
-  attr_accessor :bindings, :outer_binding_number, :closed_block_scopes, :last_if_binding
-
-  def initialize(outer_binding_number=nil)
-    # For block bindings, the outer binding number lets us know what the name
-    # of the comments are that go before/after this scope block.
-    @outer_binding_number = outer_binding_number
-    @bindings = {}
-  end
-
-  def add_closed_child_scope(scope)
-    @closed_block_scopes ||= []
-    @closed_block_scopes << scope
-  end
-
-  def add_binding(binding_name, setup_code)
-    @bindings[binding_name] ||= []
-    @bindings[binding_name] << setup_code
-  end
-  
-  def start_if_binding(binding_name, if_binding_setup)
-    @last_if_binding = [binding_name, if_binding_setup]
-  end
-  
-  def current_if_binding
-    @last_if_binding
-  end
-  
-  def close_if_binding!
-    if @last_if_binding
-      binding_name, if_binding_setup = @last_if_binding
-      @last_if_binding = nil
-      
-      add_binding(binding_name, if_binding_setup.to_setup_code)
-    end
-  end
-  
-end