rack-less 0.1.0 → 1.0.0

data/README.rdoc

@@ -16,46 +16,63 @@ or uses Rack::Builder to construct the application pipeline, simply require
 and use as follows:
 
     require 'rack/less'
-    use Rack::Less do
-      set :source,    'app/less'
-      set :hosted_at, '/'
-      set :compress,  true
-    end
+
+    use Rack::Less,
+      :source   => 'app/less'
+      :compress => true
+
     run app
 
 == Using with Rails
 
 Add this to your `config/environment.rb`:
 
-    config.middleware.use Rack::Less, :compress => true
+    config.middleware.use "Rack::Less"
 
 You should now see `Rack::Less` listed in the middleware pipeline:
 
     rake middleware
     
 == Available Options
+[<default_value>]
 
-* *root*["."]:
-  the app root. the reference point for the source and public options.  #TODO: default appropriately for Rails/Sinatra.
+* *root* ["."]:
+  the app root. the reference point for the source and public options.
 
-* *source*['app/stylesheets']:
+* *source* ['app/stylesheets']:
   the path (relative to the root) where LESS files are located
 
-* *public*['public']:
+* *public* ['public']:
   the path (relative to the root) where LESS files are located
 
-* *hosted_at*['/stylesheets']:
+* *hosted_at* ['/stylesheets']:
   the public HTTP root path for stylesheets
 
-* *cache*[false]:
+* *cache* [false]:
   whether to cache the compilation output to a corresponding file in the hosted_root
 
-* *compress*[false]:
+* *compress* [false]:
   whether to remove extraneous whitespace from compilation output
+  
+== Combinations
+
+At times, it is useful to combine many stylesheets and serve them as one resource.  Rails' has a helper for this:
+
+    stylesheet_link_tag 'one', two', :cache => 'app'
+    
+Rack::Less supports this concept by providing combinations.  Combinations are specified using a hash, where the key is the combined resource name and the value is an array of stylesheets to combine as that resource.  For example:
+
+    Rack::Less.combinations = {
+      'app' => ['one', 'two']
+    }
+
+would service the above stylesheet_link_tag.  Even better, you could re-factor the stylesheet_link_tag as follows to DRY it up:
+
+    stylesheet_link_tag Rack::Less.combinations['app'], :cache => 'app'
 
-* *combinations*[{}]:
+* *combine* [{}]:
   directives for combining the ouput of one or more LESS compilations, for example:
-    set :combine, { 'app' => ['one', 'two', 'three'] }
+    { 'app' => ['one', 'two', 'three'] }
   will direct Rack::Less to respond to a request for app.css with the concatenated output of compiling one.less, two.less, and three.less
   
 == Links

data/lib/rack/less.rb

@@ -13,15 +13,27 @@ require 'rack/less/source'
 #
 # Within a rackup file (or with Rack::Builder):
 #   require 'rack/less'
-#   use Rack::Less do
-#     set :root,     "."
-#     set :source,   'app/less'
-#     set :compress, true
-#   end
+#
+#   use Rack::Less,
+#     :source   => 'app/less'
+#     :compress => true
+#
 #   run app
 
 module Rack::Less
-  MEDIA_TYPE = "text/css"
+  MIME_TYPE = "text/css"
+  
+  class << self
+    
+    # Proxy calls to Base.combinations
+    def combinations
+      Rack::Less::Base.combinations
+    end
+    def combinations=(value={})
+      Rack::Less::Base.combinations = value
+    end
+
+  end
 
   # Create a new Rack::Less middleware component 
   # => the +options+ Hash can be used to specify default configuration values

data/lib/rack/less/options.rb

@@ -20,16 +20,10 @@ module Rack::Less
     # => compress
     #    whether to remove extraneous whitespace from
     #    compilation output
-    # => combine
-    #    expects a hash containing directives for combining
-    #    the ouput of one or more LESS compilations, for example:
-    #    { 'app' => ['one', 'two', 'three']}
-    #    will respond to a request for app.css with the concatenated
-    #    output of compiling one.less, two.less, and three.less
     
-    # Note: the following code is more or less a rip from:
+    # Note: the following code is heavily influenced by:
     # => http://github.com/rtomayko/rack-cache/blob/master/lib/rack/cache/options.rb
