jekyll-assets 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/HISTORY.md CHANGED
@@ -1,3 +1,8 @@
1
+ ### 0.6.1 (2013-07-22)
2
+
3
+ * Fix regression with `asset_path`. See #38.
4
+
5
+
1
6
  ### 0.6.0 (2013-07-14)
2
7
 
3
8
  * Remove `type` attributes from tags genereated by `javascript` and
@@ -12,13 +12,13 @@ module Jekyll
12
12
  end
13
13
 
14
14
 
15
- def _jekyll_assets
16
- @_jekyll_assets ||= Set.new
15
+ def jekyll_assets
16
+ @jekyll_assets ||= Set.new
17
17
  end
18
18
 
19
19
 
20
20
  def asset_path path, *args
21
- _jekyll_assets << resolve(path).to_s
21
+ jekyll_assets << resolve(path.to_s[/^[^#?]+/]).to_s
22
22
  site.asset_path path, *args
23
23
  rescue Sprockets::FileNotFound
24
24
  raise Environment::AssetNotFound, path
@@ -30,7 +30,7 @@ module Jekyll
30
30
  def __wrap_build_dependency_paths environment, context
31
31
  @jekyll_assets = Set.new
32
32
 
33
- context._jekyll_assets.each do |path|
33
+ context.jekyll_assets.each do |path|
34
34
  @jekyll_assets << path
35
35
  environment.find_asset(path).jekyll_assets.each{ |p| @jekyll_assets << p }
36
36
  end
@@ -1,5 +1,5 @@
1
1
  module Jekyll
2
2
  module AssetsPlugin
3
- VERSION = "0.6.0"
3
+ VERSION = "0.6.1"
4
4
  end
5
5
  end
File without changes
@@ -0,0 +1,12 @@
1
+ /* vapor css framework */
2
+
3
+ @font-face {
4
+ font-family: 'Vapor';
5
+ src: url(font_path('fonts/vapor.eot'));
6
+ src: url(font_path('fonts/vapor.eot?#iefix')) format("embedded-opentype"),
7
+ url(font_path('fonts/vapor.woff')) format("woff"),
8
+ url(font_path('fonts/vapor.ttf')) format("truetype"),
9
+ url(font_path('fonts/vapor.svg#iefix')) format("svg");
10
+ font-weight: normal;
11
+ font-style: normal;
12
+ }
@@ -0,0 +1,14 @@
1
+ require "spec_helper"
2
+
3
+
4
+ module Jekyll::AssetsPlugin
5
+ describe Environment do
6
+ context "#asset_path of context" do
7
+ it "should properly handle query params" do
8
+ css = @site.assets["vapor.css"].to_s
9
+ css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
10
+ css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.svg#iefix}
11
+ end
12
+ end
13
+ end
14
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-14 00:00:00.000000000 Z
12
+ date: 2013-07-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: jekyll
@@ -198,11 +198,12 @@ files:
198
198
  - spec/fixtures/_assets/app.css.erb
199
199
  - spec/fixtures/_assets/app.js
200
200
  - spec/fixtures/_assets/fonts/vapor.eot
201
+ - spec/fixtures/_assets/fonts/vapor.svg
201
202
  - spec/fixtures/_assets/fonts/vapor.ttf
202
203
  - spec/fixtures/_assets/fonts/vapor.woff
203
204
  - spec/fixtures/_assets/noise.png
204
205
  - spec/fixtures/_assets/should_fail.css.erb
205
- - spec/fixtures/_assets/vapor.css
206
+ - spec/fixtures/_assets/vapor.css.scss
206
207
  - spec/fixtures/_assets/vapor.js
207
208
  - spec/fixtures/_assets/vendor/bourbon.css.sass
208
209
  - spec/fixtures/_assets/vendor/compass.css.sass
@@ -216,6 +217,7 @@ files:
216
217
  - spec/lib/jekyll-assets/neat_spec.rb
217
218
  - spec/lib/jekyll/assets_plugin/asset_file_spec.rb
218
219
  - spec/lib/jekyll/assets_plugin/configuration_spec.rb
220
+ - spec/lib/jekyll/assets_plugin/environment_spec.rb
219
221
  - spec/lib/jekyll/assets_plugin/filters_spec.rb
220
222
  - spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb
221
223
  - spec/lib/jekyll/assets_plugin/tag_spec.rb
@@ -245,17 +247,18 @@ rubyforge_project:
245
247
  rubygems_version: 1.8.23
246
248
  signing_key:
247
249
  specification_version: 3
248
- summary: jekyll-assets-0.6.0
250
+ summary: jekyll-assets-0.6.1
249
251
  test_files:
250
252
  - spec/fixtures/.gitignore
251
253
  - spec/fixtures/_assets/app.css.erb
252
254
  - spec/fixtures/_assets/app.js
253
255
  - spec/fixtures/_assets/fonts/vapor.eot
256
+ - spec/fixtures/_assets/fonts/vapor.svg
254
257
  - spec/fixtures/_assets/fonts/vapor.ttf
255
258
  - spec/fixtures/_assets/fonts/vapor.woff
256
259
  - spec/fixtures/_assets/noise.png
257
260
  - spec/fixtures/_assets/should_fail.css.erb
258
- - spec/fixtures/_assets/vapor.css
261
+ - spec/fixtures/_assets/vapor.css.scss
259
262
  - spec/fixtures/_assets/vapor.js
260
263
  - spec/fixtures/_assets/vendor/bourbon.css.sass
261
264
  - spec/fixtures/_assets/vendor/compass.css.sass
@@ -269,6 +272,7 @@ test_files:
269
272
  - spec/lib/jekyll-assets/neat_spec.rb
270
273
  - spec/lib/jekyll/assets_plugin/asset_file_spec.rb
271
274
  - spec/lib/jekyll/assets_plugin/configuration_spec.rb
275
+ - spec/lib/jekyll/assets_plugin/environment_spec.rb
272
276
  - spec/lib/jekyll/assets_plugin/filters_spec.rb
273
277
  - spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb
274
278
  - spec/lib/jekyll/assets_plugin/tag_spec.rb
@@ -1,11 +0,0 @@
1
- /* vapor css framework */
2
-
3
- @font-face {
4
- font-family: 'Vapor';
5
- src: url(font-path('fonts/vapor.eot'));
6
- src: url(font-path('fonts/vapor.eot')#iefix) format("embedded-opentype"),
7
- url(font-path('fonts/vapor.woff')) format("woff"),
8
- url(font-path('fonts/vapor.ttf')) format("truetype");
9
- font-weight: normal;
10
- font-style: normal;
11
- }