haml2slim 0.2.0 → 0.3.0

data/lib/haml2slim/command.rb

@@ -11,7 +11,7 @@ module Haml2Slim
     def run
       @opts = OptionParser.new(&method(:set_opts))
       @opts.parse!(@args)
-      process
+      process!
       exit 0
     rescue Exception => ex
       raise ex if @options[:trace] || SystemExit === ex
@@ -47,25 +47,34 @@ module Haml2Slim
       end
     end
 
-    def process
-      args = @args.dup
+    def process!
+      @files = @args.dup
+
       unless @options[:input]
-        file = args.shift
+        file = @files.shift
         if file
           @options[:file]  = file
-          @options[:input] = File.open(file, 'r')
+          @options[:input] = file
         else
           @options[:file]  = 'STDIN'
           @options[:input] = $stdin
         end
       end
 
-      unless @options[:output]
-        file = args.shift || file.sub(/\.haml$/, '.slim')
-        @options[:output] = file ? File.open(file, 'w') : $stdout
+      if File.directory?(@options[:file])
+        Dir.glob(File.join(@options[:file], "**", "*.haml")).each { |file| _process(file) }
+      else
+        _process(file)
       end
+    end
+
+    private
 
-      @options[:output].puts Haml2Slim.convert!(@options[:input])
+    def _process(file)
+      slim_file = (File.file?(@options[:file]) ? @options[:output] : false) || file.sub(/\.haml$/, '.slim')
+      @options[:output] = file ? File.open(slim_file, 'w') : $stdout
+      @options[:output].puts Haml2Slim.convert!(File.open(file, 'r'))
+      @options[:output].close
     end
   end
 end

data/lib/haml2slim/converter.rb

@@ -37,11 +37,11 @@ module Haml2Slim
     def parse_tag(tag_line)
       tag_line.sub!(/^%/, "")
 
-      if attrs = tag_line.match(/\{(.+)\}/)
-        tag   = tag_line.match(/(.+)\{/)[1]
-        attrs = tag_line.match(/\{(.+)\}/)[1]
-          .gsub(/,?( ?):?"?([^"'{ ]+)"? ?=> ?/, '\1\2=')
-          .gsub(/=([^"']+)(?: |$)/, '=(\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}"
       else

data/lib/haml2slim/version.rb

@@ -1,3 +1,3 @@
 module Haml2Slim
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Fred Wu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +11:00
+date: 2010-12-22 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency