html_gen 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/html_gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{html_gen}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-11}
+  s.date = %q{2012-08-24}
   s.description = %q{A small framework for generating HTML.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/html_gen_element.rb

@@ -81,7 +81,14 @@ class Html_gen::Element
   #  another_ele.str = "Hello world!"
   #  element.html #=> "<a>\n\t<b>\n\t\tHello world!\n\t</b>\n</a>\n"
   def add_ele(name, args = {})
-    ele = Html_gen::Element.new(name, args)
+    ele = Html_gen::Element.new(name, args.merge(:nl => @nl, :inden => @inden))
+    @eles << ele
+    return ele
+  end
+  
+  #Add a text-element to the element.
+  def add_str(str)
+    ele = Html_gen::Text_ele.new(:str => str, :inden => @inden, :nl => @nl)
     @eles << ele
     return ele
   end
@@ -103,7 +110,7 @@ class Html_gen::Element
     end
     
     #Used for keeping 'pretty'-value and correct indentation according to parent elements.
-    pass_args = {:level => (level + 1), :pretty => pretty}
+    pass_args = {:level => (level + 1), :pretty => pretty, :inden => @inden}
     
     #Clone the attributes-hash since we are going to add stuff to it, and it shouldnt be reflected (if 'html' is called multiple times, it will bug unless we clone).
     attr = @attr.clone

data/lib/html_gen_parser.rb

@@ -100,6 +100,7 @@ class Html_gen::Parser
     end
   end
   
+  #Parses all attributes of the current tag.
   def parse_attr_of_tag(ele, tag_name)
     loop do
       if match = search(/\A\s*(\S+)=(\"|'|)/)
@@ -127,6 +128,7 @@ class Html_gen::Parser
     end
   end
   
+  #Parses an attribute-value until a given quote-char is reached.
   def parse_attr_until_quote(quote_char, quote_val)
     val = ""
     

data/lib/html_gen_text_ele.rb

@@ -3,10 +3,34 @@ class Html_gen::Text_ele
   
   def initialize(args)
     @str = args[:str]
+    @inden = args[:inden]
+    @nl = args[:nl]
   end
   
   #Returns the text that this element holds.
   def str
-    return @args[:str]
+    return @str
+  end
+  
+  #Returns the text HTML-escaped.
+  def html(args)
+    if args[:level]
+      level = args[:level]
+    else
+      level = 0
+    end
+    
+    if !args.key?(:pretty) or args[:pretty]
+      pretty = true
+    else
+      pretty = false
+    end
+    
+    str = ""
+    str << @inden * (level + 1) if pretty
+    str << Html_gen.escape_html(@str)
+    str << @nl if pretty
+    
+    return str
   end
 end

data/spec/html_gen_spec.rb

@@ -23,5 +23,12 @@ describe "HtmlGen" do
     
     html = Html_gen::Element.new(:b, :str_html => "<b>Test</b>").html(:pretty => false)
     raise "Expected escape HTML: '#{html}'." if html != "<b><b>Test</b></b>"
+    
+    div_ele = Html_gen::Element.new(:div)
+    div_ele.add_ele(:br)
+    div_ele.add_str("This is a test")
+    
+    html = div_ele.html(:pretty => false)
+    raise "Expected HTML: '#{html}'." if html != "<div><br />This is a test</div>"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: html_gen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-11 00:00:00 +02:00
+date: 2012-08-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4461972116095674458
+      hash: 4125427218880571716
       segments: 
       - 0
       version: "0"