volt 0.6.5 → 0.7.0

data/lib/volt/page/memory_test.rb

@@ -7,20 +7,20 @@ class Test
     listener = a.on('changed') { puts "CHANGED" }
     a.cur = 5
     listener.remove
-    
+
     ObjectTracker.process_queue
   end
-  
+
   def self.test
     a = ReactiveValue.new(Model.new)
     a._cool = [1,2,3]
-    
+
     listener = a._cool.on('added') { puts "ADDED" }
     a._cool << 4
     puts a._cool[3]
-    
+
     listener.remove
-    
+
     ObjectTracker.process_queue
   end
-end
+end

data/lib/volt/page/page.rb

@@ -38,19 +38,19 @@ class Page
     # debugger
     puts "------ Page Loaded -------"
     @model_classes = {}
-    
+
     # Run the code to setup the page
     @page = ReactiveValue.new(Model.new)
     @flash = ReactiveValue.new(Model.new({}, persistor: Persistors::Flash))
     @store = ReactiveValue.new(Model.new({}, persistor: Persistors::StoreFactory.new(tasks)))
-    
+
     @url = ReactiveValue.new(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
       %x{
@@ -59,21 +59,21 @@ class Page
             Opal.gvars.page.$launch_console();
           }
         });
-      
+
         $(document).on('click', 'a', function(event) {
           return Opal.gvars.page.$link_clicked($(this).attr('href'), event);
         });
       }
     end
   end
-  
+
   def tasks
     @tasks ||= Tasks.new(self)
   end
-  
+
   def link_clicked(url='', event=nil)
     # Skip when href == ''
-    return if url.blank?
+    return false if url.blank?
 
     # Normalize url
     # Benchmark.bm(1) do
@@ -85,21 +85,21 @@ class Page
 
       # Clear the flash
       flash.clear
-      
+
       # return false to stop the event propigation
       return false
     end
     # end
-    
+
     # Not stopping, process link normally
     return true
   end
-  
+
   # We provide a binding_name, so we can bind events on the document
   def binding_name
     'page'
   end
-  
+
   def launch_console
     puts "Launch Console"
   end
@@ -117,10 +117,10 @@ class Page
   def events
     @events
   end
-  
+
   def add_model(model_name)
     # puts "ADD MODEL: #{model_name.inspect} - #{model_name.camelize.inspect}"
-    
+
     @model_classes[["*", "_#{model_name}"]] = Object.const_get(model_name.camelize)
   end
 
@@ -130,7 +130,7 @@ class Page
     @templates[name] = {'html' => template, 'bindings' => bindings}
     # puts "Add Template: #{name}"
   end
-  
+
   def add_routes(&block)
     @routes = Routes.new.define(&block)
     @url.cur.router = @routes
@@ -157,18 +157,18 @@ class Page
       `document.title = title;`
     end
     TemplateRenderer.new(self, title_target, main_controller, "main", "home/index/index/title")
-    
+
     # TODO: this dom ready should really happen in the template renderer
     main_controller.dom_ready if main_controller.respond_to?(:dom_ready)
   end
-  
+
   # When the page is reloaded from the backend, we store the $page.page, so we
   # can reload the page in the exact same state.  Speeds up development.
   def load_stored_page
     if Volt.client?
       if `sessionStorage`
         page_obj_str = nil
-        
+
         `page_obj_str = sessionStorage.getItem('___page');`
         `if (page_obj_str) {`
           `sessionStorage.removeItem('___page');`
@@ -188,7 +188,7 @@ if Volt.client?
   $page = Page.new
 
   # Call start once the page is loaded
-  Document.ready? do    
+  Document.ready? do
     $page.start
   end
-end
+end

data/lib/volt/page/reactive_template.rb

@@ -1,39 +1,39 @@
 class ReactiveTemplate
   include Events
-  
+
   def initialize(page, context, template_path)
     # puts "New Reactive Template: #{context.inspect} - #{template_path.inspect}"
     @template_path = template_path
     @target = AttributeTarget.new
     @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
   end
-  
+
   # Render the template and get the current value
   def cur
     @target.to_html
   end
-  
+
   # TODO: improve
   def skip_current_queue_flush
     true
   end
-  
-  
+
+
   def update
     trigger!('changed')
   end
-  
-end
+
+end

data/lib/volt/page/sub_context.rb

@@ -1,19 +1,19 @@
 # A sub context takes in a hash of local variables that should be available
-# in front of the current context.  It basically proxies the local variables 
+# in front of the current context.  It basically proxies the local variables
 # first, then failing those proxies the context.
 
 class SubContext
   attr_reader :locals
-  
+
   def initialize(locals, context=nil)
     @locals = locals.stringify_keys
     @context = context
   end
-  
+
   def respond_to?(method_name)
     !!(@locals[method_name.to_s] || (@context && @context.respond_to?(method_name)) || super)
   end
-  
+
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
     if @locals[method_name]
@@ -24,4 +24,4 @@ class SubContext
 
     raise NoMethodError.new("undefined method `#{method_name}' for \"#{self.inspect}\":#{self.class.to_s}")
   end
