volt 0.9.3.pre1 → 0.9.3.pre2

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

@@ -0,0 +1,9 @@
+# A file to require all client side bindings
+require 'volt/page/bindings/attribute_binding'
+require 'volt/page/bindings/content_binding'
+require 'volt/page/bindings/each_binding'
+require 'volt/page/bindings/if_binding'
+require 'volt/page/bindings/view_binding'
+require 'volt/page/bindings/yield_binding'
+require 'volt/page/bindings/component_binding'
+require 'volt/page/bindings/event_binding'

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

@@ -6,8 +6,8 @@ module Volt
     HTML_ESCAPE_REGEXP = /[&"'><\n]/
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;', "\n" => "<br />\n" }
 
-    def initialize(page, target, context, binding_name, getter)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, getter)
+      super(volt_app, target, context, binding_name)
 
       # Listen for changes
       @computation = lambda do

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

@@ -2,8 +2,8 @@ require 'volt/page/bindings/base_binding'
 
 module Volt
   class EachBinding < BaseBinding
-    def initialize(page, target, context, binding_name, getter, variable_name, index_name, template_name)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, getter, variable_name, index_name, template_name)
+      super(volt_app, target, context, binding_name)
 
       @item_name     = variable_name
       @index_name    = index_name
@@ -14,18 +14,22 @@ module Volt
       @getter      = getter
 
       # Listen for changes
-      @computation = -> { reload }.watch!
-    end
+      @computation = lambda do
+        begin
+          value = @context.instance_eval(&@getter)
+        rescue => e
+          Volt.logger.error("EachBinding Error: #{e.inspect}")
+          value = []
+        end
 
-    # When a changed event happens, we update to the new size.
-    def reload
-      begin
-        value = @context.instance_eval(&@getter)
-      rescue => e
-        Volt.logger.error("EachBinding Error: #{e.inspect}")
-        value = []
+        value
+      end.watch_and_resolve! do |value|
+        update(value)
       end
+    end
 
+    # When a changed event happens, we update to the new size.
+    def update(value)
       # Since we're checking things like size, we don't want this to be re-triggered on a
       # size change, so we run without tracking.
       Computation.run_without_tracking do
@@ -110,7 +114,7 @@ module Volt
         end
       end
 
-      item_template = TemplateRenderer.new(@page, @target, item_context, binding_name, @template_name)
+      item_template = TemplateRenderer.new(@volt_app, @target, item_context, binding_name, @template_name)
       @templates.insert(position, item_template)
 
       update_indexes_after(position)

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

@@ -29,8 +29,8 @@ module Volt
   class EventBinding < BaseBinding
     attr_accessor :context, :binding_name
 
-    def initialize(page, target, context, binding_name, event_name, call_proc)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, event_name, call_proc)
+      super(volt_app, target, context, binding_name)
       @event_name = event_name
 
       handler = proc do |js_event|
@@ -42,12 +42,12 @@ module Volt
         result = @context.instance_exec(event, &call_proc)
       end
 
-      @listener = @page.events.add(event_name, self, handler)
+      @listener = page.events.add(event_name, self, handler)
     end
 
     # Remove the event binding
     def remove
-      @page.events.remove(@event_name, self)
+      page.events.remove(@event_name, self)
     end
   end
 end

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

@@ -2,8 +2,8 @@ require 'volt/page/bindings/base_binding'
 
 module Volt
   class IfBinding < BaseBinding
-    def initialize(page, target, context, binding_name, branches)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, branches)
+      super(volt_app, target, context, binding_name)
 
       getter, template_name = branches[0]
 
@@ -88,7 +88,7 @@ module Volt
         end
 
         if true_template
-          @template = TemplateRenderer.new(@page, @target, @context, binding_name, true_template)
+          @template = TemplateRenderer.new(@volt_app, @target, @context, binding_name, true_template)
         end
       end
     end

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

@@ -10,8 +10,8 @@ module Volt
     #                     lookup paths in ViewLookupForPath
     # @param [String|nil] content_template_path is the path to the template for the content
     #                     provided in the tag.
-    def initialize(page, target, context, binding_name, binding_in_path, getter, content_template_path = nil)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, binding_in_path, getter, content_template_path = nil)
+      super(volt_app, target, context, binding_name)
 
       @content_template_path = content_template_path
 
@@ -189,7 +189,7 @@ module Volt
         # from the group)
         generated_new = true
         # Setup the controller
