sinatra-assetpack 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d663bf9909c651baf667925dc70d3e434e3df7d5
-  data.tar.gz: 44e7f4b6b69d7ef2de0405d38b64a0d75fc95416
+  metadata.gz: 4e728d4e113b8fc40c01e5116725739d612086de
+  data.tar.gz: 4283e6dd55cc00cf441ce2aeb373003d252d1b2e
 SHA512:
-  metadata.gz: 661a0a911bc4f8deb66185be8ea943d025efb80f26b85a337873830989d4113a7b6e66bbc44b19be9ac1734dae684d9841022f82c2aabbff940449785906ef4f
-  data.tar.gz: 9c4cca3b82255e195c06044604afda72582e5ba09d85081b3ec8230460b9141ef39a4e49c87f760b114cd816e5d795c35b10d2e95cec862e7ca7df544be1e3ae
+  metadata.gz: f220be3e7b56b19ee7d9ba7d309394dc1f2312fcfa43bb51cdfee6ef67ea739b2214e778d195c8e6bf625f74b75a4434e1fc2accadff1eafc392fcd44d4c9277
+  data.tar.gz: 891c2420167550c074d6773142f543694645e49f9e89b8a34ebf55f6236bf3c270cb222609a3efc1b7089884f3ed89a54b676a9a06fa21c83026744862cbf745

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.3.0 - July 30, 2013
+
+### Changes
+  * Remove automatic image tag width/height (#121)
+
+### Fixed
+  * Tilt issue #206 workaround (#125)
+
+### Improvements
+  * Improve DSL error reporting (#124)
+  * Add filename option to templates render. (#126)
+
 ## v0.2.8 - June 25, 2013
 
 ### Fixed

data/README.md

@@ -34,6 +34,8 @@ class App < Sinatra::Base
 
     # The second parameter defines where the compressed version will be served.
     # (Note: that parameter is optional, AssetPack will figure it out.)
+    # The final parameter is an array of glob patterns defining the contents
+    # of the package (as matched on the public URIs, not the filesystem)
     js :app, '/js/app.js', [
       '/js/vendor/**/*.js',
       '/js/lib/**/*.js'
@@ -257,6 +259,9 @@ URL.
 APP_FILE  = 'app.rb'
 APP_CLASS = 'App'
 
+# For Padrino users, do not forget to add your application namspace
+# APP_CLASS = '<Project>::App'
+
 require 'sinatra/assetpack/rake'
 ```
 

data/lib/sinatra/assetpack.rb

@@ -17,6 +17,9 @@ module Sinatra
       @formats ||= begin
         hash = Hash.new
         Tilt.mappings.each do |format, (engine, _)|
+          # @todo Remove when fix is merged in tilt
+          # https://github.com/rtomayko/tilt/pull/206
+          next if engine.nil? 
           case engine.default_mime_type
           when 'text/css' then hash[format] = 'css'
           when 'application/javascript' then hash[format] = 'js'

data/lib/sinatra/assetpack/class_methods.rb

@@ -87,7 +87,7 @@ module Sinatra
 
               @template_cache.fetch(fn) {
                 settings.assets.fetch_dynamic_asset(fn) {
-                  out = render format.to_sym, File.read(fn)
+                  out = render format.to_sym, File.read(fn), :filename => fn
                   out = asset_filter_css(out)  if fmt == 'css'
                   out
                 }

data/lib/sinatra/assetpack/helpers.rb

@@ -10,19 +10,8 @@ module Sinatra
       end
 
       def img(src, options={})
-        attrs = { :src => src }.merge(options)
-
-        local = settings.assets.local_file_for src
-        if local
-          i = Image[local]
-
-          attrs[:src] = HtmlHelpers.get_file_uri(src, settings.assets)
-
-          if i.dimensions?
-            attrs[:width]  ||= i.width
-            attrs[:height] ||= i.height
-          end
-        end
+        attrs = { :src => HtmlHelpers.get_file_uri(src, settings.assets) }
+          .merge!(options)
 
         "<img#{HtmlHelpers.kv attrs} />"
       end

data/lib/sinatra/assetpack/options.rb

@@ -66,9 +66,9 @@ module Sinatra
         reset!
 
         # Defaults!
-        serve '/css',    :from => 'app/css'
-        serve '/js',     :from => 'app/js'
-        serve '/images', :from => 'app/images'
+        serve '/css',    :from => 'app/css'     rescue Errno::ENOTDIR
+        serve '/js',     :from => 'app/js'      rescue Errno::ENOTDIR
+        serve '/images', :from => 'app/images'  rescue Errno::ENOTDIR
 
         ignore '.*'
         ignore '_*'
@@ -80,13 +80,17 @@ module Sinatra
       # DSL methods
 
       def serve(path, options={})
-        raise Error unless options[:from]
+        unless from = options[:from]
+          raise ArgumentError, "Parameter :from is required" 
+        end
+
+        expanded = expand_from(from)
 
-        full_path = options[:from]
-        full_path = File.join(app.root, full_path) unless File.directory?(full_path)
-        return unless File.directory?(full_path)
+        unless File.directory? expanded
+          raise Errno::ENOTDIR, expanded
+        end
 
-        @served[path] = options[:from]
+        @served[path] = from
         @reload_files_cache = true
       end
 

data/lib/sinatra/assetpack/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module AssetPack
-    VERSION = "0.2.8"
+    VERSION = "0.3.0"
 
     # @deprecated Please use AssetPack::VERSION instead
     def self.version

data/test/helpers_test.rb

@@ -17,8 +17,6 @@ class HelpersTest < UnitTest
     get '/helper/email'
 
     assert body =~ %r{src='/images/email.png'}
-    assert body =~ %r{width='16'}
-    assert body =~ %r{height='16'}
   end
 
   test "img existing (production)" do
@@ -26,8 +24,6 @@ class HelpersTest < UnitTest
     get '/helper/email'
 
     assert body =~ %r{src='/images/email.[a-f0-9]{32}.png'}
-    assert body =~ %r{width='16'}
-    assert body =~ %r{height='16'}
   end
 
   test "css" do

data/test/options_test.rb

@@ -16,4 +16,19 @@ class OptionsTest < UnitTest
     assert App.assets.js_compression == :closure
     assert App.assets.packages['application.css'].path == "/assets/application.css"
   end
+
+  test "serve requires :from parameter" do
+    err = assert_raise ArgumentError do
+      App.assets.serve "/foo"
+    end
+    assert_equal "Parameter :from is required", err.message
+  end
+
+  test "serve requires :from to be directory" do
+    e = assert_raise Errno::ENOTDIR do
+      App.assets.serve "/foo", :from => "/does/not/exist"
+    end
+  end
+
+
 end

data/test/tilt_test.rb

@@ -2,6 +2,12 @@ require File.expand_path('../test_helper', __FILE__)
 
 class OptionsTest < UnitTest
   test "tilt mappings" do
+    # @todo Remove when fix is merged in tilt
+    # https://github.com/rtomayko/tilt/pull/206
+    # trigger Tilt issue 206 then reset formats
+    assert_nil Tilt["hello.world"]		
+    Sinatra::AssetPack.instance_variable_set :@formats, nil
+    # extract formats
     @formats = Sinatra::AssetPack.tilt_formats
     assert @formats['sass'] == 'css'
     assert @formats['scss'] == 'css'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -30,7 +30,7 @@ cert_chain:
   kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
   e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
   -----END CERTIFICATE-----
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsmin