front-end-blender 0.5.1 → 0.5.2

data/MIT-LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2008 Chris Griego & Blake Elshire.
+Copyright (c) 2008 Chris Griego
+          (c) 2008 Blake Elshire
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -1,37 +1,43 @@
-== Synopsis 
-  Blender is like Make or Ant for the front-end. It aggregates and compresses
-  CSS and/or JavaScript assets of a site into production-ready files.
+== What is Blender?
+
+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.
 
 == Examples
-  In your site directory run 'blend' to minify CSS and JavaScript.
-    blend
 
-  Other examples:
-    blend -f site/blender.yaml
-    blend -t css
-    blend -t css -d
+In your site directory run 'blend' to minify CSS and JavaScript.
+  blend
+
+Other examples:
+  blend -f site/blender.yaml
+  blend -t css
+  blend -t css -d
+  blend -F -- --preserve-semi
+
+== Usage
 
-== Usage 
-  blend [options]
+blend [options] [-- yui-compressor-options]
 
-  For help use: blend -h
+For help use: blend -h
 
 == Options
-  -h, --help                     Displays help message
-  -v, --version                  Display the version, then exit
-  -f <file>, --file <file>       Use given Blendfile
-  -t <css|js>, --type <css|js>   Compress CSS or JavaScript only
-  -d, --data                     Convert CSS url(image.ext) to url(data:) EXPERIMENTAL
-  -F, --force                    Force file minification when there are no new updates
 
-== Authors
-  Chris Griego & Blake Elshire
+-h, --help                     Displays help message
+-v, --version                  Display the version, then exit
+-f <file>, --file <file>       Use given Blendfile
+-t <css|js>, --type <css|js>   Compress CSS or JavaScript only
+-d, --data                     Convert CSS url(image.ext) to url(data:) EXPERIMENTAL
+-F, --force                    Force file minification when there are no new updates
 
 == Installation
-  To install the beta version, run the following at the command line:
-    sudo gem install front-end-blender --source=http://gems.github.com
+
+To install the beta gem, run the following at the command line:
+  sudo gem install front-end-blender --source=http://gems.github.com
 
 == License
-  Copyright (c) 2008 Chris Griego & Blake Elshire.
-  Licensed under the MIT License:
-  http://www.opensource.org/licenses/mit-license.php
+
+Copyright (c) 2008 Chris Griego
+          (c) 2008 Blake Elshire
+
+Blender is freely distributable under the terms of an MIT-style license.
+For details, see http://www.opensource.org/licenses/mit-license.php

data/bin/blend

@@ -1,55 +1,28 @@
 #!/usr/bin/env ruby
-# == Synopsis 
-#   Blender is like Make or Ant for the front-end. It aggregates and compresses
-#   CSS and/or JavaScript assets of a site into production-ready files.
-# 
-# == Examples
-#   In your site directory run 'blend' to minify CSS and JavaScript.
-#     blend
-# 
-#   Other examples:
-#     blend -f site/blender.yaml
-#     blend -t css
-#     blend -t css -d
-# 
-# == Usage 
-#   blend [options]
-# 
-#   For help use: blend -h
-# 
-# == Options
-#   -h, --help                     Displays help message
-#   -v, --version                  Display the version, then exit
-#   -f <file>, --file <file>       Use given Blendfile
-#   -t <css|js>, --type <css|js>   Compress CSS or JavaScript only
-#   -d, --data                     Convert CSS url(image.ext) to url(data:) EXPERIMENTAL
-#   -F, --force                    Force file minification when there are no new updates
-# 
-# == Authors
-#   Chris Griego & Blake Elshire
-# 
-# == Installation
-#   To install the beta version, run the following at the command line:
-#     sudo gem install front-end-blender --source=http://gems.github.com
-# 
-# == License
-#   Copyright (c) 2008 Chris Griego & Blake Elshire.
-#   Licensed under the MIT License:
-#   http://www.opensource.org/licenses/mit-license.php
 
+# Copyright (c) 2008 Chris Griego
+#           (c) 2008 Blake Elshire
+# 
+# Blender is freely distributable under the terms of an MIT-style license.
+# For details, see http://www.opensource.org/licenses/mit-license.php
 
 require 'yaml'
 require 'optparse'
 require 'rdoc/usage'
 require 'ostruct'
 require 'base64'
+require 'mime/types'
 
+# TODO Move class to lib so other tools could potentially reuse it
 class Blender
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
+  
   attr_reader :options
   
   def initialize(arguments, stdin)
-    @arguments = arguments
+    @arguments   = !arguments.include?('--') ? arguments : arguments[0...arguments.index('--')]
+    @passthrough = !arguments.include?('--') ? ''        : arguments[arguments.index('--')+1..-1]
+    
     # Set defaults
     @options = OpenStruct.new
     @options.blendfile = 'blender.yaml'
@@ -71,9 +44,9 @@ class Blender
       
       blender.each do |output_name, inputs|
         output_new = false
+        
         # Checks the type flag and if the current file meets the type requirements continues
         if output_name.match "." + @options.file_type.to_s
-          
           file_type = output_name.match(/\.css/) ? "css" : "js"
           
           # Checks if output file exists and checks the mtimes of the source files to the output file if new creates a new file
@@ -86,12 +59,12 @@ class Blender
             end
             
             if output_new || @options.force
-                create_output(output_name, inputs, file_type)
+              create_output(output_name, inputs, file_type)
             else
-                puts "Skipping: #{output_name}"
+              puts "Skipping: #{output_name}"
             end
           else
-              create_output(output_name, inputs, file_type)
+            create_output(output_name, inputs, file_type)
           end
         end
       end
@@ -100,87 +73,95 @@ class Blender
   
   protected
   
-    def parsed_options?
-      opts = OptionParser.new
-      opts.on('-v', '--version') { output_version ; exit 0 }
-      opts.on('-h', '--help')    { output_help }
-      opts.on('-f FILE', '--file FILE', String, "Use given Blendfile") do |blendfile|
-        @options.blendfile = blendfile
-      end
-      opts.on("-t [TYPE]", "--type [TYPE]", [:css, :js], "Select file type to minify (css, js)") do |t|
-        @options.file_type = t
+  def parsed_options?
+    opts = OptionParser.new
+    
+    opts.on('-v', '--version') { output_version ; exit 0 }
+    opts.on('-h', '--help')    { output_help }
+    
+    opts.on('-f FILE', '--file FILE', String, "Use given Blendfile") do |blendfile|
+      @options.blendfile = blendfile
+    end
+    
+    opts.on("-t [TYPE]", "--type [TYPE]", [:css, :js], "Select file type to minify (css, js)") do |t|
+      @options.file_type = t
+    end
+    
+    opts.on("-d", "--data", String, "Change url(image.ext) to url(data:) in css files") { @options.data = true }
+    opts.on("-F", "--force", String, "Force minification when source files aren't newer than min files") { @options.force = true }
+    
+    opts.parse!(@arguments) rescue return false
+    
+    true
+  end
+  
+  # TODO Change to work with directory hashes (css/: [ colors.css, layout.css ])
+  def create_output(output_name, inputs, type)
+    File.open(output_name, 'w') do |output_file|
+      inputs.each do |i|
+        output_file << IO.read(i)
       end
-      opts.on("-d", "--data", String, "Change url(image.ext) to url(data:) in css files") { @options.data = true }
-      opts.on("-F", "--force", String, "Force minification when source files aren't newer than min files") { @options.force = true }
-      
-      opts.parse!(@arguments) rescue return false
-      true
     end
     
-    # TODO Change to work with directory hashes (css/: [ colors.css, layout.css ])
-    def create_output(output_name, inputs, type)
+    # Compress
+    IO.popen("java -jar #{File.dirname(__FILE__)}/../lib/yuicompressor.jar #{@passthrough} --type #{type}", mode="r+") do |io|
+      io.write IO.read(output_name)
+      io.close_write
+      
       File.open(output_name, 'w') do |output_file|
-        inputs.each do |i|
-          output_file << IO.read(i)
-        end
+        output_file << io.read
       end
+    end
+    
+    # TODO Move this to before the file gets written
+    # Workaround for YUI Compressor Bug #1938329 & Bug #1961175
+    if output_name.match /\.css$/
+      output = IO.read(output_name)
       
-      # Compress
-      IO.popen("java -jar #{File.dirname(__FILE__)}/../lib/yuicompressor.jar --type #{type}", mode="r+") do |io|
-        io.write IO.read(output_name)
-        io.close_write
-        File.open(output_name, 'w') do |output_file|
-          output_file << io.read
+      output.gsub! ' and(', ' and ('
+      output.gsub! '/**/;}', '/**/}'
+      
+      if @options.data
+        output = output.gsub(/url\(['"]?([^?']+)['"]+\)/im) do
+          uri = $1
+          mime_type = ''
+          
+          # Make the URI absolute instead of relative. TODO Seems kinda hacky is there a better way?
+          uri.gsub! "../", ""
+          
+          # Figure out the mime type.
+          mime_type = MIME::Types.type_for(uri)
+          
+          url_contents = make_data_uri(IO.read(uri), mime_type)
+          
+          %Q!url("#{url_contents}")!
         end
       end
       
-      # Workaround for YUI Compressor Bug #1938329 & Bug #1961175
-      if output_name.match /\.css$/
-        output = IO.read(output_name)
-        output.gsub! ' and(', ' and ('
-        output.gsub! '/**/;}', '/**/}'
-        
-        if @options.data
-          output = output.gsub(/url\(['"]?([^?']+)['"]+\)/im) {
-            uri = $1
-            mime_type = ''
-            
-            # Make the URI absolute instead of relative. TODO Again seems kinda hacky is there a better way?
-            uri.gsub! "../", ""
-
-            # Figure out the mime type. TODO Seems hacky is there a way to read mime type built into Ruby?
-            IO.popen("file --mime #{uri}") do |io|
-              mime_type = io.read.split(": ")[1]
-            end
-            
-            url_contents = make_data_uri(IO.read(uri), mime_type)
-            
-            %Q!url("#{url_contents}")!
-          }
-        end
-        
-        File.open(output_name, 'w') do |output_file|
-          output_file << output
-        end
+      File.open(output_name, 'w') do |output_file|
+        output_file << output
       end
-      puts output_name
     end
     
-    def make_data_uri(content, content_type)
-      outuri = 'data:' + content_type + ';base64'
-      content = Base64.encode64(content)
-      outuri += ",#{content}"
-      return outuri.gsub("\n", '')
-    end
-    
-    def output_version
-      puts "#{File.basename(__FILE__)} version #{VERSION}"
-    end
+    puts output_name
+  end
+  
+  def make_data_uri(content, content_type)
+    outuri   = 'data:' + content_type + ';base64'
+    content  = Base64.encode64(content)
+    outuri  += ",#{content}"
     
-    def output_help
-      output_version
-      RDoc::usage() #exits app
-    end
+    outuri.gsub("\n", '')
+  end
+  
+  def output_version
+    puts "#{File.basename(__FILE__)} version #{VERSION}"
+  end
+  
+  def output_help
+    output_version
+    RDoc::usage() #exits app
+  end
 end
 
 # Create and run the application

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: front-end-blender
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Blake Elshire & Chris Griego
@@ -9,11 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-16 00:00:00 -07:00
+date: 2008-05-17 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: Blender is like Make or Ant for the front-end. It aggregates and compresses CSS and/or JavaScript assets of a site into production-ready files.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.15"
+    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: belshire@gmail.com
 executables: 
 - blend
@@ -45,12 +53,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- Java, v1.4 or greater
 rubyforge_project: 
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: Blender gives you production-ready CSS and/or JavaScript assets.
+summary: Blender gives you efficient, production-ready CSS and/or JavaScript assets.
 test_files: []