volt 0.8.14 → 0.8.15

data/lib/volt/server/html_parser/attribute_scope.rb

@@ -1,136 +1,146 @@
-# Included into ViewScope to provide processing for attributes
-module AttributeScope
-  # Take the attributes and create any bindings
-  def process_attributes(tag_name, attributes)
-    new_attributes = attributes.dup
-
-    attributes.each_pair do |name, value|
-      if name[0..1] == 'e-'
-        process_event_binding(tag_name, new_attributes, name, value)
-      else
-        process_attribute(tag_name, new_attributes, name, value)
+module Volt
+  # Included into ViewScope to provide processing for attributes
+  module AttributeScope
+    # Take the attributes and create any bindings
+    def process_attributes(tag_name, attributes)
+      new_attributes = attributes.dup
+
+      attributes.each_pair do |name, value|
+        if name[0..1] == 'e-'
+          process_event_binding(tag_name, new_attributes, name, value)
+        else
+          process_attribute(tag_name, new_attributes, name, value)
+        end
       end
+
+      return new_attributes
     end
 
-    return new_attributes
-  end
+    def process_event_binding(tag_name, attributes, name, value)
+      id = add_id_to_attributes(attributes)
+
+      event = name[2..-1]
 
-  def process_event_binding(tag_name, attributes, name, value)
-    id = add_id_to_attributes(attributes)
+      if tag_name == 'a'
+        # For links, we need to add blank href to make it clickable.
+        attributes['href'] ||= ''
+      end
 
-    event = name[2..-1]
+      # Remove the e- attribute
+      attributes.delete(name)
 
-    if tag_name == 'a'
-      # For links, we need to add blank href to make it clickable.
-      attributes['href'] ||= ''
+      save_binding(id, "lambda { |__p, __t, __c, __id| Volt::EventBinding.new(__p, __t, __c, __id, #{event.inspect}, Proc.new {|event| #{value} })}")
     end
 
-    # Remove the e- attribute
-    attributes.delete(name)
+    # Takes a string and splits on bindings, returns the string split on bindings
+    # and the number of bindings.
+    def binding_parts_and_count(value)
+      parts         = value.split(/(\{\{[^\}]+\}\})/).reject(&:blank?)
+      binding_count = parts.count { |p| p[0] == '{' && p[1] == '{' && p[-2] == '}' && p[-1] == '}' }
 
-    save_binding(id, "lambda { |__p, __t, __c, __id| EventBinding.new(__p, __t, __c, __id, #{event.inspect}, Proc.new {|event| #{value} })}")
-  end
+      return parts, binding_count
+    end
 
-  def process_attribute(tag_name, attributes, attribute_name, value)
-    parts = value.split(/(\{\{[^\}]+\}\})/).reject(&:blank?)
-    binding_count = parts.count {|p| p[0] == '{' && p[1] == '{' && p[-2] == '}' && p[-1] == '}'}
+    def process_attribute(tag_name, attributes, attribute_name, value)
+      parts, binding_count = binding_parts_and_count(value)
 
-    # if this attribute has bindings
-    if binding_count > 0
-      # Setup an id
-      id = add_id_to_attributes(attributes)
+      # if this attribute has bindings
+      if binding_count > 0
+        # Setup an id
+        id = add_id_to_attributes(attributes)
 
-      if parts.size > 1
-        # Multiple bindings
-        add_multiple_attribute(tag_name, id, attribute_name, parts, value)
-      elsif parts.size == 1 && binding_count == 1
-        # A single binding
-        add_single_attribute(id, attribute_name, parts)
-      end
+        if parts.size > 1
+          # Multiple bindings
+          add_multiple_attribute(tag_name, id, attribute_name, parts, value)
+        elsif parts.size == 1 && binding_count == 1
+          # A single binding
+          add_single_attribute(id, attribute_name, parts)
+        end
 
-      # Remove the attribute
-      attributes.delete(attribute_name)
+        # Remove the attribute
+        attributes.delete(attribute_name)
+      end
     end
-  end
 
-  # TODO: We should use a real parser for this
-  def getter_to_setter(getter)
-    getter = getter.strip
+    # TODO: We should use a real parser for this
+    def getter_to_setter(getter)
+      getter = getter.strip
 
-    # Convert a getter into a setter
-    if getter.index('.') || getter.index('@')
-      prefix = ''
-    else
-      prefix = 'self.'
-    end
+      # Convert a getter into a setter
+      if getter.index('.') || getter.index('@')
+        prefix = ''
+      else
+        prefix = 'self.'
+      end
 
-    return "#{prefix}#{getter}=(val)"
-  end
+      return "#{prefix}#{getter}=(val)"
+    end
 
