fewer 0.2.0 → 0.3.0

data/lib/fewer/version.rb

@@ -0,0 +1,3 @@
+module Fewer
+  VERSION = '0.3.0'
+end

data/test/app_test.rb

@@ -1,76 +1,26 @@
 require 'test_helper'
 
 class AppTest < Test::Unit::TestCase
-  include TestHelper
-
-  def setup
-    @app = stub
-    @engine = stub(
-      :check_request_extension => true,
-      :content_type => 'text/css',
-      :mtime => Time.utc(2010, 8, 17, 21, 5, 24),
-      :read => 'content'
-    )
-    @engine_klass = stub(:new => @engine)
-    @fewer_app = Fewer::App.new(:name,
-      :engine => @engine_klass,
-      :root => 'root'
-    )
-    @browser = Rack::Test::Session.new(Rack::MockSession.new(@fewer_app))
-  end
-
-  def test_can_retrieve_app_by_name
-    assert_nil Fewer::App[:not_name]
-    assert_equal @fewer_app, Fewer::App[:name]
-  end
-
-  def test_initialises_a_new_engine_with_a_single_file
-    file = 'file'
-    @engine_klass.expects(:new).with('root', file, {}).returns(@engine)
-    @browser.get "/path/#{encode(file)}.css"
-  end
-
-  def test_initialises_a_new_engine_with_multiple_files
-    files = ['file1', 'file2']
-    @engine_klass.expects(:new).with('root', files, {}).returns(@engine)
-    @browser.get "/path/#{encode(files)}.css"
+  def test_engine_required
+    assert_raises ArgumentError do
+      Fewer::App.new(:name, :root => 'blah')
+    end
   end
 
-  def test_responds_with_engine_content_type
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 'text/css', @browser.last_response.content_type
+  def test_root_required
+    assert_raises ArgumentError do
+      Fewer::App.new(:name, :engine => 'blah')
+    end
   end
 
-  def test_responds_with_cache_control
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 'public, max-age=31536000', @browser.last_response.headers['Cache-Control']
-  end
-
-  def test_responds_with_last_modified
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 'Tue, 17 Aug 2010 21:05:24 -0000', @browser.last_response.headers['Last-Modified']
-  end
-
-  def test_responds_with_bundled_content
-    @engine.expects(:read).returns('content')
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 'content', @browser.last_response.body
-  end
+  def test_named_apps_added_to_registry
+    assert_nil Fewer::App[:name]
 
-  def test_responds_with_200
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 200, @browser.last_response.status
-  end
-
-  def test_responds_with_404_for_missing_source
-    @engine.stubs(:read).raises(Fewer::MissingSourceFileError)
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 404, @browser.last_response.status
-  end
+    app = Fewer::App.new(:name,
+      :engine => stub(:new => stub),
+      :root => 'blah'
+    )
 
-  def test_responds_with_500_for_other_errors
-    @engine.stubs(:read).raises(RuntimeError)
-    @browser.get "/path/#{encode('file')}.css"
-    assert_equal 500, @browser.last_response.status
+    assert_equal app, Fewer::App[:name]
   end
 end

data/test/engine_test.rb

@@ -3,54 +3,84 @@ require 'test_helper'
 class EngineTest < Test::Unit::TestCase
   include TestHelper
 
+  def teardown
+    FakeFS::FileSystem.clear
+  end
+
+  def test_copes_with_pathnames
+    root = Pathname.new(fs)
+    path = Pathname.new(touch('a.css'))
+    engine = Fewer::Engines::Abstract.new(root, [path])
+  end
+
   def test_sanitise_paths
-    files = [
-      'dir/ectory/file.js',
-      'sub/dir/ectory/file.js',
-      './../private.txt',
+    paths = [
+      'a.css',
+      '/root/file.css',
+      '/root/../passwd',
+      '/root/./passwd',
       '/etc/passwd',
       '/etc/../passwd'
     ]
-    engine = engine_klass_no_checking.new('./happy-place', files)
+    engine = engine_klass_no_checking.new('/root', paths)
     assert_equal [
-      './happy-place/dir/ectory/file.js',
-      './happy-place/sub/dir/ectory/file.js',
-      './happy-place/./private.txt',
-      './happy-place/etc/passwd',
-      './happy-place/etc/passwd'
+      '/root/a.css',
+      '/root/file.css',
+      '/root/passwd',
+      '/root/passwd',
+      '/root/etc/passwd',
+      '/root/etc/passwd'
     ], engine.paths
   end
 
-  def test_stringify_paths
-    engine = engine_klass_no_checking.new('.', [:symbol, { :a => :b }])
-    assert_equal ['./symbol', './ab'], engine.paths
-  end
-
-  def test_converts_names_to_an_array
-    engine = engine_klass_no_checking.new(template_root, 'style')
-    assert_equal ['style'], engine.names
-  end
-
   def test_raises_error_for_missing_file
     assert_raises Fewer::MissingSourceFileError do
-      Fewer::Engines::Abstract.new(template_root, ['does-not-exist'])
+      Fewer::Engines::Abstract.new('root', ['does-not-exist'])
     end
   end
 
+  def test_mtime_is_not_nil
+    engine = Fewer::Engines::Abstract.new(fs, [])
+    assert !engine.mtime.nil?
+  end
+
   def test_can_deal_with_encoding_for_you
-    names = ['a', 'b']
-    engine = engine_klass_no_checking.new(template_root, names)
-    Fewer::Serializer.expects(:encode).with(names)
+    paths = [touch('a.css'), touch('a.css')]
+    engine = Fewer::Engines::Abstract.new(fs, paths)
+    Fewer::Serializer.expects(:encode).with(fs, paths)
     engine.encoded
   end
 
   def test_less_import_command
-    engine = Fewer::Engines::Less.new(template_root, ['style'])
+    import = touch('import.less')
+    style = fs('style.less')
+
+    File.open(style, 'w') do |f|
+      f.write '@import "import";'
+    end
+
+    engine = Fewer::Engines::Less.new(fs, [style])
+
     assert_nothing_raised do
       engine.read
     end
   end
 
+  def test_read_source_files_once_when_generating_etag_and_content
+    file = touch('a.css')
+    engine = Fewer::Engines::Abstract.new(fs, [file])
+    File.expects(:read).once.returns('')
+    engine.etag
+    engine.read
+  end
+
+  def test_generating_etag_should_not_process_content
+    file = touch('a.less')
+    engine = Fewer::Engines::Less.new(fs, [file])
+    Less::Engine.expects(:new).never
+    engine.etag
+  end
+
   private
     def engine_klass(&block)
       Class.new(Fewer::Engines::Abstract, &block)

data/test/integration_test.rb

@@ -0,0 +1,103 @@
+require 'test_helper'
+
+class IntegrationTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @app = Fewer::App.new(:test, :engine => Fewer::Engines::Css, :root => fs)
+    @browser = Rack::Test::Session.new(Rack::MockSession.new(@app))
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+  end
+
+  def test_initialises_a_new_engine_with_a_single_file
+    path = touch('a.css')
+    engine = Fewer::Engines::Css.new(fs, [path])
+    Fewer::Engines::Css.expects(:new).with(fs, [path], {}).returns(engine)
+    @browser.get "/#{encode([path])}"
+  end
+
+  def test_initialises_a_new_engine_with_multiple_files
+    paths = [touch('a.css'), touch('b.css')]
+    engine = Fewer::Engines::Css.new(fs, paths)
+    Fewer::Engines::Css.expects(:new).with(fs, paths, {}).returns(engine)
+    @browser.get "/#{encode(paths)}"
+  end
+
+  def test_strip_metadata_from_path
+    paths = [touch('a.css'), touch('b.css')]
+    engine = Fewer::Engines::Css.new(fs, paths)
+    Fewer::Engines::Css.expects(:new).with(fs, paths, {}).returns(engine)
+    @browser.get "/#{encode(paths)}-blah.css"
+  end
+
+  def test_responds_with_engine_content_type
+    path = touch('a.css')
+    @browser.get "/#{encode([path])}"
+    assert_equal 'text/css', @browser.last_response.content_type
+  end
+
+  def test_responds_with_cache_control
+    path = touch('a.css')
+    @browser.get "/#{encode([path])}"
+    assert_equal 'public, max-age=31536000', @browser.last_response.headers['Cache-Control']
+  end
+
+  def test_responds_with_last_modified
+    File.stubs(:mtime => Time.utc(2010, 8, 17, 21, 5, 24))
+    path = touch('a.css')
+    @browser.get "/#{encode([path])}"
+    assert_equal 'Tue, 17 Aug 2010 21:05:24 -0000', @browser.last_response.headers['Last-Modified']
+  end
+
+  def test_responds_with_bundled_content
+    path = fs('a.css')
+    File.open(path, 'w') do |f|
+      f.write 'content'
+    end
+
+    @browser.get "/#{encode([path])}"
+    assert_equal 'content', @browser.last_response.body
+  end
+
+  def test_responds_with_200
+    path = touch('a.css')
+    @browser.get "/#{encode([path])}"
+    assert_equal 200, @browser.last_response.status
+  end
+
+  def test_responds_with_304_for_not_modified_requests
+    file = touch('a.css')
+    path = "/#{encode([path])}"
+    @browser.get path
+    etag = @browser.last_response.headers['ETag']
+    @browser.header 'IF_NONE_MATCH', etag
+    @browser.get path
+    assert_equal 304, @browser.last_response.status
+  end
+
+  def test_responds_with_200_for_modified_requests
+    file = touch('a.css')
+    path = "/#{encode([path])}"
+    @browser.get path
+    File.open(fs('a.css'), 'w') { |f| f.write('blah') }
+    etag = @browser.last_response.headers['ETag']
+    @browser.header 'IF_NONE_MATCH', etag
+    @browser.get path
+    assert_equal 200, @browser.last_response.status
+  end
+
+  def test_responds_with_404_for_missing_source
+    Fewer::Engines::Css.stubs(:new).raises(Fewer::MissingSourceFileError)
+    @browser.get '/blah.css'
+    assert_equal 404, @browser.last_response.status
+  end
+
+  def test_responds_with_500_for_other_errors
+    Fewer::Engines::Css.stubs(:new).raises(RuntimeError)
+    @browser.get '/blah.css'
+    assert_equal 500, @browser.last_response.status
+  end
+end

data/test/middleware_test.rb

@@ -6,8 +6,7 @@ class MiddlewareTest < Test::Unit::TestCase
   def setup
     @app = stub
     @engine = stub(
-      :check_request_extension => true,
-      :content_type => 'text/css',
+      :etag => '',
       :mtime => Time.utc(2010, 8, 17, 21, 5, 24),
       :read => 'content'
     )
@@ -19,7 +18,9 @@ class MiddlewareTest < Test::Unit::TestCase
               :root => '/some/root/path',
               :engine => Fewer::Engines::Css,
               :mount => '/css'
-        run lambda{|env| [200, {'Content-Type'=>'text/html'},'Hello World']}
+        run lambda { |env|
+          [200, { 'Content-Type' => 'text/html' }, ['Hello World']]
+        }
       end
     end
 
@@ -27,7 +28,7 @@ class MiddlewareTest < Test::Unit::TestCase
   end
 
   def test_middleware_intercepts_path
-    @browser.get "/css/#{encode('file')}.css"
+    @browser.get '/css/blah.css'
     assert_equal 'content', @browser.last_response.body
     assert_equal 'text/css', @browser.last_response.content_type
   end

data/test/rails_helpers_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class RailsHelpersTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @engine_klass = stub('klass', :extension => '.fewer')
+    @engine = stub('engine',
+      :encoded => 'qwerty',
+      :mtime => Time.utc(2010, 8, 17, 21, 5, 24)
+    )
+    @app = stub('app', :engine_klass => @engine_klass, :engine => @engine)
+    Fewer::App.stubs(:[] => @app)
+
+    @helper = Class.new do
+      include Fewer::RailsHelpers
+    end.new
+    @helper.stubs(:config => @config = stub(:perform_caching => true))
+    @helper.stubs(:javascript_include_tag)
+    @helper.stubs(:stylesheet_link_tag)
+  end
+
+  def test_extension_added_if_not_present
+    @app.expects(:engine).with(['a.min.fewer', 'b.fewer.min.fewer']).returns(@engine)
+    @helper.fewer_encode_sources @app, ['a.min', 'b.fewer.min']
+  end
+
+  def test_single_stylesheet_with_caching
+    @helper.expects(:stylesheet_link_tag).with(['l7bel0/qwerty.css'], {})
+    @helper.fewer_stylesheets_tag 'a.fewer', 'b.fewer'
+  end
+
+  def test_multiple_stylesheet_with_no_caching
+    @config.stubs(:perform_caching => false)
+    @helper.expects(:stylesheet_link_tag).with(['l7bel0/qwerty-a.css', 'l7bel0/qwerty-b.css'], {})
+    @helper.fewer_stylesheets_tag 'a.fewer', 'b.fewer'
+  end
+
+  def test_stylesheet_options_forwarded
+    options = { :a => :b }
+    @helper.expects(:stylesheet_link_tag).with(['l7bel0/qwerty.css'], options)
+    @helper.fewer_stylesheets_tag 'a.fewer', 'b.fewer', options
+  end
+
+  def test_stylesheet_cache_option_removed
+    @helper.expects(:stylesheet_link_tag).with(['l7bel0/qwerty.css'], {})
+    @helper.fewer_stylesheets_tag 'a.fewer', 'b.fewer', { :cache => true }
+  end
+
+  def test_single_javascript_with_caching
+    @helper.expects(:javascript_include_tag).with(['l7bel0/qwerty.js'], {})
+    @helper.fewer_javascripts_tag 'a.fewer', 'b.fewer'
+  end
+
+  def test_multiple_javascript_with_no_caching
+    @config.stubs(:perform_caching => false)
+    @helper.expects(:javascript_include_tag).with(['l7bel0/qwerty-a.js', 'l7bel0/qwerty-b.js'], {})
+    @helper.fewer_javascripts_tag 'a.fewer', 'b.fewer'
+  end
+end

data/test/serializer_test.rb

@@ -0,0 +1,159 @@
+require 'test_helper'
+
+class SerializerTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    FakeFS.activate!
+    FileUtils.mkdir_p(fs('nested'))
+    touch('a.css')
+    touch('list.css')
+    touch('nested/files.css')
+    touch('of.css')
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
+
+  def test_encode_first_file
+    encoded = Fewer::Serializer.encode(fs, [
+      fs('a.css')
+    ])
+    assert_equal '0', encoded
+  end
+
+  def test_encode_last_file
+    encoded = Fewer::Serializer.encode(fs, [
+      fs('of.css')
+    ])
+    assert_equal '3', encoded
+  end
+
+  def test_encode_some_files
+    encoded = Fewer::Serializer.encode(fs, [
+      fs('a.css'),
+      fs('nested/files.css'),
+      fs('of.css')
+    ])
+    assert_equal '023', encoded
+  end
+
+  def test_encode_some_files_in_a_different_order
+    encoded = Fewer::Serializer.encode(fs, [
+      fs('of.css'),
+      fs('a.css'),
+      fs('nested/files.css')
+    ])
+    assert_equal '302', encoded
+  end
+
+  def test_encode_invalid_files
+    encoded = Fewer::Serializer.encode(fs, %w(0 1 2 3 4 5 6 7 8 9 a b c d e f
+      g h i j k l m n o p q r s t u v w x y z 10))
+    assert_equal '', encoded
+  end
+
+  def test_encode_35_files
+    FakeFS::FileSystem.clear
+    files = (0...36).map { |i| touch('%02d' % i + '.css') }
+
+    encoded = Fewer::Serializer.encode(fs, files)
+    assert_equal '0123456789abcdefghijklmnopqrstuvwxyz', encoded
+  end
+
+  def test_encode_99_files
+    FakeFS::FileSystem.clear
+    files = (0...99).map { |i| touch('%02d' % i + '.css') }
+
+    expected = '0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t' +
+      ',u,v,w,x,y,z,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f,1g,1h,' +
+      '1i,1j,1k,1l,1m,1n,1o,1p,1q,1r,1s,1t,1u,1v,1w,1x,1y,1z,20,21,22,23,24' +
+      ',25,26,27,28,29,2a,2b,2c,2d,2e,2f,2g,2h,2i,2j,2k,2l,2m,2n,2o,2p,2q'
+    assert_equal expected, Fewer::Serializer.encode(fs, files)
+  end
+
+  def test_encode_1_of_99_files
+    FakeFS::FileSystem.clear
+    files = (0...99).map { |i| touch('%02d' % i + '.css') }
+    assert_equal '2q', Fewer::Serializer.encode(fs, [fs('98.css')])
+  end
+
+  def test_files_encoded_in_the_same_order_each_time
+    FakeFS::FileSystem.clear
+    files = (0...36).map { |i| touch('%02d' % i + '.css') }
+    Dir.stubs(:glob).returns(files)
+    encoded1 = Fewer::Serializer.encode(fs, files)
+    Dir.stubs(:glob).returns(files.reverse)
+    encoded2 = Fewer::Serializer.encode(fs, files)
+    assert_equal encoded1, encoded2
+  end
+
+  def test_decode_first_file
+    decoded = Fewer::Serializer.decode(fs, '0')
+    assert_equal [
+      fs('a.css')
+    ], decoded
+  end
+
+  def test_decode_last_file
+    decoded = Fewer::Serializer.decode(fs, '3')
+    assert_equal [
+      fs('of.css')
+    ], decoded
+  end
+
+  def test_decode_some_files
+    decoded = Fewer::Serializer.decode(fs, '023')
+    assert_equal [
+      fs('a.css'),
+      fs('nested/files.css'),
+      fs('of.css')
+    ], decoded
+  end
+
+  def test_decode_some_files_in_a_different_order
+    decoded = Fewer::Serializer.decode(fs, '302')
+    assert_equal [
+      fs('of.css'),
+      fs('a.css'),
+      fs('nested/files.css')
+    ], decoded
+  end
+
+  def test_decode_invalid_file
+    decoded = Fewer::Serializer.decode(fs, '')
+    assert_equal [], decoded
+  end
+
+  def test_decode_another_invalid_file
+    decoded = Fewer::Serializer.decode(fs, 'z')
+    assert_equal [], decoded
+  end
+
+  def test_decode_35_files
+    FakeFS::FileSystem.clear
+    files = (0...36).map { |i| touch('%02d' % i + '.css') }
+
+    decoded = Fewer::Serializer.decode(fs, '0123456789abcdefghijklmnopqrstuvwxyz')
+    assert_equal files, decoded
+  end
+
+  def test_decode_99_files
+    FakeFS::FileSystem.clear
+    files = (0...99).map { |i| touch('%02d' % i + '.css') }
+
+    encoded = '0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t' +
+      ',u,v,w,x,y,z,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f,1g,1h,' +
+      '1i,1j,1k,1l,1m,1n,1o,1p,1q,1r,1s,1t,1u,1v,1w,1x,1y,1z,20,21,22,23,24' +
+      ',25,26,27,28,29,2a,2b,2c,2d,2e,2f,2g,2h,2i,2j,2k,2l,2m,2n,2o,2p,2q'
+    assert_equal files, Fewer::Serializer.decode(fs, encoded)
+  end
+
+  def test_decode_1_of_99_files
+    FakeFS::FileSystem.clear
+    files = (0...99).map { |i| touch('%02d' % i + '.css') }
+    assert_equal [fs('98.css')], Fewer::Serializer.decode(fs, '2q')
+  end
+end