rack-less 1.4.0 → 1.5.0

data/README.rdoc

@@ -39,28 +39,17 @@ Add this to your `config/environment.rb`:
 Add any configs in an initializer (optional - use as necessary):
 
     Rack::Less.configure do |config|
-      config.cache = true
-      # additional configs ...
+      # for example
+      config.cache = Rails.configuration.action_controller.perform_caching
+      if Rails.env.development?
+        config.cache_bust = true
+      end
     end
 
 You should now see `Rack::Less` listed in the middleware pipeline:
 
     rake middleware
     
-== Available 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
-
-* :*public* ['public']
-  - The path where static files are located
-
-* :*hosted_at* ['/stylesheets']
-  - The public HTTP path for hosted stylesheets.
-
 == Available Configurations
 
 * .*cache* [false]
@@ -75,15 +64,29 @@ You should now see `Rack::Less` listed in the middleware pipeline:
   - Directives for combining the output of many stylesheets and serving them as a single resource.
 
 * .*cache_bust* [nil]
-  - Directives for timestamping (cache-busting) while using combinations
+  - Directives for timestamping (cache-busting) stylesheet references
     - :*false* - don't explicitly cache bust (no value added)
     - :*true* - use Time.now.to_i as the explicit value (will never cache)
     - :*nil* - change cache bust value if the file is modified (similar to Rails' stylesheet_link_tag)
     - :*<any other value>* - add the value as "foo.css?<value>"
     
-=== Using in layouts
+== Available 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
+
+* :*public* ['public']
+  - The path where static files are located
+
+* :*hosted_at* ['/stylesheets']
+  - The public HTTP path for hosted stylesheets.
+
+== Using in layouts
 
-==== Cache Busting
+=== Cache Busting
 
 Rails does a lot of helpful things with 'stylesheet_link_tag' to help reference your stylesheets into your layouts - things like cache busting stylesheet hrefs.  However, Rails' will only cache bust your stylesheets if the file exists in the public/stylesheets directory.  When using Rack::Less a file may never exist at that path or, when caching is used, only exist after the initial request.
 
@@ -92,7 +95,7 @@ To help provide this behavior, Rack::Less provides a helper for generating refer
     # equivalent to: stylesheet_link_tag 'reset'
     stylesheet_link_tag Rack::Less.stylesheet('reset')
 
-==== Combinations
+=== Combinations
 
 At times, it is useful to combine multiple stylesheets and serve them as one resource.  For example you may have two sets of stylesheets: one for traditional web views and one for mobile web views.  Rails' provides the :cache option on 'stylesheet_link_tag' helper to provide this function.
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'rake/testtask'
+require 'simple_gem/testtasks'
 
 require 'lib/rack/less/version'
 
@@ -18,10 +18,12 @@ spec = Gem::Specification.new do |s|
   # s.executables    = ['rack-less']
 
   s.add_development_dependency("shoulda", [">= 2.10.2"])
+  s.add_development_dependency("leftright", [">= 0.0.6"])
   s.add_development_dependency("sinatra", [">= 0.9.4"])
   s.add_development_dependency("rack-test", [">= 0.5.3"])
   s.add_development_dependency("webrat", [">= 0.6.0"])
   s.add_development_dependency("yui-compressor", [">=0.9.1"])
+  s.add_development_dependency("kelredd-simple-gem", [">= 0.7.0"])
 
   s.add_dependency("rack", [">= 0.4"])
   s.add_dependency("less", [">= 1.2.21"])
@@ -31,28 +33,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-
-  Rcov::RcovTask.new(:coverage) do |t|
-    t.libs       = ['test']
-    t.test_files = FileList["test/**/*_test.rb"]
-    t.verbose    = true
-    t.rcov_opts  = ['--text-report', "-x #{Gem.path}", '-x /Library/Ruby', '-x /usr/lib/ruby']
-  end
-  
-  task :default => :coverage
-  
-rescue LoadError
-  warn "\n**** Install rcov (sudo gem install relevance-rcov) to get coverage stats ****\n"
-  task :default => :test
-end
+SimpleGem::TestTasks.new
 
 desc 'Generate the gemspec to serve this gem'
 task :gemspec do
@@ -60,3 +41,5 @@ task :gemspec do
   File.open(file, 'w') {|f| f << spec.to_ruby }
   puts "Created gemspec: #{file}"
 end
+
+task :default => :gem

data/lib/rack/less/base.rb

@@ -33,16 +33,16 @@ module Rack::Less
     def call!(env)
       @default_options.each { |k,v| env[k] ||= v }
       @env = env
-      
+
       if (@request = Request.new(@env.dup.freeze)).for_less?
         Response.new(@env.dup.freeze, @request.source.to_css).to_rack
       else
         @app.call(env)
       end
     end
-    
+
     private
-    
+
     def validate_options
       # ensure a root path is specified and does exists
       unless options.has_key?(option_name(:root)) and !options(:root).nil?
@@ -55,6 +55,6 @@ module Rack::Less
         raise(ArgumentError, "no :source option set")
       end
     end
-    
+
   end
 end

data/lib/rack/less/request.rb

@@ -12,7 +12,7 @@ module Rack::Less
 
   class Request < Rack::Request
     include Rack::Less::Options
-    
+
     CSS_PATH_FORMATS = ['.css']
 
     # The HTTP request method. This is the standard implementation of this
@@ -22,21 +22,25 @@ module Rack::Less
     def request_method
       @env['REQUEST_METHOD']
     end
-    
+
     def path_info
       @env['PATH_INFO']
     end
-    
+
     def http_accept
       @env['HTTP_ACCEPT']
     end
-    
+
+    def path_resource_format
+      File.extname(path_info)
+    end
+
     def path_resource_name
       File.basename(path_info, path_resource_format)
     end
-    
-    def path_resource_format
-      File.extname(path_info)
+
+    def path_resource_source
+      File.join(File.dirname(path_info).gsub(/#{options(:hosted_at)}/, ''), path_resource_name).gsub(/^\//, '')
     end
 
     def cache
@@ -51,7 +55,7 @@ module Rack::Less
           :cache    => Rack::Less.config.cache? ? cache : nil,
           :compress => Rack::Less.config.compress?
         }
-        Source.new(path_resource_name, source_opts)
+        Source.new(path_resource_source, source_opts)
       end
     end
 
@@ -62,11 +66,11 @@ module Rack::Less
     end
 
     def hosted_at?
-      File.basename(File.dirname(path_info)) == File.basename(options(:hosted_at))
+      path_info =~ /^#{options(:hosted_at)}\//
     end
-    
+
     def exists?
-      File.exists?(File.join(cache, "#{path_resource_name}#{path_resource_format}"))
+      File.exists?(File.join(cache, "#{path_resource_source}#{path_resource_format}"))
     end
 
     # Determine if the request is for existing LESS CSS file
@@ -81,6 +85,6 @@ module Rack::Less
       !exists? &&
       !source.files.empty?
     end
-    
+
   end
 end

data/lib/rack/less/source.rb

@@ -14,22 +14,22 @@ module Rack::Less
   # to compile and a path to the source files,
   # will returns corresponding compiled LESS CSS
   class Source
-    
+
     # prefer source files with the .less extension
     # but also accept files with the .css extension
     PREFERRED_EXTENSIONS = [:less, :css]
-    
+
     YUI_OPTS = {}
-    
-    attr_reader :css_name
-    
-    def initialize(css_name, options={})
-      @css_name = css_name
+
+    attr_reader :path
+
+    def initialize(path, options={})
+      @path   = path
       @compress = options[:compress]
       @cache    = options[:cache]
       @folder   = get_required_path(options, :folder)
     end
-    
+
     def compress?
       !!@compress
     end
@@ -39,18 +39,18 @@ module Rack::Less
     def cache
       @cache
     end
-    
+
     # Use named css sources before using combination sources
     def files
       @files ||= (css_sources.empty? ? combination_sources : css_sources)
     end
-    
+
     def compiled
       @compiled ||= begin
         compiled_css = files.collect do |file_path|
           Less::Engine.new(File.new(file_path)).to_css
         end.join("\n")
-        
+
         compiled_css = case @compress
         when :whitespace, true
           compiled_css.delete("\n")
@@ -64,58 +64,58 @@ module Rack::Less
           compiled_css
         end
 
-        if cache? && !File.exists?(cf = File.join(@cache, "#{@css_name}.css"))
+        if cache? && !File.exists?(cf = File.join(@cache, "#{@path}.css"))
           FileUtils.mkdir_p(@cache)
           File.open(cf, "w") do |file|
             file.write(compiled_css)
           end
         end
-        
+
         compiled_css
       end
     end
     alias_method :to_css, :compiled
     alias_method :css, :compiled
-    
+
     protected
-    
+
     # Preferred, existing source files matching the css name
     def css_sources
-      @css_sources ||= preferred_sources([@css_name])
+      @css_sources ||= preferred_sources([@path])
     end
-    
+
     # Preferred, existing source files matching a corresponding
     # Rack::Less::Config combination directive, if any
     def combination_sources
-      @combination_sources ||= preferred_sources(Rack::Less.config.combinations[@css_name] || [])
+      @combination_sources ||= preferred_sources(Rack::Less.config.combinations[@path] || [])
     end
-    
+
     private
-    
-    # Given a list of file names, return a list of
-    # existing source files with the corresponding names
+
+    # Given a list of sources, return a list of
+    # existing source files with the corresponding source paths
     # honoring the preferred extension list
-    def preferred_sources(file_names)
-      file_names.collect do |name|
+    def preferred_sources(paths)
+      paths.collect do |source_path|
         PREFERRED_EXTENSIONS.inject(nil) do |source_file, extension|
           source_file || begin
-            path = File.join(@folder, "#{name}.#{extension}")
+            path = File.join(@folder, "#{source_path}.#{extension}")
             File.exists?(path) ? path : nil
           end
         end
       end.compact
     end
-    
+
     def get_required_path(options, path_key)
       unless options.has_key?(path_key)
         raise(ArgumentError, "no :#{path_key} option specified")
       end
       unless File.exists?(options[path_key])
-        raise(ArgumentError, "the :#{path_key} ('#{options[path_key]}') does not exist") 
+        raise(ArgumentError, "the :#{path_key} ('#{options[path_key]}') does not exist")
       end
       options[path_key]
     end
-    
+
   end
-  
+
 end

data/lib/rack/less/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-less
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -05:00
+date: 2010-09-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,25 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: leftright
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 0
+        - 6
+        version: 0.0.6
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +81,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webrat
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +97,11 @@ dependencies:
         - 0
         version: 0.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yui-compressor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +113,27 @@ dependencies:
         - 1
         version: 0.9.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: kelredd-simple-gem
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,11 +144,11 @@ dependencies:
         - 4
         version: "0.4"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -128,7 +160,7 @@ dependencies:
         - 21
         version: 1.2.21
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id009
 description: 
 email: kelly@kelredd.com
 executables: []