hom 0.2.0 → 0.3.0

data/hom.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'hom'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']

data/lib/hom.rb

@@ -1,6 +1,100 @@
+require 'cgi'
+
 module HOM
-  autoload :Attribute, 'hom/attribute'
-  autoload :AttributeList, 'hom/attribute_list'
-  autoload :Element, 'hom/element'
-  autoload :Entity, 'hom/entity'
+  class Entity
+    attr_reader :value
+
+    def initialize(value)
+      @value = value
+    end
+
+    def html
+      numeric? ? "&\##{value};" : "&#{value};"
+    end
+
+    def numeric?
+      Numeric === @value
+    end
+
+    def named?
+      !numeric?
+    end
+  end
+
+  class Element
+    def initialize(tag_name, attributes = nil, content = nil)
+      @tag_name, @attributes, @content = tag_name, AttributeList.new.update(attributes), content
+    end
+
+    def html
+      @content.nil? ? start_tag : "#{start_tag}#{encode(@content)}</#{@tag_name}>"
+    end
+
+    def to_s
+      html_safe(html)
+    end
+
+    private
+
+    def html_safe(string)
+      string.respond_to?(:html_safe) ? string.html_safe : string
+    end
+
+    def encode(object)
+      if object.is_a?(Array)
+        object.map { |item| encode(item) }.join
+      elsif object.respond_to?(:html)
+        object.html
+      elsif object.respond_to?(:html_safe?) && object.html_safe?
+        object.to_s
+      else
+        HOM.escape(object)
+      end
+    end
+
+    def start_tag
+      "<#{@tag_name}#{@attributes.html}>"
+    end
+  end
+
+  class AttributeList
+    def initialize
+      @index = {}
+    end
+
+    def html
+      @index.map { |name, value| attribute_html(name, value) }.join
+    end
+
+    Undefined = Class.new
+
+    def set(name, value = Undefined)
+      @index[name.to_s] = value
+    end
+
+    def update(object)
+      case object
+      when NilClass
+        :pass
+      when Hash
+        object.each { |k, v| set(k, v) }
+      when Array
+        object.each { |item| update(item) }
+      else
+        set(object)
+      end
+
+      return self
+    end
+
+    private
+
+    def attribute_html(name, value)
+      value == Undefined ? " #{name}" : %( #{name}="#{HOM.escape value}")
+    end
+  end
+
+  def self.escape(object)
+    CGI.escapeHTML(object.to_s)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10256720 !ruby/object:Gem::Requirement
+  requirement: &10113880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *10256720
+  version_requirements: *10113880
 description: A straightforward API for generating HTML programmatically
 email:
 - mail@timcraft.com
@@ -29,14 +29,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hom/attribute.rb
-- lib/hom/attribute_list.rb
-- lib/hom/element.rb
-- lib/hom/entity.rb
 - lib/hom.rb
-- test/hom_attribute_list.rb
-- test/hom_element.rb
-- test/hom_entity.rb
 - README.txt
 - hom.gemspec
 homepage: http://github.com/timcraft/hom

data/lib/hom/attribute.rb

@@ -1,9 +0,0 @@
-require 'cgi'
-
-module HOM
-  class Attribute < Struct.new(:name, :value)
-    def html
-      value.nil? ? " #{name}" : %( #{name}="#{CGI.escapeHTML(value.to_s)}")
-    end
-  end
-end

data/lib/hom/attribute_list.rb

@@ -1,46 +0,0 @@
-module HOM
-  class AttributeList
-    def initialize
-      @index = {}
-    end
-
-    def length
-      @index.size
-    end
-
-    def html
-      @index.values.map(&:html).join
-    end
-
-    def lookup(name)
-      @index[name.to_s]
-    end
-
-    alias :[] :lookup
-
-    def set(name, value = nil)
-      attribute = lookup(name)
-
-      if attribute.nil?
-        @index[name.to_s] = Attribute.new(name, value)
-      else
-        attribute.value = value
-      end
-    end
-
-    def update(object)
-      case object
-      when NilClass
-        :pass
-      when Hash
-        object.each { |k, v| set(k, v) }
-      when Array
-        object.each { |item| update(item) }
-      else
-        set(object)
-      end
-
-      return self
-    end
-  end
-end

data/lib/hom/element.rb

@@ -1,49 +0,0 @@
-require 'cgi'
-
-module HOM
-  class Element
-    def initialize(tag_name, attributes = nil, content = nil)
-      @tag_name, @attributes, @content = tag_name, AttributeList.new.update(attributes), content
-    end
-
-    def html
-      @content.nil? ? start_tag : "#{start_tag}#{encode(@content)}</#{@tag_name}>"
-    end
-
-    def to_s
-      html_safe(html)
-    end
-
-    def lookup(name)
-      @attributes.lookup(name)
-    end
-
-    alias :[] :lookup
-
-    private
-
-    def html_safe(string)
-      string.respond_to?(:html_safe) ? string.html_safe : string
-    end
-
-    def encode(object)
-      if object.is_a?(Array)
-        object.map { |item| encode(item) }.join
-      elsif object.respond_to?(:html)
-        object.html
-      elsif object.respond_to?(:html_safe?) && object.html_safe?
-        object.to_s
-      else
-        escape(object)
-      end
-    end
-
-    def start_tag
-      "<#{@tag_name}#{@attributes.html}>"
-    end
-
-    def escape(object)
-      CGI.escapeHTML(object.to_s)
-    end
-  end
-end

data/lib/hom/entity.rb

@@ -1,21 +0,0 @@
-module HOM
-  class Entity
-    attr_reader :value
-
-    def initialize(value)
-      @value = value
-    end
-
-    def html
-      numeric? ? "&\##{value};" : "&#{value};"
-    end
-
-    def numeric?
-      Numeric === @value
-    end
-
-    def named?
-      !numeric?
-    end
-  end
-end

data/test/hom_attribute_list.rb

@@ -1,53 +0,0 @@
-require 'minitest/autorun'
-
-$:.unshift 'lib'
-
-require 'hom'
-
-class HOM::AttributeList::TestCase < MiniTest::Unit::TestCase
-  def setup
-    @list = HOM::AttributeList.new
-  end
-
-  def test_update_with_nil
-    @list.update(nil)
-
-    assert_equal 0, @list.length
-  end
-
-  def test_update_with_symbol
-    @list.update(:disabled)
-
-    assert_equal 1, @list.length
-    assert_equal :disabled, @list[:disabled].name
-    assert_equal nil, @list[:disabled].value
-  end
-
-  def test_update_with_hash
-    @list.update({type: :text, size: 30})
-
-    assert_equal 2, @list.length
-    assert_equal :type, @list[:type].name
-    assert_equal :text, @list[:type].value
-    assert_equal :size, @list[:size].name
-    assert_equal 30, @list[:size].value
-  end
-
-  def test_update_with_array
-    @list.update([{type: :text}, :disabled])
-
-    assert_equal 2, @list.length
-    assert_equal :type, @list[:type].name
-    assert_equal :text, @list[:type].value
-    assert_equal :disabled, @list[:disabled].name
-    assert_equal nil, @list[:disabled].value
-  end
-
-  def test_update_with_duplicate_symbols
-    @list.update([:disabled, :disabled])
-
-    assert_equal 1, @list.length
-    assert_equal :disabled, @list[:disabled].name
-    assert_equal nil, @list[:disabled].value
-  end
-end

data/test/hom_element.rb

@@ -1,46 +0,0 @@
-require 'minitest/autorun'
-require 'active_support/core_ext/string/output_safety'
-
-$:.unshift 'lib'
-
-require 'hom'
-
-class HOM::Element::TestCase < MiniTest::Unit::TestCase
-  def setup
-    @br = HOM::Element.new(:br)
-    @i1 = HOM::Element.new(:input, :disabled)
-    @i2 = HOM::Element.new(:input, {type: :text, size: 30})
-    @i3 = HOM::Element.new(:input, [{type: :text, size: 30}, :disabled])
-    @h1 = HOM::Element.new(:h1, nil, '')
-    @h2 = HOM::Element.new(:h2, nil, 'hello world')
-    @h3 = HOM::Element.new(:h3, nil, 'a && b, x > y')
-    @h4 = HOM::Element.new(:h4, nil, 1234567890)
-    @h5 = HOM::Element.new(:h5, nil, HOM::Element.new(:b, nil, 'how bold'))
-    @ul = HOM::Element.new(:ul, nil, (1..3).map { |n| HOM::Element.new(:li, nil, n) })
-  end
-
-  def test_stringification
-    assert_equal '<br>', @br.to_s
-    assert_equal '<input disabled>', @i1.to_s
-    assert_equal '<input type="text" size="30">', @i2.to_s
-    assert_equal '<input type="text" size="30" disabled>', @i3.to_s
-    assert_equal '<h1></h1>', @h1.to_s
-    assert_equal '<h2>hello world</h2>', @h2.to_s
-    assert_equal '<h3>a &amp;&amp; b, x &gt; y</h3>', @h3.to_s
-    assert_equal '<h4>1234567890</h4>', @h4.to_s
-    assert_equal '<h5><b>how bold</b></h5>', @h5.to_s
-    assert_equal '<ul><li>1</li><li>2</li><li>3</li></ul>', @ul.to_s
-  end
-
-  def test_output_safety
-    assert @br.to_s.html_safe?
-
-    assert '<span><br></span>', HOM::Element.new(:span, nil, '<br>'.html_safe).to_s
-  end
-
-  def test_attribute_access
-    assert_equal :text, @i3[:type].value
-    assert_equal 30, @i3[:size].value
-    assert_equal nil, @i3[:disabled].value
-  end
-end

data/test/hom_entity.rb

@@ -1,33 +0,0 @@
-require 'minitest/autorun'
-
-$:.unshift 'lib'
-
-require 'hom'
-
-class HOM::Entity::TestCase < MiniTest::Unit::TestCase
-  def setup
-    @e160 = HOM::Entity.new(160)
-
-    @nbsp = HOM::Entity.new(:nbsp)
-  end
-
-  def test_value_method
-    assert_equal 160, @e160.value
-    assert_equal :nbsp, @nbsp.value
-  end
-
-  def test_numeric_query_method
-    assert_equal true, @e160.numeric?
-    assert_equal false, @nbsp.numeric?
-  end
-
-  def test_named_query_method
-    assert_equal false, @e160.named?
-    assert_equal true, @nbsp.named?
-  end
-
-  def test_html_method
-    assert_equal '&#160;', @e160.html
-    assert_equal '&nbsp;', @nbsp.html
-  end
-end