volt 0.8.14 → 0.8.15

data/lib/volt/page/document.rb

@@ -1,7 +1,8 @@
-# Should have
-# templates
-# events
-
-class Document
+module Volt
+  # Should have
+  # templates
+  # events
+  class Document
 
+  end
 end

data/lib/volt/page/document_events.rb

@@ -1,77 +1,79 @@
-class DocumentEvents
-  def initialize
-    @events = {}
-  end
+module Volt
+  class DocumentEvents
+    def initialize
+      @events = {}
+    end
 
-  def add(event, binding, handler)
-    # Track each document event based on the event, element id, then binding.object_id
-    unless @events[event]
-      # We haven't defined an event of type event yet, lets attach it to the
-      # document.
+    def add(event, binding, handler)
+      # Track each document event based on the event, element id, then binding.object_id
+      unless @events[event]
+        # We haven't defined an event of type event yet, lets attach it to the
+        # document.
 
-      @events[event] = {}
+        @events[event] = {}
 
-      that = self
+        that = self
 
-      %x{
+        %x{
         $('body').on(event, function(e) {
           that.$handle(event, e, e.target || e.originalEvent.target);
         });
       }
 
+      end
+
+      @events[event][binding.binding_name]                    ||= {}
+      @events[event][binding.binding_name][binding.object_id] = handler
     end
 
-    @events[event][binding.binding_name] ||= {}
-    @events[event][binding.binding_name][binding.object_id] = handler
-  end
+    def handle(event_name, event, target)
+      element = Element.find(target)
 
-  def handle(event_name, event, target)
-    element = Element.find(target)
+      loop do
+        # Lookup the handler, make sure to not assume the group
+        # exists.
+        # TODO: Sometimes the event doesn't exist, but we still get
+        # an event.
+        handlers = @events[event_name]
+        handlers = handlers[element.id] if handlers
 
-    loop do
-      # Lookup the handler, make sure to not assume the group
-      # exists.
-      # TODO: Sometimes the event doesn't exist, but we still get
-      # an event.
-      handlers = @events[event_name]
-      handlers = handlers[element.id] if handlers
+        if handlers
+          handlers.values.each do |handler|
+            # Call each handler for this object
+            handler.call(event)
+          end
+        end
 
-      if handlers
-        handlers.values.each do |handler|
-          # Call each handler for this object
-          handler.call(event)
+        if element.size == 0
+          break
+        else
+          element = element.parent
         end
       end
 
-      if element.size == 0
-        break
-      else
-        element = element.parent
-      end
+      nil
     end
 
-    nil
-  end
-
-  def remove(event, binding)
-    # Remove the event binding
-    @events[event][binding.binding_name].delete(binding.object_id)
+    def remove(event, binding)
+      # Remove the event binding
+      @events[event][binding.binding_name].delete(binding.object_id)
 
-    # if there are no more handlers for this binding_name (the html id), then
-    # we remove the binding name hash
-    if @events[event][binding.binding_name].size == 0
-      @events[event].delete(binding.binding_name)
-    end
+      # if there are no more handlers for this binding_name (the html id), then
+      # we remove the binding name hash
+      if @events[event][binding.binding_name].size == 0
+        @events[event].delete(binding.binding_name)
+      end
 
-    # if there are no more handlers in this event, we can unregister the event
-    # from the document
-    if @events[event].size == 0
-      @events.delete(event)
+      # if there are no more handlers in this event, we can unregister the event
+      # from the document
+      if @events[event].size == 0
+        @events.delete(event)
 
-      # Remove the event from the body
-      %x{
-        $('body').unbind(event);
-      }
+        # Remove the event from the body
+        %x{
+          $('body').unbind(event);
+        }
+      end
     end
   end
 end

data/lib/volt/page/page.rb

@@ -29,181 +29,182 @@ require 'volt/page/url_tracker'
 require 'volt/benchmark/benchmark'
 require 'volt/page/tasks'
 
+module Volt
+  class Page
+    attr_reader :url, :params, :page, :templates, :routes, :events, :model_classes
+
+    def initialize
+      @model_classes = {}
+
+      # Run the code to setup the page
+      @page          = Model.new
+
+      @url         = URL.new
+      @params      = @url.params
+      @url_tracker = UrlTracker.new(self)
+
+      @events = DocumentEvents.new
+
+      if RUBY_PLATFORM == 'opal'
+        # Setup escape binding for console
+        %x{
+          $(document).keyup(function(e) {
+            if (e.keyCode == 27) {
+              Opal.gvars.page.$launch_console();
+            }
+          });
+
+          $(document).on('click', 'a', function(event) {
+            return Opal.gvars.page.$link_clicked($(this).attr('href'), event);
+          });
+        }
+      end
 
-class Page
-  attr_reader :url, :params, :page, :templates, :routes, :events, :model_classes
-
-  def initialize
-    @model_classes = {}
-
-    # Run the code to setup the page
-    @page = Model.new
-
-    @url = URL.new
-    @params = @url.params
-    @url_tracker = UrlTracker.new(self)
-
-    @events = DocumentEvents.new
+      # Initialize tasks so we can get the reload message
+      self.tasks if Volt.env.development?
 
-    if RUBY_PLATFORM == 'opal'
-      # Setup escape binding for console
-      %x{
-        $(document).keyup(function(e) {
-          if (e.keyCode == 27) {
-            Opal.gvars.page.$launch_console();
-          }
-        });
+      if Volt.client?
+        channel.on('reconnected') do
+          @page._reconnected = true
 
-        $(document).on('click', 'a', function(event) {
-          return Opal.gvars.page.$link_clicked($(this).attr('href'), event);
-        });
-      }
+          `setTimeout(function() {`
+            @page._reconnected = false
+          `}, 2000);`
+        end
+      end
     end
 
-    # Initialize tasks so we can get the reload message
-    self.tasks if Volt.env.development?
-
-    if Volt.client?
-      channel.on('reconnected') do
-        @page._reconnected = true
+    def flash
+      @flash ||= Model.new({}, persistor: Persistors::Flash)
+    end
 
-        `setTimeout(function() {`
-          @page._reconnected = false
-        `}, 2000);`
-      end
+    def store
+      @store ||= Model.new({}, persistor: Persistors::StoreFactory.new(tasks))
     end
-  end
 
-  def flash
-    @flash ||= Model.new({}, persistor: Persistors::Flash)
-  end
+    def local_store
+      @local_store ||= Model.new({}, persistor: Persistors::LocalStore)
+    end
 
-  def store
-    @store ||= Model.new({}, persistor: Persistors::StoreFactory.new(tasks))
-  end
+    def tasks
+      @tasks ||= Tasks.new(self)
+    end
 
-  def local_store
-    @local_store ||= Model.new({}, persistor: Persistors::LocalStore)
-  end
+    def link_clicked(url='', event=nil)
+      # Skip when href == ''
+      return false if url.blank?
 
-  def tasks
-    @tasks ||= Tasks.new(self)
-  end
+      # Normalize url
+      # Benchmark.bm(1) do
+      if @url.parse(url)
+        if event
+          # Handled new url
+          `event.stopPropagation();`
+        end
 
-  def link_clicked(url='', event=nil)
-    # Skip when href == ''
-    return false if url.blank?
+        # Clear the flash
+        flash.clear
 
-    # Normalize url
-    # Benchmark.bm(1) do
-    if @url.parse(url)
-      if event
-        # Handled new url
-        `event.stopPropagation();`
+        # return false to stop the event propigation
+        return false
       end
+      # end
 
-      # Clear the flash
-      flash.clear
-
-      # return false to stop the event propigation
-      return false
+      # Not stopping, process link normally
+      return true
     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
+    # 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
+    def launch_console
+      puts "Launch Console"
+    end
 
-  def channel
-    @channel ||= begin
-      if Volt.client?
-        Channel.new
-      else
-        ChannelStub.new
+    def channel
+      @channel ||= begin
+        if Volt.client?
+          Channel.new
+        else
+          ChannelStub.new
+        end
       end
     end
-  end
 
-  def events
-    @events
-  end
+    def events
+      @events
+    end
 
-  def add_model(model_name)
-    model_name = model_name.camelize.to_sym
-    @model_classes[model_name] = Object.const_get(model_name)
-  end
+    def add_model(model_name)
+      model_name                 = model_name.camelize.to_sym
+      @model_classes[model_name] = Object.const_get(model_name)
+    end
 
-  def add_template(name, template, bindings)
-    @templates ||= {}
-    @templates[name] = {'html' => template, 'bindings' => bindings}
-    # puts "Add Template: #{name}"
-  end
+    def add_template(name, template, bindings)
+      @templates       ||= {}
+      @templates[name] = {'html' => template, 'bindings' => bindings}
+      # puts "Add Template: #{name}"
+    end
 
-  def add_routes(&block)
-    @routes = Routes.new.define(&block)
-    @url.router = @routes
-  end
+    def add_routes(&block)
+      @routes     = Routes.new.define(&block)
+      @url.router = @routes
+    end
 
-  def start
-    # Setup to render template
-    Element.find('body').html = "<!-- $CONTENT --><!-- $/CONTENT -->"
+    def start
+      # Setup to render template
+      Element.find('body').html = "<!-- $CONTENT --><!-- $/CONTENT -->"
 
-    load_stored_page
+      load_stored_page
 
-    # Do the initial url params parse
-    @url_tracker.url_updated(true)
+      # Do the initial url params parse
+      @url_tracker.url_updated(true)
 
-    main_controller = MainController.new
+      main_controller = MainController.new
 
-    # Setup main page template
-    TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
+      # Setup main page template
+      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")
+      # Setup title reactive template
+      @title_template = StringTemplateRender.new(self, main_controller, "main/main/main/title")
 
-    # Watch for changes to the title template
-    Proc.new do
-      title = @title_template.html.gsub(/\n/, ' ')
-      `document.title = title;`
-    end.watch!
-  end
+      # 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
-  # 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');`
-
-          JSON.parse(page_obj_str).each_pair do |key, value|
-            self.page.send(:"_#{key}=", value)
-          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');`
+
+            JSON.parse(page_obj_str).each_pair do |key, value|
+              self.page.send(:"_#{key}=", value)
+            end
+          `}`
+        end
       end
+    rescue => e
+      puts "Unable to restore: #{e.inspect}"
     end
-  rescue => e
-    puts "Unable to restore: #{e.inspect}"
   end
-end
 
-if Volt.client?
-  $page = Page.new
+  if Volt.client?
+    $page = Page.new
 
-  # Call start once the page is loaded
-  Document.ready? do
-    $page.start
+    # Call start once the page is loaded
+    Document.ready? do
+      $page.start
+    end
   end
 end

data/lib/volt/page/string_template_renderer.rb

@@ -1,46 +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
+module Volt
+  # 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
+    # Render the template and get the current value
+    def html
+      @dependency.depend
 
-    html = nil
-    Computation.run_without_tracking do
-      html = @target.to_html
+      html = nil
+      Computation.run_without_tracking do
+        html = @target.to_html
+      end
+
+      return html
     end
 
-    return html
-  end
+    def changed!
+      # if @dependency is missing, this template has been removed
+      @dependency.changed! if @dependency
+    end
 
-  def changed!
-    # if @dependency is missing, this template has been removed
-    @dependency.changed! if @dependency
-  end
+    def remove
+      @dependency.remove
+      @dependency = nil
 
-  def remove
-    @dependency.remove
-    @dependency = nil
+      Computation.run_without_tracking do
+        @template.remove
+        @template = nil
+      end
 
-    Computation.run_without_tracking do
-      @template.remove
-      @template = nil
+      @target        = nil
+      @template_path = nil
     end
-
-    @target = nil
-    @template_path = nil
   end
-
 end

data/lib/volt/page/sub_context.rb

@@ -1,33 +1,34 @@
-# 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.
+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.
+  class SubContext
+    attr_reader :locals
 
-class SubContext
-  attr_reader :locals
-
-  def initialize(locals, context=nil)
-    @locals = locals.stringify_keys
-    @context = context
-  end
+    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 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.has_key?(method_name)
-      obj = @locals[method_name]
+    def method_missing(method_name, *args, &block)
+      method_name = method_name.to_s
+      if @locals.has_key?(method_name)
+        obj = @locals[method_name]
 
-      # TODORW: Might get a normal proc, flag internal procs
-      if obj.is_a?(Proc)
-        obj = obj.call(*args)
+        # 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
-      return obj
-    elsif @context
-      return @context.send(method_name, *args, &block)
-    end
 
-    raise NoMethodError.new("undefined method `#{method_name}' for \"#{self.inspect}\":#{self.class.to_s}")
+      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

@@ -3,35 +3,37 @@
 
 require 'volt/page/targets/base_section'
 
-class AttributeSection < BaseSection
-  def initialize(target, binding_name)
-    @target = target
-    @binding_name = binding_name
-  end
-
-  def text=(text)
-    set_content_and_rezero_bindings(text, {})
-  end
+module Volt
+  class AttributeSection < BaseSection
+    def initialize(target, binding_name)
+      @target       = target
+      @binding_name = binding_name
+    end
 
-  def html=(value)
-    set_content_and_rezero_bindings(value, {})
-  end
+    def text=(text)
+      set_content_and_rezero_bindings(text, {})
+    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)
-    if @binding_name == 'main'
-      @target.html = html
-    else
-      @target.find_by_binding_id(@binding_name).html = html
+    def html=(value)
+      set_content_and_rezero_bindings(value, {})
     end
 
-    return bindings
-  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)
+      if @binding_name == 'main'
+        @target.html = html
+      else
+        @target.find_by_binding_id(@binding_name).html = html
+      end
 
-  def remove
-    # TODO: is this getting run for no reason?
-    node = @target.find_by_binding_id(@binding_name)
-    node.remove if node
+      return bindings
+    end
+
+    def remove
+      # TODO: is this getting run for no reason?
+      node = @target.find_by_binding_id(@binding_name)
+      node.remove if node
+    end
   end
 end