rack-less 1.2.1 → 1.3.0

data/README.rdoc

@@ -74,6 +74,12 @@ You should now see `Rack::Less` listed in the middleware pipeline:
 * .*combinations* [{}]
   - Directives for combining the output of many stylesheets and serving them as a single resource.
 
+* .*combination_timestamp* [false]
+  - Directives for timestamping (cache-busting) while using combinations
+    - :*false* - don't explicitly add timestamps
+    - :*true* - add Time.now.to_i as the explicit timestamp (will never cache)
+    - :*<any other value>* - add the value as "foo.css?<value>" (use something like a File.mtime to cache-bust like Rails does)
+
 === 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, ie:

data/lib/rack/less.rb

@@ -44,6 +44,11 @@ module Rack::Less
       @@config.combinations(key)
     end
 
+    # Combination timestamp config convenience method
+    def combination_timestamp
+      @@config.combination_timestamp
+    end
+
   end
 
   # Create a new Rack::Less middleware component 

data/lib/rack/less/config.rb

@@ -21,15 +21,18 @@ module Rack::Less
   #       'web'    => ['reset', 'common', 'app_web'],
   #       'mobile' => ['reset', 'iui', 'common', 'app_mobile']
   #     }
+  # :combination_timestamps
+  #   whether to append a timestamp to the sheet requests generated by combinations
   class Config
     
-    ATTRIBUTES = [:cache, :compress, :combinations]
+    ATTRIBUTES = [:cache, :compress, :combinations, :combination_timestamp]
     attr_accessor *ATTRIBUTES
     
     DEFAULTS = {
       :cache        => false,
       :compress     => false,
-      :combinations => {}
+      :combinations => {},
+      :combination_timestamp => false
     }
 
     def initialize(settings={})
@@ -50,9 +53,31 @@ module Rack::Less
       if key.nil?
         @combinations
       else
-        cache? ? key : @combinations[key]
+        if cache?
+          combo_filename(key)
+        else
+          (@combinations[key] || []).collect do |combo|
+            combo_filename(combo)
+          end
+        end
       end
     end
     
+    private
+    
+    def combo_filename(combo)
+      filename = combo.strip
+      filename += ".css" unless filename.include?('.css')
+      if !filename.include?('?') && combination_timestamp
+        filename += "?"
+        filename += if combination_timestamp == true
+          Time.now.to_i
+        else
+          combination_timestamp
+        end.to_s
+      end
+      filename
+    end
+    
   end
 end

data/lib/rack/less/options.rb

@@ -28,7 +28,7 @@ module Rack::Less
           option_name(:root)      => ".",
           option_name(:source)    => 'app/stylesheets',
           option_name(:public)    => 'public',
-          option_name(:hosted_at) => '/stylesheets',
+          option_name(:hosted_at) => '/stylesheets'
         }
       end
 

data/lib/rack/less/version.rb

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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-less
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,69 +14,92 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -06:00
+date: 2010-03-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
         version: "0.4"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: less
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 21
         version: 1.2.21
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: webrat
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :development
+  version_requirements: *id006
 description: 
 email: kelly@kelredd.com
 executables: []
@@ -105,18 +133,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A better way to use LESS CSS in Ruby web apps.