sinatra-assetpack 0.0.8 → 0.0.9

data/Rakefile

@@ -12,3 +12,20 @@ task :test do
 end
 
 task :default => :test
+
+gh = "rstacruz/sinatra-assetpack"
+namespace :doc do
+  # http://github.com/rstacruz/reacco
+  desc "Builds the documentation into doc/"
+  task :build do
+    system "reacco -a --github #{gh} --css docsrc/style.css"
+  end
+
+  # http://github.com/rstacruz/git-update-ghpages
+  desc "Posts documentation to GitHub pages"
+  task :deploy => :build do
+    system "git update-ghpages #{gh} -i doc/"
+  end
+end
+
+task :doc => :'doc:build'

data/docsrc/style.css

@@ -0,0 +1,32 @@
+section.features {
+  background: #f6f6ff;
+  overflow: hidden; }
+
+h2 {
+  font-size: 26pt; }
+
+section.features h2 {
+  font-size: 32pt; }
+
+section.features ul {
+  max-width: none;
+  margin-left: 0;
+  padding-left: 0;
+  width: 100%; }
+
+section.features li {
+  list-style-type: none;
+  width: 420px;
+  float: left; margin-right: 40px; }
+
+section.features li:nth-child(odd) {
+  clear: both; }
+
+section.features li>p>strong {
+  font-family: shanti, sans-serif;
+  font-weight: normal;
+  font-size: 1.2em;
+  text-shadow: 2px 2px 0 rgba(255, 255, 255, 0.1);
+  display: block;
+  margin-bottom: 5px;
+  color: #88a; }

data/examples/compass/.gitignore

@@ -0,0 +1 @@
+public

data/examples/compass/Rakefile

@@ -0,0 +1,7 @@
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+APP_FILE  = 'app.rb'
+APP_CLASS = 'App'
+
+require 'sinatra/assetpack/rake'
+

data/examples/compass/app.rb

@@ -0,0 +1,45 @@
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'sinatra/base'
+require 'sinatra/assetpack'
+require 'compass'
+require 'sinatra/support'
+
+Encoding.default_external = 'utf-8'  if defined?(::Encoding)
+
+class App < Sinatra::Base
+  disable :show_exceptions
+  enable  :raise_exceptions
+
+  set :root, File.dirname(__FILE__)
+
+  # This is a convenient way of setting up Compass in a Sinatra
+  # project without mucking around with load paths and such.
+  register Sinatra::CompassSupport
+
+  # ### Compass sprite configuration
+  # Skip this section if you don't need sprite images.
+  #
+  # Configure Compass so it knows where to look for sprites.  This tells
+  # Compass to look for images in `app/images`, dump sprite images in the same
+  # folder, and link to it with HTTP images path.
+  #
+  c = Compass.configuration
+  c.project_path     = root
+  c.images_dir       = "app/images"
+  c.http_images_path = "/images"
+
+  # Asset Pack.
+  register Sinatra::AssetPack
+  assets do
+    css :main, ['/css/*.css']
+  end
+
+  get '/' do
+    erb :index
+  end
+end
+
+if __FILE__ == $0
+  App.run!
+end

data/examples/compass/app/css/main.scss

@@ -0,0 +1,64 @@
+@import 'compass/css3';
+@import 'compass/reset';
+
+html, body {
+  font-family: sans-serif;
+  font-size: 11pt;
+  line-height: 1.5; }
+
+body {
+  background: #c2c2cf; }
+
+#all { 
+  background: white;
+  color: #333;
+  padding: 10px;
+  width: 500px;
+  margin: 50px auto; }
+
+// ### Optional sprite config
+// You may put any of these before the `all-icon-sprites` line.
+// These are completely optional.
+
+// #### Sprite sets: (/icon/*.png)
+$icon-spacing: 0;           // How much blank space (in pixels) to put
+$icon-dimensions: false;    // Sets width/height in the classes
+$icon-repeat: no-repeat;
+$icon-position: 0;
+
+// #### Individual images: (/icon/mail.png)
+$icon-mail-spacing: 0;
+$icon-mail-repeat: no-repeat;
+$icon-mail-position: 0px;
+
+// ### Sprite setup
+// For "mail.png" and "refresh.png", this creates classes for .icon-mail and
+// .icon-refresh that you can @extend from.
+//
+// See: http://compass-style.org/help/tutorials/configuration-reference/
+//
+@import "icon/*.png";
+@include all-icon-sprites;
+
+.image1, .image2 {
+  width: 16px; height: 16px;
+  display: inline-block; }
+
+.image1 {
+  @extend .icon-mail; }
+
+.image2 {
+  @extend .icon-refresh; }
+
+// ### Advanced control
+// The sprite map is available as $icon-sprites. You can then use
+// `sprite()` on it.
+
+.image3 {
+  background: sprite($icon-sprites, refresh); }
+//background: url(...) 0 -16px;
+
+.image3-with-offset {
+  background: sprite($icon-sprites, refresh, -2px, -9px); }
+//background: url(...) -2px -19px;
+

data/examples/compass/app/js/app.js

@@ -0,0 +1,3 @@
+("App.js goes here.");
+
+

data/examples/compass/app/js/vendor/jquery.js

@@ -0,0 +1,2 @@
+("jQuery goes here.");
+

data/examples/compass/app/js/vendor/jquery.plugin.js

@@ -0,0 +1,2 @@
+("A jQuery plugin goes here.");
+

data/examples/compass/app/js/vendor/underscore.js

@@ -0,0 +1,2 @@
+("Underscore.js goes here.");
+

data/examples/compass/config.ru

@@ -0,0 +1,3 @@
+require './app'
+App.set :run, false
+run App

data/examples/compass/views/index.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    <title></title>
+    <%= css :main %>
+</head>
+<body>
+  <div id="all">
+    <h1>Here are some sprites:</h1>
+    <span class='image1'></span>
+    <span class='image2'></span>
+  </div>
+</body>
+</html>

data/lib/sinatra/assetpack.rb

@@ -14,7 +14,7 @@ module Sinatra
     # Returns a list of formats that can be served.
     # Anything not in this list will be rejected.
     def self.supported_formats
-      @supported_formats ||= %w(css js png jpg gif otf eot ttf woff)
+      @supported_formats ||= %w(css js png jpg gif otf eot ttf woff htc)
     end
 
     # Returns a map of what MIME format each Tilt type returns.

data/lib/sinatra/assetpack/class_methods.rb

@@ -19,10 +19,13 @@ module Sinatra
       def add_compressed_routes!
         assets.packages.each do |name, package|
           get package.route_regex do
-            content_type package.type
-            last_modified package.mtime  if package.mtime
+            mtime, contents = @template_cache.fetch(package.path) {
+              [ package.mtime, package.minify ]
+            }
 
-            settings.assets.cache[package.hash] ||= package.minify
+            content_type package.type
+            last_modified mtime
+            contents
           end
         end
       end
@@ -49,16 +52,19 @@ module Sinatra
               not_found  unless format == fmt
 
               if fmt == 'css'
-                asset_filter_css File.read(fn)
+                @template_cache.fetch(fn) { asset_filter_css File.read(fn) }
               else
                 send_file fn
               end
             else
               # Dynamic file
               not_found unless AssetPack.tilt_formats[format] == fmt
-              out = render format.to_sym, File.read(fn)
-              out = asset_filter_css(out)  if fmt == 'css'
-              out
+
+              @template_cache.fetch(fn) {
+                out = render format.to_sym, File.read(fn)
+                out = asset_filter_css(out)  if fmt == 'css'
+                out
+              }
             end
           end
         end

data/lib/sinatra/assetpack/options.rb

@@ -242,14 +242,6 @@ module Sinatra
         HashArray[*tuples.flatten]
       end
 
-      def cache
-        @cache ||= Hash.new
-      end
-
-      def reset_cache
-        @cache = nil && cache
-      end
-
     private
       # Returns a URI for a given file
       #     path = '/projects/x/app/css'

data/lib/sinatra/assetpack/package.rb

@@ -55,7 +55,7 @@ module Sinatra
       # Returns the regex for the route, including cache buster crap.
       def route_regex
         re = @path.gsub(/(.[^.]+)$/) { |ext| "(?:\.[0-9]+)?#{ext}" }
-        /#{re}/
+        /^#{re}$/
       end
 
       def to_development_html(options={})

data/lib/sinatra/assetpack/rake.rb

@@ -8,9 +8,15 @@ unless defined?(APP_FILE) && defined?(APP_CLASS)
   exit
 end
 
+def class_from_string(str)
+  str.split('::').inject(Object) do |mod, class_name|
+    mod.const_get(class_name)
+  end
+end
+
 def app
   require File.expand_path(APP_FILE, Dir.pwd)
-  Object.const_get(APP_CLASS.to_sym)
+  class_from_string(APP_CLASS)
 end
 
 namespace :assetpack do

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.0.8"
+      "0.0.9"
     end
   end
 end

data/test/app/app.rb

@@ -18,6 +18,10 @@ class Main < Sinatra::Base
     serve '/css',    :from => 'app/css'
     serve '/images', :from => 'app/images'
 
+    js :skitch, '/skitch.js', [
+      '/js/hi.js',
+    ]
+
     js :app, '/js/app.js', [
       '/js/vendor/**/*.js',
       '/js/assets/**/*.js',

data/test/app/app/css/behavior.htc

@@ -0,0 +1 @@
+..

data/test/app/app/js_glob/a/b/c1/hello.js

@@ -0,0 +1 @@
+alert("Hello");

data/test/app/app/js_glob/a/b/c2/hi.js

@@ -0,0 +1 @@
+alert("Hi");

data/test/app/app/js_glob/a/b/c2/hola.js

@@ -0,0 +1 @@
+alert("Hola");

data/test/cache_test.rb

@@ -2,9 +2,8 @@ require File.expand_path('../test_helper', __FILE__)
 
 class CacheTest < UnitTest
   test "Compressed js caching" do
-    app.assets.reset_cache
-    # JSMin.expects(:minify).times(1) -- not working?
-    get '/js/app.js'
-    get '/js/app.js'
+    app.set :reload_templates, false
+    JSMin.expects(:minify).times(1)
+    3.times { get '/js/app.js' }
   end
 end

data/test/compressed_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class CompressedTest < UnitTest
+  class App < UnitTest::App
+    register Sinatra::AssetPack
+
+    assets {
+      js :app, '/app.js', [ '/js/*.js' ]
+    }
+  end
+
+  def app
+    App
+  end
+
+  test "ha" do
+    get '/x/y/z/app.js'
+    assert last_response.status == 404
+  end
+
+  test "right" do
+    get '/app.js'
+    assert last_response.status == 200
+  end
+
+  test "lol" do
+    get '/app.4872837.js'
+    assert last_response.status == 200
+  end
+end

data/test/glob_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class GlobTest < UnitTest
+  class App < UnitTest::App
+    register Sinatra::AssetPack
+
+    assets {
+      serve '/js', :from => 'app/js_glob'
+      js :a, '/a.js', [ '/js/**/*.js' ]
+      js :b, '/b.js', [ '/js/a/b/c2/*.js' ]
+      js :c, '/c.js', [ '/js/a/b/*/*.js' ]
+    }
+
+    get('/a') { js :a }
+    get('/b') { js :b }
+    get('/c') { js :c }
+  end
+
+  def app
+    App
+  end
+
+  should "match double-star globs recursively" do
+    get '/a'
+    assert body.include?("a/b/c1/hello.")
+    assert body.include?("a/b/c2/hi.")
+    assert body.include?("a/b/c2/hola.")
+  end
+
+  should "match single-star globs in filenames" do
+    get '/b'
+    assert body.include?("a/b/c2/hi.")
+    assert body.include?("a/b/c2/hola.")
+  end
+
+  should "match single-star globs in paths" do
+    get '/c'
+    assert body.include?("a/b/c1/hello.")
+    assert body.include?("a/b/c2/hi.")
+    assert body.include?("a/b/c2/hola.")
+  end
+end