-end
+end

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

@@ -9,29 +9,29 @@ class AttributeSection
     @binding_name = binding_name
     # puts "init attr section on #{binding_name}"
   end
-  
+
   def text=(text)
     set_content_and_rezero_bindings(text, {})
   end
-  
+
   def html=(value)
     set_content_and_rezero_bindings(value, {})
   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)
+
+  # 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)
     if @binding_name == 'main'
       @target.html = html
     else
       @target.find_by_binding_id(@binding_name).html = html
     end
-    
+
     return bindings
   end
-  
+
   def remove
     node = @target.find_by_binding_id(@binding_name)
     node.remove
   end
-end
+end

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

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

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

@@ -7,8 +7,8 @@ class BaseSection
   def remove_anchors
     raise "not implemented"
   end
-  
+
   def insert_anchor_before_end
     raise "not implemented"
   end
-end
+end

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

@@ -7,13 +7,13 @@ require 'volt/reactive/events'
 # the html from templates outside of a normal dom.
 class ComponentNode < BaseNode
   include Events
-  
+
   attr_accessor :parent, :binding_id, :nodes
   def initialize(binding_id=nil, parent=nil)
     @nodes = []
     @binding_id = binding_id
     @parent = parent
-    
+
     @change_listener = on('changed') do
       if @parent
         @parent.trigger!('changed')
@@ -25,88 +25,88 @@ class ComponentNode < BaseNode
   def skip_current_queue_flush
     true
   end
-  
+
   def text=(text)
     self.html = text
   end
-  
+
   def html=(html)
     parts = html.split(/(\<\!\-\- \$\/?[0-9]+ \-\-\>)/).reject {|v| v == '' }
-  
+
     # Clear current nodes
     @nodes = []
-    
+
     current_node = self
-  
+
     parts.each do |part|
       case part
       when /\<\!\-\- \$[0-9]+ \-\-\>/
         # Open
         binding_id = part.match(/\<\!\-\- \$([0-9]+) \-\-\>/)[1].to_i
-      
+
         sub_node = ComponentNode.new(binding_id, current_node)
         current_node << sub_node
         current_node = sub_node
       when /\<\!\-\- \$\/[0-9]+ \-\-\>/
         # Close
         # binding_id = part.match(/\<\!\-\- \$\/([0-9]+) \-\-\>/)[1].to_i
-      
+
         current_node = current_node.parent
       else
         # html string
         current_node << HtmlNode.new(part)
       end
     end
-    
+
     trigger!('changed')
   end
-  
+
   def <<(node)
     @nodes << node
   end
-  
+
   def to_html
     str = []
     @nodes.each do |node|
       str << node.to_html
     end
-    
+
     return str.join('')
   end
-  
+
   def find_by_binding_id(binding_id)
     if @binding_id == binding_id
       return self
     end
-    
+
     @nodes.each do |node|
       if node.cur.is_a?(ComponentNode)
         val = node.find_by_binding_id(binding_id)
         return val if val
       end
     end
-    
+
     return nil
   end
-  
+
   def remove
     @nodes = []
-    
+
     trigger!('changed')
   end
-  
+
   def remove_anchors
     raise "not implemented"
 
     @parent.nodes.delete(self)
-        
+
     @change_listener.remove
     @change_listener = nil
-    
+
     trigger!('changed')
   end
-  
+
   def inspect
     "<ComponentNode:#{@binding_id} #{@nodes.inspect}>"
   end
-end
+end

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

@@ -4,8 +4,8 @@ class HtmlNode < BaseNode
   def initialize(html)
     @html = html
   end
-  
+
   def to_html
     @html
   end
-end
+end

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

@@ -5,15 +5,15 @@ class DomSection < BaseSection
     @start_node = find_by_comment("$#{binding_name}")
     @end_node = find_by_comment("$/#{binding_name}")
   end
-  
-	def find_by_comment(text, in_node=`document`)
-		node = nil
 
-		%x{
-			node = document.evaluate("//comment()[. = ' " + text + " ']", in_node, null, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null).iterateNext();
-		}
-		return node
-	end
+  def find_by_comment(text, in_node=`document`)
+    node = nil
+
+    %x{
+      node = document.evaluate("//comment()[. = ' " + text + " ']", in_node, null, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null).iterateNext();
+    }
+    return node
+  end
 
   def text=(value)
     %x{
@@ -21,7 +21,7 @@ class DomSection < BaseSection
       this.$range().insertNode(document.createTextNode(#{value}));
     }
   end
-  
+
   def html=(value)
     set_content_and_rezero_bindings(value, {})
   end
@@ -33,8 +33,8 @@ class DomSection < BaseSection
       range.deleteContents();
     }
   end
-  
-  def remove_anchors    
+
+  def remove_anchors
     %x{
       this.start_node.parentNode.removeChild(this.start_node);
       this.end_node.parentNode.removeChild(this.end_node);
@@ -42,16 +42,16 @@ class DomSection < BaseSection
     @start_node = nil
     @end_node = nil
   end
-  
+
   def insert_anchor_before_end(binding_name)
     Element.find(@end_node).before("<!-- $#{binding_name} --><!-- $/#{binding_name} -->")
   end
-  
+
   def insert_anchor_before(binding_name, insert_after_binding)
     node = find_by_comment("$#{insert_after_binding}")
     Element.find(node).before("<!-- $#{binding_name} --><!-- $/#{binding_name} -->")
   end
-  
+
   # Takes in an array of dom nodes and replaces the current content
   # with the new nodes
   def nodes=(nodes)
@@ -68,23 +68,23 @@ class DomSection < BaseSection
       }
     }
   end
