sinatra-assetpack 0.0.10 → 0.0.11

data/HISTORY.md

@@ -1,3 +1,22 @@
+v0.0.11 - Feb 21, 2012
+----------------------
+
+### Added:
+  * Support for 'prebuild' to build on startup.
+  * Support for SVG files.
+  * Implement UglifyJS support. (#18)
+  * Implement ignored files. (#17)
+  * Added support classic-style Sinatra apps. (#22)
+
+### Changed:
+  * Built files from 'rake assetpack:build' now match the mtimes of their sources. (#12)
+  * Update the readme with a note on SASS compression.
+  * Use regular expression route matcher instead of splat pattern for Padrino compatibility. (#19)
+  * Made <link> and <script> tags (generated by helpers) be more HTML5-like.
+
+### Fixed:
+  * Sinatra >= 1.3.0 compatibility. Use 'public_folder' in Sinatra >=1.3.0. (#25)
+
 v0.0.10 - Sep 18, 2011
 ----------------------
 

data/examples/classic/app.rb

@@ -0,0 +1,24 @@
+$:.unshift File.expand_path('../../../lib', __FILE__)
+
+require 'sinatra'
+require 'sinatra/assetpack'
+
+assets do
+  # By default, Sinatra::AssetPack looks at ./app/css/, ./app/js/ and
+  # ./app/images. Let's change this to look at ./css.
+  serve '/css', from: 'css'
+
+  css :main, [
+    '/css/*.css'
+  ]
+end
+
+get "/" do
+  css :main
+end
+
+__END__
+
+@@ index
+<%= css :main %>
+<h1>Hello!</h1>

data/examples/classic/css/screen.scss

@@ -0,0 +1 @@
+body { color: red }

data/lib/sinatra/assetpack.rb

@@ -3,18 +3,13 @@ require 'rack/test'
 module Sinatra
   module AssetPack
     def self.registered(app)
-      unless app.root?
-        raise Error, "Please set :root in your Sinatra app."
-      end
-
-      app.extend  ClassMethods
       app.helpers Helpers
     end
 
     # 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 htc)
+      @supported_formats ||= %w(css js png jpg gif svg otf eot ttf woff htc)
     end
 
     # Returns a map of what MIME format each Tilt type returns.
@@ -54,8 +49,13 @@ module Sinatra
     autoload :Configurator,  "#{PREFIX}/assetpack/configurator"
     autoload :HashArray,     "#{PREFIX}/assetpack/hasharray"
 
+    include ClassMethods
+
     Error = Class.new(StandardError)
 
     require "#{PREFIX}/assetpack/version"
   end
+
+  # Autoload in Sinatra classic mode
+  register AssetPack
 end

data/lib/sinatra/assetpack/class_methods.rb

@@ -38,7 +38,7 @@ module Sinatra
       # Add the routes for the individual files.
       def add_individual_routes!
         assets.served.each do |path, from|
-          get "/#{path}/*".squeeze('/') do |file|
+          get %r{#{"^/#{path}/".squeeze('/')}(.*)$} do |file|
             fmt = File.extname(file)[1..-1]
 
             # Sanity checks

data/lib/sinatra/assetpack/options.rb

@@ -41,10 +41,19 @@ module Sinatra
       include Configurator
 
       def initialize(app, &blk)
+        unless app.root?
+          raise Error, "Please set :root in your Sinatra app."
+        end
+
         @app             = app
         @js_compression  = :jsmin
         @css_compression = :simple
-        @output_path     = app.public
+
+        begin
+          @output_path   = app.public
+        rescue NoMethodError
+          @output_path   = app.public_folder
+        end
 
         @js_compression_options  = Hash.new
         @css_compression_options = Hash.new

data/lib/sinatra/assetpack/package.rb

@@ -106,9 +106,9 @@ module Sinatra
     private
       def link_tag(file, options={})
         if js?
-          "<script type='text/javascript' src='#{e file}'#{kv options}></script>"
+          "<script src='#{e file}'#{kv options}></script>"
         elsif css?
-          "<link rel='stylesheet' type='text/css' href='#{e file}'#{kv options} />"
+          "<link rel='stylesheet' href='#{e file}'#{kv options} />"
         end
       end
     end

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.0.10"
+      "0.0.11"
     end
   end
 end

data/test/build_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 class BuildTest < UnitTest
   teardown do
-    FileUtils.rm_rf app.public
+    FileUtils.rm_rf File.join(app.root, 'public')
   end
 
   test "build" do

data/test/unit_test.rb

@@ -5,7 +5,7 @@ class AppTest < UnitTest
     get '/js/hello.js'
     assert body == '$(function() { alert("Hello"); });'
   end
-
+  
   test '/js/hi.js (coffeescript)' do
     get '/js/hi.js'
     assert body.include? 'yo'
@@ -33,7 +33,12 @@ class AppTest < UnitTest
     get '/js/hello.css'
     assert last_response.status == 404
   end
-
+  
+  test 'matches only from the site root' do
+    get '/not-the-root/js/hello.js'
+    assert last_response.status == 404
+  end
+  
   test 'wrong extension for dynamic coffeescript file' do
     get '/js/hi.css'
     assert last_response.status == 404
@@ -57,14 +62,14 @@ class AppTest < UnitTest
 
   test "helpers" do
     get '/index.html'
-    assert body =~ /<script type='text\/javascript' src='\/js\/hello.[0-9]+.js'><\/script>/
-    assert body =~ /<script type='text\/javascript' src='\/js\/hi.[0-9]+.js'><\/script>/
+    assert body =~ /<script src='\/js\/hello.[0-9]+.js'><\/script>/
+    assert body =~ /<script src='\/js\/hi.[0-9]+.js'><\/script>/
   end
 
   test "helpers in production (compressed html thingie)" do
     app.expects(:production?).returns(true)
     get '/index.html'
-    assert body =~ /<script type='text\/javascript' src='\/js\/app.[0-9]+.js'><\/script>/
+    assert body =~ /<script src='\/js\/app.[0-9]+.js'><\/script>/
   end
 
   test "compressed js" do
@@ -91,6 +96,6 @@ class AppTest < UnitTest
 
   test "helpers css" do
     get '/helpers/css'
-    assert body =~ %r{link rel='stylesheet' type='text/css' href='/css/screen.[0-9]+.css' media='screen'}
+    assert body =~ %r{link rel='stylesheet' href='/css/screen.[0-9]+.css' media='screen'}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-17 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153561760 !ruby/object:Gem::Requirement
+  requirement: &2152651000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153561760
+  version_requirements: *2152651000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153561340 !ruby/object:Gem::Requirement
+  requirement: &2152650180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153561340
+  version_requirements: *2152650180
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &2153560880 !ruby/object:Gem::Requirement
+  requirement: &2152649180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153560880
+  version_requirements: *2152649180
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153560460 !ruby/object:Gem::Requirement
+  requirement: &2152648100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153560460
+  version_requirements: *2152648100
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2153560040 !ruby/object:Gem::Requirement
+  requirement: &2152646860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153560040
+  version_requirements: *2152646860
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2153559620 !ruby/object:Gem::Requirement
+  requirement: &2152645840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153559620
+  version_requirements: *2152645840
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153559200 !ruby/object:Gem::Requirement
+  requirement: &2152644700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153559200
+  version_requirements: *2152644700
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2153558780 !ruby/object:Gem::Requirement
+  requirement: &2152643520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153558780
+  version_requirements: *2152643520
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2153558360 !ruby/object:Gem::Requirement
+  requirement: &2152639780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153558360
+  version_requirements: *2152639780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153557940 !ruby/object:Gem::Requirement
+  requirement: &2152639140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153557940
+  version_requirements: *2152639140
 - !ruby/object:Gem::Dependency
   name: stylus
-  requirement: &2153557520 !ruby/object:Gem::Requirement
+  requirement: &2152638260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153557520
+  version_requirements: *2152638260
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2153557100 !ruby/object:Gem::Requirement
+  requirement: &2152637340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153557100
+  version_requirements: *2152637340
 description: Package your assets for Sinatra.
 email:
 - rico@sinefunc.com
@@ -166,6 +166,8 @@ files:
 - examples/basic/app/js/vendor/jquery.plugin.js
 - examples/basic/app/js/vendor/underscore.js
 - examples/basic/views/index.erb
+- examples/classic/app.rb
+- examples/classic/css/screen.scss
 - examples/compass/.gitignore
 - examples/compass/Rakefile
 - examples/compass/app.rb