-        controller_class.new(*args)
+        controller_class.new(@volt_app, *args)
       end
 
       # Fetch grouped controllers if we're grouping
@@ -217,7 +217,7 @@ module Volt
 
     # The context for templates can be either a controller, or the original context.
     def render_template(full_path, path)
-      @current_template = TemplateRenderer.new(@page, @target, @controller, @binding_name, full_path, path)
+      @current_template = TemplateRenderer.new(@volt_app, @target, @controller, @binding_name, full_path, path)
 
       call_ready
     end

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

@@ -5,8 +5,8 @@ require 'volt/page/template_renderer'
 
 module Volt
   class YieldBinding < BaseBinding
-    def initialize(page, target, context, binding_name)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name)
+      super(volt_app, target, context, binding_name)
 
       # Get the path to the template to yield
       full_path = @context.attrs.content_template_path
@@ -14,7 +14,7 @@ module Volt
       # Grab the controller for the content
       controller = @context.attrs.content_controller
 
-      @current_template = TemplateRenderer.new(@page, @target, controller, @binding_name, full_path)
+      @current_template = TemplateRenderer.new(volt_app, @target, controller, @binding_name, full_path)
     end
 
     def remove

data/lib/volt/page/channel.rb

@@ -64,6 +64,9 @@ module Volt
       @queue.each do |message|
         send_message(message)
       end
+
+      # Trigger a connect event
+      trigger!('connect')
     end
 
     def closed(error)
@@ -71,6 +74,9 @@ module Volt
       self.connected = false
       self.error     = `error.reason`
 
+      # Trigger a disconnect event
+      trigger!('disconnect')
+
       reconnect!
     end
 

data/lib/volt/page/channel_stub.rb

@@ -13,7 +13,7 @@ module Volt
 
     attr_reader :state, :error, :reconnect_interval
 
-    def initiailze
+    def initialize
       @state = :connected
     end
 

data/lib/volt/page/page.rb

@@ -1,38 +1,10 @@
-require 'opal'
-require 'volt/models'
-require 'volt/controllers/model_controller'
-require 'volt/tasks/task_handler'
-require 'volt/page/bindings/attribute_binding'
-require 'volt/page/bindings/content_binding'
-require 'volt/page/bindings/each_binding'
-require 'volt/page/bindings/if_binding'
-require 'volt/page/bindings/view_binding'
-require 'volt/page/bindings/yield_binding'
-require 'volt/page/bindings/component_binding'
-require 'volt/page/bindings/event_binding'
-require 'volt/page/template_renderer'
-require 'volt/page/string_template_renderer'
-require 'volt/page/document_events'
-require 'volt/page/sub_context'
-require 'volt/page/targets/dom_target'
-require 'volt/data_stores/base_adaptor_client'
-
-if RUBY_PLATFORM == 'opal'
-  require 'volt/page/channel'
-else
-  require 'volt/page/channel_stub'
-end
-require 'volt/router/routes'
-require 'volt/models/url'
-require 'volt/page/url_tracker'
-require 'volt/benchmark/benchmark'
-require 'volt/page/tasks'
 
 module Volt
   class Page
     attr_reader :url, :params, :page, :routes, :events
 
-    def initialize
+    def initialize(volt_app)
+      @volt_app = volt_app
       # Run the code to setup the page
       @page          = Model.new
 
@@ -44,24 +16,26 @@ module Volt
       @events = DocumentEvents.new
 
       if RUBY_PLATFORM == 'opal'
-        # Setup escape binding for console
-        `
-          $(document).keyup(function(e) {
-            if (e.keyCode == 27) {
-              Opal.gvars.page.$launch_console();
-            }
-          });
-
-          $(document).on('click', 'a', function(event) {
-            return Opal.gvars.page.$link_clicked($(this).attr('href'), event);
-          });
-        `
+        if Volt.in_browser?
+          # Setup escape binding for console
+          `
+            $(document).keyup(function(e) {
+              if (e.keyCode == 27) {
+                Opal.gvars.page.$launch_console();
+              }
+            });
+
+            $(document).on('click', 'a', function(event) {
+              return Opal.gvars.page.$link_clicked($(this).attr('href'), event);
+            });
+          `
+        end
       end
 
       # Initialize tasks so we can get the reload message
       tasks if Volt.env.development?
 
-      if Volt.client?
+      if Volt.in_browser?
         channel.on('reconnected') do
           @page._reconnected = true
 
@@ -178,13 +152,13 @@ module Volt
       # Do the initial url params parse
       @url_tracker.url_updated(true)
 
