volt 0.7.1 → 0.7.2

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

@@ -15,34 +15,30 @@ class EachBinding < BaseBinding
     @templates = []
 
     # Run the initial render
-    update
+    # update
+    reload
 
     @added_listener = @value.on('added') { |_, position, item| item_added(position) }
     @changed_listener = @value.on('changed') { reload }
     @removed_listener = @value.on('removed') { |_, position| item_removed(position) }
   end
 
-  # When a change event comes through, its most likely upstream, so the whole
-  # array might have changed.  In this case, just reload the whole thing
-  # TODO: Track to make sure the changed event isn't being called too often (it is currently)
+  # When a changed event happens, we update to the new size.
   def reload
-    # ObjectTracker.enable_cache
-    # Remove all of the current templates
-    if @templates
-      @templates.each do |template|
-        template.remove_anchors
-
-        # TODO: Make sure this is being removed since we already removed the anchors
-        template.remove
+    # Adjust to the new size
+    values = current_values
+    templates_size = @templates.size
+    values_size = values.size
+
+    if templates_size < values_size
+      (templates_size).upto(values_size-1) do |index|
+        item_added(index)
+      end
+    elsif templates_size > values_size
+      (templates_size-1).downto(values_size) do |index|
+        item_removed(index)
       end
     end
-
-    @templates = []
-
-    # Run update again to rebuild
-    update
-
-    # ObjectTracker.disable_cache
   end
 
   def item_removed(position)
@@ -77,7 +73,7 @@ class EachBinding < BaseBinding
     item_template = TemplateRenderer.new(@page, @target, item_context, binding_name, @template_name)
     @templates.insert(position, item_template)
 
-    update_indexes_after(position)
+    # update_indexes_after(position)
   end
 
   # When items are added or removed in the middle of the list, we need
@@ -85,27 +81,23 @@ class EachBinding < BaseBinding
   def update_indexes_after(start_index)
     size = @templates.size
     if size > 0
-      start_index.upto(@templates.size-1) do |index|
+      start_index.upto(size-1) do |index|
+        puts "UP INDEX: #{index}"
         @templates[index].context.locals[:index].cur = index
       end
     end
   end
 
-  def update(item=nil)
-    if item
-      values = [item]
-    else
-      values = @value.cur
-      return if values.is_a?(Model) || values.is_a?(Exception)
-      values = values.attributes
-    end
+  def current_values
+    values = @value.cur
 
-    # TODO: Switch to #each?
-    values.each_with_index do |value,index|
-      item_added(index)
-    end
+    return [] if values.is_a?(Model) || values.is_a?(Exception)
+    values = values.attributes
+
+    return values
   end
 
+
   # When this each_binding is removed, cleanup.
   def remove
     # puts "Remove Each"

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

@@ -12,7 +12,6 @@ class JSEvent
   end
 
   def stop
-    # puts "STOPPING"
     # `this.js_event.stopPropagation();`
     `this.js_event.preventDefault();`
   end

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

@@ -39,8 +39,10 @@ class IfBinding < BaseBinding
     @branches.each do |branch|
       value, template_name = branch
 
+      current_value = value.cur
+
       # TODO: A bug in opal requires us to check == true
-      if value.cur.true? == true
+      if current_value.true? == true && !current_value.is_a?(Exception)
         # This branch is currently true
         true_template = template_name
         break

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

@@ -11,8 +11,6 @@ class TemplateBinding < BaseBinding
 
     @current_template = nil
 
-    # puts "GETTER: #{value_from_getter(getter).inspect}"
-
     # Find the source for the getter binding
     @path, section = value_from_getter(getter)
 
@@ -20,15 +18,15 @@ class TemplateBinding < BaseBinding
       # Render this as a section
       @section = section
     else
-      # Use the value passed in as the default model
-      @model = section
+      # Use the value passed in as the default arguments
+      @arguments = section
     end
 
     # Run the initial render
     update
 
-    @path_changed_listener = @path.on('changed') { update } if @path.reactive?
-    @section_changed_listener = @section.on('changed') { update } if @section && @section.reactive?
+    @path_changed_listener = @path.on('changed') { queue_update } if @path.reactive?
+    @section_changed_listener = @section.on('changed') { queue_update } if @section && @section.reactive?
   end
 
   def setup_path(binding_in_path)
@@ -44,7 +42,7 @@ class TemplateBinding < BaseBinding
   end
 
   # Takes in a lookup path and returns the full path for the matching
-  # template.  Also returns the controller name if applicable.
+  # template.  Also returns the controller and action name if applicable.
   #
   # Looking up a path is fairly simple.  There are 4 parts needed to find
   # the html to be rendered.  File paths look like this:
@@ -79,7 +77,6 @@ class TemplateBinding < BaseBinding
 
       full_path = [@collection_name, @controller_name, @page_name, nil]
 
-      offset = 0
       start_at = full_path.size - parts_size - path_position
 
       full_path.size.times do |index|
@@ -95,9 +92,12 @@ class TemplateBinding < BaseBinding
       path = full_path.join('/')
       if check_for_template?(path)
         controller = nil
-        if path_position > 1
+
+        # Don't return a controller if we are just getting another section
+        # from the same controller
+        if path_position >= 1
           # Lookup the controller
-          controller = [full_path[0], full_path[1] + '_controller']
+          controller = [full_path[0], full_path[1] + '_controller', full_path[2]]
         end
         return path, controller
       end
@@ -107,45 +107,76 @@ class TemplateBinding < BaseBinding
   end
 
   def update
-    full_path, controller_name = path_for_template(@path.cur, @section.cur)
+    full_path, controller_path = path_for_template(@path.cur, @section.cur)
+    # puts "UPDATE: #{@path.inspect} - #{full_path.inspect}"
 
     @current_template.remove if @current_template
 
-    if @model
+    if @arguments
       # Load in any procs
-      @model.each_pair do |key,value|
+      @arguments.each_pair do |key,value|
         if value.class == Proc
-          @model[key.gsub('-', '_')] = value.call
+          @arguments[key.gsub('-', '_')] = value.call
         end
       end
     end
 
-    render_template(full_path, controller_name)
+    render_template(full_path, controller_path)
   end
 
   # The context for templates can be either a controller, or the original context.
-  def render_template(full_path, controller_name)
+  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 = get_controller(controller_name)
-    if controller_class
-      args = []
-      args << SubContext.new(@model) if @model
+    controller_class, action = get_controller(controller_path)
 
+    if controller_class
       # Setup the controller
       current_context = controller_class.new(*args)
-      @controller = current_context
     else
-      # Pass the context directly
-      current_context = @context
-      @controller = nil
+      current_context = ModelController.new(*args)
     end
+    @controller = current_context
+
+    # Trigger the action
+    @controller.send(action) if @controller.respond_to?(action)
 
     @current_template = TemplateRenderer.new(@page, @target, current_context, @binding_name, full_path)
 
     call_ready
   end
 
+
+
+  # # 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
+
   def call_ready
     if @controller
       if @controller.respond_to?(:section=)
@@ -190,11 +221,13 @@ class TemplateBinding < BaseBinding
   private
 
     # Fetch the controller class
-    def get_controller(controller_name)
-      return nil unless controller_name && controller_name.size > 0
+    def get_controller(controller_path)
+      return nil, nil unless controller_path && controller_path.size > 0
+
+      action = controller_path[-1]
 
       # Get the constant parts
-      parts = controller_name.map {|v| v.gsub('-', '_').camelize }
+      parts = controller_path[0..-2].map {|v| v.gsub('-', '_').camelize }
 
       # Home doesn't get namespaced
       if parts.first == 'Home'
@@ -212,7 +245,7 @@ class TemplateBinding < BaseBinding
         end
       end
 
-      return obj
+      return obj, action
     end
 
 end

data/lib/volt/page/document_events.rb

