rack-less 1.5.0 → 2.0.0

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/.gitignore

@@ -0,0 +1,5 @@
+/pkg/
+/doc/
+/coverage/
+*.log
+.DS_Store

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in rack-less.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    rack-less (2.0.0)
+      less (~> 1.2)
+      rack (~> 1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    json (1.5.1)
+    kelredd-useful (0.4.1)
+      json
+    leftright (0.9.0)
+    less (1.2.21)
+      mutter (>= 0.4.2)
+      treetop (>= 1.4.2)
+    mutter (0.5.3)
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    shoulda (2.11.3)
+    sinatra (1.2.1)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    test-belt (0.2.1)
+      kelredd-useful (~> 0.4.0)
+      leftright (~> 0.9.0)
+      shoulda (~> 2.11)
+    tilt (1.2.2)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    yui-compressor (0.9.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0)
+  less (~> 1.2)
+  rack (~> 1.0)
+  rack-less!
+  rack-test (>= 0.5.3)
+  sinatra (>= 0.9.4)
+  test-belt (= 0.2.1)
+  webrat (>= 0.6.0)
+  yui-compressor (>= 0.9.1)

data/Rakefile

@@ -1,45 +1,7 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'simple_gem/testtasks'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-require 'lib/rack/less/version'
+require 'test_belt/rake_tasks'
+TestBelt::RakeTasks.for :test
 
-spec = Gem::Specification.new do |s|
-  s.name             = 'rack-less'
-  s.version          = RackLess::Version.to_s
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w(README.rdoc)
-  s.rdoc_options     = %w(--main README.rdoc)
-  s.summary          = "A better way to use LESS CSS in Ruby web apps."
-  s.author           = 'Kelly Redding'
-  s.email            = 'kelly@kelredd.com'
-  s.homepage         = 'http://github.com/kelredd/rack-less'
-  s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib}/**/*")
-  # 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"])
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-SimpleGem::TestTasks.new
-
-desc 'Generate the gemspec to serve this gem'
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, 'w') {|f| f << spec.to_ruby }
-  puts "Created gemspec: #{file}"
-end
-
-task :default => :gem
+task :default => :build

data/lib/rack/less.rb

@@ -24,9 +24,9 @@ require 'rack/less/source'
 module Rack::Less
   MIME_TYPE = "text/css"
   @@config = Config.new
-  
+
   class << self
-    
+
     # Configuration accessors for Rack::Less
     # (see config.rb for details)
     def configure
@@ -38,12 +38,12 @@ module Rack::Less
     def config=(value)
       @@config = value
     end
-    
+
     # Combinations config convenience method
     def combinations(key=nil)
       @@config.combinations(key)
     end
-    
+
     # Stylesheet helper, config convenience method
     def stylesheet(key)
       @@config.stylesheet(key)
@@ -54,19 +54,13 @@ module Rack::Less
       @@config.cache_bust
     end
 
-    # <b>DEPRECATED:</b> Please use <tt>cache_bust</tt> instead.
-    def combination_timestamp
-      warn "[DEPRECATION] `combination_timestamp` is deprecated.  Please use `cache_bust` instead."
-      cache_bust
-    end
-    
   end
 
-  # Create a new Rack::Less middleware component 
+  # Create a new Rack::Less middleware component
   # => the +options+ Hash can be used to specify default configuration values
   # => (see Rack::Less::Options for possible key/values)
   def self.new(app, options={}, &block)
     Base.new(app, options, &block)
   end
-  
+
 end

data/lib/rack/less/config.rb

@@ -1,5 +1,5 @@
 module Rack::Less
-  
+
   # Handles configuration for Rack::Less
   # Available config settings:
   # :cache
@@ -24,10 +24,10 @@ module Rack::Less
   # :cache_bust
   #   whether to append a timestamp to the sheet requests generated by combinations
   class Config
-    
+
     ATTRIBUTES = [:cache, :compress, :combinations, :cache_bust]
     attr_accessor *ATTRIBUTES
-    
+
     DEFAULTS = {
       :cache        => false,
       :compress     => false,
@@ -37,30 +37,18 @@ module Rack::Less
     def initialize(settings={})
       ATTRIBUTES.each do |a|
         instance_variable_set("@#{a}", settings[a] || DEFAULTS[a])
-      end      
+      end
       @cache_bust = default_cache_bust if @cache_bust.nil?
     end
-    
-    # <b>DEPRECATED:</b> Please use <tt>cache_bust</tt> instead.
-    def combination_timestamp
-      warn "[DEPRECATION] `combination_timestamp` is deprecated.  Please use `cache_bust` instead."
-      cache_bust
-    end
-    
-    # <b>DEPRECATED:</b> Please use <tt>cache_bust=</tt> instead.
-    def combination_timestamp=(value)
-      warn "[DEPRECATION] `combination_timestamp=` is deprecated.  Please use `cache_bust=` instead."
-      cache_bust = value
-    end
-    
+
     def cache?
       !!@cache
     end
-    
+
     def compress?
       !!@compress
     end
-    
+
     def combinations(key=nil)
       if key.nil?
         @combinations
@@ -74,7 +62,7 @@ module Rack::Less
         end
       end
     end
-    
+
     def stylesheet(key)
       if @combinations[key]
         combinations(key.to_s)
@@ -84,7 +72,7 @@ module Rack::Less
     end
 
     private
-    
+
     def stylesheet_filename(key)
       filename = key.strip
       filename += ".css" unless filename.include?('.css')
@@ -98,7 +86,7 @@ module Rack::Less
       end
       filename
     end
-    
+
     def default_cache_bust
       if defined?(::Sinatra) && defined?(::Sinatra::Application)
         app_root_cache_bust(::Sinatra::Application)
@@ -106,18 +94,18 @@ module Rack::Less
         app_root_cache_bust(::Rails)
       end || false
     end
-    
+
     def app_root_cache_bust(app)
       if app.respond_to?(:root)
         mtime_cache_bust(app.root.to_s)
       end
     end
-    
+
     def mtime_cache_bust(path)
       if File.exists?(path)
         File.mtime(path).to_i
       end
     end
-    
+
   end
 end

data/lib/rack/less/request.rb

@@ -23,28 +23,42 @@ module Rack::Less
       @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)
+    def path_info
+      @env['PATH_INFO']
+    end
+
+    def hosted_at_option
+      # sanitized :hosted_at option
+      #  remove any trailing '/'
+      #  ensure single leading '/'
+      @hosted_at_option ||= options(:hosted_at).sub(/\/+$/, '').sub(/^\/*/, '/')
     end
 
-    def path_resource_name
-      File.basename(path_info, path_resource_format)
+    def path_info_resource
+      # sanitized path to the resource being requested
+      #  ensure single leading '/'
+      #  remove any resource format
+      #  ex:
+      #  '/something.css' => '/something'
+      #  '/nested/something.css' => '/nested/something'
+      #  '///something.css' => '/something'
+      #  '/nested///something.css' => '/nested/something'
+      @path_info_resource ||= File.join(
+        File.dirname(path_info.gsub(/\/+/, '/')).sub(/^#{hosted_at_option}/, ''),
+        File.basename(path_info.gsub(/\/+/, '/'), path_info_format)
+      ).sub(/^\/*/, '/')
     end
 
-    def path_resource_source
-      File.join(File.dirname(path_info).gsub(/#{options(:hosted_at)}/, ''), path_resource_name).gsub(/^\//, '')
+    def path_info_format
+      @path_info_format ||= File.extname(path_info.gsub(/\/+/, '/'))
     end
 
     def cache
-      File.join(options(:root), options(:public), options(:hosted_at))
+      File.join(options(:root), options(:public), hosted_at_option)
     end
 
     # The Rack::Less::Source that the request is for
@@ -55,35 +69,35 @@ module Rack::Less
           :cache    => Rack::Less.config.cache? ? cache : nil,
           :compress => Rack::Less.config.compress?
         }
-        Source.new(path_resource_source, source_opts)
+        Source.new(path_info_resource, source_opts)
       end
     end
 
     def for_css?
       (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)
+      CSS_PATH_FORMATS.include?(path_info_format)
     end
 
     def hosted_at?
-      path_info =~ /^#{options(:hosted_at)}\//
+      path_info =~ /^#{hosted_at_option}\//
     end
 
-    def exists?
-      File.exists?(File.join(cache, "#{path_resource_source}#{path_resource_format}"))
+    def cached?
+      File.exists?(File.join(cache, "#{path_info_resource}#{path_info_format}"))
     end
 
-    # Determine if the request is for existing LESS CSS file
+    # Determine if the request is for a non-cached existing LESS CSS source file
     # This will be called on every request so speed is an issue
-    # => first check if the request is a GET on a css resource :hosted_at (fast)
-    # => don't process if a file already exists in :hosted_at
+    # => first check if the request is a GET on a css resource in :hosted_at (fast)
+    # => don't process if a file has already been cached
     # => otherwise, check for less source files that match the request (slow)
     def for_less?
-      get? &&
+      get? &&               # GET on css resource in :hosted_at (fast, check first)
       for_css? &&
       hosted_at? &&
-      !exists? &&
-      !source.files.empty?
+      !cached? &&           # resource not cached (little slower)
+      !source.files.empty?  # there is source for the resource (slow, check last)
     end
 
   end

data/lib/rack/less/source.rb

@@ -21,10 +21,10 @@ module Rack::Less
 
     YUI_OPTS = {}
 
-    attr_reader :path
+    attr_reader :css_resource
 
-    def initialize(path, options={})
-      @path   = path
+    def initialize(css_resource, options={})
+      @css_resource = css_resource.gsub(/^\/+/, '')
       @compress = options[:compress]
       @cache    = options[:cache]
       @folder   = get_required_path(options, :folder)
@@ -64,8 +64,8 @@ module Rack::Less
           compiled_css
         end
 
-        if cache? && !File.exists?(cf = File.join(@cache, "#{@path}.css"))
-          FileUtils.mkdir_p(@cache)
+        if cache? && !File.exists?(cf = File.join(@cache, "#{@css_resource}.css"))
+          FileUtils.mkdir_p(File.dirname(cf))
           File.open(cf, "w") do |file|
             file.write(compiled_css)
           end
@@ -81,13 +81,13 @@ module Rack::Less
 
     # Preferred, existing source files matching the css name
     def css_sources
-      @css_sources ||= preferred_sources([@path])
+      @css_sources ||= preferred_sources([*@css_resource])
     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[@path] || [])
+      @combination_sources ||= preferred_sources(Rack::Less.config.combinations[@css_resource] || [])
     end
 
     private

data/lib/rack/less/version.rb

@@ -1,13 +1,5 @@
-module RackLess
-  module Version
-    
-    MAJOR = 1
-    MINOR = 5
-    TINY  = 0
-    
-    def self.to_s # :nodoc:
-      [MAJOR, MINOR, TINY].join('.')
-    end
-    
+module Rack
+  module Less
+    VERSION = '2.0.0'
   end
 end

data/rack-less.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rack/less/version"
+
+Gem::Specification.new do |s|
+  s.name        = "rack-less"
+  s.version     = Rack::Less::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Kelly Redding"]
+  s.email       = ["kelly@kelredd.com"]
+  s.homepage    = "http://github.com/kelredd/rack-less"
+  s.summary     = %q{LESS CSS preprocessing for Rack apps.}
+  s.description = %q{Use rack middleware to handle LESS CSS preprocessing.  Processing happens on requests to LESS resources.  This allows you to develop, check in, and deploy unprocessed LESS stylesheets and leave the processing to the middleware.  Allows for optimizing by environment: never-cache, always-reprocess in development; cache, process-once in production (for example).}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency("bundler", ["~> 1.0"])
+  s.add_development_dependency("test-belt", ["= 0.2.1"]) # locked to a specific version for test stability
+  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_dependency("rack", ["~> 1.0"])
+  s.add_dependency("less", ["~> 1.2"])
+end