volt 0.7.1 → 0.7.2

data/spec/router/routes_spec.rb

@@ -7,18 +7,166 @@ def routes(&block)
 end
 
 describe Routes do
+  it "should setup direct routes" do
+    routes do
+      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"}})
+  end
+
+  it "should setup indiect routes" do
+    routes do
+      get '/blog/{_id}/edit', _view: 'blog/edit'
+      get '/blog/{_id}', _view: 'blog/show'
+    end
+
+    indirect_routes = @routes.instance_variable_get(:@indirect_routes)
+    expect(indirect_routes).to eq(
+      {
+        "blog" => {
+          "*" => {
+            "edit" => {
+              nil => {:_view => "blog/edit", :_id => 1}
+            },
+            nil => {:_view => "blog/show", :_id => 1}
+          }
+        }
+      }
+    )
+  end
+
   it "should match routes" do
-    params = Model.new({}, persistor: Persistors::Params)
-    params._controller = 'blog'
-    params._index = '5'
+    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'
+    end
+
+    params = @routes.url_to_params('/blog')
+    expect(params).to eq({:_view => "blog"})
+
+    params = @routes.url_to_params('/blog/55/edit')
+    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"})
 
+    params = @routes.url_to_params('/blog/tags/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"})
+
+    params = @routes.url_to_params('/login/jim/user/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)
+
+  end
+
+  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'
+    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}
+    ])
+
+  end
+
+  it "should go from params to url" do
     routes do
-      get '/', _controller: 'index'
-      get '/blog', _controller: 'blog'
+      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
 
-    path, cleaned_params = @routes.url_for_params(params)
-    expect(path).to eq('/blog')
-    expect(cleaned_params).to eq({_index: '5'})
+    url, params = @routes.params_to_url({_view: 'blog/show', _id: '55'})
+    expect(url).to eq('/blog/55')
+    expect(params).to eq({})
+
+
+    url, params = @routes.params_to_url({_view: 'blog/edit', _id: '100'})
+    expect(url).to eq('/blog/100/edit')
+    expect(params).to eq({})
+
+    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'})
   end
+
+  it "should test that params match a param matcher" do
+    routes = Routes.new
+    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'})
+
+    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}})
+    expect(match).to eq(true)
+    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'}})
+    expect(match).to eq(true)
+    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'}})
+    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'})
+    expect(match).to eq(true)
+    expect(params).to eq({_extra: 'some value'})
+
+  end
+
+  # it "should match routes" do
+  #   params = Model.new({}, persistor: Persistors::Params)
+  #   params._controller = 'blog'
+  #   params._index = '5'
+  #
+  #   routes do
+  #     get '/', _controller: 'index'
+  #     get '/blog', _controller: 'blog'
+  #   end
+  #
+  #   path, cleaned_params = @routes.params_to_url(params)
+  #   expect(path).to eq('/blog')
+  #   expect(cleaned_params).to eq({_index: '5'})
+  # end
+  #
+  # it "should handle routes with bindings in them" do
+  #   params = Model.new({}, persistor: Persistors::Params)
+  #
+  #   routes do
+  #     get '/', _controller: 'index'
+  #     get '/blog/{_id}', _controller: 'blog'
+  #   end
+  #
+  #   params = @routes.url_to_params('/blog/20')
+  #   puts params.inspect
+  #
+  # end
 end

data/spec/server/html_parser/sandlebars_parser_spec.rb

@@ -1,25 +1,27 @@
+if RUBY_PLATFORM == 'opal'
+else
 require 'benchmark'
 require 'volt/server/html_parser/sandlebars_parser'
 
 class HTMLHandler
   attr_reader :html
-  
+
   def initialize
     @html = ''
   end
-  
+
   def comment(comment)
     @html << "<!--#{comment}-->"
   end
-  
+
   def text(text)
     @html << text
   end
-  
+
   def binding(binding)
     @html << "{#{binding}}"
   end
-  
+
   def start_tag(tag_name, attributes, unary)
     attr_str = attributes.map {|v| "#{v[0]}=\"#{v[1]}\"" }.join(' ')
     if attr_str.size > 0
@@ -28,7 +30,7 @@ class HTMLHandler
     end
     @html << "<#{tag_name}#{attr_str}#{unary ? ' /' : ''}>"
   end
-  
+
   def end_tag(tag_name)
     @html << "</#{tag_name}>"
   end
@@ -37,14 +39,14 @@ end
 def parse_url(url)
   require 'open-uri'
   html = open("http://#{url}").read
-  
+
   # html = File.read("/Users/ryanstout/Desktop/tests/#{url}1.html")
-  
+
   File.open("/Users/ryanstout/Desktop/tests/#{url}1.html", 'w') {|f| f.write(html) }
-  
+
   handler = HTMLHandler.new
   SandlebarsParser.new(html, handler)
-  
+
   File.open("/Users/ryanstout/Desktop/tests/#{url}2.html", 'w') {|f| f.write(handler.html) }
 end
 
