arbre 1.0.0.rc4 → 1.2.1

data/lib/arbre/context.rb

@@ -1,8 +1,39 @@
 require 'arbre/element'
 
 module Arbre
+
+  # The Arbre::Context class is the frontend for using Arbre.
+  #
+  # The simplest example possible:
+  #
+  #     html = Arbre::Context.new do
+  #       h1 "Hello World"
+  #     end
+  #
+  #     html.to_s #=> "<h1>Hello World</h1>"
+  #
+  # The contents of the block are instance eval'd within the Context
+  # object. This means that you lose context to the outside world from
+  # within the block. To pass local variables into the Context, use the
+  # assigns param.
+  #
+  #     html = Arbre::Context.new({one: 1}) do
+  #       h1 "Your number #{one}"
+  #     end
+  #
+  #     html.to_s #=> "Your number 1"
+  #
   class Context < Element
 
+    # Initialize a new Arbre::Context
+    #
+    # @param [Hash] assigns A hash of objecs that you would like to be
+    #                       availble as local variables within the Context
+    #
+    # @param [Object] helpers An object that has methods on it which will become
+    #                         instance methods within the context.
+    #
+    # @yield [] The block that will get instance eval'd in the context
     def initialize(assigns = {}, helpers = nil, &block)
       assigns = assigns || {}
       @_assigns = assigns.symbolize_keys
@@ -11,7 +42,7 @@ module Arbre
       @_current_arbre_element_buffer = [self]
 
       super(self)
-      instance_eval &block if block_given?
+      instance_eval(&block) if block_given?
     end
 
     def arbre_context
@@ -36,8 +67,8 @@ module Arbre
     end
     alias :length :bytesize
 
-    def respond_to?(method)
-      super || cached_html.respond_to?(method)
+    def respond_to_missing?(method, include_all)
+      super || cached_html.respond_to?(method, include_all)
     end
 
     # Webservers treat Arbre::Context as a string. We override

data/lib/arbre/element/builder_methods.rb

@@ -65,17 +65,16 @@ module Arbre
       # Returns true if the object should be converted into a text node
       # and appended into the DOM.
       def appendable_tag?(tag)
-        is_appendable = !tag.is_a?(Arbre::Element) && tag.respond_to?(:to_s)
-
-        # In ruby 1.9, Arraay.new.to_s prints out an empty array ("[]"). In
+        # Array.new.to_s prints out an empty array ("[]"). In
         # Arbre, we append the return value of blocks to the output, which
         # can cause empty arrays to show up within the output. To get
         # around this, we check if the object responds to #empty?
         if tag.respond_to?(:empty?) && tag.empty?
-          is_appendable = false
+          false
+        else
+          !tag.is_a?(Arbre::Element) && tag.respond_to?(:to_s)
         end
 
-        is_appendable
       end
     end
 

data/lib/arbre/element/proxy.rb

@@ -0,0 +1,28 @@
+module Arbre
+  class Element
+    class Proxy < BasicObject
+      undef_method :==
+      undef_method :equal?
+
+      def initialize(element)
+        @element = element
+      end
+
+      def respond_to?(method, include_all = false)
+        if method.to_s == 'to_ary'
+          false
+        else
+          super || @element.respond_to?(method, include_all)
+        end
+      end
+
+      def method_missing(method, *args, &block)
+        if method.to_s == 'to_ary'
+          super
+        else
+          @element.__send__ method, *args, &block
+        end
+      end
+    end
+  end
+end

data/lib/arbre/element.rb

@@ -1,4 +1,5 @@
 require 'arbre/element/builder_methods'
+require 'arbre/element/proxy'
 require 'arbre/element_collection'
 
 module Arbre
@@ -6,12 +7,13 @@ module Arbre
   class Element
     include BuilderMethods
 
-    attr_accessor :parent
+    attr_reader :parent
     attr_reader :children, :arbre_context
 
     def initialize(arbre_context = Arbre::Context.new)
       @arbre_context = arbre_context
       @children = ElementCollection.new