@@ -15,7 +15,7 @@ class DocumentEvents
 
       %x{
         $('body').on(event, function(e) {
-          that.$handle(event, e, e.originalEvent.target);
+          that.$handle(event, e, e.target || e.originalEvent.target);
         });
       }
 
@@ -37,6 +37,8 @@ class DocumentEvents
       # TODO: Sometimes the event doesn't exist, but we still get
       # an event.
       handlers = @events[event_name]
+      # puts "EVENT: #{event_name} - #{handlers.inspect} for #{element.id}"
+      # `console.log('target: ', target);`
       handlers = handlers[element.id] if handlers
 
       if handlers

data/lib/volt/page/draw_cycle.rb

@@ -1,9 +1,31 @@
+# The draw cycle is responsible for queueing redraws until all of the events have
+# fired.  Once that is done, everything will be redrawn.  This prevents bindings
+# from being drawn multiple times before all events have propigated.
 class DrawCycle
   def initialize
     @queue = {}
+    @timer = nil
   end
 
   def queue(binding)
+    @queue[binding] = true
+
+    unless @timer
+      # Flush once everything else has finished running
+      @timer = `setTimeout(function() { self.$flush(); }, 0);`
+    end
+  end
+
+  def flush
+    @timer = nil
+
+    work_queue = @queue
+    @queue = {}
+
+    work_queue.each_pair do |binding,_|
+      # Call the update if queued
+      binding.update
+    end
 
   end
 end

data/lib/volt/page/page.rb

@@ -1,6 +1,5 @@
 if RUBY_PLATFORM == 'opal'
   require 'opal'
-
   require 'opal-jquery'
 end
 require 'volt/models'
@@ -31,6 +30,15 @@ require 'volt/benchmark/benchmark'
 require 'volt/page/draw_cycle'
 require 'volt/page/tasks'
 
+if RUBY_PLATFORM == 'opal'
+  require 'promise.rb'
+else
+  # Opal doesn't expose its promise library directly
+  spec = Gem::Specification.find_by_name("opal")
+  require(spec.gem_dir + "/stdlib/promise")
+end
+
+
 class Page
   attr_reader :url, :params, :page, :templates, :routes, :draw_cycle, :events
 
@@ -164,6 +172,7 @@ class Page
     title_target = AttributeTarget.new
     title_target.on('changed') do
       title = title_target.to_html
+      # puts "SET TITLE: #{title.inspect}: #{title_target.inspect}"
       `document.title = title;`
     end
     TemplateRenderer.new(self, title_target, main_controller, "main", "home/index/index/title")

data/lib/volt/page/reactive_template.rb

@@ -4,36 +4,43 @@ class ReactiveTemplate
   def initialize(page, context, template_path)
     # puts "New Reactive Template: #{context.inspect} - #{template_path.inspect}"
     @template_path = template_path
-    @target = AttributeTarget.new
+    @target = AttributeTarget.new(nil, nil, self)
     @template = TemplateRenderer.new(page, @target, context, "main", template_path)
-  end
 
-  def event_added(event, scope_provider, first)
-    if first && !@template_listener
-      @template_listener = @target.on('changed') { update }
-    end
   end
 
-  def event_removed(event, last)
-    if last && @template_listener
-      @template_listener.remove
-      @template_listener = nil
-    end
+  def reactive?
+    true
   end
 
+  # def event_added(event, scope_provider, first, first_for_event)
+  #   if first && !@template_listener
+  #     @template_listener = @target.on('changed') { update }
+  #   end
+  # end
+  #
+  # def event_removed(event, last, last_for_event)
+  #   if last && @template_listener
+  #     @template_listener.remove
+  #     @template_listener = nil
+  #   end
+  # end
+
   # Render the template and get the current value
   def cur
     @target.to_html
   end
 
-  # TODO: improve
-  def skip_current_queue_flush
-    true
+  def update
+    trigger!('changed')
   end
 
+  def remove
+    @template.remove
 
-  def update
-    trigger!('changed')
+    @template = nil
+    @target = nil
+    @template_path = nil
   end
 
 end

data/lib/volt/page/sub_context.rb

@@ -16,7 +16,7 @@ class SubContext
 
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
-    if @locals[method_name]
+    if @locals.has_key?(method_name)
       return @locals[method_name]
     elsif @context
       return @context.send(method_name, *args, &block)

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

@@ -3,7 +3,7 @@
 
 require 'volt/page/targets/base_section'
 
-class AttributeSection
+class AttributeSection < BaseSection
   def initialize(target, binding_name)
     @target = target
     @binding_name = binding_name
@@ -31,7 +31,8 @@ class AttributeSection
   end
 
   def remove
+    # TODO: is this getting run for no reason?
     node = @target.find_by_binding_id(@binding_name)
-    node.remove
+    node.remove if node
   end
 end

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

@@ -7,10 +7,6 @@ require 'volt/page/targets/binding_document/html_node'
 # a string that can then be used to update a attribute binding.
 
 class AttributeTarget < ComponentNode
-  # TODO: improve
-  def skip_current_queue_flush
-    true
-  end
 
   def section(*args)
     return AttributeSection.new(self, *args)

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

@@ -1,5 +1,9 @@
+require 'volt/page/targets/dom_template'
+
 # Class to describe the interface for sections
 class BaseSection
+  @@template_cache = {}
+
   def remove
     raise "not implemented"
   end
@@ -11,4 +15,25 @@ class BaseSection
   def insert_anchor_before_end
     raise "not implemented"
   end
+
+  def set_content_to_template(page, template_name)
+    if self.is_a?(DomSection)
+      dom_template = (@@template_cache[template_name] ||= DomTemplate.new(page, template_name))
+
+      return set_template(dom_template)
+    else
+      template = page.templates[template_name]
+
+      if template
+        html = template['html']
+        bindings = template['bindings']
+      else
+        html = "<div>-- &lt; missing template #{template_name.inspect.gsub('<', '&lt;').gsub('>', '&gt;')} &gt; --</div>"
+        bindings = {}
+      end
+
+      return set_content_and_rezero_bindings(html, bindings)
+    end
+  end
+
 end

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

@@ -9,21 +9,19 @@ class ComponentNode < BaseNode
   include Events
 
   attr_accessor :parent, :binding_id, :nodes
-  def initialize(binding_id=nil, parent=nil)
+  def initialize(binding_id=nil, parent=nil, root=nil)
     @nodes = []
     @binding_id = binding_id
     @parent = parent
-
-    @change_listener = on('changed') do
-      if @parent
-        @parent.trigger!('changed')
-      end
-    end
+    @root = root
   end
 
-  # TODO: improve
-  def skip_current_queue_flush
-    true
+  def trigger!(*args, &block)
+    if @root
+      @root.trigger!(*args, &block)
+    else
+      super
+    end
   end
 
   def text=(text)
@@ -44,7 +42,7 @@ class ComponentNode < BaseNode
         # Open
         binding_id = part.match(/\<\!\-\- \$([0-9]+) \-\-\>/)[1].to_i
 
-        sub_node = ComponentNode.new(binding_id, current_node)
+        sub_node = ComponentNode.new(binding_id, current_node, @root || self)
         current_node << sub_node
         current_node = sub_node
       when /\<\!\-\- \$\/[0-9]+ \-\-\>/
@@ -93,6 +91,8 @@ class ComponentNode < BaseNode
     @nodes = []
 
     trigger!('changed')
+
+    # @binding_id = nil
   end
 
   def remove_anchors
@@ -100,10 +100,9 @@ class ComponentNode < BaseNode
 
     @parent.nodes.delete(self)
 
-    @change_listener.remove
-    @change_listener = nil
-
     trigger!('changed')
+    @parent = nil
+    @binding_id = nil
   end
 
   def inspect

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

@@ -8,4 +8,8 @@ class HtmlNode < BaseNode
   def to_html
     @html
   end
+
+  def inspect
+    "<HtmlNode #{@html.inspect}>"
+  end
 end