-      main_controller = Main::MainController.new
+      main_controller = Main::MainController.new(@volt_app)
 
       # Setup main page template
-      TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
+      TemplateRenderer.new(@volt_app, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
 
       # Setup title reactive template
-      @title_template = StringTemplateRenderer.new(self, main_controller, 'main/main/main/title')
+      @title_template = StringTemplateRenderer.new(@volt_app, main_controller, 'main/main/main/title')
 
       # Watch for changes to the title template
       proc do
@@ -214,12 +188,4 @@ module Volt
       Volt.logger.error("Unable to restore: #{e.inspect}")
     end
   end
-
-  if Volt.client?
-    $page = Page.new
-
-    `$(document).ready(function() {`
-    $page.start
-    `});`
-  end
 end

data/lib/volt/page/path_string_renderer.rb

@@ -9,13 +9,12 @@ module Volt
   class ViewLookupException < Exception; end
   class PathStringRenderer
     attr_reader :html
-    def initialize(path, attrs = nil, page = nil, render_from_path = nil)
-      # use the global page if one is not passed in
-      page ||= $page
-
+    def initialize(volt_app, path, attrs = nil, page = nil, render_from_path = nil)
       # where to do the path lookup from
       render_from_path ||= 'main/main/main/body'
 
+      page ||= volt_app.page
+
       # Make path into a full path
       @view_lookup = Volt::ViewLookupForPath.new(page, render_from_path)
       full_path, controller_path = @view_lookup.path_for_template(path, nil)
@@ -26,10 +25,10 @@ module Volt
 
       controller_class, action = ControllerHandler.get_controller_and_action(controller_path)
 
-      controller = controller_class.new # (SubContext.new(attrs, nil, true))
+      controller = controller_class.new(volt_app) # (SubContext.new(attrs, nil, true))
       controller.model = SubContext.new(attrs, nil, true)
 
-      renderer = StringTemplateRenderer.new(page, controller, full_path)
+      renderer = StringTemplateRenderer.new(volt_app, controller, full_path)
 
       @html = renderer.html
 

data/lib/volt/page/string_template_renderer.rb

@@ -5,12 +5,12 @@ module Volt
   # StringTemplateRenderer will intellegently update the string in the same way
   # a normal bindings will update the dom.
   class StringTemplateRenderer
-    def initialize(page, context, template_path)
+    def initialize(volt_app, context, template_path)
       @dependency = Dependency.new
 
       @template_path = template_path
       @target        = AttributeTarget.new(nil, nil, self)
-      @template      = TemplateRenderer.new(page, @target, context, 'main', template_path)
+      @template      = TemplateRenderer.new(volt_app, @target, context, 'main', template_path)
     end
 
     # Render the template and get the current value

data/lib/volt/page/targets/attribute_section.rb

@@ -18,9 +18,56 @@ module Volt
       set_content_and_rezero_bindings(value, {})
     end
 
+    def insert_anchor_before_end(binding_name)
+      end_node = @target.find_by_binding_id(@binding_name)
+      if end_node.is_a?(ComponentNode)
+        component_node = ComponentNode.new(binding_name, end_node, end_node.root || end_node)
+        end_node.insert(-1, component_node)
+      else
+        raise "can not insert on HtmlNode"
+      end
+    end
+
+    # When using bindings, we have to change the binding id so we don't reuse
+    # the same id when rendering a binding multiple times.
+    def rezero_bindings(html, bindings)
+      @@base_binding_id ||= 20_000
+      # rezero
+      parts  = html.split(/(\<\!\-\- \$\/?[0-9]+ \-\-\>)/).reject { |v| v == '' }
+
+      new_html = []
+      new_bindings = {}
+      id_map = {}
+
+      parts.each do |part|
+        case part
+          when /\<\!\-\- \$[0-9]+ \-\-\>/
+            # Open
+            binding_id = part.match(/\<\!\-\- \$([0-9]+) \-\-\>/)[1].to_i
+            binding = bindings[binding_id]
+            new_bindings[@@base_binding_id] = binding if binding
+
+            new_html << "<!-- $#{@@base_binding_id} -->"
+            id_map[binding_id] = @@base_binding_id
+            @@base_binding_id += 1
+          when /\<\!\-\- \$\/[0-9]+ \-\-\>/
+            # Close
+            binding_id = part.match(/\<\!\-\- \$\/([0-9]+) \-\-\>/)[1].to_i
+            new_html << "<!-- $/#{id_map[binding_id]} -->"
+          else
+            # html string
+            new_html << part
+        end
+      end
+
+      return new_html.join(''), new_bindings
+    end
+
     # Takes in our html and bindings, and rezero's the comment names, and the
     # bindings.  Returns an updated bindings hash
     def set_content_and_rezero_bindings(html, bindings)
+      html, bindings = rezero_bindings(html, bindings)
+
       if @binding_name == 'main'
         @target.html = html
       else

data/lib/volt/page/targets/base_section.rb

@@ -6,19 +6,19 @@ module Volt
     @@template_cache = {}
 
     def remove
-      fail 'not implemented'
+      fail 'remove is not implemented'
     end
 
     def remove_anchors
-      fail 'not implemented'
+      fail 'remove_anchors is not implemented'
     end
 
-    def insert_anchor_before_end
-      fail 'not implemented'
+    def insert_anchor_before_end(binding_name)
+      fail 'insert_anchor_before_end is not implemented'
     end
 
     def set_template
-      fail 'not implemented'
+      fail 'set_template is not implemented'
     end
 
     def set_content_to_template(page, template_name)

data/lib/volt/page/targets/binding_document/component_node.rb

@@ -9,7 +9,7 @@ module Volt
   class ComponentNode < BaseNode
     include Eventable
 
-    attr_accessor :parent, :binding_id, :nodes
+    attr_accessor :parent, :binding_id, :nodes, :root
 
     def initialize(binding_id = nil, parent = nil, root = nil)
       @nodes      = []
@@ -65,6 +65,11 @@ module Volt
       @nodes << node
     end
 
+    def insert(index, node)
+      @nodes.insert(index, node)
+      changed!
+    end
+
     def to_html
       str = []
       @nodes.each do |node|

data/lib/volt/page/template_renderer.rb

@@ -4,16 +4,16 @@ module Volt
   class TemplateRenderer < BaseBinding
     attr_reader :context
 
-    def initialize(page, target, context, binding_name, template_name)
-      super(page, target, context, binding_name)
+    def initialize(volt_app, target, context, binding_name, template_name)
+      super(volt_app, target, context, binding_name)
 
       @sub_bindings = []
 
-      bindings = dom_section.set_content_to_template(page, template_name)
+      bindings = dom_section.set_content_to_template(volt_app.page, template_name)
 
       bindings.each_pair do |id, bindings_for_id|
         bindings_for_id.each do |binding|
-          @sub_bindings << binding.call(page, target, context, id)
+          @sub_bindings << binding.call(volt_app, target, context, id)
         end
       end
     end

data/lib/volt/reactive/computation.rb

@@ -74,6 +74,10 @@ module Volt
       end
     end
 
+    def stopped?
+      @stopped
+    end
+
     # Runs in this computation as the current computation, returns the computation
     def run_in
       previous            = Computation.current
@@ -172,20 +176,45 @@ class Proc
   #
   # Example:
   #   -> { }
-  def watch_and_resolve!
+  def watch_and_resolve!(yield_nil_for_unresolved_promise=false)
     unless block_given?
       fail 'watch_and_resolve! requires a block to call when the value is resolved or another value other than a promise is returned in the watch.'
     end
 
-    computation = proc do
+    # Keep results between runs
+    result = nil
+
+    computation = proc do |comp|
       result = call
+      last_promise = nil
 
       if result.is_a?(Promise)
+        last_promise = result
+
+        # Often you want a to be alerted that an unresolved promise is waiting
+        # to be resolved.
+        if yield_nil_for_unresolved_promise && !result.resolved?
+          yield(nil)
+        end
+
         result.then do |final|
-          yield(final)
+          # Check to make sure that a new value didn't get reactively pushed
+          # before the promise resolved.
+          if last_promise.is_a?(Promise) && last_promise == result
+            # Don't resolve if the computation was stopped
+            unless comp.stopped?
+              yield(final)
+            end
+
+            # Clear result for GC
+            result = nil
+          end
         end
       else
         yield(result)
+
+        # Clear result for GC
+        result = nil
       end
     end.watch!
 

data/lib/volt/router/routes.rb

@@ -5,8 +5,8 @@ module Volt
   # a url to params, and params to url.
   # routes do
   #   client "/about", _view: 'about'
-  #   client "/blog/{_id}/edit", _view: 'blog/edit', _action: 'edit'
-  #   client "/blog/{_id}", _view: 'blog/show', _action: 'show'
+  #   client "/blog/{id}/edit", _view: 'blog/edit', _action: 'edit'
+  #   client "/blog/{id}", _view: 'blog/show', _action: 'show'
   #   client "/blog", _view: 'blog'
   #   client "/blog/new", _view: 'blog/new', _action: 'new'
   #   client "/cool/{_name}", _view: 'cool'
@@ -27,16 +27,16 @@ module Volt
   # @indirect_routes = {
   #     '*' => {
   #       'edit' => {
-  #         nil => {_id: 1, _view: 'blog/edit', _action: 'edit'}
+  #         nil => {id: 1, _view: 'blog/edit', _action: 'edit'}
   #       }
-  #       nil => {_id: 1, _view: 'blog/show', _action: 'show'}
+  #       nil => {id: 1, _view: 'blog/show', _action: 'show'}
   #     }
   #   }
   # }
   #
   # Match for params
   # @param_matches = [
-  #   {_id: nil, _view: 'blog/edit', _action: 'edit'} => Proc.new {|params| "/blog/#{params.id}/edit", params.reject {|k,v| k == :id }}
+  #   {id: nil, _view: 'blog/edit', _action: 'edit'} => Proc.new {|params| "/blog/#{params.id}/edit", params.reject {|k,v| k == :id }}
   # ]
   class Routes
     def initialize

data/lib/volt/server/component_templates.rb

@@ -79,6 +79,9 @@ module Volt
 
       # Load all templates in the folder
       Dir["#{views_path}*/*.{#{exts.join(',')}}"].sort.each do |view_path|
+        path_parts = view_path.scan(/([^\/]+)\/([^\/]+)\/[^\/]+\/([^\/]+)[.](html|email)$/)
+        component_name, controller_name, view, _ = path_parts[0]
+
         # file extension
         format = File.extname(view_path).downcase.delete('.').to_sym
 
@@ -88,6 +91,8 @@ module Volt
 
         file_contents = File.read(view_path)
 
+        template_calls = []
+
         # Process template if we have a handler for this file type
         if handler = ComponentTemplates.handler_for_extension(format)
           file_contents = handler.call(file_contents)
@@ -107,8 +112,11 @@ module Volt
             binding_code = "{#{binding_code.join(', ')}}"
 
             code << "#{page_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
+            template_calls << "template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})"
           end
         end
+
+        # puts "module #{component_name.camelize}\n  class #{controller_name.camelize}\n    class VoltTemplates < VoltTemplates\n      #{template_calls.join("\n")}\n    end\n  end\nend"
       end
 
       code
@@ -118,9 +126,29 @@ module Volt
     def generate_controller_code
       code             = ''
       controllers_path = "#{@component_path}/controllers/"
+      views_path = "#{@component_path}/views/"
 
-      Dir["#{controllers_path}*_controller.rb"].sort.each do |controller_path|
-        code << File.read(controller_path) + "\n\n"
+      # Controllers are optional, specifying a view folder is enough to auto
+      # generate the controller.
+
+      implicit_controllers = Dir["#{views_path}*"].sort.map do |path|
+        # remove the /views/ folder and add _controller.rb
+        path.split('/').tap {|v| v[-2] = 'controllers' }.join('/') + '_controller.rb'
+      end
+      explicit_controllers = Dir["#{controllers_path}*_controller.rb"].sort
+
+      controllers = (implicit_controllers + explicit_controllers).uniq
+      controllers.each do |path|
+        if File.exists?(path)
+          code << File.read(path) + "\n\n"
+        else
+          # parts = path.scan(/([^\/]+)\/controllers\/([^\/]+)_controller[.]rb$/)
+          # component, controller = parts[0]
+
+          # # Generate a blank controller.  (We need to actually generate one so
+          # # the Template can be attached to it for template inheritance)
+          # code << "\nmodule #{component.camelize}\n  class #{controller.camelize} < Volt::ModelController\n  end\nend\n"
+        end
       end
 
       code

data/lib/volt/server/forking_server.rb

@@ -58,11 +58,11 @@ module Volt
           # Running as child
           @reader.close
 
-          @server.boot_volt
+          volt_app = @server.boot_volt
           @rack_app = @server.new_server
 
           # Set the drb object locally
-          @dispatcher = Dispatcher.new
+          @dispatcher = Dispatcher.new(volt_app)
           drb_object = DRb.start_service('drbunix:', [self, @dispatcher])
 
           @writer.puts(drb_object.uri)