+      @parent = nil
     end
 
     def assigns
@@ -46,7 +48,7 @@ module Arbre
 
       if child.respond_to?(:parent)
         # Remove the child
-        child.parent.remove_child(child) if child.parent
+        child.parent.remove_child(child) if child.parent && child.parent != self
         # Set ourselves as the parent
         child.parent = self
       end
@@ -106,8 +108,8 @@ module Arbre
     def get_elements_by_class_name(class_name)
       elements = ElementCollection.new
       children.each do |child|
-        elements << child if child.class_list =~ /#{class_name}/
-        elements.concat(child.get_elements_by_tag_name(tag_name))
+        elements << child if child.class_list.include?(class_name)
+        elements.concat(child.get_elements_by_class_name(class_name))
       end
       elements
     end
@@ -129,6 +131,10 @@ module Arbre
       [to_s].each(&block)
     end
 
+    def inspect
+      to_s
+    end
+
     def to_str
       to_s
     end
@@ -143,11 +149,11 @@ module Arbre
       else
         element = Arbre::HTML::TextNode.from_string(element)
       end
-      ElementCollection.new([self]) + element
+      to_ary + element
     end
 
     def to_ary
-      ElementCollection.new [self]
+      ElementCollection.new [Proxy.new(self)]
     end
     alias_method :to_a, :to_ary
 

data/lib/arbre/element_collection.rb

@@ -18,7 +18,7 @@ module Arbre
     def to_s
       self.collect do |element|
         element.to_s
-      end.join.html_safe
+      end.join('').html_safe
     end
   end
 

data/lib/arbre/html/attributes.rb

@@ -4,13 +4,22 @@ module Arbre
     class Attributes < Hash
 
       def to_s
-        self.collect do |name, value|
+        map do |name, value|
+          next if value_empty?(value)
           "#{html_escape(name)}=\"#{html_escape(value)}\""
-        end.join(" ")
+        end.compact.join ' '
+      end
+
+      def any?
+        super{ |k,v| !value_empty?(v) }
       end
 
       protected
 
+      def value_empty?(value)
+        value.respond_to?(:empty?) ? value.empty? : !value
+      end
+
       def html_escape(s)
         ERB::Util.html_escape(s)
       end

data/lib/arbre/html/class_list.rb

@@ -6,6 +6,10 @@ module Arbre
     # Holds a set of classes
     class ClassList < Set
 
+      def self.build_from_string(class_names)
+        new.add(class_names)
+      end
+
       def add(class_names)
         class_names.to_s.split(" ").each do |class_name|
           super(class_name)

data/lib/arbre/html/document.rb

@@ -29,7 +29,7 @@ module Arbre
 
       def build_head
         @head = head do
-          meta :"http-equiv" => "Content-type", :content => "text/html; charset=utf-8"
+          meta :"http-equiv" => "Content-type", content: "text/html; charset=utf-8"
         end
       end
 

data/lib/arbre/html/html5_elements.rb

@@ -7,11 +7,11 @@ module Arbre
                        :dfn, :div, :dl, :dt, :em, :embed, :fieldset, :figcaption, :figure,
                        :footer, :form, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hgroup, 
                        :hr, :html, :i, :iframe, :img, :input, :ins, :keygen, :kbd, :label, 
-                       :legend, :li, :link, :map, :mark, :menu, :meta, :meter, :nav, :noscript, 
-                       :object, :ol, :optgroup, :option, :output, :pre, :progress, :q,
+                       :legend, :li, :link, :map, :mark, :menu, :menuitem, :meta, :meter, :nav, :noscript, 
+                       :object, :ol, :optgroup, :option, :output, :param, :pre, :progress, :q,
                        :s, :samp, :script, :section, :select, :small, :source, :span,
