RubyGems - glam - Versions diffs - 0.1.0 → 0.1.1 - Mend

glam 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/Rakefile +8 -0
data/glam.gemspec +1 -1
data/lib/glam.rb +1 -1
data/lib/glam/glamorizer.rb +23 -12
data/test/examples/expected/comments.html +11 -0
data/test/examples/expected/simple.html +14 -0
data/test/examples/source/comments.html +11 -0
data/test/examples/source/simple.html +1 -0
data/test/glam_test.rb +34 -0
metadata +13 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a59bb7cf94a04f6965427b87ec36bdd271dda4
-  data.tar.gz: 754b5ffb41d0b72f2b8bd049c32569e30dec667c
+  metadata.gz: ddedce9fb1adf54dfcc37baaa195c73359f18206
+  data.tar.gz: 4259c8efe06cf404a50e0456f1b782361adc6035
 SHA512:
-  metadata.gz: 09830db411522642371cb0550b052da1b5276222649a71f11e4f6fd8804c3af876e3dec57f97f0b8bb2a3cf55f358f99e8212085b995ff501a88964671c2f5cb
-  data.tar.gz: 87447b14ac94022d05d583f3e961164ffa9781c17cdbdbe1e8bf86bd7663cc61b96390ea9a53da23e99f391553d7ef96d130666f4de9c8a40c21c3d12785dc6a
+  metadata.gz: b798f1475de047e84359e59fbe6be3eeac59583385a396bef6c4592bd4ce4d924dea182ca7709103dc4879065112447b0bf9f3228c2c6b65da3add06dbe46ec4
+  data.tar.gz: 948a9bc1852b94a16c76122abb32e6d4b97eec583299be6f92a74621d20738ceebb79da131ad092f2930833ecc85e9d07e587b6dcfda8c248c29484d4c15cea0

data/Rakefile CHANGED

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.libs = ["lib", "test"]
+  t.test_files = FileList["test/*_test.rb"]
+end
+task :default => :test

data/glam.gemspec CHANGED

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "glam"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Paul Barry"]
   spec.email         = ["mail@paulbarry.com"]
   spec.description   = %q{An HTML pretty printer}

data/lib/glam.rb CHANGED

@@ -1,7 +1,7 @@
 require 'glam/glamorizer'
 module Glam
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 # Pretty-print the HTML

data/lib/glam/glamorizer.rb CHANGED

@@ -30,25 +30,36 @@ module Glam
         result = ''
         html
       else
-        result = "<!doctype html>\n"
+        result = "<!doctype html>"
         Nokogiri::HTML(html).root
       end
       result << indented_node_with_attributes(node)
-      self.current_indent += 1
-      node.children.each do |child_node|
-        if child_node.text?
-          unless child_node.blank?
-            result << "#{indent}#{child_node.content.strip}\n"
+      if node.children.size == 1 and node.children.first.text?
+        child_node = node.children.first
+        result << "#{child_node.content.strip}</#{node.name}>"
+      else
+        self.current_indent += 1
+        node.children.each do |child_node|
+          if child_node.text?
+            unless child_node.blank?
+              result << "\n#{indent}#{child_node.content.strip}"
+            end
+          elsif child_node.comment?
+            result << "\n#{indent}<!-- #{child_node.content.strip} -->"
+          elsif VOID_ELEMENTS.include?(child_node.name)
+            result << "\n#{indented_node_with_attributes(child_node)}"
+          else
+            result << glamorize(child_node)
           end
-        elsif VOID_ELEMENTS.include?(child_node.name)
-          result << indented_node_with_attributes(child_node)
+        end
+        self.current_indent -= 1
+        if current_indent < 1
+          result << "\n#{indent}</#{node.name}>\n"
         else
-          result << glamorize(child_node)
+          result << "\n#{indent}</#{node.name}>"
         end
       end
-      self.current_indent -= 1
-      result << "#{indent}</#{node.name}>\n"
     end
     private
@@ -57,7 +68,7 @@ module Glam
     end
     def indented_node_with_attributes(node)
-      "#{indent}<#{node.name}#{node.attributes.map{|n,v| %{ #{n}="#{v}"}}.join}>\n"
+      "\n#{indent}<#{node.name}#{node.attributes.map{|n,v| %{ #{n}="#{v}"}}.join}>"
     end
   end

data/test/examples/expected/comments.html ADDED

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Comments</title>
+  </head>
+  <body>
+    <h1>Comments</h1>
+    <!-- What happens with comments? -->
+    <p>They should be preserved</p>
+  </body>
+</html>

data/test/examples/expected/simple.html ADDED

@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Simple Example</title>
+  </head>
+  <body>
+    <h1>Simple Example</h1>
+    <p>
+      This is a paragraph with an
+      <a href="/">inline</a>
+      link
+    </p>
+  </body>
+</html>

data/test/examples/source/comments.html ADDED

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+<title>Comments</title>
+</head>
+<body>
+<h1>Comments</h1>
+<!-- What happens with comments? -->
+<p>They should be preserved</p>
+</body>
+</html>

data/test/examples/source/simple.html ADDED

	@@ -0,0 +1 @@
1	+ <html><head><title>Simple Example</title></head><body><h1>Simple Example</h1><p>This is a paragraph with an <a href="/">inline</a>link</body></html>

data/test/glam_test.rb ADDED

@@ -0,0 +1,34 @@
+require 'minitest/autorun'
+require 'glam'
+class GlamTest < MiniTest::Unit::TestCase
+  def initialize(name=nil)
+    @test_name = name
+    super(name)
+  end
+  def self.test(name, &block)
+    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    defined = instance_method(test_name) rescue false
+    raise "#{test_name} is already defined in #{self}" if defined
+    if block_given?
+      define_method(test_name, &block)
+    else
+      define_method(test_name) do
+        flunk "No implementation provided for #{name}"
+      end
+    end
+  end
+  source_dir = File.expand_path("examples/source/*.html", File.dirname(__FILE__))
+  Dir[source_dir].each do |example|
+    test File.basename(example, '.html') do
+      actual = Glam(File.read(example))
+      #puts actual
+      assert_equal(
+       File.read(example.sub(/(.*)(source)(.*)/, '\1expected\3')),
+       actual)
+    end
+  end
+end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glam
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Barry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -70,6 +70,11 @@ files:
 - lib/glam.rb
 - lib/glam/cli.rb
 - lib/glam/glamorizer.rb
+- test/examples/expected/comments.html
+- test/examples/expected/simple.html
+- test/examples/source/comments.html
+- test/examples/source/simple.html
+- test/glam_test.rb
 homepage: http://github.com/pjb3/glam
 licenses:
 - MIT
@@ -94,5 +99,10 @@ rubygems_version: 2.0.14
 signing_key:
 specification_version: 4
 summary: Make your HTML look glamorous!
-test_files: []
+test_files:
+- test/examples/expected/comments.html
+- test/examples/expected/simple.html
+- test/examples/source/comments.html
+- test/examples/source/simple.html
+- test/glam_test.rb
 has_rdoc: