fewer 0.0.1 → 0.1.0

data/README.md

@@ -2,12 +2,35 @@
 
 Rack middleware to bundle assets and help you make fewer HTTP requests.
 
-## How to use in Rails (3)
+## How to use as a Rack app (config.ru example)
 
-    config.middleware.insert 0, Fewer::App, {
-      :engine => Fewer::Engines::Css,
+    app = Rack::Builder.new do
+      map '/stylesheets' do
+        run Fewer::App,
+          :root => File.dirname(__FILE__)+'/less_css',
+          :engine => Fewer::Engines::Less
+      end
+
+      map '/' do
+        run MyApp
+      end
+    end
+
+    run app
+
+## How to use in Rails 3 router
+
+    match '/stylesheets/:data.css', :to => Fewer::App.new(
+      :engine => Fewer::Engines::Less,
+      :root => Rails.root.join('app', 'stylesheets')
+    )
+
+## How to use in Rails as middleware
+
+    config.middleware.use Fewer::MiddleWare, {
+      :engine => Fewer::Engines::Less,
       :mount => '/stylesheets',
-      :root => Rails.root.join('public', 'stylesheets')
+      :root => Rails.root.join('app', 'stylesheets')
     }
 
 ## Copyright

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/fewer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fewer}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Pickles"]
@@ -32,9 +32,11 @@ Gem::Specification.new do |s|
      "lib/fewer/engines/js_min.rb",
      "lib/fewer/engines/less.rb",
      "lib/fewer/errors.rb",
+     "lib/fewer/middleware.rb",
      "lib/fewer/serializer.rb",
      "test/app_test.rb",
      "test/engine_test.rb",
+     "test/middleware_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/benpickles/fewer}
@@ -45,7 +47,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/app_test.rb",
      "test/engine_test.rb",
-     "test/sass_engine_test.rb",
+     "test/middleware_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/fewer.rb

@@ -1,4 +1,5 @@
 require 'fewer/app'
 require 'fewer/engines'
 require 'fewer/errors'
+require 'fewer/middleware'
 require 'fewer/serializer'

data/lib/fewer/app.rb

@@ -1,18 +1,17 @@
 module Fewer
   class App
-    attr_reader :app, :engine_klass, :cache, :mount, :root
+    attr_reader :engine_klass, :cache, :root
 
-    def initialize(app, options = {})
-      @app = app
+    def initialize(options = {})
       @engine_klass = options[:engine]
       @mount = options[:mount]
       @root = options[:root]
       @cache = options[:cache] || 3600 * 24 * 365
+      raise 'You need to define an :engine class' unless @engine_klass
+      raise 'You need to define a :root path' unless @root
     end
 
     def call(env)
-      return app.call(env) unless env['PATH_INFO'] =~ /^#{mount}/
-
       names = names_from_path(env['PATH_INFO'])
       engine = engine_klass.new(root, names)
       headers = {
@@ -29,7 +28,7 @@ module Fewer
 
     private
       def names_from_path(path)
-        encoded = File.basename(path.sub(/^#{mount}\/?/, ''), '.*')
+        encoded = File.basename(path, '.*')
         Serializer.decode(encoded)
       end
   end

data/lib/fewer/middleware.rb

@@ -0,0 +1,18 @@
+module Fewer
+  class MiddleWare
+    def initialize(app, options = {})
+      @options = options
+      @app = app
+      @mount = @options[:mount]
+    end
+
+    def call(env)
+      if env['PATH_INFO'] =~ /^#{@mount}/
+        App.new(@options).call(env)
+      else
+        @app.call(env)
+      end
+    end
+  end
+end
+

data/test/app_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class AppTest < Test::Unit::TestCase
+  include TestHelper
+
   def setup
     @app = stub
     @engine = stub(
@@ -9,9 +11,8 @@ class AppTest < Test::Unit::TestCase
       :read => 'content'
     )
     @engine_klass = stub(:new => @engine)
-    @fewer_app = Fewer::App.new(@app, {
+    @fewer_app = Fewer::App.new({
       :engine => @engine_klass,
-      :mount => '/path',
       :root => 'root'
     })
     @browser = Rack::Test::Session.new(Rack::MockSession.new(@fewer_app))
@@ -61,13 +62,4 @@ class AppTest < Test::Unit::TestCase
     @browser.get "/path/#{encode('file')}.css"
     assert_equal 500, @browser.last_response.status
   end
-
-  private
-    def decode(string)
-      Fewer::Serializer.decode(string)
-    end
-
-    def encode(obj)
-      Fewer::Serializer.encode(obj)
-    end
 end

data/test/middleware_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class MiddlewareTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @app = stub
+    @engine = stub(
+      :check_request_extension => true,
+      :content_type => 'text/css',
+      :read => 'content'
+    )
+    Fewer::Engines::Css.stubs(:new).returns(@engine)
+
+    @app = Rack::Builder.new do
+      map '/' do
+        use Fewer::MiddleWare,
+              :root => '/some/root/path',
+              :engine => Fewer::Engines::Css,
+              :mount => '/css'
+        run lambda{|env| [200, {'Content-Type'=>'text/html'},'Hello World']}
+      end
+    end
+
+    @browser = Rack::Test::Session.new(Rack::MockSession.new(@app))
+  end
+
+  def test_middleware_intercepts_path
+    @browser.get "/css/#{encode('file')}.css"
+    assert_equal 'content', @browser.last_response.body
+    assert_equal 'text/css', @browser.last_response.content_type
+  end
+
+  def test_middleware_delegates_to_app
+    @browser.get "/blah/foobar.css"
+    assert_equal 'Hello World', @browser.last_response.body
+    assert_equal 'text/html', @browser.last_response.content_type
+  end
+end

data/test/test_helper.rb

@@ -11,3 +11,14 @@ rescue LoadError
 end
 
 require 'fewer'
+
+module TestHelper
+  private
+    def decode(string)
+      Fewer::Serializer.decode(string)
+    end
+
+    def encode(obj)
+      Fewer::Serializer.encode(obj)
+    end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fewer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ben Pickles
@@ -57,11 +57,12 @@ files:
 - lib/fewer/engines/js_min.rb
 - lib/fewer/engines/less.rb
 - lib/fewer/errors.rb
+- lib/fewer/middleware.rb
 - lib/fewer/serializer.rb
 - test/app_test.rb
 - test/engine_test.rb
+- test/middleware_test.rb
 - test/test_helper.rb
-- test/sass_engine_test.rb
 has_rdoc: true
 homepage: http://github.com/benpickles/fewer
 licenses: []
@@ -99,5 +100,5 @@ summary: Rack middleware to bundle assets and help you make fewer HTTP requests.
 test_files: 
 - test/app_test.rb
 - test/engine_test.rb
-- test/sass_engine_test.rb
+- test/middleware_test.rb
 - test/test_helper.rb

data/test/sass_engine_test.rb

@@ -1,22 +0,0 @@
-require 'test_helper'
-
-class EnginesTest < Test::Unit::TestCase
-  def test_sass_engine
-    engine = Fewer::Engines::Sass.new(template_root, 'sass')
-    assert_equal sass, engine.read
-  end
-  
-  private
-    def sass
-      '#navbar li {
-  border-top-radius: 10px;
-  -moz-border-radius-top: 10px;
-  -webkit-border-top-radius: 10px; }
-
-#footer {
-  border-top-radius: 10px;
-  -moz-border-radius-top: 10px;
- -webkit-border-top-radius: 10px; }
-'
-    end
-end