sinatra-assetpack 0.1.0 → 0.1.1

data/HISTORY.md

@@ -1,3 +1,11 @@
+v0.1.1 - Jan 15, 2013
+----------------------
+
+### Fixed
+  * Added less engine support and test (#69)
+  * Support for fonts & other AssetPack.supported_formats file format. (#50)
+  * Deal with multiple static files with same name but different extensions (ex. fonts).
+
 v0.1.0 - Jan 14, 2013
 ----------------------
 

data/README.md

@@ -639,6 +639,11 @@ class Main
 end
 ```
 
+Running the tests
+---------------
+
+    rake
+
 Acknowledgements
 ----------------
 

data/lib/sinatra/assetpack/class_methods.rb

@@ -43,9 +43,9 @@ module Sinatra
 
             # Sanity checks
             pass unless AssetPack.supported_formats.include?(fmt)
-            fn = asset_path_for(file, from)  or pass
+            fn = asset_path_for(file, from) or pass
 
-            pass  if settings.assets.ignored?("#{path}/#{file}")
+            pass if settings.assets.ignored?("#{path}/#{file}")
 
             # Send headers
             content_type fmt.to_sym
@@ -55,12 +55,13 @@ module Sinatra
             format = File.extname(fn)[1..-1]
 
             if AssetPack.supported_formats.include?(format)
-              # It's a raw file, just send it
-              not_found  unless format == fmt
-
+              # Static file
               if fmt == 'css'
+                # Matching static file format
+                pass unless fmt == File.extname(fn)[1..-1]
                 @template_cache.fetch(fn) { asset_filter_css File.read(fn) }
               else
+                # It's a raw file, just send it
                 send_file fn
               end
             else

data/lib/sinatra/assetpack/compressor.rb

@@ -47,6 +47,7 @@ module Sinatra
     require "#{AssetPack::PREFIX}/assetpack/engines/jsmin"
     require "#{AssetPack::PREFIX}/assetpack/engines/yui"
     require "#{AssetPack::PREFIX}/assetpack/engines/sass"
+    require "#{AssetPack::PREFIX}/assetpack/engines/less"
     require "#{AssetPack::PREFIX}/assetpack/engines/sqwish"
     require "#{AssetPack::PREFIX}/assetpack/engines/closure"
     require "#{AssetPack::PREFIX}/assetpack/engines/uglify"

data/lib/sinatra/assetpack/engines/less.rb

@@ -0,0 +1,11 @@
+module Sinatra::AssetPack
+  class LessEngine < Engine
+    def css(str, options={})
+      Tilt.new("less", {:style => :compressed}) { str }.render
+    rescue LoadError
+      nil
+    end
+  end
+
+  Compressor.register :css, :less, LessEngine
+end

data/lib/sinatra/assetpack/options.rb

@@ -245,11 +245,16 @@ module Sinatra
         file.sub(/^(.*)(\.[^\.]+)$/) { file, extension = $1, $2 }
 
         # Remove cache-buster (/js/app.28389.js => /js/app)
-        file = $1  if file =~ /^(.*)\.[0-9]+$/
+        file = $1 if file =~ /^(.*)\.[0-9]+$/
 
         matches = Dir[File.join(app.root, from, "#{file}.*")]
+
         # Fix for filenames with dots (can't do this with glob)
-        matches.select { |f| f =~ /#{file}\.[^.]+$/ }.first
+        matches.select! { |f| f =~ /#{file}\.[^.]+$/ }
+
+        # Sort static file match first
+        matches.sort! { |f| File.basename(f) == "#{file}#{extension}" ? -1 : 1 }
+        matches.first
       end
 
       # Writes `public/#{path}` based on contents of `output`.

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.1.0"
+      "0.1.1"
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "stylus"
   s.add_development_dependency "uglifier"
   s.add_development_dependency "rake"
+  s.add_development_dependency "less"
 end

data/test/app/app.rb

@@ -17,6 +17,7 @@ class Main < Sinatra::Base
     #serve '/js',     :from => 'app/js'
     serve '/css',    :from => 'app/css'
     serve '/images', :from => 'app/images'
+    serve '/fonts',    :from => 'app/fonts'
 
     js :skitch, '/skitch.js', [
       '/js/hi.js',

data/test/app/app/fonts/cantarell-regular-webfont.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="cantarellregular" horiz-adv-x="748" >
+<font-face units-per-em="2048" ascent="1513" descent="-535" />
+<missing-glyph horiz-adv-x="559" />
+<glyph horiz-adv-x="2048" />
+<glyph horiz-adv-x="2048" />
+<glyph unicode="&#xd;" horiz-adv-x="682" />
+<glyph unicode=" "  horiz-adv-x="559" />
+<glyph unicode="&#x09;" horiz-adv-x="559" />
+<glyph unicode="&#xa0;" horiz-adv-x="559" />
+<glyph unicode="A" horiz-adv-x="1382" d="M129 0l506 1421h192l506 -1421h-172l-143 414h-588l-143 -414h-158zM481 561h484l-240 694z" />
+<glyph unicode="&#xe000;" horiz-adv-x="985" d="M0 0v985h985v-985h-985z" />
+</font>
+</defs></svg> 

data/test/app/config.ru

@@ -0,0 +1,2 @@
+require './app'
+run Main

data/test/local_file_test.rb

@@ -6,6 +6,7 @@ class LocalFileTest < UnitTest
 
     assets {
       css :application, [ '/css/*.css' ]
+      serve '/fonts',    :from => 'app/fonts'
     }
   end
 
@@ -14,6 +15,11 @@ class LocalFileTest < UnitTest
     assert_equal r('app/images/background.jpg'), fn
   end
 
+  test "local file for (in existing files, custom serve path)" do
+    fn = App.assets.local_file_for '/fonts/cantarell-regular-webfont.ttf'
+    assert_equal r('app/fonts/cantarell-regular-webfont.ttf'), fn
+  end
+
   test "local file for (in nonexisting files)" do
     fn = App.assets.local_file_for '/images/404.jpg'
     assert fn.nil?

data/test/mime_type_test.rb

@@ -30,4 +30,29 @@ class AppTest < UnitTest
     get '/skitch.js'
     assert last_response.content_type =~ %r[^.*?/javascript]
   end
+
+  test 'eot' do
+    get '/fonts/cantarell-regular-webfont.eot'
+    assert last_response.content_type =~ %r[^application/vnd.ms-fontobject]
+  end
+
+  test 'svg' do
+    get '/fonts/cantarell-regular-webfont.svg'
+    assert last_response.content_type =~ %r[^image/svg\+xml]
+  end
+
+  test 'ttf' do
+    get '/fonts/cantarell-regular-webfont.ttf'
+    assert last_response.content_type =~ %r[^application/octet-stream]
+  end
+
+  test 'woff' do
+    get '/fonts/cantarell-regular-webfont.woff'
+    assert last_response.content_type =~ %r[^application/font-woff]
+  end
+
+  test 'woff' do
+    get '/fonts/cantarell-regular-webfont.woff'
+    assert last_response.content_type =~ %r[^application/font-woff]
+  end
 end

data/test/tilt_test.rb

@@ -5,6 +5,7 @@ class OptionsTest < UnitTest
     @formats = Sinatra::AssetPack.tilt_formats
     assert @formats['sass'] == 'css'
     assert @formats['scss'] == 'css'
+    assert @formats['less'] == 'css'
     assert @formats['coffee'] == 'js'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -219,6 +219,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  name: less
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Package your assets for Sinatra.
 email:
 - rico@sinefunc.com
@@ -269,6 +285,7 @@ files:
 - lib/sinatra/assetpack/engine.rb
 - lib/sinatra/assetpack/engines/closure.rb
 - lib/sinatra/assetpack/engines/jsmin.rb
+- lib/sinatra/assetpack/engines/less.rb
 - lib/sinatra/assetpack/engines/sass.rb
 - lib/sinatra/assetpack/engines/simple.rb
 - lib/sinatra/assetpack/engines/sqwish.rb
@@ -293,6 +310,10 @@ files:
 - test/app/app/css/style.css
 - test/app/app/css/stylus.styl
 - test/app/app/css_stylus/stylus.styl
+- test/app/app/fonts/cantarell-regular-webfont.eot
+- test/app/app/fonts/cantarell-regular-webfont.svg
+- test/app/app/fonts/cantarell-regular-webfont.ttf
+- test/app/app/fonts/cantarell-regular-webfont.woff
 - test/app/app/images/background.jpg
 - test/app/app/images/email.png
 - test/app/app/js/_ignoreme.js
@@ -306,6 +327,7 @@ files:
 - test/app/app/js_glob/a/b/c2/hi.js
 - test/app/app/js_glob/a/b/c2/hola.js
 - test/app/app/views/index.haml
+- test/app/config.ru
 - test/arity_test.rb
 - test/build_test.rb
 - test/cache_test.rb