-                       :strong, :style, :sub, :summary, :sup, :table, :tbody, :td,
-                       :textarea, :tfoot, :th, :thead, :time, :title, :tr, :ul, :var, :video ]
+                       :strong, :style, :sub, :summary, :sup, :svg, :table, :tbody, :td,
+                       :textarea, :tfoot, :th, :thead, :time, :title, :tr, :track, :ul, :var, :video, :wbr ]
 
     HTML5_ELEMENTS = [ :p ] + AUTO_BUILD_ELEMENTS
 

data/lib/arbre/html/tag.rb

@@ -6,6 +6,10 @@ module Arbre
     class Tag < Element
       attr_reader :attributes
 
+      # See: http://www.w3.org/html/wg/drafts/html/master/syntax.html#void-elements
+      SELF_CLOSING_ELEMENTS = [ :area, :base, :br, :col, :embed, :hr, :img, :input, :keygen, :link,
+                            :menuitem, :meta, :param, :source, :track, :wbr ]
+
       def initialize(*)
         super
         @attributes = Attributes.new
@@ -16,7 +20,10 @@ module Arbre
         attributes = extract_arguments(args)
         self.content = args.first if args.first
 
-        set_for_attribute(attributes.delete(:for))
+        for_value = attributes[:for]
+        unless for_value.is_a?(String) || for_value.is_a?(Symbol)
+          set_for_attribute(attributes.delete(:for))
+        end
 
         attributes.each do |key, value|
           set_attribute(key, value)
@@ -77,7 +84,16 @@ module Arbre
       end
 
       def class_list
-        get_attribute(:class) || set_attribute(:class, ClassList.new)
+        list = get_attribute(:class)
+
+        case list
+        when ClassList
+          list
+        when String
+          set_attribute(:class, ClassList.build_from_string(list))
+        else
+          set_attribute(:class, ClassList.new)
+        end
       end
 
       def to_s
@@ -95,7 +111,7 @@ module Arbre
       end
 
       INDENT_SIZE = 2
-      
+
       def indent(open_tag, child_content, close_tag)
         spaces = ' ' * indent_level * INDENT_SIZE
 
@@ -119,11 +135,11 @@ module Arbre
 
         html
       end
-      
+
       def self_closing_tag?
-        %w|meta link|.include?(tag_name)
+        SELF_CLOSING_ELEMENTS.include?(tag_name.to_sym)
       end
-      
+
       def no_child?
         children.empty?
       end
@@ -132,9 +148,8 @@ module Arbre
         children.size == 1 && children.first.is_a?(TextNode)
       end
 
-
       def attributes_html
-        attributes.any? ? " " + attributes.to_s : nil
+        " #{attributes}" if attributes.any?
       end
 
       def set_for_attribute(record)
@@ -149,7 +164,7 @@ module Arbre
         if record.class.respond_to?(:model_name)
           record.class.model_name.singular
         else
-          record.class.underscore.gsub("/", "_")
+          record.class.name.underscore.gsub("/", "_")
         end
       end
 

data/lib/arbre/html/text_node.rb

@@ -22,6 +22,10 @@ module Arbre
         @content = string
       end
 
+      def class_list
+        []
+      end
+
       def tag_name
         nil
       end

data/lib/arbre/rails/forms.rb

@@ -1,92 +1,95 @@
-module SplitOpenAndCloseOn
+module Arbre
+  module Rails
+    module Forms
 
-  def split_open_and_close_on(string, match)
-    return "" unless string && match
-    @opening_tag = string.split(Regexp.new("#{match}\\z")).first
-    @closing_tag = match
-  end
+      class FormBuilderProxy < Arbre::Component
+        attr_reader :form_builder
 
-  def opening_tag
-    @opening_tag || ""
-  end
+        # Since label and select are Arbre Elements already, we must
+        # override it here instead of letting method_missing
+        # deal with it
+        def label(*args)
+          proxy_call_to_form :label, *args
+        end
 
-  def closing_tag
-    @closing_tag || ""
-  end
+        def select(*args)
+          proxy_call_to_form :select, *args
+        end
 
-end
+        def respond_to_missing?(method, include_all)
+          if form_builder && form_builder.respond_to?(method, include_all)
+            true
+          else
+            super
+          end
+        end
 
-class FormBuilderProxy < Arbre::Component
-  attr_reader :form_builder
+        private
 
-  # Since label and select are Arbre Elements already, we must
-  # override it here instead of letting method_missing
-  # deal with it
-  def label(*args)
-    proxy_call_to_form :label, *args
-  end
+        def proxy_call_to_form(method, *args, &block)
+          text_node form_builder.send(method, *args, &block)
+        end
 
-  def select(*args)
-    proxy_call_to_form :select, *args
-  end
+        def method_missing(method, *args, &block)
+          if form_builder && form_builder.respond_to?(method)
+            proxy_call_to_form(method, *args, &block)
+          else
+            super
+          end
+        end
 
-  def respond_to?(name)
-    if form_builder && form_builder.respond_to?(name)
-      true
-    else
-      super
-    end
-  end
+      end
 
-  private
+      class FormForProxy < FormBuilderProxy
+        builder_method :form_for
 
-  def proxy_call_to_form(method, *args, &block)
-    text_node form_builder.send(method, *args, &block)
-  end
+        def build(resource, form_options = {}, &block)
+          form_string = helpers.form_for(resource, form_options) do |f|
+            @form_builder = f
+          end
 
-  def method_missing(method, *args, &block)
-    if form_builder && form_builder.respond_to?(method)
-      proxy_call_to_form(method, *args, &block)
-    else
-      super
-    end
-  end
+          @opening_tag, @closing_tag = split_string_on(form_string, "</form>")
+          super(&block)
+        end
 
-end
+        def fields_for(*args, &block)
+          insert_tag FieldsForProxy, form_builder, *args, &block
+        end
 
-class FormForProxy < FormBuilderProxy
-  builder_method :form_for
-  include SplitOpenAndCloseOn
+        def split_string_on(string, match)
+          return "" unless string && match
+          part_1 = string.split(Regexp.new("#{match}\\z")).first
+          [part_1, match]
+        end
 
-  def build(resource, form_options = {}, &block)
-    form_string = helpers.form_for(resource, form_options) do |f|
-      @form_builder = f
-    end
+        def opening_tag
+          @opening_tag || ""
+        end
 
-    split_open_and_close_on form_string, "</form>"
+        def closing_tag
+          @closing_tag || ""
+        end
 
-    super(&block)
-  end
+      end
 
-  def fields_for(*args, &block)
-    insert_tag FieldsForProxy, form_builder, *args, &block
-  end
+      class FieldsForProxy < FormBuilderProxy
 
-end
+        def build(form_builder, *args, &block)
+          form_builder.fields_for(*args) do |f|
+            @form_builder = f
+          end
 
-class FieldsForProxy < FormBuilderProxy
+          super(&block)
+        end
 
-  def build(form_builder, *args, &block)
-    form_builder.fields_for(*args) do |f|
-      @form_builder = f
-    end
+        def to_s
+          children.to_s
+        end
 
-    super(&block)
-  end
+      end
 
-  def to_s
-    children.to_s
+    end
   end
-
 end
 
+

data/lib/arbre/rails/template_handler.rb

@@ -1,14 +1,16 @@
 module Arbre
   module Rails
-
     class TemplateHandler
+      def call(template, source = nil)
+        source = template.source unless source
 
-      def call(template)
-        "Arbre::Context.new(assigns, self){ #{template.source} }"
+        <<-END
+        Arbre::Context.new(assigns, self) {
+          #{source}
+        }.to_s
+        END
       end
-
     end
-
   end
 end
 

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "1.0.0.rc4"
+  VERSION = "1.2.1"
 end