html_gen 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac5b5ea7652e96cef3131825ecba4d8b5ba621c
-  data.tar.gz: 954569c86420e7c71ebb6f407c850989f0bc21e7
+  metadata.gz: 132c41c56cc99d2520198d3a9cbe86a8e697e950
+  data.tar.gz: d6132cc6f28ce9ec5cdcb4fcfeb7be49a1b0b342
 SHA512:
-  metadata.gz: 2f2f765c920ef1ec3202b683f2a959590646872f33d4b3b01ab23557b9234a7ff3ffe502fb59fc12c8d7982ff1338f8935fc1ed030cda47fa93a6341a3bfacee
-  data.tar.gz: 83c5d9c5b80eb2e846627ed47e3649a5032d7e9ac2cc6dd607783d112c56700b9c11c32afa5bfb8cd36321edf546d28ee6cb4f7f8a6f6924a8f06c8f675df47f
+  metadata.gz: 6a7c5a17deebf100eb21fef88227ad3d191291ca3e98c38d52f57ddd64ad5c7b5dd46392951fa1874f7b4bcc5003d350cc2f9d601bc41ca48855bd6573d8cdf3
+  data.tar.gz: 44b22116af2f3c85ddf5b62bffc03d135f56f4e6b21519eaa9e075f6e0494c9b157bb29f8a6b6e22695b46c575d8c268fd47dfd0c70fcdcad93b6e899e382c8c

data/.rubocop.yml

@@ -12,21 +12,53 @@ AllCops:
 Style/FileName:
   Enabled: false
 
+# Metrics/CyclomaticComplexity:
+#   Max: 10
+
+Metrics/LineLength:
+  Max: 160
+
+# Metrics/MethodLength:
+#   Max: 50
+
+# Metrics/AbcSize:
+#   Max: 25
+
 Metrics/ClassLength:
   Max: 250
 
+# .find_each is not the same as .each
+Rails/FindEach:
+  Enabled: false
+
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
 
+Style/ConditionalAssignment:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 
 Style/EmptyLines:
   Enabled: false
 
+# Will report offences for many places that are much more readable without using a guard clause
+Style/GuardClause:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

data/.rubocop_todo.yml

@@ -1,24 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-01-20 15:14:18 +0100 using RuboCop version 0.36.0.
+# on 2016-08-27 14:26:22 +0200 using RuboCop version 0.36.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
+# Offense count: 2
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
     - 'lib/html_gen/parser.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-# SupportedStyles: keyword, variable, start_of_line
-Lint/EndAlignment:
-  Enabled: false
-
 # Offense count: 1
 Lint/UselessAssignment:
   Exclude:
@@ -26,33 +19,20 @@ Lint/UselessAssignment:
 
 # Offense count: 3
 Metrics/AbcSize:
-  Max: 82
+  Max: 88
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 35
-
-# Offense count: 3
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 189
+  Max: 38
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 72
+  Max: 77
 
 # Offense count: 5
 Metrics/PerceivedComplexity:
-  Max: 41
-
-# Offense count: 6
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/html_gen/element.rb'
-    - 'lib/html_gen/parser.rb'
+  Max: 45
 
 # Offense count: 5
 Style/IdenticalConditionalBranches:

data/Gemfile

@@ -12,7 +12,7 @@ group :development do
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 2.1"
   gem "best_practice_project", github: "kaspernj/best_practice_project", require: false
   gem "rubocop", require: false
 end

data/Gemfile.lock

@@ -8,54 +8,60 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.4.0)
     ast (2.2.0)
     auto_autoloader (0.0.4)
       string-cases
     builder (3.2.2)
     codeclimate-test-reporter (0.4.6)
       simplecov (>= 0.7.1, < 1.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     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)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.14.5)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      oauth2 (~> 1.0)
+    hashie (3.4.4)
+    highline (1.7.8)
+    jeweler (2.1.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
+      semver
     json (1.8.2)
-    jwt (1.2.1)
+    jwt (1.5.4)
+    mini_portile2 (2.1.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (1.0.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     parser (2.3.0.1)
       ast (~> 2.2)
+    pkg-config (1.1.7)
     powerpack (0.1.1)
-    rack (1.6.0)
+    rack (2.0.1)
     rainbow (2.0.0)
-    rake (10.4.2)
+    rake (11.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
@@ -72,12 +78,14 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
     ruby-progressbar (1.7.5)
+    semver (1.0.1)
     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)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
@@ -86,11 +94,11 @@ DEPENDENCIES
   best_practice_project!
   bundler (>= 1.0.0)
   codeclimate-test-reporter
-  jeweler (~> 1.8.4)
+  jeweler (~> 2.1)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   rubocop
   string-cases
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -28,6 +28,11 @@ p.add_str "Test"
 div.html #=> '<div width="100px" style="height: 50px;" class="class1 class2">Hello world<p>Test</p></div>'
 ```
 
+With text in initializer:
+```ruby
+HtmlGen::Element.new(:div, str: "Hello world")
+```
+
 ### Parse HTML into elements
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/html_gen.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: html_gen 0.0.12 ruby lib
+# stub: html_gen 0.0.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "html_gen"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   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 = "2016-02-04"
+  s.date = "2016-08-27"
   s.description = "A small framework for generating HTML."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/html_gen"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.0"
+  s.rubygems_version = "2.5.1"
   s.summary = "A small framework for generating HTML."
 
   if s.respond_to? :specification_version then
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1"])
       s.add_development_dependency(%q<best_practice_project>, [">= 0"])
       s.add_development_dependency(%q<rubocop>, [">= 0"])
     else
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1"])
       s.add_dependency(%q<best_practice_project>, [">= 0"])
       s.add_dependency(%q<rubocop>, [">= 0"])
     end
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
     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"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1"])
     s.add_dependency(%q<best_practice_project>, [">= 0"])
     s.add_dependency(%q<rubocop>, [">= 0"])
   end

data/lib/html_gen/element.rb

@@ -1,6 +1,6 @@
 # This class can be used to generate HTML.
 #===Examples
-#  ele = HtmlGen::Element.new(:a) #=> #<HtmlGen::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="" ...>
 #  ele.classes << "custom_link"
 #  ele.css["font-weight"] = "bold"
 #  ele.attr[:href] = "http://www.youtube.com"
@@ -10,7 +10,7 @@
 #
 #  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 HtmlGen::Element
-  FORBIDDEN_SHORT = ["script"].freeze
+  FORBIDDEN_SHORT = %w(div script span).freeze
 
   # Attributes hash which will be used to generate attributes-elements.
   #===Example
@@ -66,7 +66,7 @@ class HtmlGen::Element
     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: {}, data: {}, 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: "  "}.each do |arg, default_val|
       if args[arg]
         instance_variable_set("@#{arg}", args[arg])
       else
@@ -126,7 +126,8 @@ class HtmlGen::Element
     # Used for keeping 'pretty'-value and correct indentation according to parent elements.
     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).
+    # 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).

data/lib/html_gen/parser.rb

@@ -102,7 +102,7 @@ private
   # Parses all attributes of the current tag.
   def parse_attr_of_tag(ele, tag_name)
     loop do
-      if match = search(/\A\s*(\S+)=(\"|'|)/)
+      if (match = search(/\A\s*(\S+)=(\"|'|)/))
         attr_name = match[1]
         raise "Attribute already exists on element: '#{attr_name}'." if ele.attr.key?(attr_name)
 
@@ -160,16 +160,16 @@ private
     loop do
       if search(/\A\s*\Z/)
         raise "Could not find end of tag: '#{tag_name}'."
-      elsif match = search(/\A\s*<\s*\/\s*#{Regexp.escape(tag_name)}\s*>\s*/i)
+      elsif (match = search(/\A\s*<\s*\/\s*#{Regexp.escape(tag_name)}\s*>\s*/i))
         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)/)
+      elsif (match = search(/\A(.+?)(<|\Z)/))
         puts "Text-content-match: '#{match.to_a}'." if @debug
 
         # Put end back into buffer.

data/spec/html_gen_parser_spec.rb

@@ -2,7 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 describe "Parser" do
   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(:doc) do
+    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>"
+    )
+  end
   let(:td) { doc.eles.first }
 
   it "detects a single root element" do

data/spec/html_gen_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "HtmlGen" do
+describe HtmlGen do
   it "generates elements with classes" do
     html = HtmlGen::Element.new(:td, classes: [:test]).html(pretty: false)
     html.should eq "<td class=\"test\" />"
@@ -67,6 +67,20 @@ describe "HtmlGen" do
     div_ele = HtmlGen::Element.new(:div)
     div_ele.add_str "test"
 
-    div_ele.html.should eq "<div>\n\ttest\n</div>\n"
+    div_ele.html.should eq "<div>\n  test\n</div>\n"
+  end
+
+  it "adds recursive sub elements correctly" do
+    progress = HtmlGen::Element.new(:div, classes: ["progress"])
+    progress_bar = progress.add_ele(:div, classes: ["progress-bar"])
+    progress_bar_text = progress.add_ele(:div, classes: ["bb-progress-bar-text"], str: "Test")
+
+    progress.eles.length.should eq 2
+    progress_bar.eles.length.should eq 0
+    progress_bar_text.eles.length.should eq 0
+
+    html = progress.html(pretty: false)
+
+    html.should eq "<div class=\"progress\"><div class=\"progress-bar\"></div><div class=\"bb-progress-bar-text\">Test</div></div>"
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if ENV['CODECLIMATE_REPO_TOKEN']
+if ENV["CODECLIMATE_REPO_TOKEN"]
   require "codeclimate-test-reporter"
   CodeClimate::TestReporter.start
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html_gen
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-cases
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: best_practice_project
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A small framework for generating HTML.