-  # Add an attribute binding on the tag, bind directly to the getter in the binding
-  def add_single_attribute(id, attribute_name, parts)
-    getter = parts[0][2...-2].strip
+    # Add an attribute binding on the tag, bind directly to the getter in the binding
+    def add_single_attribute(id, attribute_name, parts)
+      getter = parts[0][2...-2].strip
 
-    # if getter.index('@')
-    #   raise "Bindings currently do not support instance variables"
-    # end
+      # if getter.index('@')
+      #   raise "Bindings currently do not support instance variables"
+      # end
 
-    setter = getter_to_setter(getter)
+      setter = getter_to_setter(getter)
 
-    save_binding(id, "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { #{getter} }, Proc.new { |val| #{setter} }) }")
-  end
+      save_binding(id, "lambda { |__p, __t, __c, __id| Volt::AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { #{getter} }, Proc.new { |val| #{setter} }) }")
+    end
 
 
-  def add_multiple_attribute(tag_name, id, attribute_name, parts, content)
-    case attribute_name
-    when 'checked', 'value'
-      if parts.size > 1
-        if tag_name == 'textarea'
-          raise "The content of text area's can not be bound to multiple bindings."
-        else
-          # Multiple values can not be passed to value or checked attributes.
-          raise "Multiple bindings can not be passed to a #{attribute_name} binding: #{parts.inspect}"
-        end
+    def add_multiple_attribute(tag_name, id, attribute_name, parts, content)
+      case attribute_name
+        when 'checked', 'value'
+          if parts.size > 1
+            if tag_name == 'textarea'
+              raise "The content of text area's can not be bound to multiple bindings."
+            else
+              # Multiple values can not be passed to value or checked attributes.
+              raise "Multiple bindings can not be passed to a #{attribute_name} binding: #{parts.inspect}"
+            end
+          end
       end
-    end
 
-    string_template_renderer_path = add_string_template_renderer(content)
+      string_template_renderer_path = add_string_template_renderer(content)
 
-    save_binding(id, "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { StringTemplateRender.new(__p, __c, #{string_template_renderer_path.inspect}) }) }")
-  end
+      save_binding(id, "lambda { |__p, __t, __c, __id| Volt::AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { Volt::StringTemplateRender.new(__p, __c, #{string_template_renderer_path.inspect}) }) }")
+    end
+
+    def add_string_template_renderer(content)
+      path            = @path + "/_rv#{@binding_number}"
+      new_handler     = ViewHandler.new(path, false)
+      @binding_number += 1
 
-  def add_string_template_renderer(content)
-    path = @path + "/_rv#{@binding_number}"
-    new_handler = ViewHandler.new(path, false)
-    @binding_number += 1
+      SandlebarsParser.new(content, new_handler)
 
-    SandlebarsParser.new(content, new_handler)
+      # Close out the last scope
+      new_handler.scope.last.close_scope
 
-    # Close out the last scope
-    new_handler.scope.last.close_scope
+      # Copy in the templates from the new handler
+      new_handler.templates.each_pair do |key, value|
+        @handler.templates[key] = value
+      end
 
-    # Copy in the templates from the new handler
-    new_handler.templates.each_pair do |key, value|
-      @handler.templates[key] = value
+      return path
     end
 
-    return path
-  end
+    def add_id_to_attributes(attributes)
+      id              = attributes['id'] ||= "id#{@binding_number}"
+      @binding_number += 1
 
-  def add_id_to_attributes(attributes)
-    id = attributes['id'] ||= "id#{@binding_number}"
-    @binding_number += 1
+      return id.to_s
+    end
 
-    return id.to_s
-  end
+    def attribute_string(attributes)
+      attr_str = attributes.map { |v| "#{v[0]}=\"#{v[1]}\"" }.join(' ')
+      if attr_str.size > 0
+        # extra space
+        attr_str = " " + attr_str
+      end
 
-  def attribute_string(attributes)
-    attr_str = attributes.map {|v| "#{v[0]}=\"#{v[1]}\"" }.join(' ')
-    if attr_str.size > 0
-      # extra space
-      attr_str = " " + attr_str
+      return attr_str
     end
-
-    return attr_str
   end
-end
+end

data/lib/volt/server/html_parser/each_scope.rb

@@ -1,22 +1,23 @@
-class EachScope < ViewScope
-  def initialize(handler, path, content)
-    super(handler, path)
-    # @content, @variable_name = content.strip.split(/ as /)
+module Volt
+  class EachScope < ViewScope
+    def initialize(handler, path, content)
+      super(handler, path)
+      # @content, @variable_name = content.strip.split(/ as /)
 