-    # => thanks to rtomayko, I thought this approach was really smart and the credit is his.
+    # => thanks to rtomayko, I thought his approach was really smart.
     
     RACK_ENV_NS = "rack-less"
     
@@ -42,8 +36,7 @@ module Rack::Less
           option_name(:public)    => 'public',
           option_name(:hosted_at) => '/stylesheets',
           option_name(:cache)     => false,
-          option_name(:compress)  => false,
-          option_name(:combine)   => {}
+          option_name(:compress)  => false
         }
       end
 
@@ -58,6 +51,21 @@ module Rack::Less
         end
       end
       
+      # Rack::Less uses combinations to combine the output of many stylesheets
+      # and serve them as a single resource.  Combinations are specified using
+      # a hash, where the key is the combined resource name and the value is an
+      # array of stylesheets to combine as that resource.  For example:
+      # Rack::Less.combinations = {
+      #   'app' => ['one', 'two']
+      # }
+      @@combinations = {}
+      def combinations
+        @@combinations || {}
+      end
+      def combinations=(value={})
+        @@combinations = value
+      end
+      
     end
     
     module InstanceMethods
@@ -92,10 +100,8 @@ module Rack::Less
       # exactly as specified. The +option+ argument may also be a Hash in
       # which case each key/value pair is merged into the environment as if
       # the #set method were called on each.
-      def set(option, value=nil, &block)
-        if block_given?
-          write_option option, block
-        elsif value.nil?
+      def set(option, value=nil)
+        if value.nil?
           self.options = option.to_hash
         else
           write_option option, value

data/lib/rack/less/request.rb

@@ -28,7 +28,10 @@ module Rack::Less
       @env['PATH_INFO']
     end
     
-    # TODO: test these
+    def http_accept
+      @env['HTTP_ACCEPT']
+    end
+    
     def path_resource_name
       path_info =~ CSS_PATH_REGEX ? path_info.match(CSS_PATH_REGEX)[1] : nil
     end
@@ -48,15 +51,15 @@ module Rack::Less
         source_opts = {
           :folder   => File.join(options(:root), options(:source)),
           :cache    => cache,
-          :compress => options(:compress),
-          :combine  => options(:combine)
+          :compress => options(:compress)
         }
         Source.new(path_resource_name, source_opts)
       end
     end
 
     def for_css?
-      media_type == Rack::Less::MEDIA_TYPE ||
+      (http_accept && http_accept.include?(Rack::Less::MIME_TYPE)) ||
+      (media_type  && media_type.include?(Rack::Less::MIME_TYPE )) ||
       CSS_PATH_FORMATS.include?(path_resource_format)
     end
 

data/lib/rack/less/response.rb

@@ -33,7 +33,7 @@ module Rack::Less
       @status = 200 # OK
       @headers = Rack::Utils::HeaderHash.new
 
-      headers["Content-Type"] = Rack::Less::MEDIA_TYPE
+      headers["Content-Type"] = Rack::Less::MIME_TYPE
       headers["Content-Length"] = self.class.content_length(body).to_s
     end
     

data/lib/rack/less/source.rb

@@ -19,7 +19,6 @@ module Rack::Less
       @compress = options[:compress]
       @cache    = options[:cache]
       @folder   = get_required_path(options, :folder)
-      @combine  = options[:combine] || {}
     end
     
     def compress?
@@ -29,9 +28,9 @@ module Rack::Less
       !@cache.nil?
     end
     
-    # Use named css sources before using combine directive sources
+    # Use named css sources before using combination sources
     def files
-      @files ||= (css_sources.empty? ? combined_sources : css_sources)
+      @files ||= (css_sources.empty? ? combination_sources : css_sources)
     end
     
     def compiled
@@ -62,9 +61,9 @@ module Rack::Less
     end
     
     # Preferred, existing source files matching a corresponding
-    # combine directive, if any
-    def combined_sources
-      @combined_sources ||= preferred_sources(@combine[@css_name] || [])
+    # Rack::Less::Base combination directive, if any
+    def combination_sources
+      @combination_sources ||= preferred_sources(Base.combinations[@css_name] || [])
     end
     
     private

data/lib/rack/less/version.rb

@@ -1,8 +1,8 @@
 module RackLess
   module Version
     
-    MAJOR = 0
-    MINOR = 1
+    MAJOR = 1
+    MINOR = 0
     TINY  = 0
     
     def self.to_s # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-less
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Kelly Redding