rack-less 1.1.1 → 1.2.0

data/README.rdoc

@@ -48,31 +48,31 @@ You should now see `Rack::Less` listed in the middleware pipeline:
     rake middleware
     
 == Available Options
-key: name [default]: description
 
-* *root* ["."]:
-  the app root. the reference point for the source and public options.
+* :*root* ["."]
+  - The app root.  The reference point for the source and public options.
 
-* *source* ['app/stylesheets']:
-  the path (relative to the root) where LESS source files are located
+* :*source* ['app/stylesheets']
+  - The path (relative to the root) where LESS source files are located
 
-* *public* ['public']:
-  the path (relative to the root) static files are located
+* :*public* ['public']
+  - The path where static files are located
 
-* *hosted_at* ['/stylesheets']:
-  the public HTTP path for hosted stylesheets
+* :*hosted_at* ['/stylesheets']
+  - The public HTTP path for hosted stylesheets.
 
 == Available Configurations
-key: name [default]: description
 
-* *cache* [false]:
-  whether to cache the compilation output to a corresponding static file
+* .*cache* [false]
+  - Whether to cache the compilation output to a corresponding static file
 
-* *compress* [false]:
-  whether to remove extraneous whitespace from compilation output
+* .*compress* [false]
+  - Whether or not to apply compression to the concatenation output
+    - :*yui* - use YUI Compressor (gem install yui-compressor)
+    - :*whitespace* - remove extraneous whitespace only.
 
-* *combinations* [{}]:
-  directives for combining the output of many stylesheets and serving them as a single resource
+* .*combinations* [{}]
+  - Directives for combining the output of many stylesheets and serving them as a single resource.
 
 === Combinations
 
@@ -112,9 +112,11 @@ then the same stylesheet link tags behave like they have the :cache option set,
 
 == Links
 
-GitHub: http://github.com/kelredd/rack-less
+* *GitHub*
+  - http://github.com/kelredd/rack-less
 
-Less:   http://lesscss.org
+* *Less* *CSS*
+  - http://lesscss.org
 
 == License
 

data/lib/rack/less/base.rb

@@ -33,7 +33,6 @@ module Rack::Less
     def call!(env)
       @default_options.each { |k,v| env[k] ||= v }
       @env = env
-      # TODO: get this going
       
       if (@request = Request.new(@env.dup.freeze)).for_less?
         Response.new(@env.dup.freeze, @request.source.to_css).to_rack

data/lib/rack/less/request.rb

@@ -13,7 +13,6 @@ module Rack::Less
   class Request < Rack::Request
     include Rack::Less::Options
     
-    CSS_PATH_REGEX = /\A.*\/(\w+)\.(\w+)\Z/
     CSS_PATH_FORMATS = ['.css']
 
     # The HTTP request method. This is the standard implementation of this

data/lib/rack/less/source.rb

@@ -1,5 +1,11 @@
 require 'less'
-require 'rack/less'
+
+begin
+  require "yui/compressor"
+rescue LoadError
+  # only error about missing yui compressor if
+  # :yui compression is requested
+end
 
 module Rack::Less
 
@@ -13,6 +19,8 @@ module Rack::Less
     # but also accept files with the .css extension
     PREFERRED_EXTENSIONS = [:less, :css]
     
+    YUI_OPTS = {}
+    
     attr_reader :css_name
     
     def initialize(css_name, options={})
@@ -43,7 +51,19 @@ module Rack::Less
           Less::Engine.new(File.new(file_path)).to_css
         end.join("\n")
         
-        compiled_css.delete!("\n") if compress?
+        compiled_css = case @compress
+        when :whitespace, true
+          compiled_css.delete("\n")
+        when :yui
+          if defined?(YUI::CssCompressor)
+            YUI::CssCompressor.new(YUI_OPTS).compress(compiled_css)
+          else
+            raise LoadError, "YUI::CssCompressor is not available. Install it with: gem install yui-compressor"
+          end
+        else
+          compiled_css
+        end
+
         if cache? && !File.exists?(cf = File.join(@cache, "#{@css_name}.css"))
           FileUtils.mkdir_p(@cache)
           File.open(cf, "w") do |file|

data/lib/rack/less/version.rb

@@ -2,8 +2,8 @@ module RackLess
   module Version
     
     MAJOR = 1
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/lib/rack/less.rb

@@ -48,7 +48,6 @@ module Rack::Less
 
   # Create a new Rack::Less middleware component 
   # => the +options+ Hash can be used to specify default configuration values
-  # => a block can given as an alternate method for setting option values (see example above)
   # => (see Rack::Less::Options for possible key/values)
   def self.new(app, options={}, &block)
     Base.new(app, options, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-less
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -06:00
+date: 2010-02-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency