volt 0.7.23 → 0.8.0

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

@@ -1,5 +1,7 @@
 # Some template bindings share the controller with other template bindings based
-# on a name.  This class stores those and provides helper methods to clear/set/get.
+# on a name.  This class keeps track of the number of templates using this controller
+# and clears it once no one else is using it.  Use #get or #inc to add to the count.
+# #clear removes 1 from the count.  When the count is 0, delete the controller.
 class GroupedControllers
   @@controllers = {}
 
@@ -8,14 +10,27 @@ class GroupedControllers
   end
 
   def get
-    @@controllers[@name]
+    return (controller = self.controller) && controller[0]
   end
 
   def set(controller)
-    @@controllers[@name] = controller
+    @@controllers[@name] = [controller, 1]
+  end
+
+  def inc
+    controller[1] += 1
   end
 
   def clear
-    @@controllers.delete(@name)
+    controller = self.controller
+    controller[1] -= 1
+    if controller[1] == 0
+      @@controllers.delete(@name)
+    end
   end
+
+  private
+    def controller
+      @@controllers[@name]
+    end
 end

data/lib/volt/page/channel.rb

@@ -1,30 +1,28 @@
 # The channel is the connection between the front end and the backend.
 
-require 'volt/reactive/events'
 require 'json'
+require 'volt/reactive/reactive_accessors'
+require 'volt/reactive/eventable'
 
 class Channel
-  include ReactiveTags
+  include ReactiveAccessors
+  include Eventable
 
-  attr_reader :status, :error, :reconnect_interval
+  reactive_accessor :connected, :status, :error, :reconnect_interval, :retry_count
 
   def initialize
     @socket = nil
-    @status = :opening
-    @connected = false
-    @error = nil
-    @retry_count = 0
+    self.status = :opening
+    self.connected = false
+    self.error = nil
+    self.retry_count = 0
     @queue = []
 
     connect!
   end
 
   def connected?
-    @connected
-  end
-
-  def retry_count
-    @retry_count
+    self.connected
   end
 
   def connect!
@@ -54,35 +52,23 @@ class Channel
     @queue.each do |message|
       send_message(message)
     end
-
-    trigger!('open')
-    trigger!('changed')
-    if old_status == :reconnecting
-      trigger!('reconnected')
-    end
   end
 
   def closed(error)
-    @status = :closed
-    @connected = false
-    @error = `error.reason`
-
-    trigger!('closed')
-    trigger!('changed')
+    self.status = :closed
+    self.connected = false
+    self.error = `error.reason`
 
     reconnect!
   end
 
   def reconnect!
-    @status = :reconnecting
-    @reconnect_interval ||= 0
-    @reconnect_interval += (2000 + rand(5000))
-    @retry_count += 1
-
-    # Trigger changed for reconnect interval
-    trigger!('changed')
+    self.status = :reconnecting
+    self.reconnect_interval ||= 0
+    self.reconnect_interval += (2000 + rand(5000))
+    self.retry_count += 1
 
