html2slim 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,10 @@
+[![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)
+
 ## HTML2Slim
 
-Script for converting HTML (or sHTML) files to slim (slim-lang.org).
+Script for converting HTML and ERB files to slim (slim-lang.org).
 
 It's not perfect, but certainly it helps a lot!
 
@@ -8,7 +12,7 @@ It's based on Hpricot. Yeah, I'm old school.
 
 ## Usage
 
-You may convert files using the included executable `html2slim`.
+You may convert files using the included executables `html2slim` and `erb2slim`.
 
     # html2slim -h
 
@@ -18,7 +22,15 @@ You may convert files using the included executable `html2slim`.
         -h, --help                       Show this message
         -v, --version                    Print version
 
-Alternatively, to convert files or strings on the fly in your application, you may do so by calling `HTML2Slim.convert!`.
+    # erb2slim -h
+
+    Usage: erb2slim INPUT_FILENAME_OR_DIRECTORY [OUTPUT_FILENAME_OR_DIRECTORY] [options]
+            --trace                      Show a full traceback on error
+        -d, --delete                     Delete ERB files
+        -h, --help                       Show this message
+        -v, --version                    Print version
+
+Alternatively, to convert files or strings on the fly in your application, you may do so by calling `HTML2Slim.convert!(file, format)` where format is either :html or :erb.
 
 ## License
 
@@ -34,6 +46,6 @@ https://github.com/slim-template/html2slim
 
 ## ROADMAP
 
-1. Improve minitests
-2. ERB support, I guess...
+1. ERB support is pre-alpha, and works only for 90% of the cases. Lotsa weird regexes. Gotta improve that.
+2. Use temple.
 3. Merge with other *2slim gems. Would be handy.

data/bin/erb2slim

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'html2slim/command'
+
+cmd = HTML2Slim::ERBCommand.new(ARGV)
+cmd.run

data/bin/html2slim

@@ -3,5 +3,5 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'html2slim/command'
 
-cmd = HTML2Slim::Command.new(ARGV)
+cmd = HTML2Slim::HTMLCommand.new(ARGV)
 cmd.run

data/lib/html2slim.rb

@@ -2,7 +2,11 @@ require_relative 'html2slim/version'
 require_relative 'html2slim/converter'
 
 module HTML2Slim
-  def self.convert!(input)
-    Converter.new(input)
+  def self.convert!(input, format=:html)
+    if format.to_s == "html"
+      HTMLConverter.new(input)
+    else
+      ERBConverter.new(input)
+    end
   end
 end

data/lib/html2slim/command.rb

@@ -3,6 +3,7 @@ require 'html2slim'
 
 module HTML2Slim
   class Command
+
     def initialize(args)
       @args    = args
       @options = {}
@@ -23,8 +24,16 @@ module HTML2Slim
 
     protected
 
+    def format
+      @format ||= (self.class.to_s =~ /ERB/ ? :erb : :html)
+    end
+
+    def command_name
+      @command_name ||= format == :html ? "html2slim" : "erb2slim"
+    end
+
     def set_opts(opts)
-      opts.banner = "Usage: html2slim INPUT_FILENAME_OR_DIRECTORY [OUTPUT_FILENAME_OR_DIRECTORY] [options]"
+      opts.banner = "Usage: #{command_name} INPUT_FILENAME_OR_DIRECTORY [OUTPUT_FILENAME_OR_DIRECTORY] [options]"
 
       opts.on('--trace', :NONE, 'Show a full traceback on error') do
         @options[:trace] = true
@@ -36,11 +45,11 @@ module HTML2Slim
       end
 
       opts.on_tail('-v', '--version', 'Print version') do
-        puts "html2slim #{HTML2Slim::VERSION}"
+        puts "#{command_name} #{HTML2Slim::VERSION}"
         exit
       end
 
-      opts.on('-d', '--delete', 'Delete HTML files') do
+      opts.on('-d', '--delete', "Delete #{format.upcase} files") do
         @options[:delete] = true
       end
     end
@@ -80,10 +89,15 @@ module HTML2Slim
                 end
 
       @options[:output] = slim_file && slim_file != '-' ? File.open(slim_file, 'w') : $stdout
-      @options[:output].puts HTML2Slim.convert!(in_file)
+      # raise "|||#{self.class.inspect}|||"
+      @options[:output].puts HTML2Slim.convert!(in_file, format)
       @options[:output].close
 
       File.delete(file) if @options[:delete]
     end
   end
+  class HTMLCommand < Command
+  end
+  class ERBCommand < Command
+  end
 end

data/lib/html2slim/converter.rb

@@ -1,12 +1,34 @@
 require_relative 'hpricot_monkeypatches'
-# html = File.read(ARGV[0])
+
 module HTML2Slim
   class Converter
+    def to_s
+      @slim
+    end
+  end
+  class HTMLConverter < Converter
     def initialize(html)
       @slim = Hpricot(html).to_slim
     end
-    def to_s
-      @slim
+  end
+  class ERBConverter < Converter
+    def initialize(file)
+      # open.read makes it works for files & IO
+      erb = File.exists?(file) ? open(file).read : file
+      
+      erb.gsub!(/<%(.+?)\s*\{\s*(\|.+?\|)?\s*%>/){ %(<%#{$1} do #{$2}%>) }
+
+      # while, case, if, for and blocks...
+      erb.gsub!(/<%(\s*while .+?|\s*case .+?|\s*if .+?|\s*for .+?|.+?do\s*(\|.+?\|)?\s*)%>/){ %(<ruby code="#{$1.gsub(/"/, '&quot;')}">) }
+      # else
+      erb.gsub!(/<%\s*else\s*%>/, %(</ruby><ruby code="else">))
+      # elsif
+      erb.gsub!(/<%\s*(elsif .+?)\s*%>/){ %(</ruby><ruby code="#{$1}">) }
+      # when
+      erb.gsub!(/<%\s*(when .+?)\s*%>/){ %(</ruby><ruby code="#{$1}">) }
+      erb.gsub!(/<%\s*(end|})\s*%>/, %(</ruby>))
+      erb.gsub!(/<%(.+?)\s*%>/){ %(<ruby code="#{$1.gsub(/"/, '&quot;')}"></ruby>) }
+      @slim ||= Hpricot(erb).to_slim
     end
   end
 end

data/lib/html2slim/hpricot_monkeypatches.rb

@@ -1,5 +1,7 @@
 require 'hpricot'
 
+Hpricot::XHTMLTransitional.tagset[:ruby] = [:code]
+# raise Hpricot::XHTMLTransitional.tagset.inspect
 class Hpricot::BogusETag
   def to_slim(lvl=0)
     nil
@@ -8,22 +10,14 @@ end
 
 class Hpricot::Text
   def to_slim(lvl=0)
-    if to_s.strip.empty?
-      nil
-    else
-      ('  ' * lvl) + %(| #{to_s.gsub(/\s+/, ' ')})
-    end
+    return nil if to_s.strip.empty?
+    ('  ' * lvl) + %(| #{to_s.gsub(/\s+/, ' ')})
   end
 end
 
 class Hpricot::Comment
   def to_slim(lvl=0)
-    # For SHTML <!--#include virtual="foo.html" -->
-    if self.content =~ /include (file|virtual)="(.+)"/
-      ('  ' * lvl) + "= render '#{$~[2]}'"
-    else
-      nil
-    end
+    nil
   end
 end
 
@@ -36,22 +30,20 @@ end
 class Hpricot::Elem
   def slim(lvl=0)
     r = ('  ' * lvl)
-    if self.name == 'div' and (self.has_attribute?('id') || self.has_attribute?('class'))
-      r += ''
-    else
-      r += self.name
-    end
-    if(self.has_attribute?('id'))
-      r += "##{self['id']}"
-      self.remove_attribute('id')
-    end
-    if(self.has_attribute?('class'))
-      r += ".#{self['class'].split(/\s+/).join('.')}"
-      self.remove_attribute('class')
-    end
-    unless attributes_as_html.to_s.strip.empty?
-      r += "[#{attributes_as_html.to_s.strip}]"
+    if self.name == "ruby"
+      if self.attributes["code"].strip[0] == "="
+        return r += self.attributes["code"].strip
+      else
+        return r += "- " + self.attributes["code"].strip
+      end
     end
+
+    r += self.name unless self.name == 'div' and (self.has_attribute?('id') || self.has_attribute?('class'))
+    r += "##{self['id']}" if self.has_attribute?('id')
+    self.remove_attribute('id')    
+    r += ".#{self['class'].split(/\s+/).join('.')}" if self.has_attribute?('class')
+    self.remove_attribute('class')
+    r += "[#{attributes_as_html.to_s.strip}]" unless attributes_as_html.to_s.strip.empty?
     r
   end
   def to_slim(lvl=0)

data/lib/html2slim/version.rb

@@ -1,3 +1,3 @@
 module HTML2Slim
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html2slim
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000Z
+date: 2013-04-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2152919480 !ruby/object:Gem::Requirement
+  requirement: &2153298760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152919480
+  version_requirements: *2153298760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152919060 !ruby/object:Gem::Requirement
+  requirement: &2153298340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152919060
+  version_requirements: *2153298340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153297920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153297920
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &2152918540 !ruby/object:Gem::Requirement
+  requirement: &2153297400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +54,20 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152918540
+  version_requirements: *2153297400
 description: Convert HTML to Slim templates. Because HTML sux and Slim rules. That's
   why.
 email:
 - maiz@lulk.in
 executables:
+- erb2slim
 - html2slim
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - README.md
+- bin/erb2slim
 - bin/html2slim
 - lib/html2slim.rb
 - lib/html2slim/command.rb