ruby-yui 0.0.4 → 0.0.5

data/lib/ruby-yui/yui.rb

@@ -1,3 +1,7 @@
+# Auto-generated ruby debug require       
+require "ruby-debug"
+Debugger.start
+Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
 # TODO md5 checksum the compressed files for spec testing to verify they were compressed correctly.
 # TODO output yui.checksums.txt "#{OUT_PATH}\t#{CHECKSUM}\n"
 
@@ -11,7 +15,7 @@ class Yui
   
   MAJOR = 0
   MINOR = 0
-  RELEASE = 4
+  RELEASE = 5
   def Yui.version
     [MAJOR,MINOR,RELEASE].join('.')
   end
@@ -67,9 +71,7 @@ class Yui
   #   Returns path to bundle if successful, otherwise nil
   #
   def bundle
-    if @files.empty?
-      raise NoInputFileException, "Nothing to do, check input path."
-    end
+    raise(NoInputFileException, "Nothing to do, check input path.")if @files.empty?
     
     bundle_data = ""
     successful_compressions = 0
@@ -91,7 +93,7 @@ class Yui
       if @options[:suffix].empty?
         bundle_file_name = "bundle.#{@options[:type]}"
       else
-        bundle_file_name = "bundle.#{@options[:suffix]}.#{@options[:type]}"
+        bundle_file_name = "bundle#{@options[:suffix]}.#{@options[:type]}"
       end
       bundle_path = File.join(outpath,bundle_file_name)
       File.open(bundle_path,'w'){|f| f.write(bundle_data)}
@@ -102,33 +104,44 @@ class Yui
   end
   
   def minify
-    if @files.empty?
-      raise NoInputFileException, "Nothing to do, check input path."
-    end
+    raise(NoInputFileException, "Nothing to do, check input path.") if @files.empty?
     
     successful_compressions = 0
     
     @files.each do |file|
-      out_file = file.split('.')      # split on '.'
-      out_file.pop                    # pop off file extension
-      out_file.push @options[:suffix] unless @options[:suffix].empty? # add yui min suffix
-      out_file.push @options[:type]   # add extension back on
-      out_file = out_file.join('.')    # put it all together
+      #put the suffix on before the externsion if provided
+      if @options[:suffix].empty?
+        out_file = file.clone
+      else
+        out_file = file.split('.')
+        out_file.pop #pop off extension
+        out_file = out_file.join('.') << @options[:suffix] << ".#{@options[:type]}"
+      end
       
-      out_file.sub!(@inpath,outpath) if @options[:out_path]
+      #Substitute the outpath
+      out_file.sub!(@inpath,outpath)
       
-      cmd = Yui.gen_cmd(file,@options)
-      cmd << "-o #{out_file}"
+      cmd = Yui.gen_cmd(file,@options) << "-o #{out_file}"
       
       FileUtils.mkdir_p File.dirname(out_file)
 
       puts "Compressing:\n\t #{file} =>\n\t #{out_file}"
       stdin, stdout, stderr = popen3(cmd.join(' '))
 
-      if stdout.read.empty? && stderr.read.empty?
+      stdout = stdout.read
+      stderr = stderr.read
+
+      if stdout.empty? && stderr.empty?
         successful_compressions += 1 
       else
         puts "Failed to compress: #{file}"
+        if @options[:rename_on_fail] && !@options[:suffix].empty?
+          puts "Copying:\n\t #{file} =>\n\t #{out_file}"
+          FileUtils.cp file, out_file
+        end
+
+        puts "OUT: #{stdout}"
+        puts "ERR: #{stderr}"
       end
     end
     
@@ -141,11 +154,10 @@ class Yui
     if suffix.empty?
       glob_path = File.join(path,"**.#{type}")
     else
-      glob_path = File.join(path,"**","*.#{suffix}.#{type}")
+      glob_path = File.join(path,"**","*#{suffix}.#{type}")
     end
     
-    files = Dir.glob glob_path
-    files.each do |file|
+    Dir.glob(glob_path).each do |file|
       puts "Clobbering #{file}..."
       FileUtils.rm file
     end
@@ -157,8 +169,7 @@ class Yui
   #   Was 100% of files compressed
   #
   def Yui.compress(inpath,options={})
-    _yui_obj = Yui.new(inpath,options)
-    _yui_obj.minify
+    Yui.new(inpath,options).minify
   end
   
   protected
@@ -178,14 +189,15 @@ class Yui
       :clobber        => false,
       :java_cli       => "java -jar",
       :yui_jar        => File.join(YUI_ROOT,"ext","yuicompressor-2.4.2.jar"),
-      :suffix         => "yui-min",
+      :suffix         => ".yui-min",
       :out_path       => nil,   #file_path.sub(inpath,outpath)
       :type           => :js,
       :charset        => nil,
       :preserve_semi  => false,
       :disable_opt    => false,
       :nomunge        => false,
-      :stomp          => false #destroys originls if NO suffix and NO out_path
+      :stomp          => false, #destroys originls if NO suffix and NO out_path
+      :rename_on_fail => false  #If failed to compress and suffix given, original file will be renamed still
     }
   end
 end

data/spec/unit/yui_spec.rb

@@ -57,10 +57,21 @@ describe Yui do
     }.should raise_error(Exception)
   end
   
+  it 'should be able to specify an alternate out path' do
+    yui = Yui.new "./test/data/javascripts", :out_path => "./test/data/alt_out_path/javascripts"
+    yui.minify
+    
+    File.exist?("./test/data/alt_out_path/javascripts/prototype.yui-min.js").should be(true)
+    File.exist?("./test/data/alt_out_path/javascripts/jquery-1.2.6.yui-min.js").should be(true)
+    
+    FileUtils.rm "./test/data/alt_out_path/javascripts/prototype.yui-min.js"
+    FileUtils.rm "./test/data/alt_out_path/javascripts/jquery-1.2.6.yui-min.js"
+  end
+  
   it 'should have an identical file name (optionally path) if no suffix is supplied' do
     yui = Yui.new "./test/data/javascripts", :suffix => nil, :out_path => "./test/data/alt_out_path/javascripts"
     yui.minify
-    
+
     File.exist?("./test/data/alt_out_path/javascripts/prototype.js").should be(true)
     File.exist?("./test/data/alt_out_path/javascripts/jquery-1.2.6.js").should be(true)
     
@@ -76,7 +87,7 @@ describe Yui do
     
     pre_md5.should_not == post_md5
     
-    #restore backups for testing...
+    #restore backups after testing...
     FileUtils.cp "./test/data/backups/stompable.js", "./test/data/stompers/stompable.js"
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-yui
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: []