hom 0.1.0 → 0.2.0

data/hom.gemspec

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

data/lib/hom/attribute_list.rb

@@ -1,18 +1,28 @@
 module HOM
-  class AttributeList < Array
+  class AttributeList
+    def initialize
+      @index = {}
+    end
+
+    def length
+      @index.size
+    end
+
     def html
-      map(&:html).join
+      @index.values.map(&:html).join
     end
 
     def lookup(name)
-      detect { |object| object.name.to_s == name.to_s }
+      @index[name.to_s]
     end
 
+    alias :[] :lookup
+
     def set(name, value = nil)
       attribute = lookup(name)
 
       if attribute.nil?
-        self << Attribute.new(name, value)
+        @index[name.to_s] = Attribute.new(name, value)
       else
         attribute.value = value
       end

data/lib/hom/element.rb

@@ -2,50 +2,48 @@ require 'cgi'
 
 module HOM
   class Element
-    attr_reader :tag_name, :attributes
-
     def initialize(tag_name, attributes = nil, content = nil)
       @tag_name, @attributes, @content = tag_name, AttributeList.new.update(attributes), content
     end
 
     def html
-      start_tag = "<#{@tag_name}#{@attributes.html}>"
-
-      @content.nil? ? start_tag : "#{start_tag}#{escape(@content)}</#{@tag_name}>"
+      @content.nil? ? start_tag : "#{start_tag}#{encode(@content)}</#{@tag_name}>"
     end
 
     def to_s
       html_safe(html)
     end
 
-    def method_missing(name, *args, &block)
-      if args.empty? && block.nil?
-        attribute = attributes.lookup(name)
-
-        unless attribute.nil? || attribute.value.nil?
-          return attribute.value
-        end
-      end
-
-      super name, *args, &block
+    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 escape(object)
+    def encode(object)
       if object.is_a?(Array)
-        object.map { |item| escape(item) }.join
+        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
-        CGI.escapeHTML(object.to_s)
+        escape(object)
       end
     end
+
+    def start_tag
+      "<#{@tag_name}#{@attributes.html}>"
+    end
+
+    def escape(object)
+      CGI.escapeHTML(object.to_s)
+    end
   end
 end

data/test/hom_attribute_list.rb

@@ -19,35 +19,35 @@ class HOM::AttributeList::TestCase < MiniTest::Unit::TestCase
     @list.update(:disabled)
 
     assert_equal 1, @list.length
-    assert_equal :disabled, @list[0].name
-    assert_equal nil, @list[0].value
+    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[0].name
-    assert_equal :text, @list[0].value
-    assert_equal :size, @list[1].name
-    assert_equal 30, @list[1].value
+    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[0].name
-    assert_equal :text, @list[0].value
-    assert_equal :disabled, @list[1].name
-    assert_equal nil, @list[1].value
+    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[0].name
-    assert_equal nil, @list[0].value
+    assert_equal :disabled, @list[:disabled].name
+    assert_equal nil, @list[:disabled].value
   end
 end

data/test/hom_element.rb

@@ -39,8 +39,8 @@ class HOM::Element::TestCase < MiniTest::Unit::TestCase
   end
 
   def test_attribute_access
-    assert_equal :text, @i3.type
-    assert_equal 30, @i3.size
-    assert_raises(NoMethodError) { @i3.disabled }
+    assert_equal :text, @i3[:type].value
+    assert_equal 30, @i3[:size].value
+    assert_equal nil, @i3[:disabled].value
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000 +01:00
-default_executable: 
+date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &3706480 !ruby/object:Gem::Requirement
+  requirement: &10256720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *3706480
+  version_requirements: *10256720
 description: A straightforward API for generating HTML programmatically
 email:
 - mail@timcraft.com
@@ -40,7 +39,6 @@ files:
 - test/hom_entity.rb
 - README.txt
 - hom.gemspec
-has_rdoc: true
 homepage: http://github.com/timcraft/hom
 licenses: []
 post_install_message: 
@@ -61,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: See description