@@ -52,141 +54,147 @@ describe SandlebarsParser do
   def test_html(html, match=nil)
     handler = HTMLHandler.new
     parser = SandlebarsParser.new(html, handler)
-    
+
     expect(handler.html).to eq(match || html)
   end
-  
+
   it "should handle a doctype" do
     html = "<!DOCTYPE html><p>text</p>"
-    
+
     test_html(html)
   end
-  
+
   it "should parse comments" do
     html = "<!-- my comment -->"
     test_html(html)
   end
-  
+
   it "should handle text" do
     html = "some text, <!-- a comment -->, some more text"
     test_html(html)
   end
-  
+
   it "should handle tags" do
     html = "<a name=\"cool\"></a>"
     test_html(html)
   end
-  
+
   it "should close tags" do
     html = "<div><p>test</p>"
     match = "<div><p>test</p></div>"
-    
+
     test_html(html, match)
   end
-  
+
   it "should handle a script tag with html in it" do
     html = "<script><!-- some js code <a>cool</a> here --></script>"
     match = "<script> some js code <a>cool</a> here </script>"
     test_html(html, match)
   end
-  
+
   it "should handle bindings" do
     html = "<p>some cool {text} is {awesome}</p>"
     test_html(html)
   end
-  
+
   it "should handle bindings with nested { and }" do
     html = "<p>testing with {nested { 'binding stuff' }}</p>"
     test_html(html)
   end
-  
+
   it "should raise an exception on an unclosed binding at the end of the document" do
     html = "<p>testing with {nested"
-    
+
     handler = HTMLHandler.new
     expect { SandlebarsParser.new(html, handler) }.to raise_error(HTMLParseError)
   end
-  
+
   it "should raise an exception on an unclosed binding" do
     html = "<p>testing with {nested </p>\n<p>ok</p>"
-    
+
     handler = HTMLHandler.new
-    expect { SandlebarsParser.new(html, handler) }.to raise_error(HTMLParseError)    
+    expect { SandlebarsParser.new(html, handler) }.to raise_error(HTMLParseError)
   end
-  
+
   it "should report the line number" do
     html = "\n\n<p>some paragraph</p>\n\n<p>testing with {nested </p>\n<p>ok</p>"
-    
+
     handler = HTMLHandler.new
-    expect { SandlebarsParser.new(html, handler) }.to raise_error(HTMLParseError, "unclosed binding: {nested </p> on line: 5")    
+    expect { SandlebarsParser.new(html, handler) }.to raise_error(HTMLParseError, "unclosed binding: {nested </p> on line: 5")
   end
-  
+
   it "should handle a bunch of things" do
     html = <<-END
     <p class="some class">This is my text <a href="something.com">something.com</a></p>
     END
-    
+
     test_html(html)
   end
-  
+
   it "should not jump between script tags" do
     html = "\n<script>some text</script>\n\n<script>inside 2</script>\n"
-    
+
     test_html(html)
   end
-  
+
   it "should not jump bindings" do
     html = "<p>{some} text {binding}</p>"
     test_html(html)
   end
-  
+
   it "should handle escaping things in a tripple escape" do
     html = "this is my {{{ tripple escape }}}"
     match = "this is my  tripple escape "
-    test_html(html, match) 
+    test_html(html, match)
   end
-  
+
   it "should let you escape { and }" do
     html = "should escape {{{{}}} and {{{}}}}"
     match = "should escape { and }"
-    test_html(html, match)    
+    test_html(html, match)
   end
-  
+
   it "should handle sandlebar tags" do
     html = "custom tag <:awesome name=\"yes\" />"
-    test_html(html) 
+    test_html(html)
   end
-  
+
   it "should keep the text after script" do
     html = "<ul><li>\n\n<script>\n\nsome js code\n\nmore\n\n</script>     \n     </li>   \n \n  </ul>"
     test_html(html)
   end
-  
+
   it "should handle dashes in attributes" do
     html = "<form accept-charset=\"UTF-8\"></form>"
     test_html(html)
   end
-  
+
   it "should handle conditional comments for IE" do
     html = "<!--[if ie6]>some ie only stuff<![endif]-->\n<br />"
     test_html(html)
   end
-  
+
   it "should be fast" do
     html = File.read(File.join(File.dirname(__FILE__), 'sample_page.html'))
     handler = HTMLHandler.new
     time = Benchmark.measure do
       SandlebarsParser.new(html, handler)
     end
-    
+
     # Less than 100ms
     expect(time.total).to be < 0.1
   end
-  
+
+  it "should parse nested components" do
+    html = "custom tag <:awesome:cool name=\"yes\" />"
+    test_html(html)
+  end
+
   # it "should warn you when you over close tags" do
   #   html = "<div><p>test</p></div></div>"
-  #   
+  #
   #   handler = HTMLHandler.new
   #   expect { SandlebarsParser.new(html, handler) }.to raise_error(HTMLParseError)
   # end
+end
 end

data/spec/server/html_parser/view_parser_spec.rb

@@ -1,3 +1,5 @@
+if RUBY_PLATFORM == 'opal'
+else
 require 'benchmark'
 require 'volt/server/html_parser/view_parser'
 
@@ -283,4 +285,5 @@ describe ViewParser do
     })
   end
 
+end
 end

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.2.1.min.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/home.js"])
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,16 +5,20 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
+ENV['SERVER'] = 'true'
 ENV['SAUCE_USERNAME'] = 'ryanstout'
 ENV['SAUCE_ACCESS_KEY'] = 'a537b01d-33ed-4028-9e80-eeb602748a5f'
 
 if ENV['IN_BROWSER']
-  require 'capybara/rspec'
-  # Needed at the moment to get chrome tests working
-  require 'chromedriver2/helper'
-  require 'capybara/poltergeist'
-  # require "sauce/capybara"
-  # require 'sauce/connect'
+  if RUBY_PLATFORM == 'opal'
+  else
+    require 'capybara/rspec'
+    # Needed at the moment to get chrome tests working
+    require 'chromedriver2/helper'
+    require 'capybara/poltergeist'
+    # require "sauce/capybara"
+    # require 'sauce/connect'
+  end
 end
 
 require 'volt'
@@ -36,15 +40,25 @@ require 'volt'
 #   Capybara::Selenium::Driver.new(app, :browser => :chrome)
 # end
 
-# Capybara.default_driver = :selenium
 if ENV['IN_BROWSER']
-  require 'volt/server'
+  if RUBY_PLATFORM == 'opal'
+  else
+    require 'volt/server'
+
 
+    kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), "apps/kitchen_sink"))
+    Capybara.app = Server.new(kitchen_sink_path).app
 
-  kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), "apps/kitchen_sink"))
-  Capybara.app = Server.new(kitchen_sink_path).app
+    Capybara.default_driver = :poltergeist
 
-  Capybara.default_driver = :poltergeist
+    # Capybara.register_driver :chrome do |app|
+    #   Capybara::Selenium::Driver.new(app, :browser => :chrome)
+    # end
+    #
+    # Capybara.default_driver = :chrome
+
+    # Capybara.default_driver = :selenium
+  end
 end
 
 

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

@@ -15,4 +15,16 @@ describe ComponentNode do
     expect(@component.find_by_binding_id(0).to_html).to eq('Before  Inside  After')
 
   end
+
+  # it "should render if blocks" do
+  #   view = <<-END
+  #   {#if _show}show{/} title
+  #   END
+  #
+  #   page = Page.new
+  #
+  #   template = ViewParser.new(view, 'home/index/index/title')
+  #
+  #   page.add_template
+  # end
 end

data/templates/project/Gemfile.tt

@@ -12,6 +12,17 @@ gem 'volt-bootstrap'
 gem 'volt-bootstrap-jumbotron-theme'
 
 
+# Server for MRI
+platform :mri do
+  gem 'thin', '~> 1.6.0'
+  gem 'bson_ext', '~> 1.9.0'
+end
+
+# Server for jruby
+platform :jruby do
+  gem 'jubilee'
+end
+
 
 #---------------------
 # Needed at the moment

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

@@ -1,4 +1,4 @@
-get "/about", _view: 'about'
+get "/about", _controller: 'about'
 
 # The main route
 get '/'

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

@@ -1,9 +1,9 @@
 class IndexController < ModelController
-  model :page
-
-  def initialize
-    super
+  def index
+    # Add code for when the main page is loaded
+  end
 
-    # Add controller setup code here
+  def home
+    # Add code for when the home view is loaded
   end
 end

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

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

data/volt.gemspec

@@ -22,19 +22,18 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 0.18.0"
   spec.add_dependency "pry", "~> 0.9.12.0"
   spec.add_dependency "rspec", "3.0.0.beta1"
-  spec.add_dependency "nokogiri", "~> 1.6.0"
   spec.add_dependency "rack", "~> 1.5.0"
   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 "bson_ext", "~> 1.9.0"
-  spec.add_dependency "thin", "~> 1.6.0"
-  spec.add_dependency "multi_json", "~> 1.8.2"
-  spec.add_dependency "oj", "~> 2.5.0"
+  # spec.add_dependency "bson_ext", "~> 1.9.0"
+  # spec.add_dependency "thin", "~> 1.6.0"
   spec.add_dependency "rake", "~> 10.0.4"
   spec.add_dependency "listen", "~> 2.4.0"
   spec.add_dependency "uglifier", "~> 2.4.0"
   spec.add_dependency "yui-compressor", "~> 0.12.0"
+  # spec.add_dependency "promise.rb", "~> 0.6.1"
+
   # spec.add_dependency "rack-colorized_logger", "~> 1.0.4"
 
 
@@ -49,5 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "poltergeist", "~> 1.5.0"
   spec.add_development_dependency "sauce", "~> 3.3.0"
   spec.add_development_dependency "sauce-connect", "~> 3.3.0"
-  
+
 end