volt 0.8.15 → 0.8.16

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

@@ -11,7 +11,7 @@ module Volt
     end
 
     def get
-      return (controller = self.controller) && controller[0]
+      (controller = self.controller) && controller[0]
     end
 
     def set(controller)
@@ -31,6 +31,7 @@ module Volt
     end
 
     private
+
     def controller
       @@controllers[@name]
     end

data/lib/volt/page/channel.rb

@@ -23,11 +23,11 @@ module Volt
     end
 
     def connected?
-      self.connected
+      connected
     end
 
     def connect!
-      %x{
+      `
         this.socket = new SockJS('/channel');
 
         this.socket.onopen = function() {
@@ -41,7 +41,7 @@ module Volt
         this.socket.onclose = function(error) {
           self.$closed(error);
         };
-      }
+      `
     end
 
     def opened
@@ -71,11 +71,11 @@ module Volt
 
       interval = self.reconnect_interval
 
-      %x{
+      `
         setTimeout(function() {
           self['$connect!']();
         }, interval);
-      }
+      `
     end
 
     def message_received(message)
@@ -85,22 +85,22 @@ module Volt
     end
 
     def send_message(message)
-      if self.status != :open
+      if status != :open
         @queue << message
       else
         # TODO: Temp: wrap message in an array, so we're sure its valid JSON
         message = JSON.dump([message])
-        %x{
+        `
           this.socket.send(message);
-        }
+        `
       end
     end
 
     def close!
       self.status = :closed
-      %x{
+      `
         this.socket.close();
-      }
+      `
     end
   end
 end

data/lib/volt/page/channel_stub.rb

@@ -31,7 +31,7 @@ module Volt
     end
 
     def close!
-      raise "close! should not be called on the backend channel"
+      fail 'close! should not be called on the backend channel'
     end
   end
 end

data/lib/volt/page/document.rb

@@ -3,6 +3,5 @@ module Volt
   # templates
   # events
   class Document
-
   end
 end

data/lib/volt/page/document_events.rb

@@ -14,11 +14,11 @@ module Volt
 
         that = self
 
-        %x{
+        `
         $('body').on(event, function(e) {
           that.$handle(event, e, e.target || e.originalEvent.target);
         });
-      }
+      `
 
       end
 
@@ -70,9 +70,9 @@ module Volt
         @events.delete(event)
 
         # Remove the event from the body
-        %x{
+        `
           $('body').unbind(event);
-        }
+        `
       end
     end
   end

data/lib/volt/page/page.rb

@@ -47,7 +47,7 @@ module Volt
 
       if RUBY_PLATFORM == 'opal'
         # Setup escape binding for console
-        %x{
+        `
           $(document).keyup(function(e) {
             if (e.keyCode == 27) {
               Opal.gvars.page.$launch_console();
@@ -57,18 +57,18 @@ module Volt
           $(document).on('click', 'a', function(event) {
             return Opal.gvars.page.$link_clicked($(this).attr('href'), event);
           });
-        }
+        `
       end
 
       # Initialize tasks so we can get the reload message
-      self.tasks if Volt.env.development?
+      tasks if Volt.env.development?
 
       if Volt.client?
         channel.on('reconnected') do
           @page._reconnected = true
 
           `setTimeout(function() {`
-            @page._reconnected = false
+          @page._reconnected = false
           `}, 2000);`
         end
       end
@@ -90,7 +90,7 @@ module Volt
       @tasks ||= Tasks.new(self)
     end
 
-    def link_clicked(url='', event=nil)
+    def link_clicked(url = '', event = nil)
       # Skip when href == ''
       return false if url.blank?
 
@@ -111,7 +111,7 @@ module Volt
       # end
 
       # Not stopping, process link normally
-      return true
+      true
     end
 
     # We provide a binding_name, so we can bind events on the document
@@ -120,7 +120,7 @@ module Volt
     end
 
     def launch_console
-      puts "Launch Console"
+      puts 'Launch Console'
     end
 
     def channel
@@ -133,9 +133,7 @@ module Volt
       end
     end
 
-    def events
-      @events
-    end
+    attr_reader :events
 
     def add_model(model_name)
       model_name                 = model_name.camelize.to_sym
@@ -143,8 +141,17 @@ module Volt
     end
 
     def add_template(name, template, bindings)
-      @templates       ||= {}
-      @templates[name] = {'html' => template, 'bindings' => bindings}
+      @templates ||= {}
+
+      # First template gets priority.  The backend will load templates in order so
+      # that local templates come in before gems (so they can be overridden).
+      #
+      # TODO: Currently this means we will send templates to the client that will
+      # not get used because they are being overridden.  Need to detect that and
+      # not send them.
+      unless @templates[name]
+        @templates[name] = { 'html' => template, 'bindings' => bindings }
+      end
       # puts "Add Template: #{name}"
     end
 
@@ -155,7 +162,7 @@ module Volt
 
     def start
       # Setup to render template
-      Element.find('body').html = "<!-- $CONTENT --><!-- $/CONTENT -->"
+      Element.find('body').html = '<!-- $CONTENT --><!-- $/CONTENT -->'
 
       load_stored_page
 
@@ -168,10 +175,10 @@ module Volt
       TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
 
       # Setup title reactive template
-      @title_template = StringTemplateRender.new(self, main_controller, "main/main/main/title")
+      @title_template = StringTemplateRender.new(self, main_controller, 'main/main/main/title')
 
       # Watch for changes to the title template
-      Proc.new do
+      proc do
         title = @title_template.html.gsub(/\n/, ' ')
         `document.title = title;`
       end.watch!
@@ -186,11 +193,11 @@ module Volt
 
           `page_obj_str = sessionStorage.getItem('___page');`
           `if (page_obj_str) {`
-            `sessionStorage.removeItem('___page');`
+          `sessionStorage.removeItem('___page');`
 
-            JSON.parse(page_obj_str).each_pair do |key, value|
-              self.page.send(:"_#{key}=", value)
-            end
+          JSON.parse(page_obj_str).each_pair do |key, value|
+            page.send(:"_#{key}=", value)
+          end
           `}`
         end
       end

data/lib/volt/page/string_template_renderer.rb

@@ -10,7 +10,7 @@ module Volt
 
       @template_path = template_path
       @target        = AttributeTarget.new(nil, nil, self)
-      @template      = TemplateRenderer.new(page, @target, context, "main", template_path)
+      @template      = TemplateRenderer.new(page, @target, context, 'main', template_path)
     end
 
     # Render the template and get the current value
@@ -22,7 +22,7 @@ module Volt
         html = @target.to_html
       end
 
-      return html
+      html
     end
 
     def changed!

data/lib/volt/page/sub_context.rb

@@ -2,21 +2,25 @@ module Volt
   # 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
   # first, then failing those proxies the context.
+  #
+  # SubContext is also used for the attrs in controllers.  You can pass return_nils
+  # to have missing values return nil (as in attrs).
   class SubContext
     attr_reader :locals
 
-    def initialize(locals, context=nil)
+    def initialize(locals, context = nil, return_nils = false)
       @locals  = locals.stringify_keys
       @context = context
+      @return_nils = return_nils
     end
 
     def respond_to?(method_name)
-      !!(@locals[method_name.to_s] || (@context && @context.respond_to?(method_name)) || super)
+      !!(@locals[method_name.to_s] || (@context && @context.respond_to?(method_name)))
     end
 
     def method_missing(method_name, *args, &block)
       method_name = method_name.to_s
-      if @locals.has_key?(method_name)
+      if @locals.key?(method_name)
         obj = @locals[method_name]
 
         # TODORW: Might get a normal proc, flag internal procs
@@ -24,11 +28,13 @@ module Volt
           obj = obj.call(*args)
         end
         return obj
+      elsif @return_nils && method_name[-1] != '='
+        return nil
       elsif @context
         return @context.send(method_name, *args, &block)
       end
 
-      raise NoMethodError.new("undefined method `#{method_name}' for \"#{self.inspect}\":#{self.class.to_s}")
+      fail NoMethodError.new("undefined method `#{method_name}' for \"#{inspect}\":#{self.class}")
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Volt
         @target.find_by_binding_id(@binding_name).html = html
       end
 
-      return bindings
+      bindings
     end
 
     def remove

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

@@ -7,9 +7,8 @@ module Volt
   # 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
-
     def dom_section(*args)
-      return AttributeSection.new(self, *args)
+      AttributeSection.new(self, *args)
     end
   end
 end

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

@@ -1,20 +1,20 @@
 require 'volt/page/targets/dom_template'
 
 module Volt
-# Class to describe the interface for sections
+  # Class to describe the interface for sections
   class BaseSection
     @@template_cache = {}
 
     def remove
-      raise "not implemented"
+      fail 'not implemented'
     end
 
     def remove_anchors
-      raise "not implemented"
+      fail 'not implemented'
     end
 
     def insert_anchor_before_end
-      raise "not implemented"
+      fail 'not implemented'
     end
 
     def set_content_to_template(page, template_name)

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

@@ -1,5 +1,4 @@
 module Volt
   class BaseNode
-
   end
 end

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

@@ -11,7 +11,7 @@ module Volt
 
     attr_accessor :parent, :binding_id, :nodes
 
-    def initialize(binding_id=nil, parent=nil, root=nil)
+    def initialize(binding_id = nil, parent = nil, root = nil)
       @nodes      = []
       @binding_id = binding_id
       @parent     = parent
@@ -24,7 +24,6 @@ module Volt
       else
         trigger!('changed')
       end
-
     end
 
     def text=(text)
@@ -72,7 +71,7 @@ module Volt
         str << node.to_html
       end
 
-      return str.join('')
+      str.join('')
     end
 
     def find_by_binding_id(binding_id)
@@ -87,7 +86,7 @@ module Volt
         end
       end
 
-      return nil
+      nil
     end
 
     def remove
@@ -100,7 +99,7 @@ module Volt
     end
 
     def remove_anchors
-      raise "not implemented"
+      fail 'not implemented'
 
       @parent.nodes.delete(self)
 

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

@@ -10,12 +10,11 @@ module Volt
       @end_node   = find_by_comment("$/#{binding_name}")
     end
 
-
     def text=(value)
-      %x{
+      `
         this.$range().deleteContents();
         this.$range().insertNode(document.createTextNode(#{value}));
-      }
+      `
     end
 
     def html=(value)
@@ -25,18 +24,18 @@ module Volt
     end
 
     def remove
-      range = self.range()
+      range = self.range
 
-      %x{
+      `
         range.deleteContents();
-      }
+      `
     end
 
     def remove_anchors
-      %x{
+      `
         this.start_node.parentNode.removeChild(this.start_node);
         this.end_node.parentNode.removeChild(this.end_node);
-      }
+      `
       @start_node = nil
       @end_node   = nil
     end
@@ -53,9 +52,9 @@ module Volt
     # Takes in an array of dom nodes and replaces the current content
     # with the new nodes
     def nodes=(nodes)
-      range = self.range()
+      range = self.range
 
-      %x{
+      `
         range.deleteContents();
 
         for (var i=nodes.length-1; i >= 0; i--) {
@@ -64,50 +63,50 @@ module Volt
           node.parentNode.removeChild(node);
           range.insertNode(node);
         }
-      }
+      `
     end
 
     # Returns the nearest DOM node that contains all of the section.
     def container_node
-      range = self.range()
-      return `range.commonAncestorContainer`
+      range = self.range
+      `range.commonAncestorContainer`
     end
 
     def set_template(dom_template)
       dom_nodes, bindings = dom_template.make_new
 
       children = nil
-      %x{
+      `
       children = dom_nodes.childNodes;
-    }
+        `
 
       # Update the nodes
       self.nodes = children
 
-      %x{
+      `
       dom_nodes = null;
-    }
+        `
 
-      return bindings
+      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 = range
 
-      return range
+      range
     end
 
     def inspect
-      "<#{self.class.to_s}>"
+      "<#{self.class}>"
     end
   end
 end