blender 0.20 → 0.24

data/Manifest.txt

@@ -1,5 +1,5 @@
 History.txt
-MIT-LICENSE
+License.txt
 Manifest.txt
 README.txt
 Rakefile

data/README.txt

@@ -35,18 +35,22 @@ source files are the hash values as an array. Here is a sample Blendfile:
 == Usage
 
   Usage: blend [options]
-    -h, --help                       Show this message
-    -V, --version                    Prints Blender's version number
-    -g, --generate                   Generate a stub Blendfile
-    -f, --file FILE                  Use given Blendfile
-    -r, --root ROOT                  Specify the path to the web root directory
-    -t, --type TYPE                  Select file type to blend (css, js)
-    -m, --min [MINIFIER]             Select minifier to use (yui, none)
-    -c, --cache-buster [BUSTER]      Append cache busters to URLs in CSS, defaults to timestamps
-        --force                      Force blending when source files aren't newer than output files
-        --yui=YUIOPTS                Pass arguments to YUI Compressor
-    -d, --data                       EXPERIMENTAL Convert url(file.ext) to url(data:) in CSS files
-    -z, --gzip                       EXPERIMENTAL Also create gzip output files
+      -g, --generate                   Generate a stub Blendfile
+      -f, --file FILE                  Use specified Blendfile
+      -r, --root ROOT                  Specify the path to the web root directory
+      -t, --type TYPE                  Select file type to blend (css, js)
+      -m, --min [MINIFIER]             Select minifier to use (yui, none)
+      -c, --cache-buster [BUSTER]      Add cache busters to URLs in CSS
+          --force                      Don't allow output files to be skipped
+          --yui=YUIOPTS                Pass arguments to YUI Compressor
+  
+  Experimental:
+      -d, --data                       Convert url(file.ext) to url(data:) in CSS
+      -z, --gzip                       Additionally generate gzipped output files
+  
+  Meta:
+      -h, --help                       Show this message
+      -V, --version                    Show the version number
 
 == Examples
 
@@ -63,21 +67,18 @@ Other examples:
 == Installation
 
 To install the RubyGem, run the following at the command line (you may need to use a command such as su or sudo):
-  gem install mime-types
-  gem install colored
-  gem install front-end-blender --source http://gems.github.com
+  gem install blender
 
-If you're using Windows, you'll also need to run the following:
+If you're using Windows, you'll also want to run the following to get colored command line output:
   gem install win32console
 
-* Java v1.4 or greater is required, http://java.com/en/
-* Ruby v1.8.6 or greater is required, http://www.ruby-lang.org/en/downloads/
-* RubyGems v1.2 or greater is recommended, http://rubygems.org/read/chapter/3
+* Java[http://java.com/en/] v1.4 or greater is required
+* Ruby[http://www.ruby-lang.org/en/downloads/] v1.8.6 or greater is required
+* RubyGems[http://rubygems.org/read/chapter/3] v1.2 or greater is recommended
 
 == License
 
-  Copyright (c) 2008 Chris Griego
-            (c) 2008 Blake Elshire
+Copyright (c) 2008 Blake Elshire, Chris Griego
 
 Blender is freely distributable under the terms of an MIT-style license.
 For details, see http://www.opensource.org/licenses/mit-license.php

data/Rakefile

@@ -1,5 +1,4 @@
-# Copyright (c) 2008 Chris Griego
-#           (c) 2008 Blake Elshire
+# Copyright (c) 2008 Blake Elshire, Chris Griego
 # 
 # Blender is freely distributable under the terms of an MIT-style license.
 # For details, see http://www.opensource.org/licenses/mit-license.php
@@ -8,15 +7,14 @@ $:.unshift File.join(File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE
 
 require 'rubygems'
 require 'hoe'
-require 'front_end_architect/blender.rb'
+require 'front_end_architect/blender'
 
 hoe = Hoe.new('blender', FrontEndArchitect::Blender::VERSION) do |p|
-  p.author          = ['Blake Elshire', 'Chris Griego']
-  p.email           = 'blender@front-end-architect.com'
-  p.summary         = 'Blender outputs efficient, production-ready CSS and/or JavaScript assets.'
-  p.description     = 'Blender is like ant or make for the front-end. It aggregates and compresses CSS and/or JavaScript assets for a site into efficient, production-ready files.'
-  
-  p.url             = 'http://www.front-end-architect.com/blender/'
+  p.author      = ['Blake Elshire', 'Chris Griego']
+  p.email       = 'blender@front-end-architect.com'
+  p.summary     = 'Blender outputs efficient, production-ready CSS and/or JavaScript assets.'
+  p.description = 'Blender is like ant or make for the front-end. It aggregates and compresses CSS and/or JavaScript assets for a site into efficient, production-ready files.'
+  p.url         = 'http://www.front-end-architect.com/blender/'
   
   p.extra_deps << ['mime-types', '>= 1.15']
   p.extra_deps << ['colored',    '>= 1.1']
@@ -24,6 +22,7 @@ hoe = Hoe.new('blender', FrontEndArchitect::Blender::VERSION) do |p|
   p.spec_extras[:requirements] = 'Java, v1.4 or greater'
   
   p.remote_rdoc_dir = '' # Release to root
+  p.rdoc_pattern    = /^(lib\/front_end_architect|bin|ext)|txt$/
 end
 
 task :update_gemspec do

data/bin/blend

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright (c) 2008 Chris Griego
-#           (c) 2008 Blake Elshire
+# Copyright (c) 2008 Blake Elshire, Chris Griego
 # 
 # Blender is freely distributable under the terms of an MIT-style license.
 # For details, see http://www.opensource.org/licenses/mit-license.php
@@ -12,19 +11,28 @@ require 'front_end_architect/blender'
 
 options = {}
 
+def section(opts, title)
+  opts.separator ''
+  opts.separator title + ':'
+end
+
 opts = OptionParser.new do |opts|
-  opts.on('-h',              '--help',                                 "Show this message")                                               {    puts opts; exit 0                                     }
-  opts.on('-V',              '--version',                              "Show the version number")                                         {    puts "Front-End Blender v#{Blender::VERSION}"; exit 0 }
-  opts.on('-g',              '--generate',              String,        "Generate a stub Blendfile")                                       {    options[:generate]     = true                         }
-  opts.on('-f FILE',         '--file FILE',             String,        "Use given Blendfile")                                             {|f| options[:blendfile]    = f                            }
-  opts.on('-r ROOT',         '--root ROOT',             String,        "Set the path to the web root directory")                          {|r| options[:root]         = r                            }
-  opts.on('-t TYPE',         '--type TYPE',             [:css, :js],   "Select file type to blend (css, js)")                             {|t| options[:file_type]    = t                            }
-  opts.on('-m [MINIFIER]',   '--min [MINIFIER]',        [:yui, :none], "Select minifier to use (yui, none)")                              {|m| options[:min]          = m.nil? ? :none : m.to_sym    }
-  opts.on('-c [BUSTER]',     '--cache-buster [BUSTER]', String,        "Append cache busters to URLs in CSS, defaults to timestamps")     {|b| options[:cache_buster] = b.nil? ? :mtime : b          }
-  opts.on(                   '--force',                 String,        "Force blending when source files aren't newer than output files") {    options[:force]        = true                         }
-  opts.on(                   '--yui=YUIOPTS',           String,        "Pass arguments to YUI Compressor")                                {|o| options[:yuiopts]      = o                            }
-  opts.on('-d',              '--data',                  String,        "EXPERIMENTAL Convert url(file.ext) to url(data:) in CSS files")   {    options[:data]         = true                         }
-  opts.on('-z',              '--gzip',                  String,        "EXPERIMENTAL Also create gzip output files")                      {    options[:gzip]         = true                         }
+  version = "Front-End Blender v#{FrontEndArchitect::Blender::VERSION}"
+  
+  opts.on('-g',            '--generate',              String,        "Generate a stub Blendfile")                  {    options[:generate]     = true                                }
+  opts.on('-f FILE',       '--file FILE',             String,        "Use specified Blendfile")                    {|f| options[:blendfile]    = f; options[:root] = File.dirname(f) }
+  opts.on('-r ROOT',       '--root ROOT',             String,        "Specify the path to the web root directory") {|r| options[:root]         = r                                   }
+  opts.on('-t TYPE',       '--type TYPE',             [:css, :js],   "Select file type to blend (css, js)")        {|t| options[:file_type]    = t                                   }
+  opts.on('-m [MINIFIER]', '--min [MINIFIER]',        [:yui, :none], "Select minifier to use (yui, none)")         {|m| options[:min]          = m.nil? ? :none : m.to_sym           }
+  opts.on('-c [BUSTER]',   '--cache-buster [BUSTER]', String,        "Add cache busters to URLs in CSS")           {|b| options[:cache_buster] = b.nil? ? :mtime : b                 }
+  opts.on(                 '--force',                 String,        "Don't allow output files to be skipped")     {    options[:force]        = true                                }
+  opts.on(                 '--yui=YUIOPTS',           String,        "Pass arguments to YUI Compressor")           {|o| options[:yuiopts]      = o                                   }
+  section opts, 'Experimental'
+  opts.on('-d',            '--data',                  String,        "Convert url(file.ext) to url(data:) in CSS") {    options[:data]         = true                                }
+  opts.on('-z',            '--gzip',                  String,        "Additionally generate gzipped output files") {    options[:gzip]         = true                                }
+  section opts, 'Meta'
+  opts.on('-h',            '--help',                                 "Show this message")                          {    puts opts;    exit 0                                         }
+  opts.on('-V',            '--version',                              "Show the version number")                    {    puts version; exit 0                                         }
   
   opts.parse!(ARGV) rescue return false
 end

data/lib/front_end_architect/blender.rb

@@ -1,5 +1,4 @@
-# Copyright (c) 2008 Chris Griego
-#           (c) 2008 Blake Elshire
+# Copyright (c) 2008 Blake Elshire, Chris Griego
 # 
 # Blender is freely distributable under the terms of an MIT-style license.
 # For details, see http://www.opensource.org/licenses/mit-license.php
@@ -7,30 +6,33 @@
 $:.unshift File.join(File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__), *%w[..])
 
 require 'rubygems'
-require 'yaml'
+
 require 'base64'
 require 'benchmark'
-require 'colored'
-require 'mime/types'
+require 'colored' unless PLATFORM =~ /win32/ && !Gem.available?('win32console')
 require 'find'
+require 'mime/types'
 require 'pathname'
 require 'zlib'
+require 'yaml'
+
 require 'front_end_architect/hash'
 
 module FrontEndArchitect
   class Blender
-    VERSION = '0.20'
+    VERSION = '0.24'
     
-    FILTER_REGEX = /filter: ?[^?]+\(src=(['"])([^\?'"]+)(\?(?:[^'"]+)?)?\1,[^?]+\1\);/im
-    IMPORT_REGEX = /@import(?: url\(| )(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]+)?)?\1\)?(?:[^?;]+)?;/im
+    ALPHA_REGEX  = /(-ms-)?filter:\s*(['"]?)progid:DXImageTransform\.Microsoft\.AlphaImageLoader\(\s*src=(['"])([^\?'"\)]+)(\?(?:[^'"\)]+)?)?\3,\s*sizingMethod=(['"])(image|scale|crop)\6\s*\)\2/im
+    IMPORT_REGEX = /@import(?: url\(| )(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]+)?)?\1\)?(?:[^?;]+)?;/im # shouldn't the semicolon be optional?
     URL_REGEX    = /url\((['"]?)([^\?'"\)]+)(\?(?:[^'"\)]+)?)?\1?\)/im
     
     DEFAULT_OPTIONS = {
       :blendfile => 'Blendfile.yaml',
       :data      => false,
       :force     => false,
-      :root      => File.dirname(:blendfile.to_s),
+      :root      => File.dirname('Blendfile.yaml'),
       :min       => :yui,
+      :colored   => (Object.const_defined? :Colored),
     }
     
     def initialize(opts)
@@ -83,12 +85,12 @@ module FrontEndArchitect
                 if File.writable?(output_name) && !(@options[:gzip] && !File.writable?(gzip_output_name))
                   create_output(output_name, sources, file_type)
                 else
-                  puts 'Permission Denied:'.white_on_red + ' ' + output_name.red
-                  puts 'Permission Denied:'.white_on_red + ' ' + gzip_output_name.red if @options[:gzip]
+                  puts_colored 'Permission Denied:' + ' ' + output_name,      :red
+                  puts_colored 'Permission Denied:' + ' ' + gzip_output_name, :red if @options[:gzip]
                 end
               else
-                puts 'Skipping: '.yellow + output_name.yellow
-                puts 'Skipping: '.yellow + gzip_output_name.yellow if @options[:gzip]
+                puts_colored 'Skipping: ' + output_name,      :yellow
+                puts_colored 'Skipping: ' + gzip_output_name, :yellow if @options[:gzip]
               end
             else
               create_output(output_name, sources, file_type)
@@ -137,6 +139,14 @@ module FrontEndArchitect
     
     protected
     
+    def puts_colored(output, color)
+      if @options[:colored]
+        puts Colored.colorize(output, { :foreground => color })
+      else
+        puts output
+      end
+    end
+    
     def flatten_blendfile(value, key=nil, context=[])
       if value.is_a? Hash
         context << key unless key.nil?
@@ -208,15 +218,19 @@ module FrontEndArchitect
           end
         end
         
-        # Data
+        # Data URI conversion is processed after compression for speed
+        # Workaround for YUI Compressor Bug #2099271
         if @options[:data]
           if File.extname(output_name).downcase == '.css'
             output = output.gsub(URL_REGEX) do
-              unless $2.downcase.include?('.css')
-                mime_type    = MIME::Types.type_for($2)
-                url_contents = make_data_uri(IO.read($2), mime_type[0])
+              url   = $2
+              query = $3
+              
+              unless url.downcase.include?('.css')
+                mime_type    = MIME::Types.type_for(url)
+                url_contents = make_data_uri(IO.read(url), mime_type[0])
               else
-                url_contents = $2
+                url_contents = url
               end
                 %Q!url(#{url_contents})!
             end
@@ -226,7 +240,7 @@ module FrontEndArchitect
         output_file << output
       end
       
-      puts output_name.green
+      puts_colored output_name, :green
       
       if @options[:gzip]
         output_gzip = output_name + '.gz'
@@ -235,12 +249,13 @@ module FrontEndArchitect
           gz.write(output)
         end
         
-        puts output_gzip.green
+        puts_colored output_gzip, :green
       end
     end
     
-    # TODO Move this to a seperate class and clean it up A LOT. For 1.1
     def process_css(input_file, output_path)
+      # TODO Move this to a seperate class and clean it up A LOT. For 2.0
+      
       # Determine full path of input file
       input_path    = Pathname.new(File.dirname(input_file))
       input         = IO.read(input_file)
@@ -248,45 +263,50 @@ module FrontEndArchitect
       
       # Find filter statements and append cache busters to URLs
       if @options[:cache_buster]
-        input = input.gsub(FILTER_REGEX) do |filter|
-          uri = $2
-          cbuster = $3
-          unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/i)
-            full_path = File.expand_path($2, File.dirname(input_file))
-            buster    = make_cache_buster(full_path, $3)
-            new_path  = uri.to_s + buster
-            
-            %Q!filter='#{new_path}'!
-          else
-            %Q!filter='#{uri}#{cbuster}'!
+        input = input.gsub(ALPHA_REGEX) do |alpha|
+          prefix       = $1
+          outter_quote = $2
+          inner_quote1 = $3
+          url          = $4
+          query        = $5
+          inner_quote2 = $6
+          sizing       = $7
+          
+          # TODO Rewrite to root relative (if :root specified?)
+          
+          unless url.match(/^(https:\/\/|http:\/\/|\/\/)/i)
+            full_path = File.expand_path(url, File.dirname(input_file))
+            query = make_cache_buster(full_path, query)
           end
+          
+          "#{prefix}filter:#{outter_quote}progid:DXImageTransform.Microsoft.AlphaImageLoader(src=#{inner_quote1}#{url}#{query}#{inner_quote1},sizingMethod=#{inner_quote2}#{sizing}#{inner_quote2})#{outter_quote}"
         end
       end
       
       # Handle @import statements URL rewrite and adding cache busters
       input = input.gsub(IMPORT_REGEX) do |import|
-        uri        = $2
-        asset_path = Pathname.new(File.expand_path(uri, input_path))
+        url        = $2
+        query      = $3
+        asset_path = Pathname.new(File.expand_path(url, input_path))
         
-        if uri.match(/^(\/[^\/]+.+)$/)
-          asset_path = Pathname.new(File.join(File.expand_path(@options[:root]), uri))
+        if url.match(/^(\/[^\/]+.+)$/)
+          asset_path = Pathname.new(File.join(File.expand_path(@options[:root]), url))
         end
         
-        unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/i)
+        unless url.match(/^(https:\/\/|http:\/\/|\/\/)/i)
           if (output_path != input_path)
-            
             new_path = asset_path.relative_path_from(output_path)
             
             if @options[:cache_buster]
-              buster = make_cache_buster(asset_path, $3)
-              import.gsub!(uri, new_path.to_s+buster)
+              buster = make_cache_buster(asset_path, query)
+              import.gsub!(url, new_path.to_s + buster)
             else
-              import.gsub!(uri, new_path)
+              import.gsub!(url, new_path)
             end
           else
             if @options[:cache_buster]
-              buster = make_cache_buster(asset_path, $3)
-              import.gsub!(uri, asset_path.to_s+buster)
+              buster = make_cache_buster(asset_path, query)
+              import.gsub!(url, asset_path.to_s + buster)
             end
           end
         end
@@ -299,39 +319,39 @@ module FrontEndArchitect
       if output_path == input_path
         if @options[:data]
           input = input.gsub(URL_REGEX) do
-            uri     = $2
-            cbuster = $3
+            url   = $2
+            query = $3
             
-            unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/i)
-              new_path = File.expand_path($2, File.dirname(input_file))
+            unless url.match(/^(https:\/\/|http:\/\/|\/\/)/i)
+              new_path = File.expand_path(url, File.dirname(input_file))
               
