volt 0.8.14 → 0.8.15

data/lib/volt/models/validators/presence_validator.rb

@@ -1,17 +1,19 @@
-class PresenceValidator
-  def self.validate(model, field_name, args)
-    errors = {}
-    value = model.send(field_name)
-    if !value || value.blank?
-      if args.is_a?(Hash) && args[:message]
-        message = args[:message]
-      else
-        message = "must be specified"
+module Volt
+  class PresenceValidator
+    def self.validate(model, field_name, args)
+      errors = {}
+      value  = model.send(field_name)
+      if !value || value.blank?
+        if args.is_a?(Hash) && args[:message]
+          message = args[:message]
+        else
+          message = "must be specified"
+        end
+
+        errors[field_name] = [message]
       end
 
-      errors[field_name] = [message]
+      return errors
     end
-
-    return errors
   end
 end

data/lib/volt/page/bindings/attribute_binding.rb

@@ -1,140 +1,140 @@
 require 'volt/page/bindings/base_binding'
 require 'volt/page/targets/attribute_target'
 
-class AttributeBinding < BaseBinding
-  def initialize(page, target, context, binding_name, attribute_name, getter, setter)
-    super(page, target, context, binding_name)
+module Volt
+  class AttributeBinding < BaseBinding
+    def initialize(page, target, context, binding_name, attribute_name, getter, setter)
+      super(page, target, context, binding_name)
 
-    @attribute_name = attribute_name
-    @getter = getter
-    @setter = setter
+      @attribute_name = attribute_name
+      @getter         = getter
+      @setter         = setter
 
-    setup
-  end
+      setup
+    end
 
-  def setup
+    def setup
 
-    # Listen for changes
-    @computation = -> do
-      begin
-        update(@context.instance_eval(&@getter))
-      rescue => e
-        Volt.logger.error("AttributeBinding Error: #{e.inspect}")
-        update('')
-      end
-    end.watch!
+      # Listen for changes
+      @computation = -> do
+        begin
+          update(@context.instance_eval(&@getter))
+        rescue => e
+          Volt.logger.error("AttributeBinding Error: #{e.inspect}")
+          update('')
+        end
+      end.watch!
 
-    @is_radio = element.is('[type=radio]')
-    if @is_radio
-      @selected_value = element.attr('value')
-    end
+      @is_radio = element.is('[type=radio]')
+      if @is_radio
+        @selected_value = element.attr('value')
+      end
 
-    # Bind so when this value updates, we update
-    case @attribute_name
-    when 'value'
-      element.on('input.attrbind') { changed }
-    when 'checked'
-      element.on('change.attrbind') {|event| changed(event) }
+      # Bind so when this value updates, we update
+      case @attribute_name
+        when 'value'
+          element.on('input.attrbind') { changed }
+        when 'checked'
+          element.on('change.attrbind') { |event| changed(event) }
+      end
     end
-  end
 
-  def changed(event=nil)
-    case @attribute_name
-    when 'value'
-      current_value = element.value
-    else
-      current_value = element.is(':checked')
-    end
+    def changed(event=nil)
+      case @attribute_name
+        when 'value'
+          current_value = element.value
+        else
+          current_value = element.is(':checked')
+      end
 
-    if @is_radio
-      if current_value
-        # if it is a radio button and its checked
-        @context.instance_exec(@selected_value, &@setter)
+      if @is_radio
+        if current_value
+          # if it is a radio button and its checked
+          @context.instance_exec(@selected_value, &@setter)
+        end
+      else
+        @context.instance_exec(current_value, &@setter)
       end
-    else
-      @context.instance_exec(current_value, &@setter)
     end
-  end
-
-  def element
-    Element.find('#' + binding_name)
-  end
 
-  def update(new_value)
-    if @attribute_name == 'checked'
-      update_checked(new_value)
-      return
+    def element
+      Element.find('#' + binding_name)
     end
 
-    # Stop any previous reactive template computations
-    @string_template_renderer_computation.stop if @string_template_renderer_computation
-    @string_template_renderer.remove if @string_template_renderer
+    def update(new_value)
+      if @attribute_name == 'checked'
+        update_checked(new_value)
+        return
+      end
 
-    if new_value.is_a?(StringTemplateRender)
-      # We don't need to refetch the whole reactive template to
-      # update, we can just depend on it and update directly.
-      @string_template_renderer = new_value
+      # Stop any previous reactive template computations
+      @string_template_renderer_computation.stop if @string_template_renderer_computation
+      @string_template_renderer.remove if @string_template_renderer
 
-      @string_template_renderer_computation = -> do
-        self.value = @string_template_renderer.html
-      end.watch!
-    else
-      if new_value.is_a?(NilMethodCall) || new_value.nil?
-        new_value = ''
-      end
+      if new_value.is_a?(StringTemplateRender)
+        # We don't need to refetch the whole reactive template to
+        # update, we can just depend on it and update directly.
+        @string_template_renderer = new_value
 
-      self.value = new_value
-    end
-  end
+        @string_template_renderer_computation = -> do
+          self.value = @string_template_renderer.html
+        end.watch!
+      else
+        if new_value.is_a?(NilMethodCall) || new_value.nil?
+          new_value = ''
+        end
 
-  def value=(val)
-    case @attribute_name
-    when 'value'
-      # TODO: only update if its not the same, this keeps it from moving the
-      # cursor in text fields.
-      if val != element.value
-        element.value = val
+        self.value = new_value
       end
-    else
-      element[@attribute_name] = val
     end
-  end
 
-  def update_checked(value)
-    if value.is_a?(NilMethodCall) || value.nil?
-      value = false
+    def value=(val)
+      case @attribute_name
+        when 'value'
+          # TODO: only update if its not the same, this keeps it from moving the
+          # cursor in text fields.
+          if val != element.value
+            element.value = val
+          end
+        else
+          element[@attribute_name] = val
+      end
     end
 
-    if @is_radio
-      value = (@selected_value == value)
-    end
+    def update_checked(value)
+      if value.is_a?(NilMethodCall) || value.nil?
+        value = false
+      end
 
-    element.prop('checked', value)
-  end
+      if @is_radio
+        value = (@selected_value == value)
+      end
 
-  def remove
-    # Unbind events, leave the element there since attribute bindings
-    # aren't responsible for it being there.
-    case @attribute_name
-    when 'value'
-      element.off('input.attrbind', nil)
-    when 'checked'
-      element.off('change.attrbind', nil)
+      element.prop('checked', value)
     end
 
-    @string_template_renderer.remove if @string_template_renderer
-    @string_template_renderer_computation.stop if @string_template_renderer_computation
-    @computation.stop if @computation
-
-    # Clear any references
-    @target = nil
-    @context = nil
-    @getter = nil
-  end
+    def remove
+      # Unbind events, leave the element there since attribute bindings
+      # aren't responsible for it being there.
+      case @attribute_name
+        when 'value'
+          element.off('input.attrbind', nil)
+        when 'checked'
+          element.off('change.attrbind', nil)
+      end
 
-  def remove_anchors
-    raise "attribute bindings do not have anchors, can not remove them"
-  end
+      @string_template_renderer.remove if @string_template_renderer
+      @string_template_renderer_computation.stop if @string_template_renderer_computation
+      @computation.stop if @computation
 
+      # Clear any references
+      @target  = nil
+      @context = nil
+      @getter  = nil
+    end
 
+    def remove_anchors
+      raise "attribute bindings do not have anchors, can not remove them"
+    end
+  end
 end

data/lib/volt/page/bindings/base_binding.rb

@@ -8,32 +8,34 @@
 # 3. context - the context object the binding will be evaluated in
 # 4. binding_name - the id for the comment (or id for attributes) where the
 #                   binding will be inserted.
-class BaseBinding
-  attr_accessor :target, :context, :binding_name
+module Volt
+  class BaseBinding
+    attr_accessor :target, :context, :binding_name
 
-  def initialize(page, target, context, binding_name)
-    @page = page
-    @target = target
-    @context = context
-    @binding_name = binding_name
+    def initialize(page, target, context, binding_name)
+      @page         = page
+      @target       = target
+      @context      = context
+      @binding_name = binding_name
 
-    @@binding_number ||= 10000
-  end
+      @@binding_number ||= 10000
+    end
 
-  def dom_section
-    @dom_section ||= target.dom_section(@binding_name)
-  end
+    def dom_section
+      @dom_section ||= target.dom_section(@binding_name)
+    end
 
-  def remove
-    @dom_section.remove if @dom_section
+    def remove
+      @dom_section.remove if @dom_section
 
-    # Clear any references
-    @target = nil
-    @context = nil
-    @dom_section = nil
-  end
+      # Clear any references
+      @target      = nil
+      @context     = nil
+      @dom_section = nil
+    end
 
-  def remove_anchors
-    @dom_section.remove_anchors if @dom_section
+    def remove_anchors
+      @dom_section.remove_anchors if @dom_section
+    end
   end
 end

data/lib/volt/page/bindings/component_binding.rb

@@ -1,5 +1,7 @@
 require 'volt/page/bindings/template_binding'
 
 # Component bindings are the same as template bindings, but handle components.
-class ComponentBinding < TemplateBinding
+module Volt
+  class ComponentBinding < TemplateBinding
+  end
 end

data/lib/volt/page/bindings/content_binding.rb

@@ -1,38 +1,38 @@
 require 'volt/page/bindings/base_binding'
 
-class ContentBinding < BaseBinding
-  def initialize(page, target, context, binding_name, getter)
-    # puts "New Content Binding: #{self.inspect}"
-    super(page, target, context, binding_name)
-
-    # Listen for changes
-    @computation = -> do
-      begin
-        update(@context.instance_eval(&getter))
-      rescue => e
-        Volt.logger.error("ContentBinding Error: #{e.inspect}")
-        update('')
-      end
-    end.watch!
-  end
-
-  def update(value)
-    value = value.or('')
-
-    # Exception values display the exception as a string
-    value = value.to_s
-
-    # Update the html in this section
-    # TODO: Move the formatter into another class.
-    dom_section.html = value.gsub("\n", "<br />\n")
+module Volt
+  class ContentBinding < BaseBinding
+    def initialize(page, target, context, binding_name, getter)
+      # puts "New Content Binding: #{self.inspect}"
+      super(page, target, context, binding_name)
+
+      # Listen for changes
+      @computation = -> do
+        begin
+          update(@context.instance_eval(&getter))
+        rescue => e
+          Volt.logger.error("ContentBinding Error: #{e.inspect}")
+          update('')
+        end
+      end.watch!
+    end
+
+    def update(value)
+      value            = value.or('')
+
+      # Exception values display the exception as a string
+      value            = value.to_s
+
+      # Update the html in this section
+      # TODO: Move the formatter into another class.
+      dom_section.html = value.gsub("\n", "<br />\n")
+    end
+
+    def remove
+      @computation.stop if @computation
+      @computation = nil
+
+      super
+    end
   end
-
-  def remove
-    @computation.stop if @computation
-    @computation = nil
-
-    super
-  end
-
-
 end