html2slim 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eece9c3c64833b43a38e67031800308ca6575ca
-  data.tar.gz: 63335c0229a9e8161aab1e8ac29c18a4e08703ee
+  metadata.gz: 44b797bc3773fce1d804c911e1d37cbbdda05f42
+  data.tar.gz: 56ac9b993d994e044c0066312b2c7c97e7d5d0dd
 SHA512:
-  metadata.gz: b3bb20dd62fa408f22657ee9fda3bb3a10b9d157ccd97e42aa0c4b5e4d6c1615d43818f896b2566e76e102d86b6890506fa8a80ee42fa63eaeb6625f2d0e2195
-  data.tar.gz: 654678b5831303841e368fbda3935b4963b79ccbce5258d9a703cd48562e44849db37ae306421e37ff03af15213771a01e4ee6eb892462df6132617bc7266fcb
+  metadata.gz: 6f73e26146faa023907be525d087665302d0108f06b28c9aac79f925d893e13dd700312c1c306f40c4d526efc6c89ab5dbfeee58e45a7acd189f4dd0db8bacf8
+  data.tar.gz: 68dec2af87d41e5a7cd11fde3cbef56ba2de2edafe05dcb2321e2cd9a7f9908ade5657367b081aebd0deae2677df600919c0379fba8c5568a965dfd3f69ddab3

data/README.md

@@ -1,3 +1,5 @@
+![Version](https://img.shields.io/gem/v/html2slim.svg)
+
 [![Build Status](https://travis-ci.org/slim-template/html2slim.png?branch=master)](https://travis-ci.org/slim-template/html2slim)
 
 [![Code climate](https://codeclimate.com/github/slim-template/html2slim.png)](https://codeclimate.com/github/slim-template/html2slim)
@@ -38,14 +40,14 @@ This project is released under the MIT license.
 
 ## Author
 
-[Maiz Lulkin] (https://github.com/joaomilho)
+[Maiz Lulkin] (https://github.com/joaomilho) and [contributors](https://github.com/slim-template/html2slim/graphs/contributors)
 
 ## OFFICIAL REPO
 
-https://github.com/slim-template/html2slim
+[https://github.com/slim-template/html2slim](https://github.com/slim-template/html2slim)
 
 ## ROADMAP
 
-1. ERB support is pre-alpha, and works only for 90% of the cases. Lotsa weird regexes. Gotta improve that.
+1. ERB support is beta, and works only for ~92.6% of the cases. Lotsa weird regexes. Gotta improve that.
 2. Use temple.
 3. Merge with other *2slim gems. Would be handy.

data/lib/html2slim/command.rb

@@ -85,6 +85,8 @@ module HTML2Slim
       else
         slim_file = destination || slim_file
       end
+      
+      fail(ArgumentError, "Source and destination files can't be the same.") if @options[:input] != '-' && file == slim_file
 
       in_file = if @options[:input] == "-"
         $stdin

data/lib/html2slim/converter.rb

@@ -18,14 +18,14 @@ module HTML2Slim
 
       erb.gsub!(/<%(.+?)\s*\{\s*(\|.+?\|)?\s*%>/){ %(<%#{$1} do #{$2}%>) }
 
-      # while, case, if, for and blocks...
-      erb.gsub!(/<%(-\s+)?(\s*while .+?|\s*case .+?|\s*if .+?|\s*for .+?|.+?do\s*(\|.+?\|)?\s*)-?%>/){ %(<ruby code="#{$2.gsub(/"/, '&quot;')}">) }
+      # case, if, for, unless, until, while, and blocks...
+      erb.gsub!(/<%(-\s+)?((\s*(case|if|for|unless|until|while) .+?)|.+?do\s*(\|.+?\|)?\s*)-?%>/){ %(<ruby code="#{$2.gsub(/"/, '&quot;')}">) }
       # else
       erb.gsub!(/<%-?\s*else\s*-?%>/, %(</ruby><ruby code="else">))
       # elsif
-      erb.gsub!(/<%-?\s*(elsif .+?)\s*-?%>/){ %(</ruby><ruby code="#{$1}">) }
+      erb.gsub!(/<%-?\s*(elsif .+?)\s*-?%>/){ %(</ruby><ruby code="#{$1.gsub(/"/, '&quot;')}">) }
       # when
-      erb.gsub!(/<%-?\s*(when .+?)\s*-?%>/){ %(</ruby><ruby code="#{$1}">) }
+      erb.gsub!(/<%-?\s*(when .+?)\s*-?%>/){ %(</ruby><ruby code="#{$1.gsub(/"/, '&quot;')}">) }
       erb.gsub!(/<%\s*(end|}|end\s+-)\s*%>/, %(</ruby>))
       erb.gsub!(/<%(.+?)\s*-?%>/m){ %(<ruby code="#{$1.gsub(/"/, '&quot;')}"></ruby>) }
       @slim ||= Hpricot(erb).to_slim

data/lib/html2slim/hpricot_monkeypatches.rb

@@ -44,6 +44,8 @@ class Hpricot::DocType
 end
 
 class Hpricot::Elem
+  BLANK_RE = /\A[[:space:]]*\z/
+
   def slim(lvl=0)
     r = '  ' * lvl
 
@@ -97,11 +99,11 @@ class Hpricot::Elem
   end
 
   def has_id?
-    has_attribute?('id')
+    has_attribute?('id') && !(BLANK_RE === self['id'])
   end
 
   def has_class?
-    has_attribute?('class')
+    has_attribute?('class') && !(BLANK_RE === self['class'])
   end
 
   def ruby?

data/lib/html2slim/version.rb

@@ -1,3 +1,3 @@
 module HTML2Slim
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2slim
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Maiz Lulkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot