RubyGems - html5small - Versions diffs - 0.2.0 → 0.3.0 - Mend

html5small 0.2.0 → 0.3.0

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 (10) hide show

checksums.yaml +15 -0
data/VERSION +1 -1
data/fixtures/lists.html.min +1 -1
data/fixtures/whitespace-complex.html.min +1 -1
data/fixtures/whitespace-p.html +1 -0
data/fixtures/whitespace-p.html.min +1 -1
data/html5small.gemspec +4 -4
data/lib/html5small/minifier.rb +17 -6
data/lib/html5small.rb +1 -1
metadata +5 -15

checksums.yaml ADDED Viewed

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGY2YjdiMTIzYjBjY2ExZmIwNzQxYjc5MDFkNTE2ZjU5MmNhOTk0MQ==
+  data.tar.gz: !binary |-
+    MTdjN2NmMTY2NWNjNTVjYmRiMTFiMDgyYTI3M2UxZTdhZTg3YTQxZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODVlYTI4NjhkNDc1OTcyM2UxYzlmN2YwZGY4YzQ1OTRmMjU4NGJhZjlhOWEw
+    YWM1MzhmMDVkYWM4MWYyMDg3NmVmN2M1YWI1ZmJhMWZmMTFmZTdkZDE2ZDM2
+    MWM0YmUwOTJjMDExN2Y1MDllOTE0ZTVmYWFlMjUwYWQ4NmEzNTA=
+  data.tar.gz: !binary |-
+    MmI5YWMxZWM2NTk0ZTk2ZWY4ODI1Njg2NzQwMTMxZjFjYzkyM2JhYTY5ZDZl
+    ZGJkM2E3NDhjMmMwN2YzYjE1Y2Y3Y2QyZjZjZGUxZmY1MTAxMjJmMWQ4ZGUy
+    MjcwNDIzYzc1ZmYzNWYyZGEzNzgzMTQ4MGJlNGRkNjFlM2UzNzA=

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.2.0
1	+ 0.3.0

data/fixtures/lists.html.min CHANGED Viewed

	@@ -1 +1 @@
1	- <!doctype html><meta charset=utf-8><title>Untitled</title><body><ul><li><i>one</i><li><i>two</i></ul>
1	+ <!doctype html><meta charset=utf-8><title>Untitled</title><body><ul><li><i>one</i><li><i> two </i></ul>

data/fixtures/whitespace-complex.html.min CHANGED Viewed

	@@ -1 +1 @@
1	- <!doctype html><meta charset=utf-8><title>Untitled</title><section><p>A <code>b</code> <i>c</i> d <dfn>e <code>f</code> ~~.</~~dfn></section>
1	+ <!doctype html><meta charset=utf-8><title>Untitled</title><section><p>A <code>b</code> <i>c</i> d <dfn>e <code> f </code> . </dfn></section>

data/fixtures/whitespace-p.html CHANGED Viewed

@@ -2,3 +2,4 @@
 <meta charset=utf-8>
 <title>Untitled</title>
 <p>This  is a<code>string </code>.
+Here is a space<span> </span>.

data/fixtures/whitespace-p.html.min CHANGED Viewed

	@@ -1 +1 @@
1	- <!doctype html><meta charset=utf-8><title>Untitled</title><body><p>This is a<code>string</code>.
1	+ <!doctype html><meta charset=utf-8><title>Untitled</title><body><p>This is a<code>string </code>. Here is a space<span> </span>.

data/html5small.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = "html5small"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Run Paint Run Run", "Ruben Verborgh"]
-  s.date = "2012-12-02"
+  s.date = "2013-08-14"
   s.description = "Minifier for HTML5 documents"
   s.email = "ruben.verborgh@gmail.com"
   s.executables = ["html5small", "html5small"]
@@ -77,11 +77,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/RubenVerborgh/HTML5small"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.6"
   s.summary = "HTML5small"
   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<htmlentities>, [">= 4.1.0"])

data/lib/html5small/minifier.rb CHANGED Viewed

@@ -16,11 +16,17 @@ module HTML5small
                        strong style sub sup svg table textarea time ul var video wbr
                       }.map(&:to_sym)
+    # BLock-level elements
+    BLOCK_ELEMENTS = %w{address article aside audio blockquote canvas dd div dl fieldset
+                        figcaption figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr
+                        li noscript ol output p pre section table thead tfoot tr ul video
+                       }.map(&:to_sym)
     attr_accessor :buf, :text_node, :entities
     def initialize
       @buf, @text_node = '', ''
-      @stack = []
+      @stack = [], @prev_tag
       @entities = HTMLEntities.new :expanded
     end
@@ -33,14 +39,17 @@ module HTML5small
       name = normalise_name name
       dump_text_node
       @stack.push name
+      @prev_tag = name
+      buf.rstrip! if is_block_element?(name) and not in_pre_element?
       buf << "<#{name}" + format_attributes(attrs, name) + ">"
     end
     def end_element name
       name = normalise_name name
       dump_text_node
-      buf.rstrip! unless in_pre_element?
+      buf.rstrip! if is_block_element?(name) and not in_pre_element?
       @stack.pop
+      @prev_tag = name
       buf << "</#{name}>"
     end
@@ -104,10 +113,8 @@ module HTML5small
       return text if in_pre_element?
       # Treat all whitespace as spaces
       text.gsub!(/[\n\t]/, ' ')
-      # Don't strip inter-element white space for flow elements
-      unless buf =~ %r{</\w+>\s*\Z} and in_flow_element?
-        text.lstrip!
-      end
+      # Strip leading whitespace at the beginning of block elements
+      text.lstrip! if @prev_tag == @stack.last and is_block_element?(@prev_tag)
       # Normalize spaces
       text.squeeze(' ')
     end
@@ -124,6 +131,10 @@ module HTML5small
       @stack.include? :script
     end
+    def is_block_element? name
+      BLOCK_ELEMENTS.include? name
+    end
     def dump_text_node
       buf << format_text_node
       text_node.clear

data/lib/html5small.rb CHANGED Viewed

@@ -5,6 +5,6 @@ module HTML5small
   def self.minify html
     minifier = Minifier.new
     Nokogiri::HTML::SAX::Parser.new(minifier).parse(html)
-    OptionalTags.remove minifier.buf.strip
+    (OptionalTags.remove minifier.buf).strip
   end
 end

metadata CHANGED Viewed

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html5small
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease:
+  version: 0.3.0
 platform: ruby
 authors:
 - Run Paint Run Run
@@ -10,12 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -143,26 +134,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/RubenVerborgh/HTML5small
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: HTML5small
 test_files: []