-    interval = @reconnect_interval
+    interval = self.reconnect_interval
 
     %x{
       setTimeout(function() {
@@ -93,14 +79,12 @@ class Channel
 
   def message_received(message)
     message = JSON.parse(message)
-    trigger!('message', nil, *message)
-  end
 
-  tag_method(:send_message) do
-    destructive!
+    trigger!('message', *message)
   end
+
   def send_message(message)
-    if @status != :open
+    if self.status != :open
       @queue << message
     else
       # TODO: Temp: wrap message in an array, so we're sure its valid JSON
@@ -112,7 +96,7 @@ class Channel
   end
 
   def close!
-    @status = :closed
+    self.status = :closed
     %x{
       this.socket.close();
     }

data/lib/volt/page/channel_stub.rb

@@ -1,14 +1,14 @@
 # Acts the same as the Channel class on the front-end, but calls
 # directly instead of using sockjs.
 
-require 'volt/reactive/events'
 require 'volt/tasks/dispatcher'
+require 'volt/reactive/eventable'
 
 # Behaves the same as the Channel class, only the Channel class uses
 # sockjs to pass messages to the backend.  ChannelStub, simply passes
 # them directly to SocketConnectionHandlerStub.
 class ChannelStub
-  include ReactiveTags
+  include Eventable
 
   attr_reader :state, :error, :reconnect_interval
 
@@ -22,12 +22,9 @@ class ChannelStub
   end
 
   def message_received(*message)
-    trigger!('message', nil, *message)
+    trigger!('message', *message)
   end
 
-  tag_method(:send_message) do
-    destructive!
-  end
   def send_message(message)
     SocketConnectionHandlerStub.new(self).process_message(message)
   end

data/lib/volt/page/page.rb

@@ -12,7 +12,7 @@ require 'volt/page/bindings/template_binding'
 require 'volt/page/bindings/component_binding'
 require 'volt/page/bindings/event_binding'
 require 'volt/page/template_renderer'
-require 'volt/page/reactive_template'
+require 'volt/page/string_template_renderer'
 require 'volt/page/document_events'
 require 'volt/page/sub_context'
 require 'volt/page/targets/dom_target'
@@ -26,26 +26,24 @@ require 'volt/router/routes'
 require 'volt/models/url'
 require 'volt/page/url_tracker'
 require 'volt/benchmark/benchmark'
-require 'volt/page/draw_cycle'
 require 'volt/page/tasks'
 
 
 
 class Page
-  attr_reader :url, :params, :page, :templates, :routes, :draw_cycle, :events
+  attr_reader :url, :params, :page, :templates, :routes, :events
 
   def initialize
     @model_classes = {}
 
     # Run the code to setup the page
-    @page = ReactiveValue.new(Model.new)
+    @page = Model.new
 
-    @url = ReactiveValue.new(URL.new)
+    @url = URL.new
     @params = @url.params
     @url_tracker = UrlTracker.new(self)
 
     @events = DocumentEvents.new
-    @draw_cycle = DrawCycle.new
 
     if RUBY_PLATFORM == 'opal'
       # Setup escape binding for console
@@ -65,25 +63,27 @@ class Page
     # Initialize tasks so we can get the reload message
     self.tasks if Volt.env.development?
 
-    channel.on('reconnected') do
-      @page._reconnected.cur = true
+    if Volt.client?
+      channel.on('reconnected') do
+        @page._reconnected = true
 
-      `setTimeout(function() {`
-        @page._reconnected.cur = false
-      `}, 2000);`
+        `setTimeout(function() {`
+          @page._reconnected = false
+        `}, 2000);`
+      end
     end
   end
 
   def flash
-    @flash ||= ReactiveValue.new(Model.new({}, persistor: Persistors::Flash))
+    @flash ||= Model.new({}, persistor: Persistors::Flash)
   end
 
   def store
-    @store ||= ReactiveValue.new(Model.new({}, persistor: Persistors::StoreFactory.new(tasks)))
+    @store ||= Model.new({}, persistor: Persistors::StoreFactory.new(tasks))
   end
 
   def local_store
-    @local_store ||= ReactiveValue.new(Model.new({}, persistor: Persistors::LocalStore))
+    @local_store ||= Model.new({}, persistor: Persistors::LocalStore)
   end
 
   def tasks
@@ -126,9 +126,9 @@ class Page
   def channel
     @channel ||= begin
       if Volt.client?
-        ReactiveValue.new(Channel.new)
+        Channel.new
       else
-        ReactiveValue.new(ChannelStub.new)
+        ChannelStub.new
       end
     end
   end
@@ -149,7 +149,7 @@ class Page
 
   def add_routes(&block)
     @routes = Routes.new.define(&block)
-    @url.cur.router = @routes
+    @url.router = @routes
   end
 
   def start
@@ -166,16 +166,14 @@ class Page
     # Setup main page template
     TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
 
-    # Setup title listener template
-    title_target = AttributeTarget.new
-    title_target.on('changed') do
-      title = title_target.to_html
-      `document.title = title;`
-    end
-    TemplateRenderer.new(self, title_target, main_controller, "main", "main/main/main/title")
+    # Setup title reactive template
+    @title_template = StringTemplateRender.new(self, main_controller, "main/main/main/title")
 
-    # TODO: this dom ready should really happen in the template renderer
-    main_controller.dom_ready if main_controller.respond_to?(:dom_ready)
+    # Watch for changes to the title template
+    Proc.new do
+      title = @title_template.html.gsub(/\n/, ' ')
+      `document.title = title;`
+    end.watch!
   end
 
   # When the page is reloaded from the backend, we store the $page.page, so we

data/lib/volt/page/string_template_renderer.rb

@@ -0,0 +1,46 @@
+# StringTemplateRender are used to render a template to a string.  Call .html
+# to get the string.  Be sure to call .remove when complete.
+#
+# StringTemplateRender will intellegently update the string in the same way
+# a normal bindings will update the dom.
+
+class StringTemplateRender
+  def initialize(page, 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)
+  end
+
+  # Render the template and get the current value
+  def html
+    @dependency.depend
+
+    html = nil
+    Computation.run_without_tracking do
+      html = @target.to_html
+    end
+
+    return html
+  end
+
+  def changed!
+    # if @dependency is missing, this template has been removed
+    @dependency.changed! if @dependency
+  end
+
+  def remove
+    @dependency.remove
+    @dependency = nil
+
+    Computation.run_without_tracking do
+      @template.remove
+      @template = nil
+    end
+
+    @target = nil
+    @template_path = nil
+  end
+
+end

data/lib/volt/page/sub_context.rb

@@ -17,7 +17,13 @@ class SubContext
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
     if @locals.has_key?(method_name)
-      return @locals[method_name]
+      obj = @locals[method_name]
+
+      # TODORW: Might get a normal proc, flag internal procs
+      if obj.is_a?(Proc)
+        obj = obj.call(*args)
+      end
+      return obj
     elsif @context
       return @context.send(method_name, *args, &block)
     end

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

@@ -1,12 +1,12 @@
 require 'volt/page/targets/binding_document/html_node'
-require 'volt/reactive/events'
+require 'volt/reactive/eventable'
 
 # Component nodes contain an array of both HtmlNodes and ComponentNodes.
 # Instead of providing a full DOM API, component nodes are the branch
 # nodes and html nodes are the leafs.  This is all we need to produce
 # the html from templates outside of a normal dom.
 class ComponentNode < BaseNode
-  include Events
+  include Eventable
 
   attr_accessor :parent, :binding_id, :nodes
   def initialize(binding_id=nil, parent=nil, root=nil)
@@ -16,12 +16,13 @@ class ComponentNode < BaseNode
     @root = root
   end
 
-  def trigger!(*args, &block)
+  def changed!
     if @root
-      @root.trigger!(*args, &block)
+      @root.changed!
     else
-      super
+      trigger!('changed')
     end
+
   end
 
   def text=(text)
@@ -56,7 +57,7 @@ class ComponentNode < BaseNode
       end
     end
 
-    trigger!('changed')
+    changed!
   end
 
   def <<(node)
@@ -78,7 +79,7 @@ class ComponentNode < BaseNode
     end
 
     @nodes.each do |node|
-      if node.cur.is_a?(ComponentNode)
+      if node.is_a?(ComponentNode)
         val = node.find_by_binding_id(binding_id)
         return val if val
       end
@@ -90,7 +91,8 @@ class ComponentNode < BaseNode
   def remove
     @nodes = []
 
-    trigger!('changed')
+    # puts "Component Node Removed"
+    changed!
 
     # @binding_id = nil
   end
@@ -100,7 +102,7 @@ class ComponentNode < BaseNode
 
     @parent.nodes.delete(self)
 
-    trigger!('changed')
+    changed!
     @parent = nil
     @binding_id = nil
   end

data/lib/volt/page/tasks.rb

@@ -6,7 +6,8 @@ class Tasks
     @callback_id = 0
     @callbacks = {}
 
-    page.channel.on('message') do |_, *args|
+    # TODORW: ...
+    page.channel.on('message') do |*args|
       received_message(*args)
     end
   end
@@ -62,7 +63,7 @@ class Tasks
 
   def reload
     # Stash the current page value
-    value = JSON.dump($page.page.cur.to_h.reject {|k,v| v.reactive? })
+    value = JSON.dump($page.page.to_h)
 
     # If this browser supports session storage, store the page, so it will
     # be in the same state when we reload.

data/lib/volt/page/url_tracker.rb

@@ -6,9 +6,10 @@ class UrlTracker
     @page = page
 
     if Volt.client?
-      page.params.on('child_changed') do
-        @page.url.update!
-      end
+      # TODORW:
+      # page.params.on('child_changed') do
+      #   @page.url.update!
+      # end
 
       that = self