jekyll-assets 0.6.0 → 0.6.1

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.6.1 (2013-07-22)
+
+* Fix regression with `asset_path`. See #38.
+
+
 ### 0.6.0 (2013-07-14)
 
 * Remove `type` attributes from tags genereated by `javascript` and

data/lib/jekyll/assets_plugin/patches/context_patch.rb

@@ -12,13 +12,13 @@ module Jekyll
         end
 
 
-        def _jekyll_assets
-          @_jekyll_assets ||= Set.new
+        def jekyll_assets
+          @jekyll_assets ||= Set.new
         end
 
 
         def asset_path path, *args
-          _jekyll_assets << resolve(path).to_s
+          jekyll_assets << resolve(path.to_s[/^[^#?]+/]).to_s
           site.asset_path path, *args
         rescue Sprockets::FileNotFound
           raise Environment::AssetNotFound, path

data/lib/jekyll/assets_plugin/patches/processed_asset_patch.rb

@@ -30,7 +30,7 @@ module Jekyll
         def __wrap_build_dependency_paths environment, context
           @jekyll_assets = Set.new
 
-          context._jekyll_assets.each do |path|
+          context.jekyll_assets.each do |path|
             @jekyll_assets << path
             environment.find_asset(path).jekyll_assets.each{ |p| @jekyll_assets << p }
           end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/spec/fixtures/_assets/vapor.css.scss

@@ -0,0 +1,12 @@
+/* vapor css framework */
+
+@font-face {
+  font-family: 'Vapor';
+  src: url(font_path('fonts/vapor.eot'));
+  src: url(font_path('fonts/vapor.eot?#iefix')) format("embedded-opentype"),
+       url(font_path('fonts/vapor.woff')) format("woff"),
+       url(font_path('fonts/vapor.ttf')) format("truetype"),
+       url(font_path('fonts/vapor.svg#iefix')) format("svg");
+  font-weight: normal;
+  font-style: normal;
+}

data/spec/lib/jekyll/assets_plugin/environment_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+
+module Jekyll::AssetsPlugin
+  describe Environment do
+    context "#asset_path of context" do
+      it "should properly handle query params" do
+        css = @site.assets["vapor.css"].to_s
+        css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
+        css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.svg#iefix}
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -198,11 +198,12 @@ files:
 - spec/fixtures/_assets/app.css.erb
 - spec/fixtures/_assets/app.js
 - spec/fixtures/_assets/fonts/vapor.eot
+- spec/fixtures/_assets/fonts/vapor.svg
 - spec/fixtures/_assets/fonts/vapor.ttf
 - spec/fixtures/_assets/fonts/vapor.woff
 - spec/fixtures/_assets/noise.png
 - spec/fixtures/_assets/should_fail.css.erb
-- spec/fixtures/_assets/vapor.css
+- spec/fixtures/_assets/vapor.css.scss
 - spec/fixtures/_assets/vapor.js
 - spec/fixtures/_assets/vendor/bourbon.css.sass
 - spec/fixtures/_assets/vendor/compass.css.sass
@@ -216,6 +217,7 @@ files:
 - spec/lib/jekyll-assets/neat_spec.rb
 - spec/lib/jekyll/assets_plugin/asset_file_spec.rb
 - spec/lib/jekyll/assets_plugin/configuration_spec.rb
+- spec/lib/jekyll/assets_plugin/environment_spec.rb
 - spec/lib/jekyll/assets_plugin/filters_spec.rb
 - spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb
 - spec/lib/jekyll/assets_plugin/tag_spec.rb
@@ -245,17 +247,18 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.6.0
+summary: jekyll-assets-0.6.1
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
 - spec/fixtures/_assets/app.js
 - spec/fixtures/_assets/fonts/vapor.eot
+- spec/fixtures/_assets/fonts/vapor.svg
 - spec/fixtures/_assets/fonts/vapor.ttf
 - spec/fixtures/_assets/fonts/vapor.woff
 - spec/fixtures/_assets/noise.png
 - spec/fixtures/_assets/should_fail.css.erb
-- spec/fixtures/_assets/vapor.css
+- spec/fixtures/_assets/vapor.css.scss
 - spec/fixtures/_assets/vapor.js
 - spec/fixtures/_assets/vendor/bourbon.css.sass
 - spec/fixtures/_assets/vendor/compass.css.sass
@@ -269,6 +272,7 @@ test_files:
 - spec/lib/jekyll-assets/neat_spec.rb
 - spec/lib/jekyll/assets_plugin/asset_file_spec.rb
 - spec/lib/jekyll/assets_plugin/configuration_spec.rb
+- spec/lib/jekyll/assets_plugin/environment_spec.rb
 - spec/lib/jekyll/assets_plugin/filters_spec.rb
 - spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb
 - spec/lib/jekyll/assets_plugin/tag_spec.rb

data/spec/fixtures/_assets/vapor.css

@@ -1,11 +0,0 @@
-/* vapor css framework */
-
-@font-face {
-  font-family: 'Vapor';
-  src: url(font-path('fonts/vapor.eot'));
-  src: url(font-path('fonts/vapor.eot')#iefix) format("embedded-opentype"),
-       url(font-path('fonts/vapor.woff')) format("woff"),
-       url(font-path('fonts/vapor.ttf')) format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}