sqweeze 0.0.6 → 0.0.7

data/Manifest

@@ -1,4 +1,3 @@
-Manifest
 README.rdoc
 Rakefile
 bin/sqweeze
@@ -17,4 +16,4 @@ lib/sqweezeUtils.rb
 spec/confManager_spec.rb
 spec/domCompiler_spec.rb
 spec/sqw_spec_helper.rb
-sqweeze.gemspec
+Manifest

data/README.rdoc

@@ -6,31 +6,31 @@ A command line web asset optimisation tool.
 _Sqweeze_ cuts the unnecessary bytes out of your web assets, helping you delivering your web project more fast and efficiently. 
 With a little help from a number of well known open source third party tools, _Sqweeze_ does the following:
 
-1. Lossless compresses .PNG, .JPEG and .GIF image assets. 
-2. Compresses and concatenates into single files multiple Stylesheets and Javascript files.
-3. Embeds the compressed image assets into the stylesheet, using {Data-uris}[https://developer.mozilla.org/En/The_data_URL_scheme] (for proper browsers and IE8) and {MHTML}[http://en.wikipedia.org/wiki/MHTML] (for IE6 and IE7). 
-4. Finally, it provides some basic functionality for linking the compressed Javascript and CSS just created, to the main HTML document, 
+* Lossless compresses .PNG, .JPEG and .GIF image assets. 
+* Compresses and concatenates into single files multiple Stylesheets and Javascript files.
+* Embeds the compressed assets referenced into the stylesheet, using using {Data-uris}[https://developer.mozilla.org/En/The_data_URL_scheme] (for proper browsers and IE8) and {MHTML}[http://en.wikipedia.org/wiki/MHTML] (for IE6-7). 
+* Finally, it provides some basic functionality for linking the compressed Javascript and CSS just created to the main HTML document, 
   and removing automatically the links pointing to the old uncompressed ones.  
 
 === Installing it
 
 Sqweeze relies on a few command-line image compression tools, namely Pngcrush, Jpegtrain, and Gifsicle, which have to be installed first. 
-On an Ubuntu box, you can install these all in once by running a single command line
+On an Ubuntu box, you can install these by running a single command line
  
   sudo apt-get install pngcrush gifsicle libjpeg-progs  
 
+(This assumes you have ruby, ruby1.8-dev, and gem installed).
+
 Mac OSX users can install the first two as Macports packages. The third (part of libjpeg) instead, has to be 
 {compiled manually}[http://www.phpied.com/installing-jpegtran-mac-unix-linux]. 
 
-Once installed these third party tools, you can install _Sqweeze_ using the rubygems package manager 
+Once installed these, you can install _Sqweeze_ using rubygems
 
  gem install sqweeze
 
-(this assumes that you have both ruby and rugygems installed). 
-
 === Configuration
 
-When run for the first time, the script creates a configuration file in the user's $HOME directory, and sets therein the default file paths of Pngcrush and friends. 
+When run for the first time, the script creates a config file in the user's $HOME directory and sets therein the default paths of command line tools such as pngcrush and friends. 
  
  # file $HOME/.sqweeze.yml
 
@@ -39,45 +39,4 @@ When run for the first time, the script creates a configuration file in the user
     - jpegtran: /usr/bin/jpegtran
     - gifsicle: /usr/bin/gifsicle
  
-If you have installed those anywhere else than in <code>/usr/bin</code>, you will have to edit this file with your own paths, so that sqweeze can find them.  
-
-=== Usage 
-
-
- sqweeze input_dir [target_dir]
-
-When invoked with no options, sqweeze will simply copy the content of a source directory, compress its Image assets, and finally generate three new files in the target directory:
-
-[javascripts.min.js]
-   A file concatenating and compressing together all the other javascript files in the source directory
-[styleshees.min.js] 
-   A file concatenating and compressing together all the other Stylesheets in the source directory
-[styleshees.min.datauri.js] 
-   Same as stylesheets.min.js, but embedding the image referenced in the stylesheets through the data URI scheme.
-
-==== MHTML Support
-
-Whilst the generated <code>stylesheets.all.datauri.css</code> will work fine in most recent web-browsers (i.e Chrome, Safari, Firefox, IE 8), it will 
-fail displaying images in Internet Explorer 6 and 7. A viable way around to this limitation, however, is that of using
-Microsoft's MIME HTML. In order to have sqweeze generate also a MHTML stylesheet suitable to be read by IE6 and IE7, one has to specify the parameter <code>--MHTML-ROOT</code>; that is the URL of the directory where the stylesheet will be deployed. 
-
- sqweeze --mhtml-root=http://example.com/css example-sourcedir
-
-At this point, both the Data URI and the MHTML stylesheet can be linked to the main index.html and loaded selectively through {Internet Explorer's Conditional Comments}[http://en.wikipedia.org/wiki/Conditional_comment]
-
-    <!--[if (!IE)|(gte IE 8)]><!-->
-         <link href="css/stylesheets.min.datauri.css" media="screen" rel="stylesheet" type="text/css" />
-    <!--<![endif]-->
-    <!--[if lte IE 7]>
-         <link href="css/stylesheets.min.mhtml.css" media="screen" rel="stylesheet" type="text/css" />
-   <![endif]-->
-
-==== Inline asset optimisation
-
-Although the process described above is the most broadly adopted by already established Web optimisation tools (e.g. Jammit), 
-sometimes it can be useful - in order to reduce the amount of HTTP requests - to render compressed assets in-line, directly in the HTML file 
-(as opposed to linking them to an external stylesheet or javascript ). Although this is still very experimental and does not support base64 image embedding yet, sqweeze provides a functionality for compiling assets inline into an HTML file. 
-
-  sqweeze -S all_inline -D source_dir/index.html source_dir
-
-[....]
+If you have installed these anywhere else than in /usr/bin+, you will have to edit this file so that sqweeze can find them.    

data/bin/sqweeze

@@ -1,7 +1,5 @@
 #! /usr/bin/env ruby
-
-
-# third party libs
+# rubygems
 %w[rubygems yui/compressor closure-compiler hpricot].each{|lib| require lib}
 # ruby standard library
 %w[logger singleton yaml base64 open-uri pathname optparse fileutils].each{|lib| require lib}
@@ -26,7 +24,7 @@ op=OptionParser.new do |opts|
 
   opts.banner = "Usage: sqweeze [options] SOURCE_DIR [TARGET_DIR]"
   opts.program_name= 'sqweeze'
-  opts.on("-S", "--optimisation-strategy=ALL_IN_ONE",
+  opts.on("-s", "--optimisation-strategy=ALL_IN_ONE",
           "JavaScript/CSS optimisation strategy to be adopted ") do |s|
     raise OptionParser::InvalidArgument unless ['all_inline','all_in_one'].include?(s)
     options[:optimisation_strategy] = s.downcase.to_sym
@@ -40,7 +38,7 @@ op=OptionParser.new do |opts|
   opts.on('-e','--exclude-files=PATTERN', "Exclude a file/directory pattern (e.g. doc/**/*.* )") do |exc|
     options[:exclude_files] = exc
   end
-  opts.on('-D','--dom-documents=PATTERN', "Dom document/s to which CSS/JS  should be linked (e.g. **/index.html )") do |dom|
+  opts.on('-d','--dom-documents=PATTERN', "Dom document/s to which CSS/JS  should be linked (e.g. **/index.html )") do |dom|
     options[:dom_documents] = dom
   end  
 
@@ -82,7 +80,7 @@ op=OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Console output:"
   
-  opts.on('-q',"--quite", "suppress console output ") do |q|  
+  opts.on('-q',"--quiet", "suppress console output ") do |q|  
       options[:suppress_warn] = true
       options[:suppress_info] = true
   end
@@ -95,13 +93,12 @@ begin
   op.parse!
   Proc.new { puts "Missing SOURCE_DIR argument"; exit(1) }.call unless ARGV[0]
   Proc.new { puts "source directory #{ARGV[0]} does not exist, please provide a valid path"
-             exit(1) }.call unless ARGV[0] and File.exists?(ARGV[0])
+             exit(1) }.call unless File.exists?(ARGV[0])
   
 
   cm=ConfManager.instance
   cm.prepare(ARGV[0], ARGV[1], options)
-  
-
+   
   # Compress images  
   { :compress_png => PngCompressor.new, 
     :compress_gif => GifCompressor.new,
@@ -112,17 +109,16 @@ begin
   
   case cm.get_conf(:optimisation_strategy)
     when :all_inline
-       raise "You must specify a valid DOM document to use the inline strategy" unless File.exists?(cm.get_conf(:dom_documents).first) 
-       JsDomCompiler.new.compile
-       CssDomCompiler.new.compile
+     puts "not implemented yet.."
+     exit
+
 
     when :all_in_one 
-      
       { :compress_js => JsCompressor.new, 
         :compress_css => CssCompressor.new
       }.each do |opt, cmp|
          cmp.compress unless cm.get_conf(opt) == false
-        end
+      end
       # link assets to main HTML file
       AssetLinker.new.compile unless cm.get_conf(:dom_documents).empty?
   end

data/lib/compilers/assetLinker.rb

@@ -7,32 +7,27 @@ class AssetLinker < DOMCompiler
       # Otherwise delete. 
       elm.parent.children.delete(elm)
     end    
-         
     dom_documents.each do |path|
-      target_path=remap_filepath(path) 
-
       # Append concatenated JavaScript file.
-
       doc = Hpricot(open(path))
       doc.search(@cm.get_conf(:append_scripts_to).to_s.downcase).append( "<script type='text/javascript' src='javascripts.min.js'></script>") 
-
-      notify("#{ansi_bold(target_path)}:".ljust(60) + ansi_green("Appending Sylesheets"),:info)
-
+      
 stylesheets_html=<<EOF     
-
-        <!--[if (!IE)|(gte IE 8)]><!-->
-              <link href="stylesheets.min.datauri.css" media="screen" rel="stylesheet" type="text/css" />
-         <!--<![endif]-->
-         <!--[if lte IE 7]>
-              <link href="stylesheets.min.mhtml.css" media="screen" rel="stylesheet" type="text/css" />
-        <![endif]-->
+      <!--[if lte IE 8]>
+          <link href="stylesheets.min.mhtml.css" rel="stylesheet" />
+      <![endif]-->
+      <!--[if IE 8]>
+          <link href="stylesheets.min.datauri.css" rel="stylesheet" />
+      <![endif]-->
+      <!--[if !IE]>
+         <link href="stylesheets.min.datauri.css" rel="stylesheet" />
+      <![endif]-->
 EOF
-     
-      # Append concatenated CSS files, wrapping them within IE conditional tags
-      doc.search('head').append(stylesheets_html)       
-      notify("#{ansi_bold(target_path)}:".ljust(60)+ansi_green("Appending Sylesheets"),:info)
-      write_file(doc.innerHTML, target_path)
-    end 
+  
+      # Append ie conditional tags
+      doc.search('head').append(stylesheets_html)      
+      write_file(doc.innerHTML,path)
+    end
   end
   
 end

data/lib/compilers/jsDomCompiler.rb

@@ -12,7 +12,7 @@ class JsDomCompiler < DOMCompiler
   
   
   def compress(fbody)
-   unless @cm.get_conf(:default_js_compressor) == :closure
+   unless @cm.default_js_compressor == :closure
        compressor, method = YUI::JavaScriptCompressor.new( :munge => true), :compress
      else
        compressor, method = Closure::Compiler.new, :compiler

data/lib/compressors/cssCompressor.rb

@@ -19,8 +19,9 @@ class CssCompressor < Compressor
     EMBED_DETECTOR = /url\(['"]?([^\s)]+\.[a-z]+)(\?\d+)?['"]?\)/
 
     # MHTML file constants.
-    MHTML_START = "/*\r\nContent-Type: multipart/related; boundary=\"SQWEEZED_ASSET\"\r\n\r\n"
-    MHTML_SEPARATOR= "--SQWEEZED_ASSET\r\n"
+    MHTML_START = "/*\nContent-Type: multipart/related; boundary=\"SQWEEZED_ASSET\"\n"
+    MHTML_SEPARATOR= "--SQWEEZED_ASSET"
+    MHTML_END = "*/\n"
 
   def initialize
     super('css')  
@@ -58,27 +59,22 @@ class CssCompressor < Compressor
   end
 
   def embed_datauris(compressed_css)
-
     out=compressed_css.gsub(EMBED_DETECTOR) do |url|
-      
-      compressed_asset_path=remap_filepath($1)
-      mime_t=mime_type(compressed_asset_path)
-      if compressed_asset_path and File.exists?(compressed_asset_path) and File.size(compressed_asset_path) < MAX_IMAGE_SIZE and mime_t
-         
-         base64_asset=encoded_contents( compressed_asset_path ) 
+    
+     compressed_asset_path=remap_filepath($1)
+     mime_t=mime_type(compressed_asset_path)
 
-         notify("file:#{compressed_asset_path}; mime-type: #{mime_type($1)}#",:debug)
+     if compressed_asset_path and File.exists?(compressed_asset_path) and File.size(compressed_asset_path) < MAX_IMAGE_SIZE and mime_t
+         base64_asset=encoded_contents( compressed_asset_path ) 
+         $log.debug("file:#{compressed_asset_path}; mime-type: #{mime_type($1)}#")
          # label the image
          @assets[ compressed_asset_path ] = base64_asset 
          "url(\"data:#{mime_t};charset=utf-8;base64,#{base64_asset}\")"
        else
          "url(#{$1})"
-      end
-    end
-
-    total_file_weight=@assets.keys.inject(0){|sum,path| sum+File.size(path)}
-
-   notify("Converting #{ansi_bold(@assets.size)} images (#{ansi_bold(total_file_weight)} bytes) into base64".ljust(60),:info)
+       end
+    end 
+    
     write_file(out,"#{@cm.target_dir}/stylesheets.min.datauri.css")
   end
 
@@ -87,18 +83,18 @@ class CssCompressor < Compressor
     mhtml= MHTML_START
    
     @assets.each do |mhtml_loc,base64|
-      mhtml << [MHTML_SEPARATOR, 
-               "Content-location: #{mhtml_loc}\r\n", 
-               "Content-Transfer-Encoding: base64\r\n",
-               "Content-type: #{mime_type(mhtml_loc)} \r\n\r\n",
-               "#{base64}\r\n"
-      ].join('')
+    mhtml <<"
+#{MHTML_SEPARATOR}  
+Content-location: #{ mhtml_loc  }
+Content-Transfer-Encoding:base64
+
+#{base64}\n"
     end
-    mhtml << "*/\r\n"
+    mhtml << "*/\n"
     mhtml << compressed_css.gsub(EMBED_DETECTOR) do |css|
       compressed_asset_path=remap_filepath($1)
       if compressed_asset_path
-       "url(mhtml:#{@cm.get_conf(:mhtml_root).gsub(/\/$/,'')}/stylesheets.min.mhtml.css!#{compressed_asset_path})"
+       "url(mhtml:#{@cm.get_conf(:mhtml_root).gsub(/\/$/,'')}/stylesheets.min.mhtml.css!#{mhtml_location( compressed_asset_path)})"
         else
         "url(#{$1})"
       end

data/lib/compressors/pngCompressor.rb

@@ -2,7 +2,7 @@ class PngCompressor < Compressor
    
   def initialize
     super('png')
-    set_command(:pngcrush,'%executable% -q -rem text %input% %output%')
+    set_command(:pngcrush,'%executable% -q -rem alla -brute -reduce  %input% %output%')
 
   end
  

data/lib/confManager.rb

@@ -37,7 +37,7 @@ class ConfManager
     }
   end   
   attr_reader :target_dir,:source_dir,
-              :files,:conf_filename,:conf              
+                :files,:conf_filename,:conf              
   
   
   # Setter method used to populate the <code>@conf</code> attribute with key value pairs.
@@ -93,7 +93,7 @@ class ConfManager
     FileUtils.rm_r(nested_dir) if File.directory?(nested_dir)
   end
 
-  # Re-maps a file path from the source to the target directory.
+  # Remaps a filepath from the source to the target directory.
   #
   #  TODO:check if this works with relative paths (i.e. <code>../imgs/bar.png</code>)
   
@@ -103,6 +103,7 @@ class ConfManager
 
  
   # Generates a file pattern suitable to be expanded by ruby's {Dir[]}[http://ruby-doc.org/core/classes/Dir.html] method.
+
   def mkpath(pattern,dir=@source_dir) 
     dir.to_a.push(pattern).join('/')
   end
@@ -126,6 +127,7 @@ class ConfManager
   end
     
   # Parses configuration files and sets user-defined file inclusion/exlusion patterns.
+  
   def parse_conf(configfile="#{ENV['HOME']}/#{@conf_filename}")
     notify("Parsing configuration file: #{configfile}",:debug) 
     conf=YAML::load_file( configfile ) 

data/lib/domCompiler.rb

@@ -7,32 +7,29 @@ class DOMCompiler
      #   @dom_extnames=['.html','.svg']
      @cm=ConfManager.instance
      #if @cm.link_assets_to and not @cm.link_assets_to.empty? 
-     @dom_documents=@cm.get_conf(:dom_documents).collect{|path| remap_filepath(path) }
+     @dom_documents=@cm.get_conf(:dom_documents).to_a
   end
   # Retrieves a resource, being this either a URL or a file.
   def get_resource(path_or_url)
-    puts "opening ..#{path_or_url}"
-    target_path=remap_filepath(path_or_url)
-    puts "tp: #{target_path}"
-    f=open(target_path)
+    f=open(remap_filepath(path_or_url))
     (f.is_a? File)? f.read : f 
   end
-
-  # Iterates over a DOM element and allows to apply a custom block over it.
+  # Iterates over a DOM element and allows to apply a custom block over it. 
+  
   def iterate_over(selector)  
    @dom_documents.each do |path|
-   raise "File #{path} does not seem to exist" unless File.exists?(path)
-   doc=Hpricot(open(path))
-
-   if doc
+    doc=Hpricot(open(path))
+    if doc
       doc.search(selector).each do |element|
-      yield(element, doc) 
+        
+      #$log.debug..
+      yield(element, doc)
+      # save document 
+      #write_file(doc.innerHTML, [@cm.target_dir, File.basename(path) ].join('/') )
       write_file(doc.innerHTML, path )
     end
       else
-      notify("DOMCompiler cannot parse #{path}",
-             :error
-      )
+      notify("DOMCompiler cannot parse #{path}",:error)  
     end
    end
   end

data/lib/sqweezeUtils.rb

@@ -10,8 +10,9 @@ module SqweezeUtils
       '.tiff' => 'image/tiff',
       '.ttf' => 'font/truetype',
       '.otf' => 'font/opentype'
-  }   
+  } 
   
+
   def write_file(fbody,fpath)
     File.open(fpath,'w') do |f|
       f.write(fbody)
@@ -31,46 +32,26 @@ module SqweezeUtils
   # Otherwise, if the resource is a relative url in the source dir, try 
   # to map it to its compressed version in the target directory
   
-  def remap_filepath(path)  
-    parent_dir, path_basename = path.split('/')[-2..-1]
-
-    # Handle file paths at 0 level of depth 'style.css'
-    path_basename = path if path_basename.nil?
-    
-    parent_dir = get_confManager().target_dir if parent_dir.gsub(/\/$/,'') == get_confManager().source_dir.gsub(/\/$/,'')   
-    
-
-
+  def remap_filepath(path)
+    path=Pathname.new(path)
+    parent_dir, path_basename = path.parent, path.basename
     is_absolute = URI.parse(path).absolute? 
     unless is_absolute
-       
-    find_file_in_targetdir([parent_dir, path_basename].join('/'))
+       find_file_in_targetdir( [parent_dir, path_basename].join('/'))
       else 
-       path
+       path.to_s
     end
   end
   
-
-
-  # Find a file in the target directory
-  # endpath is a string containing parent directory and file name 
-  # (e.g imgs/separator.png)
-  
-  def find_file_in_targetdir(endpath)
-    pattern= [get_confManager.target_dir,"**/**"].join('/')
-    # puts "Searching for #{endpath} into #{pattern}"
-    Dir[pattern].find{|path| path =~ Regexp.new("#{endpath}$")}
-  end
-
-
-
   # Return the Base64-encoded contents of an asset on a single line.
   def encoded_contents(asset_path)
       data = open(asset_path, 'rb'){|f| f.read }
       Base64.encode64(data).gsub(/\n/, '')
   end  
   
-  # Gets the byte weight of input strames, wether these are file paths or just strings
+  
+   # Gets the byte weight of input strames, wether these are file paths or just strings
+
   def byteweight(path_or_string)
       path_or_string="" if path_or_string.nil?
   
@@ -87,6 +68,18 @@ module SqweezeUtils
     sprintf('%.2f',after_bweight/before_bweight.to_f * 100)
   end
   
+
+  # Find a file in the target directory
+  # endpath is a string containing parent directory and file name 
+  # (e.g imgs/separator.png)
+  
+  # TODO: rewrite this! (it sucks..)
+
+  def find_file_in_targetdir(endpath)
+    pattern=  [get_confManager.target_dir,"**/*#{File.extname(endpath)}"].join('/')
+    #puts "searcing for files in #{pattern} ending with #{endpath}"
+    Dir[pattern].find{|path| path =~ Regexp.new("#{endpath}$")}
+  end
   
 
   # Prints to STDERR and adds a log entry. 

data/spec/confManager_spec.rb

@@ -1,5 +1,6 @@
 require 'sqw_spec_helper'
 
+
 describe ConfManager do 
   context "Starting up" do
   
@@ -9,7 +10,7 @@ describe ConfManager do
 
   after(:each) do
     @cm=nil
-    # clean up local configuration file
+    # clean up config files
     %w( ENV['home'] test_dir ).each do |f|  
         f << "/.sqweeze.yml"
         FileUtils.rm(f) if File.exists?(f) 
@@ -17,37 +18,44 @@ describe ConfManager do
   end
   
   it "Should create a .sqweeze.yml file in the home directory" do  
-      @cm.prepare('test_dir', 'test_dir_sqweeze', {:suppress_info => true} )
+      @cm.prepare('test_dir')
       File.exists?("#{ENV['HOME']}/.sqweeze.yml").should be_true
   end
  
   it "Should select the list of files provided by the user if the *include:* section of the .sqweeze.yml is not empty" do
    extra_lines= ["include:","- js/**/*.js",'- color/**/*.png']
    write_configfile(extra_lines[0..1].join("\n"))
-   @cm.prepare('test_dir', 'test_dir_sqweeze', {:suppress_info => true} )
+   @cm.prepare('test_dir')
    @cm.should have(3).files
   
    write_configfile(extra_lines.join("\n"))
-
-   @cm.prepare('test_dir', 'test_dir_sqweeze', {:suppress_info => true} )
+   @cm.prepare('test_dir')
    @cm.should have(5).files
   end
+
   it "Should select all files in the project if the include: section of .sqweeze.yml is left empty" do 
     project_file_count= Dir['test_dir/**/*'].reject{|f| File.directory?(f)}.size
-    @cm.prepare('test_dir', 'test_dir_sqweeze',:suppress_info => true)
+    @cm.prepare('test_dir')
     @cm.should have(project_file_count).files 
   end
+
   it "Should always exclude the files specified by the user in the .sqweeze.yml exclude section " do
     write_configfile(["exclude:","- js/**/*.js"].join("\n"))
     project_file_count= Dir['test_dir/**/*'].reject{|f| File.directory?(f)}.size
-    @cm.prepare('test_dir', 'test_dir_sqweeze',:suppress_info => true)
+    @cm.prepare('test_dir')
     @cm.should have(46).files
   end
- 
+  
   it "Should search *dom_documents* in the the target directory " do
-    write_configfile("dom_documents: test_dir/**/*.php")
-    @cm.prepare('test_dir', 'test_dir_sqweeze',:suppress_info => true)
-    @cm.get_conf(:dom_documents).should include('test_dir_sqweeze/tpl/page.tpl.php')
-  end 
+    write_configfile("dom_documents: test_dir/*/page.tpl.php")
+    @cm.prepare('test_dir')
+    @cm.get_conf(:dom_documents).should include('test_dir_sqweezed/tpl/page.tpl.php')
+  end
+  
+ 
+   
+ 
+ 
+ 
  end 
 end

data/spec/domCompiler_spec.rb

@@ -1,37 +1,38 @@
+require '../lib/confManager'
+require '../lib/DomCompiler'
+require '../lib/jsDomCompiler'
+require '../lib/cssDomCompiler'
 require 'sqw_spec_helper'
 
 describe DOMCompiler do 
    before(:each) do 
-     wget_webpage('http://www.dreamhost.com/domains.html','dom-testdir') 
+      wget_webpage('http://www.dreamhost.com/domains.html','dom-testdir') 
       cm = ConfManager.instance
-      cm.prepare('dom-testdir','dom-testdir-build',{
-                                 :suppress_info => true,
-                                 :dom_documents => '*.html'
-      })
-      @js_c=JsDomCompiler.new
-   end
+      cm.prepare('dom-testdir','dom-testdir-build')
+      @js_c=JSDOMCompiler.new
+    end
   
     after(:each) do
-      #FileUtils.rm_r('dom-testdir')
-      #FileUtils.rm_r('dom-testdir-build')
+      FileUtils.rm_r('dom-testdir')
+      FileUtils.rm_r('dom-testdir-build')
     end
     
     it "(all subclasses) should look for *dom_documents* in target directory" do     
       @js_c.should have(1).dom_documents
-      @js_c.dom_documents.should include('dom-testdir-build/domains.html')
+      @js_c.dom_documents.should include('dom-testdir-build/index.html')
     end
   
     it "Should fill each script element having a src attribute with the compressed content of the javascript file therin referenciated" do 
       @js_c.compile
     
-      Hpricot( open('dom-testdir-build/domains.html')).search('script').each do |element|
+      Hpricot( open('dom-testdir-build/index.html')).search('script').each do |element|
         element.innerHTML.should_not be_empty
         element.get_attribute('src').should be_nil
       end
     end
  
     it "Should fill each link tag having a href attribute with the compressed content of the  css file therein referenced" do
-      @css_c=CssDomCompiler.new
+      @css_c=CSSDOMCompiler.new
       @css_c.compile()
     end
     

data/spec/sqw_spec_helper.rb

@@ -1,21 +1,5 @@
-require 'singleton'
-require 'hpricot'
-require 'fileutils'
-require 'logger'
-require 'open-uri'
-require 'pp'
-require 'yui/compressor' 
-require 'closure-compiler'
-require 'hpricot'
-require '../lib/sqweezeUtils'
-require '../lib/confManager'
-require '../lib/domCompiler'
-require '../lib/compilers/jsDomCompiler'
-require '../lib/compilers/cssDomCompiler'
-
-
-SQW_CONF_FILE='test_dir/.sqweeze.yml'
-SQW_FBODY=<<EOF
+     SQW_CONF_FILE='test_dir/.sqweeze.yml'
+     SQW_FBODY=<<EOF
 bin_paths:
    - pngcrush: /usr/bin/pngcrush
    - jpegtran: /usr/bin/jpegtran

data/sqweeze.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sqweeze}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrea Fiore"]
-  s.date = %q{2010-05-01}
+  s.date = %q{2010-08-20}
   s.default_executable = %q{sqweeze}
   s.description = %q{A command line web-asset optimisation tool}
   s.email = %q{and@inventati.org}
   s.executables = ["sqweeze"]
   s.extra_rdoc_files = ["README.rdoc", "bin/sqweeze", "lib/compilers/assetLinker.rb", "lib/compilers/cssDomCompiler.rb", "lib/compilers/jsDomCompiler.rb", "lib/compressor.rb", "lib/compressors/cssCompressor.rb", "lib/compressors/gifCompressor.rb", "lib/compressors/jpegCompressor.rb", "lib/compressors/jsCompressor.rb", "lib/compressors/pngCompressor.rb", "lib/confManager.rb", "lib/domCompiler.rb", "lib/sqweezeUtils.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "bin/sqweeze", "lib/compilers/assetLinker.rb", "lib/compilers/cssDomCompiler.rb", "lib/compilers/jsDomCompiler.rb", "lib/compressor.rb", "lib/compressors/cssCompressor.rb", "lib/compressors/gifCompressor.rb", "lib/compressors/jpegCompressor.rb", "lib/compressors/jsCompressor.rb", "lib/compressors/pngCompressor.rb", "lib/confManager.rb", "lib/domCompiler.rb", "lib/sqweezeUtils.rb", "spec/confManager_spec.rb", "spec/domCompiler_spec.rb", "spec/sqw_spec_helper.rb", "sqweeze.gemspec"]
-  s.homepage = %q{http://github.com/premasagar/sqweeze}
+  s.files = ["README.rdoc", "Rakefile", "bin/sqweeze", "lib/compilers/assetLinker.rb", "lib/compilers/cssDomCompiler.rb", "lib/compilers/jsDomCompiler.rb", "lib/compressor.rb", "lib/compressors/cssCompressor.rb", "lib/compressors/gifCompressor.rb", "lib/compressors/jpegCompressor.rb", "lib/compressors/jsCompressor.rb", "lib/compressors/pngCompressor.rb", "lib/confManager.rb", "lib/domCompiler.rb", "lib/sqweezeUtils.rb", "spec/confManager_spec.rb", "spec/domCompiler_spec.rb", "spec/sqw_spec_helper.rb", "Manifest", "sqweeze.gemspec"]
+  s.homepage = %q{http://github.com/afiore/sqwidget-builder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sqweeze", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{sqweeze}

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sqweeze
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andrea Fiore
@@ -14,61 +9,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 +01:00
+date: 2010-08-20 00:00:00 +01:00
 default_executable: sqweeze
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 2
         version: 0.8.2
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: closure-compiler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 2
         version: 0.2.2
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: yui-compressor
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
         version: 0.9.1
-  type: :runtime
-  version_requirements: *id003
+    version: 
 description: A command line web-asset optimisation tool
 email: and@inventati.org
 executables: 
@@ -91,7 +70,6 @@ extra_rdoc_files:
 - lib/domCompiler.rb
 - lib/sqweezeUtils.rb
 files: 
-- Manifest
 - README.rdoc
 - Rakefile
 - bin/sqweeze
@@ -110,9 +88,10 @@ files:
 - spec/confManager_spec.rb
 - spec/domCompiler_spec.rb
 - spec/sqw_spec_helper.rb
+- Manifest
 - sqweeze.gemspec
 has_rdoc: true
-homepage: http://github.com/premasagar/sqweeze
+homepage: http://github.com/afiore/sqwidget-builder
 licenses: []
 
 post_install_message: 
@@ -129,21 +108,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
       version: "1.2"
+  version: 
 requirements: []
 
 rubyforge_project: sqweeze
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A command line web-asset optimisation tool