hom 1.2.0 → 1.3.0

data/hom.gemspec

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

data/lib/hom.rb

@@ -25,6 +25,10 @@ module HOM
     def html_safe?
       true
     end
+
+    def +(object)
+      NodeList.new([self, object])
+    end
   end
 
   class Element
@@ -45,6 +49,10 @@ module HOM
     def to_s
       Encoding.safe_encode(self)
     end
+
+    def +(object)
+      NodeList.new([self, object])
+    end
   end
 
   class NodeList
@@ -69,7 +77,7 @@ module HOM
     end
 
     def join(separator)
-      Encoding.safe_encode(intersperse(separator, @nodes))
+      self.class.new(intersperse(separator, @nodes))
     end
 
     private

data/spec/element_spec.rb

@@ -1,6 +1,11 @@
 require 'minitest/autorun'
 require 'active_support/core_ext/string/output_safety'
-require 'hom'
+
+if defined? require_relative
+  require_relative '../lib/hom'
+else
+  require File.join(File.dirname(__FILE__), '../lib/hom')
+end
 
 describe 'HOM::Element' do
   describe 'content query method' do
@@ -26,4 +31,12 @@ describe 'HOM::Element' do
       output.must_equal('<br>')
     end
   end
+
+  describe 'addition of an element with another object' do
+    it 'returns a node list containing the two nodes' do
+      nodes = HOM::Element.new(:br) + "\n"
+      nodes.must_be_instance_of(HOM::NodeList)
+      nodes.to_s.must_equal("<br>\n")
+    end
+  end
 end

data/spec/encoding_spec.rb

@@ -1,6 +1,11 @@
 require 'minitest/autorun'
 require 'active_support/core_ext/string/output_safety'
-require 'hom'
+
+if defined? require_relative
+  require_relative '../lib/hom'
+else
+  require File.join(File.dirname(__FILE__), '../lib/hom')
+end
 
 describe 'HOM::Encoding' do
   describe 'encode method' do

data/spec/entity_spec.rb

@@ -1,74 +1,67 @@
 require 'minitest/autorun'
-require 'hom'
 
-describe 'HOM::Entity initialized with a symbol' do
+if defined? require_relative
+  require_relative '../lib/hom'
+else
+  require File.join(File.dirname(__FILE__), '../lib/hom')
+end
+
+describe 'HOM::Entity' do
   before do
-    @entity = HOM::Entity.new(:nbsp)
+    @named_entity = HOM::Entity.new(:nbsp)
+
+    @numeric_entity = HOM::Entity.new(160)
   end
 
   describe 'value method' do
-    it 'returns the symbol value' do
-      @entity.value.must_equal(:nbsp)
+    it 'returns the value passed to the constructor' do
+      @named_entity.value.must_equal(:nbsp)
+
+      @numeric_entity.value.must_equal(160)
     end
   end
 
   describe 'numeric query method' do
-    it 'returns false' do
-      @entity.numeric?.must_equal(false)
+    it 'returns false for named entities' do
+      @named_entity.numeric?.must_equal(false)
     end
-  end
 
-  describe 'named query method' do
-    it 'returns true' do
-      @entity.named?.must_equal(true)
+    it 'returns true for numeric entities' do
+      @numeric_entity.numeric?.must_equal(true)
     end
   end
 
-  describe 'to_s method' do
-    it 'returns the encoded html entity' do
-      @entity.to_s.must_equal(' ')
+  describe 'named query method' do
+    it 'returns true for named entities' do
+      @named_entity.named?.must_equal(true)
     end
-  end
 
-  describe 'html_safe query method' do
-    it 'returns true' do
-      @entity.html_safe?.must_equal(true)
+    it 'returns false for numeric entities' do
+      @numeric_entity.named?.must_equal(false)
     end
   end
-end
 
-describe 'HOM::Entity initialized with an integer' do
-  before do
-    @entity = HOM::Entity.new(160)
-  end
+  describe 'to_s method' do
+    it 'returns the encoded html entity' do
+      @named_entity.to_s.must_equal(' ')
 
-  describe 'value method' do
-    it 'returns the integer value' do
-      @entity.value.must_equal(160)
+      @numeric_entity.to_s.must_equal(' ')
     end
   end
 
-  describe 'numeric query method' do
+  describe 'html_safe query method' do
     it 'returns true' do
-      @entity.numeric?.must_equal(true)
-    end
-  end
+      @named_entity.html_safe?.must_equal(true)
 
-  describe 'named query method' do
-    it 'returns false' do
-      @entity.named?.must_equal(false)
+      @numeric_entity.html_safe?.must_equal(true)
     end
   end
 
-  describe 'to_s method' do
-    it 'returns the encoded html entity' do
-      @entity.to_s.must_equal(' ')
-    end
-  end
-
-  describe 'html_safe query method' do
-    it 'returns true' do
-      @entity.html_safe?.must_equal(true)
+  describe 'addition of an entity with another object' do
+    it 'returns a node list containing the two nodes' do
+      nodes = HOM::Entity.new(:pound) + '9.99'
+      nodes.must_be_instance_of(HOM::NodeList)
+      nodes.to_s.must_equal('£9.99')
     end
   end
 end

data/spec/node_list_spec.rb

@@ -1,6 +1,11 @@
 require 'minitest/autorun'
 require 'active_support/core_ext/string/output_safety'
-require 'hom'
+
+if defined? require_relative
+  require_relative '../lib/hom'
+else
+  require File.join(File.dirname(__FILE__), '../lib/hom')
+end
 
 describe 'HOM::NodeList' do
   describe 'html_safe query method' do
@@ -45,10 +50,10 @@ describe 'HOM::NodeList' do
   end
 
   describe 'join method' do
-    it 'returns an html safe string containing the encoded nodes seperated by the argument' do
-      output = HOM::NodeList.new(%w(a b c)).join(HOM::Entity.new(:nbsp))
-      output.html_safe?.must_equal(true)
-      output.must_equal('a b c')
+    it 'returns a new node list containing the items in the list seperated by the given node' do
+      nodes = HOM::NodeList.new(%w(a b c)).join(HOM::Entity.new(:nbsp))
+      nodes.must_be_instance_of(HOM::NodeList)
+      nodes.to_s.must_equal('a b c')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hom
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake