haml2slim 0.4.6 → 0.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d3f15b271d9ca5c4d98e54f98582d4b6bebaffbd
+  data.tar.gz: 2b1abb84b3cfb8637b7f824975f87fd5dfc89e44
+SHA512:
+  metadata.gz: c9b62cae1b4e381e292ccad5df16a02de21698fcd4501f9255b41d4ce8a72651ef0df978abf2c08a390ae939548559428cc4cbadce0fbb6448b10c93b0cf8776
+  data.tar.gz: bf2a11d1e54f10eb90df16c86f79465bfd0a89379b89e131e6dd6ebe1bcf4cbbc8bca07c222b6e51719dfd8c594f4b3d79e05b047b82a784a085988505e57d00

data/README.md

@@ -2,6 +2,12 @@
 
 [Haml](https://github.com/nex3/haml) to [Slim](https://github.com/stonean/slim) converter.
 
+## Limitation
+
+Due to the complex logic behind both Haml's and Slim's parsers, there is currently no way of reliably converting between Haml and Slim templates.
+
+`Haml2Slim` only serves as a preliminary tool for templates conversion. You should __always__ manually verify the converted templates.
+
 ## Usage
 
 You may convert files using the included executable `haml2slim`.

data/lib/haml2slim/command.rb

@@ -51,6 +51,8 @@ module Haml2Slim
       @options[:input]  = file        = args.shift
       @options[:output] = destination = args.shift
 
+      @options[:input] = file = "-" unless file
+
       if File.directory?(@options[:input])
         Dir["#{@options[:input]}/**/*.haml"].each { |file| _process(file, destination) }
       else
@@ -71,8 +73,14 @@ module Haml2Slim
         slim_file = destination || slim_file
       end
 
-      @options[:output] = file ? File.open(slim_file, 'w') : $stdout
-      @options[:output].puts Haml2Slim.convert!(File.open(file, 'r'))
+      in_file = if @options[:input] == "-"
+                  $stdin
+                else
+                  File.open(file, 'r')
+                end
+
+      @options[:output] = slim_file && slim_file != '-' ? File.open(slim_file, 'w') : $stdout
+      @options[:output].puts Haml2Slim.convert!(in_file)
       @options[:output].close
 
       File.delete(file) if @options[:delete]

data/lib/haml2slim/converter.rb

@@ -16,15 +16,19 @@ module Haml2Slim
       indent = line[/^[ \t]*/]
       line.strip!
 
+      # removes the HAML's whitespace removal characters ('>' and '<')
+      line.gsub!(/(>|<)$/, '')
+
       converted = case line[0, 2]
         when '&=' then line.sub(/^&=/, '==')
-        when '!=' then line.sub(/^!=/, '=')
+        when '!=' then line.sub(/^!=/, '==')
         when '-#' then line.sub(/^-#/, '/')
+        when '#{' then line
         else
           case line[0]
             when ?%, ?., ?# then parse_tag(line)
             when ?:         then "#{line[1..-1]}:"
-            when ?!         then line.sub(/^!!!/, 'doctype')
+            when ?!         then line == "!!!" ? line.sub(/^!!!/, 'doctype html') : line.sub(/^!!!/, 'doctype') 
             when ?-, ?=     then line
             when ?~         then line.sub(/^~/, '=')
             when ?/         then line.sub(/^\//, '/!')
@@ -44,17 +48,34 @@ module Haml2Slim
 
     def parse_tag(tag_line)
       tag_line.sub!(/^%/, '')
+      tag_line.sub!(/^(\w+)!=/, '\1==')
 
-      if tag_line_contains_attr = tag_line.match(/(.+)\{(.+)\}/)
-        tag, attrs = *tag_line_contains_attr[1..2]
-
-        attrs.gsub!(/,?( ?):?"?([^"'{ ]+)"? ?=> ?/, '\1\2=')
-        attrs.gsub!(/=([^"']+)(?: |$)/, '=(\1)')
-
-        "#{tag} #{attrs}"
+      if tag_line_contains_attr = tag_line.match(/([^\{]+)\{(.+)\}(.*)/)
+        tag, attrs, text = *tag_line_contains_attr[1..3]
+        "#{tag} #{parse_attrs(attrs)} #{text}"
       else
-        tag_line
+        tag_line.sub(/^!=/, '=')
+      end
+    end
+
+    def parse_attrs(attrs, key_prefix='')
+      data_temp = {}
+      attrs.gsub!(/:data\s*=>\s*\{([^\}]*)\}/) do
+        key = rand(99999).to_s
+        data_temp[key] = parse_attrs($1, 'data-')
+        ":#{key} => #{key}"
+      end
+      attrs.gsub!(/,?( ?):?"?([^"'{ ]+)"?\s*=>\s*([^,]*)/) do
+        space = $1
+        key = $2
+        value = $3
+        wrapped_value = value.to_s =~ /\s+/ ? "(#{value})" : value
+        "#{space}#{key_prefix}#{key}=#{wrapped_value}"
+      end
+      data_temp.each do |k, v|
+        attrs.gsub!("#{k}=#{k}", v)
       end
+      attrs
     end
   end
-end
+end

data/lib/haml2slim/version.rb

@@ -1,3 +1,3 @@
 module Haml2Slim
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,71 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haml2slim
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.6
+version: !ruby/object:Gem::Version
+  version: 0.4.7
 platform: ruby
-authors: 
+authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: haml
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby_parser
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: slim
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Convert Haml templates to Slim templates.
-email: 
+email:
 - ifredwu@gmail.com
-executables: 
+executables:
 - haml2slim
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - bin/haml2slim
 - lib/haml2slim.rb
@@ -74,30 +97,26 @@ files:
 - lib/haml2slim/version.rb
 homepage: http://github.com/fredwu/haml2slim
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Haml to Slim converter.
 test_files: []
-