RubyGems - html_gen - Versions diffs - 0.0.5 → 0.0.6 - Mend

html_gen 0.0.5 → 0.0.6

Files changed (17) hide show

checksums.yaml +7 -0
data/Gemfile +3 -0
data/Gemfile.lock +45 -5
data/README.md +60 -0
data/Rakefile +1 -1
data/VERSION +1 -1
data/html_gen.gemspec +15 -10
data/lib/html_gen.rb +16 -9
data/lib/{html_gen_element.rb → html_gen/element.rb} +121 -78
data/lib/{html_gen_parser.rb → html_gen/parser.rb} +41 -40
data/lib/{html_gen_text_ele.rb → html_gen/text_ele.rb} +9 -9
data/shippable.yml +9 -0
data/spec/html_gen_parser_spec.rb +43 -18
data/spec/html_gen_spec.rb +47 -26
data/spec/spec_helper.rb +3 -1
metadata +83 -67
data/README.rdoc +0 -19

checksums.yaml ADDED

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c67d70ec80e15b84be9ffb5d38c994877a9fe8cb
+  data.tar.gz: cb4312924ea5936e3e85504d8242724267cdd297
+SHA512:
+  metadata.gz: 3fc3b7aa1ad97434106efc26ee97df3c0fa83ea693aa839be8301b7f076ec984d7785fd853df413c6eea1b3b38cb0ffe7e0f22ce23a14f63ca54e7f4d1830d2c
+  data.tar.gz: 7da0053e8d31c33098cfdeae5749b0ded911349a7cec7f7b4eb5a216b81ef63845f301da52dadcb902e1697cab5ad434c6712e58579a55d11b40735f2fece8c6

data/Gemfile CHANGED

@@ -3,6 +3,9 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem "string-cases"
+gem "codeclimate-test-reporter", group: :test, require: nil
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock CHANGED

@@ -1,16 +1,48 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.7)
+    builder (3.2.2)
+    codeclimate-test-reporter (0.4.6)
+      simplecov (>= 0.7.1, < 1.0.0)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.4)
+    docile (1.1.5)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    git (1.2.9.1)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (3.4.0)
+    highline (1.6.21)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.2)
+    jwt (1.2.1)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.0)
+    rake (10.4.2)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -20,12 +52,20 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    string-cases (0.0.0)
 PLATFORMS
   ruby
 DEPENDENCIES
   bundler (>= 1.0.0)
+  codeclimate-test-reporter
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
+  string-cases

data/README.md ADDED

@@ -0,0 +1,60 @@
+[![Build Status](https://api.shippable.com/projects/540e7b9b3479c5ea8f9ec21c/badge?branchName=master)](https://app.shippable.com/projects/540e7b9b3479c5ea8f9ec21c/builds/latest)
+[![Code Climate](https://codeclimate.com/github/kaspernj/html_gen/badges/gpa.svg)](https://codeclimate.com/github/kaspernj/html_gen)
+[![Test Coverage](https://codeclimate.com/github/kaspernj/html_gen/badges/coverage.svg)](https://codeclimate.com/github/kaspernj/html_gen)
+# HtmlGen
+A small and fast framework to parse and generate HTML in Ruby.
+## Install
+Add to your Gemfile and bundle:
+```ruby
+gem "html_gen"
+```
+## Usage
+### Generate elements
+```ruby
+div = HtmlGen::Element.new(:div, classes: ["class1", "class2"], attr: {width: "100px"}, css: {height: "50px"})
+div.add_str "Hello world"
+p = div.add_ele(:p)
+p.add_str "Test"
+div.html #=> '<div width="100px" style="height: 50px;" class="class1 class2">Hello world<p>Test</p></div>'
+```
+### Parse HTML into elements
+```ruby
+parser = HtmlGen::Parser.new(str: "<html><head><title>Test</title></head><body>This is the body</body></html>")
+html = parser.eles.first
+head = html.eles.first
+head.name #=> "head"
+title = head.eles.first
+title.html #=> "Test"
+title.attr #=> {}
+title.css #=> {}
+```
+## Contributing to html_gen
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+## Copyright
+Copyright (c) 2012 Kasper Johansen. See LICENSE.txt for
+further details.

data/Rakefile CHANGED

@@ -36,7 +36,7 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
-task :default => :spec
+task default: :spec
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.0.5
1	+ 0.0.6

data/html_gen.gemspec CHANGED

@@ -2,19 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: html_gen 0.0.6 ruby lib
 Gem::Specification.new do |s|
   s.name = "html_gen"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-13"
+  s.date = "2015-02-13"
   s.description = "A small framework for generating HTML."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -22,39 +24,42 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "html_gen.gemspec",
     "lib/html_gen.rb",
-    "lib/html_gen_element.rb",
-    "lib/html_gen_parser.rb",
-    "lib/html_gen_text_ele.rb",
+    "lib/html_gen/element.rb",
+    "lib/html_gen/parser.rb",
+    "lib/html_gen/text_ele.rb",
+    "shippable.yml",
     "spec/html_gen_parser_spec.rb",
     "spec/html_gen_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kaspernj/html_gen"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.4.0"
   s.summary = "A small framework for generating HTML."
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<string-cases>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
+      s.add_dependency(%q<string-cases>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
+    s.add_dependency(%q<string-cases>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/lib/html_gen.rb CHANGED

@@ -1,14 +1,21 @@
-#This class doesnt hold other methods than for autoloading of subclasses.
-class Html_gen
-  #Autoloader for subclasses.
+require "string-cases"
+# This class doesnt hold other methods than for autoloading of subclasses.
+class HtmlGen
+  # Autoloader for subclasses.
   def self.const_missing(name)
-    require "#{File.dirname(__FILE__)}/html_gen_#{name.to_s.downcase}.rb"
-    raise "Still not defined: '#{name}'." if !Html_gen.const_defined?(name)
-    return Html_gen.const_get(name)
+    file_path = "#{File.dirname(__FILE__)}/html_gen/#{::StringCases.camel_to_snake(name)}.rb"
+    if File.exists?(file_path)
+      require file_path
+      return HtmlGen.const_get(name) if HtmlGen.const_defined?(name)
+    end
+    super
   end
-  #Escapes HTML from the given string. This is to avoid any dependencies and should not be used by other libs.
+  # Escapes HTML from the given string. This is to avoid any dependencies and should not be used by other libs.
   def self.escape_html(string)
     return string.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
   end
-end
+end

data/lib/{html_gen_element.rb → html_gen/element.rb} RENAMED

@@ -1,218 +1,222 @@
 #This class can be used to generate HTML.
 #===Examples
-#  ele = Html_gen::Element.new(:a) #=> #<Html_gen::Element:0x00000000e5f650 @attr={}, @name=:a, @classes=[], @str_html="", @str="", @css={}, @eles=[], @nl="\n", @inden="\t">
+#  ele = HtmlGen::Element.new(:a) #=> #<HtmlGen::Element:0x00000000e5f650 @attr={}, @name=:a, @classes=[], @str_html="", @str="", @css={}, @eles=[], @nl="\n", @inden="\t">
 #  ele.classes << "custom_link"
 #  ele.css["font-weight"] = "bold"
 #  ele.attr[:href] = "http://www.youtube.com"
-#
+#
 #  b = ele.add_ele(:b)
 #  b.str = "Title of link"
-#
+#
 #  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
+class HtmlGen::Element
   FORBIDDEN_SHORT = ["script"]
   #Attributes hash which will be used to generate attributes-elements.
   #===Example
   #  element.attr[:href] = "http://www.youtube.com"
   attr_reader :attr
   #CSS-hash which will be used to generate the 'style'-attribute.
   #===Example
   #  element.css["font-weight"] = "bold"
   attr_reader :css
+  #Data hash which will nest keys.
+  attr_reader :data
   #Classes-array which will be used to generate the 'class'-attribute.
   #===Example
   #  element.classes += ["class1", "class2"]
   #  element.html #=> ... class="class1 class2"...
   attr_reader :classes
   #This string is used to generate the value of an element. It will be HTML-escaped.
   #===Example
-  #  element = Html_gen::Element.new("b")
+  #  element = HtmlGen::Element.new("b")
   #  element.str = "Te<i>s</i>t"
-  #  element.html(:pretty => false) #=> "<b>Te&lt;i&gt;s&lt;/i&gt;t</b>"
+  #  element.html(pretty: false) #=> "<b>Te&lt;i&gt;s&lt;/i&gt;t</b>"
   attr_accessor :str
   #This string is used to generate the value of an element. It will not be HTML-escaped.
   #===Example
-  #  element = Html_gen::Element.new("b")
+  #  element = HtmlGen::Element.new("b")
   #  element.str_html = "Te<i>s</i>t"
   #  element.html #=> "<b>Te<i>s</i>t</b>"
   attr_accessor :str_html
   #An array holding all the sub-elements of this element.
   attr_accessor :eles
   #The name of the element. "a" for <a> and such.
   attr_accessor :name
   #You can give various arguments as shortcuts to calling the methods. You can also decide what should be used for newline and indentation.
-  #  Html_gen::Element.new(:b, {
-  #    :css => {"font-weight" => "bold"},
-  #    :attr => {"href" => "http://www.youtube.com"},
-  #    :classes => ["class1", "class2"],
-  #    :str => "A title",
-  #    :str_html => "Some custom URL as title",
-  #    :nl => "\n",
-  #    :inden => "\t",
-  #    :eles => [Html_gen::Element.new("i", :str => "Hello world!")
+  #  HtmlGen::Element.new(:b, {
+  #    css: {"font-weight" => "bold"},
+  #    attr: {"href" => "http://www.youtube.com"},
+  #    classes: ["class1", "class2"],
+  #    str: "A title",
+  #    str_html: "Some custom URL as title",
+  #    nl: "\n",
+  #    inden: "\t",
+  #    eles: [HtmlGen::Element.new("i", str: "Hello world!")
   #  })
   def initialize(name, args = {})
-    raise "'name' should be a string or a symbol but was a '#{name.class.name}'."if !name.is_a?(String) and !name.is_a?(Symbol)
+    raise "'name' should be a string or a symbol but was a '#{name.class.name}'."if !name.is_a?(String) && !name.is_a?(Symbol)
     @name = name
-    {:attr => {}, :classes => [], :str_html => "", :str => "", :css => {}, :eles => [], :nl => "\n", :inden => "\t"}.each do |arg, default_val|
+    {attr: {}, data: {}, classes: [], str_html: "", str: "", css: {}, eles: [], nl: "\n", inden: "\t"}.each do |arg, default_val|
       if args[arg]
         instance_variable_set("@#{arg}", args[arg])
       else
         instance_variable_set("@#{arg}", default_val)
       end
       args.delete(arg)
     end
     raise "Unknown arguments: '#{args.keys.join(",")}'." if !args.empty?
   end
   #Adds a sub-element to the element.
   #===Examples
-  #  element = Html_gen::Element.new("a")
+  #  element = HtmlGen::Element.new("a")
   #  another_ele = element.add_ele("b")
   #  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.merge(:nl => @nl, :inden => @inden))
+    ele = HtmlGen::Element.new(name, args.merge(nl: @nl, inden: @inden))
     @eles << ele
     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)
+    ele = HtmlGen::TextEle.new(str: str, inden: @inden, nl: @nl)
     @eles << ele
     return ele
   end
   # Returns the HTML for the element.
   # To avoid indentation and newlines you can use the 'pretty'-argument:
-  #  element.html(:pretty => false)
+  #  element.html(pretty: false)
   def html(args = {})
     if args[:level]
       level = args[:level]
     else
       level = 0
     end
     if args.key?(:pretty)
       pretty = args[:pretty]
     else
       pretty = true
     end
     #Used for keeping 'pretty'-value and correct indentation according to parent elements.
-    pass_args = {:level => (level + 1), :pretty => pretty, :inden => @inden}
+    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
     #Start generating the string with HTML (possible go give a custom 'str'-variable where the content should be pushed to).
     if args[:str]
       str = args[:str]
     else
       str = ""
     end
-    str << @inden * level if pretty and level > 0
+    str << @inden * level if pretty && level > 0
     str << "<#{@name}"
     #Add content from the 'css'-hash to the 'style'-attribute in the right format.
-    if !@css.empty?
+    unless @css.empty?
       style = ""
       @css.each do |key, val|
-        style << "; " if !style.empty?
+        style << "; " unless style.empty?
         style << "#{key}: #{val};"
       end
-      if attr[:style] and !attr[:style].empty?
-        attr[:style] << "; "
-        attr[:style] << style
+      if attr[:style] && !attr[:style].empty?
+        attr[:style] << "; #{style}"
       else
         attr[:style] = style
       end
     end
     #Add content from the 'classes'-array to the 'class'-attribute in the right format.
-    if !@classes.empty?
+    unless @classes.empty?
       class_str = @classes.join(" ")
-      if @attr[:class] and !@attr[:class].empty?
+      if @attr[:class] && !@attr[:class].empty?
         attr[:class] << " #{class_str}"
       else
         attr[:class] = class_str
       end
     end
     #Write out the attributes to the string.
     attr.each do |key, val|
-      str << " #{key}=\"#{Html_gen.escape_html(val)}\""
+      str << " #{key}=\"#{HtmlGen.escape_html(val)}\""
     end
+    str << " #{data_attributes(@data, "data")}" if @data.any?
     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 @eles.empty? && @str.empty? && @str_html.empty? && !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 << ">"
-      if @eles.empty? and @str.empty? and @str_html.empty? and forbidden_short
+      if @eles.empty? && @str.empty? && @str_html.empty? && forbidden_short
         skip_pretty = true
       end
-      str << @nl if pretty and !skip_pretty
-      if !@str.empty?
+      str << @nl if pretty && !skip_pretty
+      unless @str.empty?
         str << @inden * (level + 1) if pretty
-        str << Html_gen.escape_html(@str)
+        str << HtmlGen.escape_html(@str)
         str << @nl if pretty
       end
-      if !@str_html.empty?
+      unless @str_html.empty?
         str << @inden * (level + 1) if pretty
         str << @str_html
         str << @nl if pretty
       end
       @eles.each do |subele|
         str << subele.html(pass_args)
       end
-      str << @inden * level if pretty and level > 0 and !skip_pretty
+      str << @inden * level if pretty && level > 0 && !skip_pretty
       str << "</#{@name}>"
       str << @nl if pretty
     end
     #Returns the string.
     return str
   end
   #Returns the names of all sub-elements in an array.
   def eles_names
     names = []
     @eles.each do |ele|
       names << ele.name
     end
     return names
   end
   #Converts the content of the 'style'-attribute to css-hash-content.
   def convert_style_to_css
     if !@attr[:style].to_s.strip.empty?
@@ -222,7 +226,7 @@ class Html_gen::Element
     else
       raise "No style set in element."
     end
     loop do
       if match = style.match(/\A\s*(\S+?):\s*(.+?)\s*(;|\Z)/)
         style.gsub!(match[0], "")
@@ -237,4 +241,43 @@ class Html_gen::Element
       end
     end
   end
-end
+  def convert_data_attributes_to_data
+    @attr.delete_if do |key, value|
+      match = key.to_s.match(/\Adata-(.+)\Z/)
+      if match
+        data_keys = match[1].split("-")
+        last_key = data_keys.pop
+        current_data_element = @data
+        data_keys.each do |key_part|
+          current_data_element = current_data_element[key_part] ||= {}
+        end
+        current_data_element[last_key] = value
+        true
+      else
+        false
+      end
+    end
+  end
+private
+  def data_attributes(data_hash, prev_key)
+    html = ""
+    data_hash.each do |key, value|
+      if value.is_a?(Hash)
+        html << " " unless html.empty?
+        html << "#{data_attributes(value, "#{prev_key}-#{key}")}"
+      else
+        html << " " unless html.empty?
+        html << "#{prev_key}-#{key}=\"#{HtmlGen.escape_html(value)}\""
+      end
+    end
+    return html
+  end
+end

data/lib/{html_gen_parser.rb → html_gen/parser.rb} RENAMED

@@ -1,39 +1,39 @@
 #A simple, lightweight and pure-Ruby class for parsing HTML-strings into elements.
 #===Examples
-#  doc = Html_gen::Parser.new(:str => a_html_variable)
+#  doc = HtmlGen::Parser.new(str: a_html_variable)
 #  html_ele = doc.eles.first
 #  html_ele.name #=> "html"
-class Html_gen::Parser
+class HtmlGen::Parser
   #An array that holds all the parsed root-elements.
   attr_reader :eles
   #The constructor. See class documentation for usage of this.
   def initialize(args)
     if args[:io]
       @io = args[:io]
     elsif args[:str]
-      @io = StringIO.new(args[:str])
+      @io = ::StringIO.new(args[:str])
     else
       raise "Dont know how to handle given arguments."
     end
-    raise "No ':io' was given." if !@io
+    raise "No ':io' was given." unless @io
     @eof = false
     @buffer = ""
     @eles = []
     @eles_t = []
     @debug = args[:debug]
-    while !@eof or !@buffer.empty?
+    while !@eof || !@buffer.empty?
       parse_tag
     end
   end
-  private
+private
   #Ensures at least 16kb of data is loaded into the buffer.
   def ensure_buffer
-    while @buffer.length < 16384 and !@eof
+    while @buffer.length < 16384 && !@eof
       str = @io.gets(16384)
       if !str
         @eof = true
@@ -42,31 +42,31 @@ class Html_gen::Parser
       end
     end
   end
   #Searches for a given regex. If found the contents is removed from the buffer.
   def search(regex)
     ensure_buffer
     if match = @buffer.match(regex)
       @buffer.gsub!(regex, "")
       ensure_buffer
       return match
     end
     return false
   end
   #Asumes a tag is the next to be parsed and adds it to document-data.
   def parse_tag(args = {})
     if match = search(/\A\s*<\s*(\/|)\s*(\S+?)(\s+|\/\s*>|>)/)
       tag_name = match[2].to_s.strip.downcase
       start_sign = match[1].to_s.strip.downcase
       end_sign = match[3].to_s.strip.downcase
-      raise "Dont know how to handle start-sign: '#{start_sign}' for tag: '#{tag_name}'." if !start_sign.empty?
-      ele = Html_gen::Element.new(tag_name)
+      raise "Dont know how to handle start-sign: '#{start_sign}' for tag: '#{tag_name}'." unless start_sign.empty?
+      ele = HtmlGen::Element.new(tag_name)
       if @eles_t.empty?
         puts "Adding element '#{tag_name}' to root elements." if @debug
         @eles << ele
@@ -74,10 +74,10 @@ class Html_gen::Parser
         puts "Adding element '#{tag_name}' to last t-element: '#{@eles_t.last.name}'." if @debug
         @eles_t.last.eles << ele
       end
       @eles_t << ele
       puts "New element-match: #{match.to_a}" if @debug
       if end_sign.match(/^\/\s*>$/)
         puts "End of element '#{tag_name}' for '#{@eles_t.last.name}'." if @debug
         ele = @eles_t.pop
@@ -85,7 +85,8 @@ class Html_gen::Parser
         return ele
       elsif end_sign.to_s.strip.empty?
         parse_attr_of_tag(ele, tag_name)
-        ele.convert_style_to_css if ele.attr.key?("style") or ele.attr.key?(:style)
+        ele.convert_style_to_css if ele.attr.key?("style") || ele.attr.key?(:style)
+        ele.convert_data_attributes_to_data
         return ele
       else
         parse_content_of_tag(ele, tag_name)
@@ -99,14 +100,14 @@ class Html_gen::Parser
       end
     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+)=(\"|'|)/)
         attr_name = match[1]
         raise "Attribute already exists on element: '#{attr_name}'." if ele.attr.key?(attr_name)
         if match[2].to_s.empty?
           quote_char = /\s+/
           quote_val = :whitespace
@@ -114,9 +115,9 @@ class Html_gen::Parser
           quote_char = /#{Regexp.escape(match[2])}/
           quote_val = :normal
         end
         attr_val = parse_attr_until_quote(quote_char, quote_val)
         puts "Parsed attribute '#{attr_name}' with value '#{attr_val}'." if @debug
         ele.attr[attr_name] = attr_val
       elsif search(/\A\s*>/)
@@ -127,16 +128,16 @@ class Html_gen::Parser
       end
     end
   end
   #Parses an attribute-value until a given quote-char is reached.
   def parse_attr_until_quote(quote_char, quote_val)
     val = ""
     loop do
       ensure_buffer
       char = @buffer.slice!(0)
       break if !char
       if char == "\\"
         val << char
         val << @buffer.slice!(0)
@@ -149,15 +150,15 @@ class Html_gen::Parser
         val << char
       end
     end
     return val
   end
   #Assumes some content of a tag is next to be parsed and parses it.
   def parse_content_of_tag(ele, tag_name)
     raise "Empty tag-name given: '#{tag_name}'." if tag_name.to_s.strip.empty?
     raise "No 'ele' was given." if !ele
     loop do
       if search(/\A\s*\Z/)
         raise "Could not find end of tag: '#{tag_name}'."
@@ -165,23 +166,23 @@ class Html_gen::Parser
         puts "Found end: '#{match.to_a}' for '#{@eles_t.last.name}'." if @debug
         ele = @eles_t.pop
         raise "Expected ele-name to be: '#{tag_name}' but it wasnt: '#{ele.name}'." if ele.name.to_s != tag_name
         break
-      elsif new_ele = parse_tag(:false => true)
+      elsif new_ele = parse_tag(false: true)
         puts "Found new element '#{new_ele.name}' and adding it to '#{ele.name}'." if @debug
         #ele.eles << new_ele
       elsif match = search(/\A(.+?)(<|\Z)/)
         puts "Text-content-match: '#{match.to_a}'." if @debug
         #Put end back into buffer.
         @buffer = match[2] + @buffer
         puts "Buffer after text-match: #{@buffer}" if @debug
         #Add text element to list as finished.
-        ele.eles << Html_gen::Text_ele.new(:str => match[1])
+        ele.eles << HtmlGen::TextEle.new(str: match[1])
       else
         raise "Dont know what to do with buffer: '#{@buffer}'."
       end
     end
   end
-end
+end

data/lib/{html_gen_text_ele.rb → html_gen/text_ele.rb} RENAMED

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

data/shippable.yml ADDED

@@ -0,0 +1,9 @@
+language: ruby
+cache: bundler
+archive: true
+rvm:
+  - 2.1.2
+script:
+  - CODECLIMATE_REPO_TOKEN=81bf37d5bc3daf65852d6763dda5dbe2f39d5273dd23ac85a91d3efd41cd74d3 bundle exec rspec
+notifications:
+   email: false

data/spec/html_gen_parser_spec.rb CHANGED

@@ -1,25 +1,50 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Parser" do
-  it "should be able generate elements from HTML" do
-    parser = Html_gen::Parser.new(:str => "<html><head><title>Test</title></head><body>This is the body</body></html>")
-    raise "Expected 1 root element but got: '#{parser.eles.length}'." if parser.eles.length != 1
+  let(:parser) { HtmlGen::Parser.new(str: "<html><head><title>Test</title></head><body>This is the body</body></html>") }
+  let(:doc) { HtmlGen::Parser.new(str: "<td colspan=\"2\" data-test=\"test-value\" data-nested-test=\"test-nested-keys\" style=\"font-weight: bold;\" width='100px' height=50px>test</td>") }
+  let(:td) { doc.eles.first }
+  it "detects a single root element" do
+    parser.eles.length.should eq 1
+  end
+  it "detects the head and body element under the html element" do
     html = parser.eles.first
-    raise "Expected 2 elements of HTML element but got: '#{html.eles.length}'. #{html.eles_names}" if html.eles.length != 2
-    head = html.eles.first
+    html.eles.length.should eq 2
+  end
+  it "reads the head-title element content correct" do
+    head = parser.eles.first.eles.first
     title = head.eles.first
-    raise "Expected name to be 'title' but it wasnt: '#{title.name}'." if title.name != "title"
-    doc = Html_gen::Parser.new(:str => "<td colspan=\"2\" style=\"font-weight: bold;\" width='100px' height=50px>test</td>")
-    td = doc.eles.first
-    raise "Expected name of element to be 'td' but it wasnt: '#{td.name}'." if td.name != "td"
-    raise "Expected colspan to be '2' but it wasnt: '#{td.attr["colspan"]}'." if td.attr["colspan"] != "2"
-    raise "Expected width to be '100px' but it wasnt: '#{td.attr["width"]}'." if td.attr["width"] != "100px"
-    raise "Expected height to be '50px' but it wasnt: '#{td.attr["height"]}'." if td.attr["height"] != "50px"
-    raise "Expected CSS-font-weight to be 'bold' but it wasnt: '#{td.css["font-weight"]}'." if td.css["font-weight"] != "bold"
-    raise "Expected style to be empty but it wasnt: '#{td.attr["style"]}'." if !td.attr["style"].to_s.empty?
+    title.name.should eq "title"
+  end
+  it "reads the td elements name" do
+    td.name.should eq "td"
+  end
+  it "detects html attributes" do
+    td.attr["colspan"].should eq "2"
+    td.attr["width"].should eq "100px"
+    td.attr["height"].should eq "50px"
+  end
+  it "detects data attributes" do
+    td.data["test"].should eq "test-value"
+  end
+  it "detects nested data key attributes" do
+    td.data["nested"]["test"].should eq "test-nested-keys"
+  end
+  it "removes the original attributes" do
+    td.attr["data-test"].should eq nil
+    td.attr["data-nested-test"].should eq nil
+  end
+  it "detects CSS attributes" do
+    td.css["font-weight"].should eq "bold"
+    td.attr["style"].to_s.empty?.should eq true
   end
 end

data/spec/html_gen_spec.rb CHANGED

@@ -1,34 +1,55 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "spec_helper"
 describe "HtmlGen" do
-  it "should be able to generate html" do
-    html = Html_gen::Element.new(:td, :classes => [:test]).html(:pretty => false)
-    raise "Expected valid HTML." if html != "<td class=\"test\" />"
-    html = Html_gen::Element.new(:td, :attr => {:colspan => 2}).html(:pretty => false)
-    raise "Expected valid HTML." if html != "<td colspan=\"2\" />"
-    html = Html_gen::Element.new(:td, :css => {:width => "80px"}).html(:pretty => false)
-    raise "Expected valid HTML: '#{html}'." if html != "<td style=\"width: 80px;\" />"
-    a = Html_gen::Element.new(:a)
+  it "generates elements with classes" do
+    html = HtmlGen::Element.new(:td, classes: [:test]).html(pretty: false)
+    html.should eq "<td class=\"test\" />"
+  end
+  it "generates elements with attributes" do
+    html = HtmlGen::Element.new(:td, attr: {colspan: 2}).html(pretty: false)
+    html.should eq "<td colspan=\"2\" />"
+  end
+  it "generates elements with css attributes" do
+    html = HtmlGen::Element.new(:td, css: {width: "80px"}).html(pretty: false)
+    html.should eq "<td style=\"width: 80px;\" />"
+  end
+  it "generates elements with sub elementes" do
+    a = HtmlGen::Element.new(:a)
     b = a.add_ele(:b)
     b.str = "Test"
-    html = a.html(:pretty => false)
-    raise "Expected something else." if html != "<a><b>Test</b></a>"
-    html = Html_gen::Element.new(:b, :str => "<b>Test</b>").html(:pretty => false)
-    raise "Expected escape HTML: '#{html}'." if html != "<b>&lt;b&gt;Test&lt;/b&gt;</b>"
-    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)
+    html = a.html(pretty: false)
+    html.should eq "<a><b>Test</b></a>"
+  end
+  it "generates elements with string content and escapes it" do
+    html = HtmlGen::Element.new(:b, str: "<b>Test</b>").html(pretty: false)
+    html.should eq "<b>&lt;b&gt;Test&lt;/b&gt;</b>"
+  end
+  it "generates elements with html content and doesn't escape it" do
+    html = HtmlGen::Element.new(:b, str_html: "<b>Test</b>").html(pretty: false)
+    html.should eq "<b><b>Test</b></b>"
+  end
+  it "supports mixed elements and string content" do
+    div_ele = HtmlGen::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>"
+    html = div_ele.html(pretty: false)
+    html.should eq "<div><br />This is a test</div>"
+  end
+  it "supports data attributes" do
+    div_ele = HtmlGen::Element.new(:div, str: "Test", data: {test: "value"})
+  end
+  it "supports nested data attributes" do
+    div_ele = HtmlGen::Element.new(:div, str: "Test", data: {deep: {nested: {test: "value"}}})
+    div_ele.html(pretty: false).should eq "<div data-deep-nested-test=\"value\">Test</div>"
   end
 end

data/spec/spec_helper.rb CHANGED

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
@@ -8,5 +11,4 @@ require 'html_gen'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
 end

metadata CHANGED

@@ -1,116 +1,132 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: html_gen
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 0.0.6
 platform: ruby
-authors:
+authors:
 - Kasper Johansen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2015-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: string-cases
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: "3.12"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 description: A small framework for generating HTML.
 email: k@spernj.org
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
-files:
-- .document
-- .rspec
+- README.md
+files:
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - html_gen.gemspec
 - lib/html_gen.rb
-- lib/html_gen_element.rb
-- lib/html_gen_parser.rb
-- lib/html_gen_text_ele.rb
+- lib/html_gen/element.rb
+- lib/html_gen/parser.rb
+- lib/html_gen/text_ele.rb
+- shippable.yml
 - spec/html_gen_parser_spec.rb
 - spec/html_gen_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kaspernj/html_gen
-licenses:
+licenses:
 - MIT
+metadata: {}
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version
-      hash: -1265875924025815085
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.4.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: A small framework for generating HTML.
 test_files: []

data/README.rdoc DELETED

@@ -1,19 +0,0 @@
-= html_gen
-Description goes here.
-== Contributing to html_gen
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-== Copyright
-Copyright (c) 2012 Kasper Johansen. See LICENSE.txt for
-further details.