-  
+
   # Returns the nearest DOM node that contains all of the section.
   def container_node
     range = self.range()
     return `range.commonAncestorContainer`
   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)
-		sub_nodes = nil
+
+  # 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)
+    sub_nodes = nil
     temp_div = nil
 
     %x{
       temp_div = document.createElement('div');
       var doc = jQuery.parseHTML(html);
-      
+
       if (doc) {
         for (var i=0;i < doc.length;i++) {
           temp_div.appendChild(doc[i]);
@@ -104,7 +104,7 @@ class DomSection < BaseSection
             var node = temp_div.querySelector('#' + name);
             node.setAttribute('id', 'id' +new_name);
           }
-          
+
           new_bindings["id#{new_name}"] = binding
         else
           # Assume a fixed id
@@ -112,6 +112,8 @@ class DomSection < BaseSection
           new_bindings[name] = binding
         end
       else
+        # puts "----- #{name.inspect} - #{new_name}"
+        # `console.log(temp_div);`
         # Change the comment ids
         start_comment = find_by_comment("$#{name}", temp_div)
         end_comment = find_by_comment("$/#{name}", temp_div)
@@ -130,33 +132,33 @@ class DomSection < BaseSection
 
 
     children = nil
-		%x{
-		  children = temp_div.childNodes;
-		}
-    
+    %x{
+      children = temp_div.childNodes;
+    }
+
     # Update the nodes
     self.nodes = children
-    
+
     %x{
       temp_div = null;
     }
 
-		return new_bindings
-	end
-  
+    return new_bindings
+  end
+
   def range
     return @range if @range
 
-		range = nil
-		%x{
-		  range = document.createRange();
-		  range.setStartAfter(this.start_node);
-		  range.setEndBefore(this.end_node);
-		}
+    range = nil
+    %x{
+      range = document.createRange();
+      range.setStartAfter(this.start_node);
+      range.setEndBefore(this.end_node);
+    }
 
     @range = range
 
-		return range
+    return range
   end
 
-end
+end

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

@@ -3,9 +3,9 @@ require 'volt/page/targets/dom_section'
 
 # DomTarget's provide an interface that can render bindings into
 # the dom.  Currently only one "dom" is supported, but multiple
-# may be allowed in the future (iframes?) 
+# may be allowed in the future (iframes?)
 class DomTarget < BaseSection
   def section(*args)
     return DomSection.new(*args)
   end
-end
+end

data/lib/volt/page/tasks.rb

@@ -5,12 +5,12 @@ class Tasks
     @page = page
     @callback_id = 0
     @callbacks = {}
-    
+
     page.channel.on('message') do |_, *args|
       received_message(*args)
     end
   end
-  
+
   def call(class_name, method_name, *args, &callback)
     if callback
       callback_id = @callback_id
@@ -22,11 +22,11 @@ class Tasks
     else
       callback_id = nil
     end
-    
+
     @page.channel.send_message([callback_id, class_name, method_name, *args])
   end
-  
-  
+
+
   def received_message(name, callback_id, *args)
     case name
     when 'added', 'removed', 'updated', 'changed'
@@ -37,12 +37,12 @@ class Tasks
       reload
     end
   end
-  
+
   # When a request is sent to the backend, it can attach a callback,
   # this is called from the backend to pass to the callback.
   def response(callback_id, result, error)
     callback = @callbacks.delete(callback_id)
-    
+
     if callback
       if error
         # TODO: full error handling
@@ -52,7 +52,7 @@ class Tasks
       end
     end
   end
-  
+
   # Called when the backend sends a notification to change the results of
   # a query.
   def notify_query(method_name, collection, query, *args)
@@ -60,19 +60,19 @@ class Tasks
     # puts "FOUND QUERY: #{collection.inspect} - #{query.inspect} - #{query_obj.inspect} - #{method_name} - #{query_obj.instance_variable_get('@stores').inspect}"
     query_obj.send(method_name, *args)
   end
-  
+
   def reload
     puts "RELOAD"
     # Stash the current page value
     value = JSON.dump($page.page.cur.to_h.reject {|k,v| v.reactive? })
-    
+
     # If this browser supports session storage, store the page, so it will
     # be in the same state when we reload.
     if `sessionStorage`
       `sessionStorage.setItem('___page', value);`
     end
-    
+
     $page.page._reloading = true
     `window.location.reload(false);`
   end
-end
+end