-    @content, @variable_name = content.split(/.each\s+do\s+\|/)
+      @content, @variable_name = content.split(/.each\s+do\s+\|/)
 
-    @variable_name = @variable_name.gsub(/\|/, '')
-  end
-
-  def close_scope
-    binding_number = @handler.scope[-2].binding_number
-    @handler.scope[-2].binding_number += 1
-    @path += "/__template/#{binding_number}"
+      @variable_name = @variable_name.gsub(/\|/, '')
+    end
 
-    super
+    def close_scope
+      binding_number                    = @handler.scope[-2].binding_number
+      @handler.scope[-2].binding_number += 1
+      @path                             += "/__template/#{binding_number}"
 
-    @handler.html << "<!-- $#{binding_number} --><!-- $/#{binding_number} -->"
-		@handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| EachBinding.new(__p, __t, __c, __id, Proc.new { #{@content} }, #{@variable_name.inspect}, #{@path.inspect}) }")
+      super
 
+      @handler.html << "<!-- $#{binding_number} --><!-- $/#{binding_number} -->"
+      @handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { #{@content} }, #{@variable_name.inspect}, #{@path.inspect}) }")
+    end
   end
-end
+end

data/lib/volt/server/html_parser/if_view_scope.rb

@@ -1,71 +1,73 @@
-class IfViewScope < ViewScope
-  def initialize(handler, path, content)
-    super(handler, path)
+module Volt
+  class IfViewScope < ViewScope
+    def initialize(handler, path, content)
+      super(handler, path)
 
-    @original_path = @path
+      @original_path = @path
 
-    @last_content = content
-    @branches = []
+      @last_content                = content
+      @branches                    = []
 
-    # We haven't added the if yet
-    @if_binding_number = @handler.last.binding_number
-    @handler.last.binding_number += 1
+      # We haven't added the if yet
+      @if_binding_number           = @handler.last.binding_number
+      @handler.last.binding_number += 1
 
-    @path_number = 0
+      @path_number = 0
 
-    new_path
-  end
+      new_path
+    end
 
-  def new_path
-    @path = @original_path + "/__if#{@path_number}"
-    @path_number += 1
-  end
+    def new_path
+      @path        = @original_path + "/__if#{@path_number}"
+      @path_number += 1
+    end
 
-  # When we reach an else block, we basically commit the current html
-  # and template, and start a new one.
-  def add_else(content)
-    close_scope(false)
+    # When we reach an else block, we basically commit the current html
+    # and template, and start a new one.
+    def add_else(content)
+      close_scope(false)
 
-    @last_content = content
+      @last_content = content
 
-    # Clear existing
-    @html = ''
-    @bindings = {}
+      # Clear existing
+      @html         = ''
+      @bindings     = {}
 
-    # Close scope removes us, so lets add it back.
-    @handler.scope << self
+      # Close scope removes us, so lets add it back.
+      @handler.scope << self
 
-    @binding_number = 0
+      @binding_number = 0
 
-    # Generate a new template path for this section.
-    new_path
-  end
+      # Generate a new template path for this section.
+      new_path
+    end
 
-  def close_scope(final=true)
-    @branches << [@last_content, path]
+    def close_scope(final=true)
+      @branches << [@last_content, path]
 
-    super()
+      super()
 
-    if final
-      # Add the binding to the parent
-      branches = @branches.map do |branch|
-        content = branch[0]
-        if content == nil
-          content = nil.inspect
-        else
-          content = "Proc.new { #{branch[0]} }"
-        end
+      if final
+        # Add the binding to the parent
+        branches = @branches.map do |branch|
+          content = branch[0]
+          if content == nil
+            content = nil.inspect
+          else
+            content = "Proc.new { #{branch[0]} }"
+          end
 
-        "[#{content}, #{branch[1].inspect}]"
-      end.join(', ')
+          "[#{content}, #{branch[1].inspect}]"
+        end.join(', ')
 
-      new_scope = @handler.last
+        new_scope = @handler.last
 
-      # variables are captured for branches, so we must prefix them so they don't conflict.
-      # page, target, context, id
-      new_scope.save_binding(@if_binding_number, "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [#{branches}]) }")
+        # variables are captured for branches, so we must prefix them so they don't conflict.
+        # page, target, context, id
+        new_scope.save_binding(@if_binding_number, "lambda { |__p, __t, __c, __id| Volt::IfBinding.new(__p, __t, __c, __id, [#{branches}]) }")
 
-      new_scope.html << "<!-- $#{@if_binding_number} --><!-- $/#{@if_binding_number} -->"
+        new_scope.html << "<!-- $#{@if_binding_number} --><!-- $/#{@if_binding_number} -->"
+      end
     end
   end
 end