-              if uri.match(/^(\/[^\/]+.+)$/)
-                new_path = Pathname.new(File.join(File.expand_path(@options[:root]), uri))
+              if url.match(/^(\/[^\/]+.+)$/)
+                new_path = Pathname.new(File.join(File.expand_path(@options[:root]), url))
               end
               
               %Q!url(#{new_path})!
             else
-              %Q!url(#{uri}#{cbuster})!
+              %Q!url(#{url}#{query})!
             end
           end
         elsif @options[:cache_buster]
           input = input.gsub(URL_REGEX) do
-            unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/i)
-              uri     = $2
-              cbuster = $3
-              
-              if uri.match(/^(\/[^\/]+.+)$/)
-                uri = Pathname.new(File.join(File.expand_path(@options[:root]), uri))
+            url   = $2
+            query = $3
+            
+            unless url.match(/^(https:\/\/|http:\/\/|\/\/)/i)
+              if url.match(/^(\/[^\/]+.+)$/)
+                url = Pathname.new(File.join(File.expand_path(@options[:root]), url))
               end
               
               if @options[:cache_buster]
-                buster   = make_cache_buster(uri, $3)
-                new_path = uri.to_s+buster
+                buster   = make_cache_buster(url, query)
+                new_path = url.to_s + buster
               end
               
               %Q!url(#{new_path})!
             else
-              %Q!url(#{uri}#{cbuster})!
+              %Q!url(#{url}#{query})!
             end
           end
         end
@@ -340,37 +360,37 @@ module FrontEndArchitect
       else
         # Find all url(.ext) in file and rewrite relative url from output directory.
         input = input.gsub(URL_REGEX) do
-          uri     = $2
-          cbuster = $3
+          url   = $2
+          query = $3
           
-          unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/i)
+          unless url.match(/^(https:\/\/|http:\/\/|\/\/)/i)
             if @options[:data]
               # if doing data conversion rewrite url as an absolute path
-              new_path = File.expand_path(uri, File.dirname(input_file))
+              new_path = File.expand_path(url, File.dirname(input_file))
               
-              if uri.match(/^(\/[^\/]+.+)$/)
-                new_path = Pathname.new(File.join(File.expand_path(@options[:root]), uri))
+              if url.match(/^(\/[^\/]+.+)$/)
+                new_path = Pathname.new(File.join(File.expand_path(@options[:root]), url))
               end
             else
-              asset_path = Pathname.new(File.expand_path(uri, File.dirname(input_file)))
+              asset_path = Pathname.new(File.expand_path(url, File.dirname(input_file)))
               
-              if uri.match(/^(\/[^\/]+.+)$/)
-                asset_path = Pathname.new(File.join(File.expand_path(@options[:root]), uri))
+              if url.match(/^(\/[^\/]+.+)$/)
+                asset_path = Pathname.new(File.join(File.expand_path(@options[:root]), url))
               end
               
               new_path = asset_path.relative_path_from(output_path)
               
               if @options[:cache_buster]
-                buster   = make_cache_buster(asset_path, $3)
-                new_path = new_path.to_s+buster
+                buster   = make_cache_buster(asset_path, query)
+                new_path = new_path.to_s + buster
               else
-                new_path = new_path.to_s+$3 unless $3.nil?
+                new_path = new_path.to_s + query unless query.nil?
               end
             end
             
             %Q!url(#{new_path})!
           else
-            %Q!url(#{uri}#{cbuster})!
+            %Q!url(#{url}#{query})!
           end
         end
         
@@ -378,18 +398,18 @@ module FrontEndArchitect
       end
     end
     
-    def make_cache_buster(asset_path, query_string)
-      unless query_string.nil?
-        query_string += '&'
+    def make_cache_buster(asset_path, query)
+      unless query.nil?
+        query += '&'
       else
-        query_string = '?'
+        query = '?'
       end
       
       if @options[:cache_buster] == :mtime
         file_mtime = File.mtime(asset_path).to_i
-        buster     = query_string + file_mtime.to_s
+        buster     = query + file_mtime.to_s
       else
-        buster = query_string + @options[:cache_buster]
+        buster = query + @options[:cache_buster]
       end
       
       return buster

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blender
 version: !ruby/object:Gem::Version 
-  version: "0.20"
+  version: "0.24"
 platform: ruby
 authors: 
 - Blake Elshire
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -05:00
+date: 2009-03-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: Blender is like ant or make for the front-end. It aggregates and compresses CSS and/or JavaScript assets for a site into efficient, production-ready files.
 email: blender@front-end-architect.com
@@ -51,11 +51,12 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- License.txt
 - Manifest.txt
 - README.txt
 files: 
 - History.txt
-- MIT-LICENSE
+- License.txt
 - Manifest.txt
 - README.txt
 - Rakefile
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Java, v1.4 or greater
 rubyforge_project: blender
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Blender outputs efficient, production-ready CSS and/or JavaScript assets.