rack-less 2.0.2 → 3.0.0

data/.gitignore

@@ -1,5 +1,6 @@
-/pkg/
-/doc/
-/coverage/
+pkg/*
+.bundle
+*.gem
 *.log
-.DS_Store
+.rvmrc
+.rbenv-version

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in rack-less.gemspec
 gemspec
+
+gem "rake", "~> 0.9.2"
+gem "differ"

data/Gemfile.lock

@@ -1,37 +1,31 @@
 PATH
   remote: .
   specs:
-    rack-less (2.0.2)
-      less (~> 1.2)
+    rack-less (3.0.0)
+      less (~> 2.0)
       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)
+    ansi (1.3.0)
+    assert (0.3.0)
+      ansi (~> 1.3)
+    differ (0.1.2)
+    less (2.0.6)
+      therubyracer (~> 0.9.2)
+    libv8 (3.3.10.2)
     nokogiri (1.4.4)
-    polyglot (0.3.1)
     rack (1.2.2)
     rack-test (0.5.7)
       rack (>= 1.0)
-    shoulda (2.11.3)
+    rake (0.9.2)
     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)
+    therubyracer (0.9.4)
+      libv8 (~> 3.3.10)
     tilt (1.2.2)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
@@ -42,10 +36,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  assert (~> 0.3.0)
   bundler (~> 1.0)
+  differ
   rack-less!
   rack-test (>= 0.5.3)
+  rake (~> 0.9.2)
   sinatra (>= 0.9.4)
-  test-belt (= 0.2.1)
   webrat (>= 0.6.0)
   yui-compressor (>= 0.9.1)

data/README.rdoc

@@ -4,6 +4,8 @@
 
 A better way to use LESS CSS in Ruby web apps.
 
+* Update: rack-less as of v3.x.x \ uses the latest version of the ruby less parser, https://github.com/cowboyd/less.rb (based on less.js).  To use the older ruby based parse, require rack-less ~> 2.0.
+
 == Installation
 
     $ gem install rack-less
@@ -16,7 +18,7 @@ or uses Rack::Builder to construct the application pipeline, simply require
 and use as follows:
 
     require 'rack/less'
-    
+
     # optional - use as necessary
     Rack::Less.configure do |config|
       config.compress = true
@@ -49,7 +51,7 @@ Add any configs in an initializer (optional - use as necessary):
 You should now see `Rack::Less` listed in the middleware pipeline:
 
     rake middleware
-    
+
 == Available Configurations
 
 * .*cache* [false]
@@ -69,7 +71,7 @@ You should now see `Rack::Less` listed in the middleware pipeline:
     - :*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>"
-    
+
 == Available Options
 
 * :*root* ["."]
@@ -101,7 +103,7 @@ At times, it is useful to combine multiple stylesheets and serve them as one res
 
     stylesheet_link_tag 'reset', 'common', 'app_web', :cache => 'web'
     stylesheet_link_tag 'reset', 'common', 'iui', 'app_mobile', :cache => 'mobile'
-    
+
 Rack::Less uses combinations, in conjunction with the :cache config setting, to provide this function.  Combinations are configured using a hash, where the key is the resource name and the value is an array of names corresponding to stylesheets to combine as the named resource.  For the above example, use a configuration like this:
 
     Rack::Less.configure do |config|
@@ -115,14 +117,14 @@ and stylesheet link tags like this:
 
     # equivalent to: stylesheet_link_tag 'reset', 'common', 'app_web'
     stylesheet_link_tag Rack::Less.stylesheet('web')
-    
+
     # equivalent to: stylesheet_link_tag 'reset', 'common', 'iui', 'app_mobile'
     stylesheet_link_tag Rack::Less.stylesheet('mobile')
-    
+
 If you configure Rack::Less to cache, with something like this:
 
     Rack::Less.config.cache = true
-    
+
 then the same stylesheet link tags behave like they have the :cache option set, respectively:
 
     # equivalent to: stylesheet_link_tag 'reset', 'common', 'app_web', :cache => 'web'

data/Rakefile

@@ -1,7 +1,7 @@
+require 'assert/rake_tasks'
+include Assert::RakeTasks
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'test_belt/rake_tasks'
-TestBelt::RakeTasks.for :test
-
 task :default => :build

data/lib/rack/less/base.rb

@@ -57,4 +57,4 @@ module Rack::Less
     end
 
   end
-end
+end

data/lib/rack/less/config.rb

@@ -113,4 +113,4 @@ module Rack::Less
     end
 
   end
-end
+end

data/lib/rack/less/response.rb

@@ -11,7 +11,7 @@ module Rack::Less
 
     # Rack response tuple accessors.
     attr_accessor :status, :headers, :body
-    
+
     class << self
 
       # Calculate appropriate content_length
@@ -22,7 +22,7 @@ module Rack::Less
           body.size
         end
       end
-      
+
     end
 
     # Create a Response instance given the env
@@ -36,10 +36,10 @@ module Rack::Less
       headers["Content-Type"] = Rack::Less::MIME_TYPE
       headers["Content-Length"] = self.class.content_length(body).to_s
     end
-    
+
     def to_rack
       [status, headers.to_hash, body]
     end
 
   end
-end
+end

data/lib/rack/less/source.rb

@@ -48,7 +48,12 @@ module Rack::Less
     def compiled
       @compiled ||= begin
         compiled_css = files.collect do |file_path|
-          Less::Engine.new(File.new(file_path)).to_css
+          opts = {
+            :paths => [ File.dirname(file_path) ],
+            :filename => File.basename(file_path)
+          }
+          less = File.send(File.respond_to?(:binread) ? :binread : :read, file_path.to_s)
+          Less::Parser.new(opts).parse(less).to_css(:compress => !!@compress)
         end.join("\n")
 
         compiled_css = case @compress

data/lib/rack/less/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Less
-    VERSION = '2.0.2'
+    VERSION = '3.0.0'
   end
-end
+end

data/rack-less.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   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.description = %q{LESS CSS preprocessing for Rack apps.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -18,12 +18,13 @@ Gem::Specification.new do |s|
   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("assert", ["~>0.3.0"])
+
   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"])
+  s.add_dependency("less", ["~> 2.0"])
 end

data/test/app_helper.rb

@@ -1,14 +1,14 @@
 require 'rack/test'
 require 'webrat'
 
-class Test::Unit::TestCase
+class Assert::Context
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
- 
+
   Webrat.configure do |config|
     config.mode = :rack
-  end 
+  end
 
   class << self
 

data/test/bootstrap_test.rb

@@ -0,0 +1,26 @@
+require "assert"
+require 'rack/less/source'
+
+require 'differ'
+
+module Rack::Less
+
+  class BootstrapSourceTests < Assert::Context
+    desc 'the bootstrap less source'
+    setup do
+      @source_folder = file_path('test','fixtures', 'bootstrap_v1.1.0')
+      @compiled = File.read(File.join(@source_folder, "bootstrap-1.1.0.css"))
+      @source = Source.new('bootstrap', :folder => @source_folder)
+    end
+
+    should "compile correctly" do
+      assert_equal @compiled.strip, @source.compiled.strip, '.compiled is incorrect'
+      assert_equal @compiled.strip, @source.to_css.strip, '.to_css is incorrect'
+      assert_equal @compiled.strip, @source.css.strip, '.css is incorrect'
+
+      puts Differ.diff_by_line(@source.compiled.strip, @compiled.strip).format_as(:color)
+    end
+
+  end
+
+end

data/test/config_test.rb

@@ -1,11 +1,15 @@
-require "test/helper"
+require "assert"
 require 'rack/less/config'
 
-class ConfigTest < Test::Unit::TestCase
-  context 'Rack::Less::Config' do
-    setup do
-      @config = Rack::Less::Config.new
-    end
+module Rack::Less
+
+  class ConfigTests < Assert::Context
+    desc 'the rack-less config'
+    setup { @config = Config.new }
+    subject { @config }
+
+    should have_accessors :cache, :compress, :combinations, :cache_bust
+    should have_readers :cache?, :compress?
 
     { :cache => false,
       :compress => false,
@@ -15,17 +19,10 @@ class ConfigTest < Test::Unit::TestCase
       should "default #{k} correctly" do
         assert_equal v, @config.send(k)
       end
-
-      should "have an accessor for #{k}" do
-        assert_respond_to @config, k, "no reader for #{k}"
-        assert_respond_to @config, "#{k}=".to_sym, "no writer for #{k}"
-      end
     end
 
     should "provide boolean readers" do
-      assert_respond_to @config, :cache?, "no reader for :cache?"
       assert_equal !!@config.cache, @config.cache?
-      assert_respond_to @config, :compress?, "no reader for :compress?"
       assert_equal !!@config.compress, @config.compress?
     end
 
@@ -47,169 +44,134 @@ class ConfigTest < Test::Unit::TestCase
     end
 
     should "be accessible at Rack::Less class level" do
-      assert_respond_to Rack::Less, :configure
-      assert_respond_to Rack::Less, :config
-      assert_respond_to Rack::Less, :config=
-      assert_respond_to Rack::Less, :combinations
-      assert_respond_to Rack::Less, :cache_bust
-      assert_respond_to Rack::Less, :stylesheet
-    end
-
-    context "given a new configuration" do
-      setup do
-        @old_config = Rack::Less.config
-        @settings = {
-          :cache => true,
-          :compress => true,
-          :combinations => {
-            'all' => ['one', 'two']
-          },
-          :cache_bust => false
-        }
-        @traditional_config = Rack::Less::Config.new @settings
-      end
-      teardown do
-        Rack::Less.config = @old_config
-      end
-
-      should "allow Rack::Less to directly apply settings" do
-        Rack::Less.config = @traditional_config.dup
-
-        assert_equal @traditional_config.cache, Rack::Less.config.cache
-        assert_equal @traditional_config.compress, Rack::Less.config.compress
-        assert_equal @traditional_config.combinations, Rack::Less.config.combinations
-        assert_equal @traditional_config.cache_bust, Rack::Less.config.cache_bust
-      end
-
-      should "allow Rack::Less to apply settings using a block" do
-        Rack::Less.configure do |config|
-          config.cache    = true
-          config.compress = true
-          config.combinations = {
-            'all' => ['one', 'two']
-          }
-          config.cache_bust = false
-        end
-
-        assert_equal @traditional_config.cache, Rack::Less.config.cache
-        assert_equal @traditional_config.compress, Rack::Less.config.compress
-        assert_equal @traditional_config.combinations, Rack::Less.config.combinations
-        assert_equal @traditional_config.cache_bust, Rack::Less.config.cache_bust
-      end
-
-      context "helpers" do
-        setup do
-          @settings = {
-            :combinations => {
-              'all' => ['one', 'two']
-            },
-            :cache_bust => false
-          }
-        end
-
-        context "#combinations" do
-          should "should be able to access it's values with a parameter" do
-            config = Rack::Less::Config.new @settings
-
-            assert_equal [], config.combinations('one')
-            assert_equal [], config.combinations('wtf')
-            assert_equal ['one.css', 'two.css'], config.combinations('all')
-          end
+      assert_respond_to :configure, Rack::Less
+      assert_respond_to :config, Rack::Less
+      assert_respond_to :config=, Rack::Less
+      assert_respond_to :combinations, Rack::Less
+      assert_respond_to :cache_bust, Rack::Less
+      assert_respond_to :stylesheet, Rack::Less
+    end
 
-          context "if cache setting is true" do
-            setup do
-              @settings[:cache] = true
-            end
+  end
 
-            should "use the lookup parameter instead of the value" do
-              config = Rack::Less::Config.new @settings
+  class NewConfigTests < Assert::Context
+    desc "a new configuration"
+    setup do
+      @old_config = Rack::Less.config
+      @settings = {
+        :cache => true,
+        :compress => true,
+        :combinations => { 'all' => ['one', 'two'] },
+        :cache_bust => false
+      }
+      @traditional_config = Config.new @settings
+    end
+    teardown do
+      Rack::Less.config = @old_config
+    end
 
-              assert_equal 'all.css', config.combinations('all')
-            end
-          end
+    should "allow Rack::Less to directly apply settings" do
+      Rack::Less.config = @traditional_config.dup
 
-        end
+      assert_equal @traditional_config.cache, Rack::Less.config.cache
+      assert_equal @traditional_config.compress, Rack::Less.config.compress
+      assert_equal @traditional_config.combinations, Rack::Less.config.combinations
+      assert_equal @traditional_config.cache_bust, Rack::Less.config.cache_bust
+    end
 
-        context "#stylesheet" do
-          should "should be able to stylesheet references" do
-            config = Rack::Less::Config.new @settings
+    should "allow Rack::Less to apply settings using a block" do
+      Rack::Less.configure do |config|
+        config.cache    = true
+        config.compress = true
+        config.combinations = { 'all' => ['one', 'two'] }
+        config.cache_bust = false
+      end
 
-            assert_equal 'one.css', config.stylesheet('one')
-            assert_equal 'wtf.css', config.stylesheet('wtf')
-          end
+      assert_equal @traditional_config.cache, Rack::Less.config.cache
+      assert_equal @traditional_config.compress, Rack::Less.config.compress
+      assert_equal @traditional_config.combinations, Rack::Less.config.combinations
+      assert_equal @traditional_config.cache_bust, Rack::Less.config.cache_bust
+    end
 
-          should "should be able to access combination values with a parameter" do
-            config = Rack::Less::Config.new @settings
+  end
 
-            assert_equal ['one.css', 'two.css'], config.stylesheet('all')
-          end
+  class ConfigCombinationStylesheetTests < ConfigTests
+    desc "a rack less config"
+    setup do
+      @settings = {
+        :combinations => { 'all' => ['one', 'two'] },
+        :cache_bust => false
+      }
+      @config = Rack::Less::Config.new @settings
+    end
 
-          context "if cache setting is true" do
-            setup do
-              @settings[:cache] = true
-            end
+    should "access #combinations by name" do
+      assert_equal [], @config.combinations('one')
+      assert_equal [], @config.combinations('wtf')
+      assert_equal ['one.css', 'two.css'], @config.combinations('all')
+    end
 
-            should "use the lookup parameter instead of the value" do
-              config = Rack::Less::Config.new @settings
+    should "generate #stylesheet references by name" do
+      assert_equal 'one.css', @config.stylesheet('one')
+      assert_equal 'wtf.css', @config.stylesheet('wtf')
+      assert_equal ['one.css', 'two.css'], @config.stylesheet('all')
+    end
 
-              assert_equal 'one.css', config.stylesheet('one')
-              assert_equal 'all.css', config.stylesheet('all')
-            end
-          end
+  end
 
-          context "when cache_bust is false" do
-            setup do
-              @settings[:cache_bust] = false
-            end
+  class CachedConfigComboStylesheetTests < ConfigCombinationStylesheetTests
+    desc "when cache setting is true"
+    setup do
+      @settings[:cache] = true
+      @config = Rack::Less::Config.new @settings
+    end
 
-            should "should not put in a cache bust value" do
-              config = Rack::Less::Config.new @settings
+    should "use the lookup combos and stylesheets by the cache name" do
+      assert_equal 'all.css', @config.combinations('all')
 
-              assert_equal 'one.css', config.stylesheet('one')
-            end
-          end
+      assert_equal 'one.css', @config.stylesheet('one')
+      assert_equal 'all.css', @config.stylesheet('all')
+    end
 
-          context "when cache_bust is nil" do
-            setup do
-              @settings[:cache_bust] = nil
-            end
+  end
 
-            should "should not put in a cache bust value" do
-              config = Rack::Less::Config.new @settings
+  class ConfigCacheBustTests < ConfigCombinationStylesheetTests
 
-              assert_equal 'one.css', config.stylesheet('one')
-            end
-          end
+    should "should not put in a cache bust value when cache_bust is false" do
+      @settings[:cache_bust] = false
+      config = Rack::Less::Config.new @settings
 
-          context "when cache_bust is true" do
-            setup do
-              @settings[:cache_bust] = true
-            end
+      assert_equal 'one.css', config.stylesheet('one')
+    end
 
-            should "always put a timestamp value on the end of the href" do
-              config = Rack::Less::Config.new @settings
+    should "should not put in a cache bust value when cache_bust is nil" do
+      @settings[:cache_bust] = nil
+      config = Rack::Less::Config.new @settings
 
-              assert_match /one.css\?[0-9]+/, config.stylesheet('one')
-            end
-          end
+      assert_equal 'one.css', config.stylesheet('one')
+    end
 
-          context "when timestamp specified" do
-            setup do
-              @stamp = Time.now.to_i - 100_000
-              @settings[:cache_bust] = @stamp
-            end
+    should "always put a timestamp value on the end of the href when cache_bust is true" do
+      @settings[:cache_bust] = true
+      config = Rack::Less::Config.new @settings
 
-            should "always use that timestamp" do
-              config = Rack::Less::Config.new @settings
+      assert_match /one.css\?[0-9]+/, config.stylesheet('one')
+    end
 
-              assert_equal ["one.css?#{@stamp}", "two.css?#{@stamp}"], config.stylesheet('all')
-            end
+  end
 
-          end
-        end
+  class ConfigTimeStampTests < ConfigCombinationStylesheetTests
+    desc "when timestamp specified"
+    setup do
+      @stamp = Time.now.to_i - 100_000
+      @settings[:cache_bust] = @stamp
+      @config = Rack::Less::Config.new @settings
+    end
 
-      end
+    should "always use that timestamp" do
+      assert_equal ["one.css?#{@stamp}", "two.css?#{@stamp}"], @config.stylesheet('all')
     end
 
   end
+
 end