volt 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7be61678b8ab551460135dfeeaaab5060ed02f47
-  data.tar.gz: cc56d76316db3a18138fcce5f9bae3b7e4d301d7
+  metadata.gz: 6c3db947b2a626b68ef6ed4d2a12b3724ee7d10c
+  data.tar.gz: cd9a7fc5cd979912a02ef3298c4d901d53166e4d
 SHA512:
-  metadata.gz: 2cbbe9373a883d689ac88dfbc2d710a8c8e621de33e9baf90b1513b62c85021c7eda0ea21a8ed037d1d85a58149a64c71e742c681cd4ee5b5f591479ecf6df67
-  data.tar.gz: 9052a27af07b504f5f765d5c9ad2c833efea2acecb60e820518cf9a5532198435be84b3c84cfdf64a750e35077f1ba4b1e026801d51108c58f2937fa70582bbd
+  metadata.gz: a2fa2133cf4ee62729a34d8fff30234cb81477b3817289a70c5d6d229fc39866b9e8c8b250b31e72cf476a6d6e6cc26008e7bed3f53c03a8a56fca6ac7ce92ff
+  data.tar.gz: a8f19f6779cfd3a34df76537c2f77df4760735ffea222d8c5b33ce297cd732adfd029ef7013860e70015c646acfbd284dc44cf6e1776ecad66394b1d35b9592e

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/lib/volt/models/model.rb

@@ -202,7 +202,6 @@ class Model
     end
   
     def __track_element(key, value)
-      puts "TRACK: #{key} - #{value.inspect}"
       __setup_tracking(key, value) do |event, key, args|
         trigger_by_attribute!(event, key, *args)
       end

data/lib/volt/models/url.rb

@@ -39,7 +39,7 @@ class URL
     
     path, params = @router.url_for_params(@params)
 
-    new_url = "#{@scheme}://#{host_with_port}#{path || @path}"
+    new_url = "#{@scheme}://#{host_with_port}#{(path || @path).chomp('/')}"
     
     unless params.empty?
       new_url += '?'

data/lib/volt/router/routes.rb

@@ -1,8 +1,14 @@
+require 'volt'
+
 class Routes
-  attr_reader :routes
+  attr_reader :routes, :path_matchers
 
   def initialize
     @routes = []
+    
+    if Volt.server?
+      @path_matchers = []
+    end
   end
   
   def define(&block)
@@ -11,7 +17,7 @@ class Routes
     return self
   end
   
-  def get(path, options)
+  def get(path, options={})
     if path.index('{') && path.index('}')
       sections = path.split(/(\{[^\}]+\})/)
       sections = sections.reject {|v| v == '' }
@@ -21,6 +27,9 @@ class Routes
           options[section[1..-2]] = nil
         end
       end
+      
+      add_path_matcher(sections) if Volt.server?
+      
       path = Proc.new do |params|
         # Create a path using the params in the path
         sections.map do |section|
@@ -31,10 +40,26 @@ class Routes
           end
         end.join('')
       end
+    else
+      add_path_matcher([path]) if Volt.server?
     end
     
     @routes << [path, options]
   end
+
+  # TODO: This is slow, optimize with a DFA or NFA
+  def add_path_matcher(sections)
+    match_path = ''
+    sections.each do |section|
+      if section[0] == '{' && section[-1] == '}'
+        match_path << "[^\/]+"
+      else
+        match_path << section
+      end
+    end
+    
+    @path_matchers << (/^#{match_path}$/)
+  end
   
   # Takes in params and generates a path and the remaining params
   # that should be shown in the url.

data/lib/volt/server.rb

@@ -28,17 +28,18 @@ class Server
     @app.use Rack::CommonLogger
     @app.use Rack::ShowExceptions
 
+    component_paths = @component_paths
     @app.map '/components' do
-      run ComponentHandler.new
+      run ComponentHandler.new(component_paths)
     end
+    
+    # Serve the opal files
+    OpalFiles.new(@app, @app_path, @component_paths)
 
     # Serve the main html files from public, also figure out
     # which JS/CSS files to serve.
     @app.use IndexFiles, @component_paths
     
-    # Serve the opal files
-    OpalFiles.new(@app, @app_path, @component_paths)
-    
     # Handle socks js connection
     if RUBY_PLATFORM != 'java'
       @app.map "/channel" do

data/lib/volt/server/component_handler.rb

@@ -1,88 +1,33 @@
 require 'stringio'
 require 'volt'
 require 'volt/server/template_parser'
+require 'volt/server/component_templates'
+require 'volt/server/rack/component_files'
 
 class ComponentHandler
+  def initialize(component_paths)
+    @component_paths = component_paths
+  end
+  
   def call(env)
     req = Rack::Request.new(env)
 
     # TODO: Sanatize template path
-    @component_path = req.path.strip.gsub(/^\/components\//, '').gsub(/[.]js$/, '')
+    component_name = req.path.strip.gsub(/^\/components\//, '').gsub(/[.]js$/, '')
 
-    code = generate_controller_code + generate_view_code + generate_model_code + generate_routes_code
+    code = ''
 
+    component_files = ComponentFiles.new(component_name, @component_paths)
+    component_files.component_paths.each do |component_path, component_name|
+      code << ComponentTemplates.new(component_path, component_name).code
+      code << "\n\n"
+    end
+    
     javascript_code = Opal.compile(code)
 
     # puts "ENV: #{env.inspect}"
     [200, {"Content-Type" => "text/html"}, StringIO.new(javascript_code)]
   end
 
-  def generate_view_code
-    code = ''
-    views_path = Volt.root + "/app/#{@component_path}/views/"
-
-    # Load all templates in the folder
-    Dir["#{views_path}*/*.html"].each do |view_path|
-      # Get the path for the template, supports templates in folders
-      template_path = view_path[views_path.size..((-1 * ('.html'.size + 1)))]
-      template_path = "#{@component_path}/#{template_path}"
-      # puts "Template Path: #{template_path.inspect}"
-
-      all_templates = TemplateParser.new(File.read(view_path), template_path)
 
-      binding_initializers = []
-      all_templates.templates.each_pair do |name, template|
-        binding_code = []
-
-        template['bindings'].each_pair do |key,value|
-          binding_code << "#{key.inspect} => [#{value.join(', ')}]"
-        end
-
-        binding_code = "{#{binding_code.join(', ')}}"
-
-        code << "$page.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
-      end
-    end
-    # puts "--------------"
-    # puts "CODE: #{code}"
-
-    return code
-  end
-
-  def generate_controller_code
-    code = ''
-    controllers_path = Volt.root + "/app/#{@component_path}/controllers/"
-
-    Dir["#{controllers_path}*_controller.rb"].each do |controller_path|
-      code << File.read(controller_path) + "\n\n"
-    end
-
-    return code
-  end
-  
-  def generate_model_code
-    code = ''
-    models_path = Volt.root + "/app/#{@component_path}/models/"
-
-    Dir["#{models_path}*.rb"].each do |model_path|
-      code << File.read(model_path) + "\n\n"
-      
-      model_name = model_path.match(/([^\/]+)[.]rb$/)[1]
-      
-      code << "$page.add_model(#{model_name.inspect})\n\n"
-    end
-
-    return code
-  end
-  
-  def generate_routes_code
-    code = ''
-    routes_path = Volt.root + "/app/#{@component_path}/config/routes.rb"
-    
-    code << "$page.add_routes do\n"
-    code << "\n" + File.read(routes_path) + "\n"
-    code << "end\n\n"
-
-    return code
-  end
 end

data/lib/volt/server/component_templates.rb

@@ -0,0 +1,82 @@
+# Initialize with the path to a component and returns all the front-end
+# setup code (for controllers, models, views, and routes)
+class ComponentTemplates
+  def initialize(component_path, component_name)
+    @component_path = component_path
+    @component_name = component_name
+  end
+  
+  def code
+    return generate_controller_code + generate_view_code + generate_model_code + generate_routes_code
+  end
+  
+  def generate_view_code
+    code = ''
+    views_path = "#{@component_path}/views/"
+
+    # Load all templates in the folder
+    Dir["#{views_path}*/*.html"].each do |view_path|
+      # Get the path for the template, supports templates in folders
+      template_path = view_path[views_path.size..((-1 * ('.html'.size + 1)))]
+      template_path = "#{@component_name}/#{template_path}"
+
+      all_templates = TemplateParser.new(File.read(view_path), template_path)
+
+      binding_initializers = []
+      all_templates.templates.each_pair do |name, template|
+        binding_code = []
+
+        template['bindings'].each_pair do |key,value|
+          binding_code << "#{key.inspect} => [#{value.join(', ')}]"
+        end
+
+        binding_code = "{#{binding_code.join(', ')}}"
+
+        code << "$page.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
+      end
+    end
+    # puts "--------------"
+    # puts "CODE: #{code}"
+
+    return code
+  end
+
+  def generate_controller_code
+    code = ''
+    controllers_path = "#{@component_path}/controllers/"
+
+    Dir["#{controllers_path}*_controller.rb"].each do |controller_path|
+      code << File.read(controller_path) + "\n\n"
+    end
+
+    return code
+  end
+  
+  def generate_model_code
+    code = ''
+    models_path = "#{@component_path}/models/"
+
+    Dir["#{models_path}*.rb"].each do |model_path|
+      code << File.read(model_path) + "\n\n"
+      
+      model_name = model_path.match(/([^\/]+)[.]rb$/)[1]
+      
+      code << "$page.add_model(#{model_name.inspect})\n\n"
+    end
+
+    return code
+  end
+  
+  def generate_routes_code
+    code = ''
+    routes_path = "#{@component_path}/config/routes.rb"
+    
+    if File.exists?(routes_path)
+      code << "$page.add_routes do\n"
+      code << "\n" + File.read(routes_path) + "\n"
+      code << "end\n\n"
+    end
+
+    return code
+  end
+end

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

@@ -51,6 +51,10 @@ class ComponentFiles
     @component_paths.component_path(name || @component_name)
   end
   
+  def component_paths
+    @components.map {|c| [path_to_component(c), c] }
+  end
+  
   def load_child_components
     path = path_to_component
     if path

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

@@ -1,14 +1,29 @@
 require 'volt/server/rack/component_files'
+require 'volt/router/routes'
 
 # Serves the main pages
 class IndexFiles
   def initialize(app, component_paths)
     @app = app
     @component_paths = component_paths
+    
+    @@router ||= Routes.new.define do
+      # Find the route file
+      route_file = File.read('app/home/config/routes.rb')
+      eval(route_file)
+    end
+  end
+  
+  def route_match?(path)
+    @@router.path_matchers.each do |path_matcher|
+      return true if path =~ path_matcher
+    end
+    
+    return false
   end
 
   def call(env)
-    if %w[/ /demo /blog /todos /page3 /page4].include?(env['PATH_INFO']) || env['PATH_INFO'][0..5] == '/todos'
+    if route_match?(env['PATH_INFO'])
       [200, { 'Content-Type' => 'text/html' }, [html]]
     else
       @app.call env

data/lib/volt/templates/template_binding.rb

@@ -97,13 +97,13 @@ class TemplateBinding < BaseBinding
         controller = nil
         if path_position > 1
           # Lookup the controller
-          controller = full_path[1]
+          controller = [full_path[0], full_path[1]]
         end
         return path, controller
       end
     end
     
-    return nil
+    return nil, nil
   end
 
   def update
@@ -127,8 +127,19 @@ class TemplateBinding < BaseBinding
     if controller
       args = []
       args << SubContext.new(@model) if @model
+      
+      name = controller[1].camelize
+      
+      # For the home object, we do not need to namespace our controller
+      if controller[0] != 'home'
+        base_name = controller[0].camelize
+        base_object = Object.send(:const_get, base_name.to_sym)
+      else
+        base_object = Object
+      end
+      
       # Initialize the new controller
-      current_context = Object.send(:const_get, (controller.camelize + 'Controller').to_sym).new(*args)
+      current_context = base_object.send(:const_get, (name + 'Controller').to_sym).new(*args)
     elsif @model
       # Passed in attributes, but there is no controller
       current_context = SubContext.new(@model, current_context)      

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -306,6 +306,7 @@ files:
 - lib/volt/server/binding_setup.rb
 - lib/volt/server/channel_handler.rb
 - lib/volt/server/component_handler.rb
+- lib/volt/server/component_templates.rb
 - lib/volt/server/if_binding_setup.rb
 - lib/volt/server/rack/component_files.rb
 - lib/volt/server/rack/component_paths.rb