html_gen 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.4)
+    json (1.7.5)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/html_gen.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{html_gen}
-  s.version = "0.0.4"
+  s.name = "html_gen"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-24}
-  s.description = %q{A small framework for generating HTML.}
-  s.email = %q{k@spernj.org}
+  s.date = "2012-09-13"
+  s.description = "A small framework for generating HTML."
+  s.email = "k@spernj.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
     "spec/html_gen_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kaspernj/html_gen}
+  s.homepage = "http://github.com/kaspernj/html_gen"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A small framework for generating HTML.}
+  s.rubygems_version = "1.8.24"
+  s.summary = "A small framework for generating HTML."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/html_gen_element.rb

@@ -10,6 +10,8 @@
 #  
 #  ele.html #=> "<a href=\"http://www.youtube.com\" style=\"font-weight: bold;\" class=\"custom_link\">\n\t<b>\n\t\tTitle of link\n\t</b>\n</a>\n"
 class Html_gen::Element
+  FORBIDDEN_SHORT = ["script"]
+  
   #Attributes hash which will be used to generate attributes-elements.
   #===Example
   #  element.attr[:href] = "http://www.youtube.com"
@@ -86,6 +88,8 @@ class Html_gen::Element
     return ele
   end
   
+  alias add add_ele
+  
   #Add a text-element to the element.
   def add_str(str)
     ele = Html_gen::Text_ele.new(:str => str, :inden => @inden, :nl => @nl)
@@ -157,14 +161,22 @@ class Html_gen::Element
       str << " #{key}=\"#{Html_gen.escape_html(val)}\""
     end
     
-    if @eles.empty? and @str.empty? and @str_html.empty?
+    forbidden_short = FORBIDDEN_SHORT.include?(@name.to_s)
+    skip_pretty = false
+    
+    if @eles.empty? and @str.empty? and @str_html.empty? and !forbidden_short
       #If no sub-string, sub-HTML or sub-elements are given, we should end the HTML with " />".
       str << " />"
       str << @nl if pretty
     else
       #Write end-of-element and then all sub-elements.
       str << ">"
-      str << @nl if pretty
+      
+      if @eles.empty? and @str.empty? and @str_html.empty? and forbidden_short
+        skip_pretty = true
+      end
+      
+      str << @nl if pretty and !skip_pretty
       
       if !@str.empty?
         str << @inden * (level + 1) if pretty
@@ -182,7 +194,7 @@ class Html_gen::Element
         str << subele.html(pass_args)
       end
       
-      str << @inden * level if pretty and level > 0
+      str << @inden * level if pretty and level > 0 and !skip_pretty
       str << "</#{@name}>"
       str << @nl if pretty
     end

data/lib/html_gen_text_ele.rb

@@ -27,7 +27,7 @@ class Html_gen::Text_ele
     end
     
     str = ""
-    str << @inden * (level + 1) if pretty
+    str << @inden * level if pretty
     str << Html_gen.escape_html(@str)
     str << @nl if pretty
     

metadata

@@ -2,7 +2,7 @@
 name: html_gen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-24 00:00:00 +02:00
-default_executable: 
+date: 2012-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -83,7 +82,6 @@ files:
 - spec/html_gen_parser_spec.rb
 - spec/html_gen_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kaspernj/html_gen
 licenses: 
 - MIT
@@ -97,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4125427218880571716
+      hash: -1265875924025815085
       segments: 
       - 0
       version: "0"
@@ -110,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A small framework for generating HTML.