volt 0.8.14 → 0.8.15

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

@@ -1,187 +1,188 @@
 require 'volt/server/html_parser/attribute_scope'
 
-class ViewScope
-  include AttributeScope
+module Volt
+  class ViewScope
+    include AttributeScope
 
-  attr_reader :html, :bindings
-  attr_accessor :path, :binding_number
+    attr_reader :html, :bindings
+    attr_accessor :path, :binding_number
 
-  def initialize(handler, path)
-    @handler = handler
-    @path = path
+    def initialize(handler, path)
+      @handler = handler
+      @path    = path
 
-    @html = ''
-    @bindings = {}
-    @binding_number = 0
-  end
+      @html           = ''
+      @bindings       = {}
+      @binding_number = 0
+    end
 
-  def <<(html)
-    @html << html
-  end
+    def <<(html)
+      @html << html
+    end
 
-  def add_binding(content)
-    content = content.strip
-    index = content.index(/[ \(]/)
-    if index
-      first_symbol = content[0...index]
-      args = content[index..-1].strip
-
-      case first_symbol
-      when 'if'
-        add_if(args)
-      when 'elsif'
-        add_else(args)
-      when 'else'
-        if args.blank?
-          add_else(nil)
-        else
-          raise "else does not take a conditional, #{content} was provided."
+    def add_binding(content)
+      content = content.strip
+      index   = content.index(/[ \(]/)
+      if index
+        first_symbol = content[0...index]
+        args         = content[index..-1].strip
+
+        case first_symbol
+          when 'if'
+            add_if(args)
+          when 'elsif'
+            add_else(args)
+          when 'else'
+            if args.blank?
+              add_else(nil)
+            else
+              raise "else does not take a conditional, #{content} was provided."
+            end
+          when 'template'
+            add_template(args)
+          else
+            if content =~ /.each\s+do\s+\|/
+              add_each(content)
+            else
+              add_content_binding(content)
+            end
         end
-      when 'template'
-        add_template(args)
       else
-        if content =~ /.each\s+do\s+\|/
-          add_each(content)
-        else
-          add_content_binding(content)
+        case content
+          when 'end'
+            # Close the binding
+            close_scope
+          when 'else'
+            add_else(nil)
+          else
+            add_content_binding(content)
         end
       end
-    else
-      case content
-      when 'end'
-        # Close the binding
-        close_scope
-      when 'else'
-        add_else(nil)
-      else
-        add_content_binding(content)
-      end
     end
-  end
 
-  def add_content_binding(content)
-    @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
-    save_binding(@binding_number, "lambda { |__p, __t, __c, __id| ContentBinding.new(__p, __t, __c, __id, Proc.new { #{content} }) }")
-    @binding_number += 1
-  end
+    def add_content_binding(content)
+      @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
+      save_binding(@binding_number, "lambda { |__p, __t, __c, __id| Volt::ContentBinding.new(__p, __t, __c, __id, Proc.new { #{content} }) }")
+      @binding_number += 1
+    end
 
-  def add_if(content)
-    # Add with path for if group.
-    @handler.scope << IfViewScope.new(@handler, @path + "/__ifg#{@binding_number}", content)
-    @binding_number += 1
-  end
+    def add_if(content)
+      # Add with path for if group.
+      @handler.scope << IfViewScope.new(@handler, @path + "/__ifg#{@binding_number}", content)
+      @binding_number += 1
+    end
 
-  def add_else(content)
-    raise "#else can only be added inside of an if block"
-  end
+    def add_else(content)
+      raise "#else can only be added inside of an if block"
+    end
 
-  def add_each(content)
-    @handler.scope << EachScope.new(@handler, @path + "/__each#{@binding_number}", content)
-  end
+    def add_each(content)
+      @handler.scope << EachScope.new(@handler, @path + "/__each#{@binding_number}", content)
+    end
 
-  def add_template(content)
-    # Strip ( and ) from the outsides
-    content = content.strip.gsub(/^\(/, '').gsub(/\)$/, '')
+    def add_template(content)
+      # Strip ( and ) from the outsides
+      content = content.strip.gsub(/^\(/, '').gsub(/\)$/, '')
 
-    @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
-    save_binding(@binding_number, "lambda { |__p, __t, __c, __id| TemplateBinding.new(__p, __t, __c, __id, #{@path.inspect}, Proc.new { [#{content}] }) }")
+      @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
+      save_binding(@binding_number, "lambda { |__p, __t, __c, __id| Volt::TemplateBinding.new(__p, __t, __c, __id, #{@path.inspect}, Proc.new { [#{content}] }) }")
 
-    @binding_number += 1
-  end
+      @binding_number += 1
+    end
 
-  # Returns ruby code to fetch the parent. (by removing the last fetch)
-  # TODO: Probably want to do this with AST transforms with the parser/unparser gems
-  def parent_fetcher(getter)
-    parent = getter.strip.gsub(/[.][^.]+$/, '')
+    # Returns ruby code to fetch the parent. (by removing the last fetch)
+    # TODO: Probably want to do this with AST transforms with the parser/unparser gems
+    def parent_fetcher(getter)
+      parent = getter.strip.gsub(/[.][^.]+$/, '')
 
-    if parent.blank? || !getter.index('.')
-      parent = 'self'
-    end
+      if parent.blank? || !getter.index('.')
+        parent = 'self'
+      end
 
-    return parent
-  end
+      return parent
+    end
 
-  def last_method_name(getter)
-    return getter.strip[/[^.]+$/]
-  end
+    def last_method_name(getter)
+      return getter.strip[/[^.]+$/]
+    end
 
-  def add_component(tag_name, attributes, unary)
-    component_name = tag_name[1..-1].gsub(':', '/')
+    def add_component(tag_name, attributes, unary)
+      component_name = tag_name[1..-1].gsub(':', '/')
 
-    @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
+      @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
 
-    data_hash = []
-    attributes.each_pair do |name, value|
-      parts = value.split(/(\{\{[^\}]+\}\})/).reject(&:blank?)
-      binding_count = parts.count {|p| p[0] == '{' && p[1] == '{' && p[-2] == '}' && p[-1] == '}'}
+      data_hash = []
+      attributes.each_pair do |name, value|
+        parts, binding_count = binding_parts_and_count(value)
 
-      # if this attribute has bindings
-      if binding_count > 0
-        if binding_count > 1
-          # Multiple bindings
-        elsif parts.size == 1 && binding_count == 1
-          # A single binding
-          getter = value[2...-2].strip
-          data_hash << "#{name.inspect} => Proc.new { #{getter} }"
+        # if this attribute has bindings
+        if binding_count > 0
+          if binding_count > 1
+            # Multiple bindings
+          elsif parts.size == 1 && binding_count == 1
+            # A single binding
+            getter = value[2...-2].strip
+            data_hash << "#{name.inspect} => Proc.new { #{getter} }"
 
-          setter = getter_to_setter(getter)
-          data_hash << "#{(name + "=").inspect} => Proc.new { |val| #{setter} }"
+            setter = getter_to_setter(getter)
+            data_hash << "#{(name + "=").inspect} => Proc.new { |val| #{setter} }"
 
-          # Add an _parent fetcher.  Useful for things like volt-fields to get the parent model.
-          parent = parent_fetcher(getter)
+            # Add an _parent fetcher.  Useful for things like volt-fields to get the parent model.
+            parent = parent_fetcher(getter)
 
-          # TODO: This adds some overhead, perhaps there is a way to compute this dynamically on the
-          # front-end.
-          data_hash << "#{(name + "_parent").inspect} => Proc.new { #{parent} }"
+            # TODO: This adds some overhead, perhaps there is a way to compute this dynamically on the
+            # front-end.
+            data_hash << "#{(name + "_parent").inspect} => Proc.new { #{parent} }"
 
-          # Add a _last_method property.  This is useful
-          data_hash << "#{(name + "_last_method").inspect} => #{last_method_name(getter).inspect}"
+            # Add a _last_method property.  This is useful
+            data_hash << "#{(name + "_last_method").inspect} => #{last_method_name(getter).inspect}"
+          end
+        else
+          # String
+          data_hash << "#{name.inspect} => #{value.inspect}"
         end
-      else
-        # String
-        data_hash << "#{name.inspect} => #{value.inspect}"
       end
-    end
 
-    arguments = "#{component_name.inspect}, { #{data_hash.join(',')} }"
+      arguments = "#{component_name.inspect}, { #{data_hash.join(',')} }"
 
-    save_binding(@binding_number, "lambda { |__p, __t, __c, __id| ComponentBinding.new(__p, __t, __c, __id, #{@path.inspect}, Proc.new { [#{arguments}] }) }")
-
-    @binding_number += 1
-  end
+      save_binding(@binding_number, "lambda { |__p, __t, __c, __id| Volt::ComponentBinding.new(__p, __t, __c, __id, #{@path.inspect}, Proc.new { [#{arguments}] }) }")
 
-  def add_textarea(tag_name, attributes, unary)
-    @handler.scope << TextareaScope.new(@handler, @path + "/__txtarea#{@binding_number}", attributes)
-    @binding_number += 1
+      @binding_number += 1
+    end
 
-    # close right away if unary
-    @handler.last.close_scope if unary
-  end
+    def add_textarea(tag_name, attributes, unary)
+      @handler.scope << TextareaScope.new(@handler, @path + "/__txtarea#{@binding_number}", attributes)
+      @binding_number += 1
 
-  # Called when this scope should be closed out
-  def close_scope(pop=true)
-    if pop
-      scope = @handler.scope.pop
-    else
-      scope = @handler.last
+      # close right away if unary
+      @handler.last.close_scope if unary
     end
 
-    raise "template path already exists: #{scope.path}" if @handler.templates[scope.path]
+    # Called when this scope should be closed out
+    def close_scope(pop=true)
+      if pop
+        scope = @handler.scope.pop
+      else
+        scope = @handler.last
+      end
 
-    template = {
-      'html' => scope.html
-    }
+      raise "template path already exists: #{scope.path}" if @handler.templates[scope.path]
 
-    if scope.bindings.size > 0
-      # Add the bindings if there are any
-      template['bindings'] = scope.bindings
-    end
+      template = {
+          'html' => scope.html
+      }
 
-    @handler.templates[scope.path] = template
-  end
+      if scope.bindings.size > 0
+        # Add the bindings if there are any
+        template['bindings'] = scope.bindings
+      end
 
-  def save_binding(binding_number, code)
-    @bindings[binding_number] ||= []
-    @bindings[binding_number] << code
+      @handler.templates[scope.path] = template
+    end
+
+    def save_binding(binding_number, code)
+      @bindings[binding_number] ||= []
+      @bindings[binding_number] << code
+    end
   end
 end

data/lib/volt/server/rack/asset_files.rb

@@ -1,107 +1,109 @@
 # Used to get a list of the assets and other included components
 # from the dependencies.rb files.
-class AssetFiles
-  def initialize(component_name, component_paths)
-    @component_paths = component_paths
-    @assets = []
-    @included_components = {}
-    @components = []
-
-    component('volt')
-    component(component_name)
-  end
-
-  def load_dependencies(path)
-    if path
-      dependencies_file = File.join(path, "config/dependencies.rb")
-    else
-      raise "Unable to find component #{component_name.inspect}"
+module Volt
+  class AssetFiles
+    def initialize(component_name, component_paths)
+      @component_paths     = component_paths
+      @assets              = []
+      @included_components = {}
+      @components          = []
+
+      component('volt')
+      component(component_name)
     end
 
-    if File.exists?(dependencies_file)
-      # Run the dependencies file in this asset files context
-      code = File.read(dependencies_file)
-      instance_eval(code)
+    def load_dependencies(path)
+      if path
+        dependencies_file = File.join(path, "config/dependencies.rb")
+      else
+        raise "Unable to find component #{component_name.inspect}"
+      end
+
+      if File.exists?(dependencies_file)
+        # Run the dependencies file in this asset files context
+        code = File.read(dependencies_file)
+        instance_eval(code)
+      end
     end
-  end
 
-  def component(name)
-    unless @included_components[name]
-      # Get the path to the component
-      path = @component_paths.component_path(name)
+    def component(name)
+      unless @included_components[name]
+        # Get the path to the component
+        path                       = @component_paths.component_path(name)
 
-      # Track that we added
-      @included_components[name] = true
+        # Track that we added
+        @included_components[name] = true
 
-      # Load the dependencies
-      load_dependencies(path)
+        # Load the dependencies
+        load_dependencies(path)
 
-      # Add any assets
-      add_assets(path)
-      @components << [path, name]
+        # Add any assets
+        add_assets(path)
+        @components << [path, name]
+      end
     end
-  end
 
-  def components
-    @included_components.keys
-  end
+    def components
+      @included_components.keys
+    end
 
-  def javascript_file(url)
-    @assets << [:javascript_file, url]
-  end
+    def javascript_file(url)
+      @assets << [:javascript_file, url]
+    end
 
-  def css_file(url)
-    @assets << [:css_file, url]
-  end
+    def css_file(url)
+      @assets << [:css_file, url]
+    end
 
-  def component_paths
-    return @components
-  end
+    def component_paths
+      return @components
+    end
 
-  def add_assets(path)
-    asset_folder = File.join(path, 'assets')
-    if File.directory?(asset_folder)
-      @assets << [:folder, asset_folder]
+    def add_assets(path)
+      asset_folder = File.join(path, 'assets')
+      if File.directory?(asset_folder)
+        @assets << [:folder, asset_folder]
+      end
     end
-  end
 
 
-  def javascript_files(opal_files)
-    javascript_files = []
-    @assets.each do |type, path|
-      case type
-      when :folder
-        javascript_files += Dir["#{path}/**/*.js"].sort.map {|folder| '/assets' + folder[path.size..-1] }
-      when :javascript_file
-        javascript_files << path
+    def javascript_files(opal_files)
+      javascript_files = []
+      @assets.each do |type, path|
+        case type
+          when :folder
+            javascript_files += Dir["#{path}/**/*.js"].sort.map { |folder| '/assets' + folder[path.size..-1] }
+          when :javascript_file
+            javascript_files << path
+        end
       end
-    end
 
-    opal_js_files = []
-    if Volt.source_maps?
-      opal_js_files += opal_files.environment['volt/page/page'].to_a.map {|v| '/assets/' + v.logical_path + '?body=1' }
-    else
-      opal_js_files << '/assets/volt/page/page.js'
-    end
-    opal_js_files << '/components/main.js'
+      opal_js_files = []
+      if Volt.source_maps?
+        opal_js_files += opal_files.environment['volt/page/page'].to_a.map { |v| '/assets/' + v.logical_path + '?body=1' }
+      else
+        opal_js_files << '/assets/volt/page/page.js'
+      end
+      opal_js_files << '/components/main.js'
 
-    javascript_files += opal_js_files
+      javascript_files += opal_js_files
 
-    return javascript_files
-  end
+      return javascript_files
+    end
 
-  def css_files
-    css_files = []
-    @assets.each do |type, path|
-      case type
-      when :folder
-        css_files += Dir["#{path}/**/*.{css,scss}"].sort.map {|folder| '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '') }
-      when :css_file
-        css_files << path
+    def css_files
+      css_files = []
+      @assets.each do |type, path|
+        case type
+          when :folder
+            css_files += Dir["#{path}/**/*.{css,scss}"].sort.map { |folder| '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '') }
+          when :css_file
+            css_files << path
+        end
       end
+
+      return css_files
     end
 
-    return css_files
   end
-
 end

data/lib/volt/server/rack/component_code.rb

@@ -4,22 +4,24 @@ require 'volt/server/rack/asset_files'
 
 # Takes in the name and all component paths and has a .code
 # method that returns all of the ruby setup code for the component.
-class ComponentCode
-  def initialize(component_name, component_paths, client=true)
-    @component_name = component_name
-    @component_paths = component_paths
-    @client = client
-  end
+module Volt
+  class ComponentCode
+    def initialize(component_name, component_paths, client=true)
+      @component_name  = component_name
+      @component_paths = component_paths
+      @client          = client
+    end
 
-  def code
-    code = ''
+    def code
+      code = ''
 
-    asset_files = AssetFiles.new(@component_name, @component_paths)
-    asset_files.component_paths.each do |component_path, component_name|
-      code << ComponentTemplates.new(component_path, component_name, @client).code
-      code << "\n\n"
-    end
+      asset_files = AssetFiles.new(@component_name, @component_paths)
+      asset_files.component_paths.each do |component_path, component_name|
+        code << ComponentTemplates.new(component_path, component_name, @client).code
+        code << "\n\n"
+      end
 
-    return code
+      return code
+    end
   end
-end
+end

data/lib/volt/server/rack/component_html_renderer.rb

@@ -1,21 +1,23 @@
 require 'volt/page/page'
 
 # A rack app that renders the html for a component on the backend.
-class ComponentHtmlRenderer
-  def initialize
+module Volt
+  class ComponentHtmlRenderer
+    def initialize
 
-  end
+    end
 
-  def call(env)
-    req = Rack::Request.new(env)
-    path = req.path
+    def call(env)
+      req            = Rack::Request.new(env)
+      path           = req.path
 
-    # For now just assume main
-    component_name = 'main'
+      # For now just assume main
+      component_name = 'main'
 
-    page = Page.new
+      page = Page.new
 
-    component_paths = ComponentPaths.new(Volt.root)
-    code = ComponentCode.new(component_name, component_paths).code
+      component_paths = ComponentPaths.new(Volt.root)
+      code            = ComponentCode.new(component_name, component_paths).code
+    end
   end
-end
+end