html2slim 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80166682417a633dce92c9ab90fbdf483031f025
-  data.tar.gz: 6b0ba218756add50271fa2b2ce4df4510774d1b3
+  metadata.gz: a160f480ebf84e9e8ec97bfe7f4f2698f6789758
+  data.tar.gz: e33e1d4799ac272c263e9db46fc1769eb59370df
 SHA512:
-  metadata.gz: 2090c80d405e2a9080d57783734110f2130f5e4d20e53816559b360627c08f94eba147d568328c79a03fd423ff0073fe7acb40816733c5220cd27615e0ce538f
-  data.tar.gz: 58a092ca40b3707d689456c48835f4307deaa6c56cc86fe7e8164a6b2238cb93cb0b5df9dc36bd0081b18c03540f8ef1e0054038b4305176c4e0cec547b8456f
+  metadata.gz: 3e67c5c0e003f756da34b7a183d9a77ae40731e6fea884ae548a120bd44062b2abfe00749cc3eef6fdec7ec4be56579fe59e79ba007a69efb5f5c4a8b0609190
+  data.tar.gz: 7caa78d05f9a7dc3c955a219aa00324e4ca17a66257458c55f7380660a903f7e9cc9ea07b513601af4816e5d8dee2c28b2ce03788e1ff2f524a2fa6f3964a1fc

data/lib/html2slim/command.rb

@@ -63,7 +63,7 @@ module HTML2Slim
       @options[:input] = file = "-" unless file
 
       if File.directory?(@options[:input])
-        Dir["#{@options[:input]}/**/*.html"].each { |file| _process(file, destination) }
+        Dir["#{@options[:input]}/**/*.#{format}"].each { |file| _process(file, destination) }
       else
         _process(file, destination)
       end
@@ -71,11 +71,15 @@ module HTML2Slim
 
     private
 
+    def input_is_dir?
+      File.directory? @options[:input]
+    end
+
     def _process(file, destination = nil)
       require 'fileutils'
-      slim_file = file.sub(/\.html$/, '.slim')
+      slim_file = file.sub(/\.#{format}/, '.slim')
 
-      if File.directory?(@options[:input]) && destination
+      if input_is_dir? && destination
         FileUtils.mkdir_p(File.dirname(slim_file).sub(@options[:input].chomp('/'), destination))
         slim_file.sub!(@options[:input].chomp('/'), destination)
       else
@@ -83,13 +87,12 @@ module HTML2Slim
       end
 
       in_file = if @options[:input] == "-"
-                  $stdin
-                else
-                  File.open(file, 'r')
-                end
+        $stdin
+      else
+        File.open(file, 'r')
+      end
 
       @options[:output] = slim_file && slim_file != '-' ? File.open(slim_file, 'w') : $stdout
-      # raise "|||#{self.class.inspect}|||"
       @options[:output].puts HTML2Slim.convert!(in_file, format)
       @options[:output].close
 

data/lib/html2slim/hpricot_monkeypatches.rb

@@ -1,7 +1,18 @@
 require 'hpricot'
 
 Hpricot::XHTMLTransitional.tagset[:ruby] = [:code]
-# raise Hpricot::XHTMLTransitional.tagset.inspect
+
+module SlimText
+  def to_slim(lvl=0)
+    return nil if to_s.strip.empty?
+    ('  ' * lvl) + %(| #{to_s.gsub(/\s+/, ' ')})
+  end
+end
+
+class Hpricot::CData
+  include SlimText
+end
+
 class Hpricot::BogusETag
   def to_slim(lvl=0)
     nil
@@ -9,10 +20,7 @@ class Hpricot::BogusETag
 end
 
 class Hpricot::Text
-  def to_slim(lvl=0)
-    return nil if to_s.strip.empty?
-    ('  ' * lvl) + %(| #{to_s.gsub(/\s+/, ' ')})
-  end
+  include SlimText
 end
 
 class Hpricot::Comment
@@ -23,36 +31,86 @@ end
 
 class Hpricot::DocType
   def to_slim(lvl=0)
-    'doctype'
+    if to_s.include? "xml"
+      to_s.include?("iso-8859-1") ? "doctype xml ISO-88591" : "doctype xml"
+    elsif to_s.include? "XHTML" or self.to_s.include? "HTML 4.01"
+      available_versions = Regexp.union ["Basic", "1.1", "strict", "Frameset", "Mobile", "Transitional"]
+      version = to_s.match(available_versions).to_s.downcase
+      "doctype #{version}"
+    else
+      "doctype html"
+    end
   end
 end
 
 class Hpricot::Elem
   def slim(lvl=0)
-    r = ('  ' * lvl)
-    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 = '  ' * lvl
 
-    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?
+    return r + slim_ruby_code if ruby?
+
+    r += name unless skip_tag_name?
+    r += slim_id
+    r += slim_class
+    r += slim_attributes
     r
   end
+
   def to_slim(lvl=0)
     if respond_to?(:children) and children
-      return %(#{self.slim(lvl)}\n#{children.map { |x| x.to_slim(lvl+1) }.select{|e| !e.nil? }.join("\n")})
+      return %(#{slim(lvl)}\n#{children.map{|c| c.to_slim(lvl+1) }.select{|e| !e.nil? }.join("\n")})
     else
-      self.slim(lvl)
+      slim(lvl)
     end
   end
+
+  private
+
+  def slim_ruby_code
+    (code.strip[0] == "=" ? "" : "- ") + code.strip
+  end
+
+  def code
+    attributes["code"]
+  end
+
+  def skip_tag_name?
+    div? and (has_id? || has_class?)
+  end
+
+  def slim_id
+    has_id?? "##{self['id']}" : ""
+  end
+
+  def slim_class
+    has_class?? ".#{self['class'].split(/\s+/).join('.')}" : ""
+  end
+
+  def slim_attributes
+    remove_attribute('class')
+    remove_attribute('id')
+    has_attributes?? "[#{attributes_as_html.to_s.strip}]" : ""
+  end
+
+  def has_attributes?
+    attributes.to_hash.any?
+  end
+
+  def has_id?
+    has_attribute?('id')
+  end
+
+  def has_class?
+    has_attribute?('class')
+  end
+
+  def ruby?
+    name == "ruby"
+  end
+
+  def div?
+    name == "div"
+  end
 end
 
 class Hpricot::Doc
@@ -63,4 +121,4 @@ class Hpricot::Doc
       ''
     end
   end
-end
+end

data/lib/html2slim/version.rb

@@ -1,3 +1,3 @@
 module HTML2Slim
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2slim
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Maiz Lulkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
@@ -110,4 +110,3 @@ signing_key:
 specification_version: 4
 summary: HTML to Slim converter.
 test_files: []
-has_rdoc: