jekyll-assets 0.7.3 → 0.7.4

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.
Files changed (7) hide show
  1. checksums.yaml +8 -8
  2. data/HISTORY.md +5 -0
  3. data/lib/jekyll/assets_plugin/patches/context_patch.rb +3 -2
  4. data/lib/jekyll/assets_plugin/version.rb +1 -1
  5. data/spec/fixtures/_assets/lib/relative.css.scss +12 -0
  6. data/spec/lib/jekyll/assets_plugin/environment_spec.rb +7 -0
  7. metadata +5 -3
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YTY5MmJlYzIyMzc3ZWVjMzA2MjVkYWZjN2JmODNiZTFjNjA1YzFkMg==
4
+ Zjk3MTMwZWI5OTI0YmY1NDY5MzM2OTAxMDM2OWRjYjE1M2RhM2ViMA==
5
5
  data.tar.gz: !binary |-
6
- MGIwODUxYjA1MGFjYzAyZjZkN2UwOWEzMWExNjVkOGY1ZTlhMjkxOQ==
6
+ YzhlMmJhZmRhNDY0OGEyMWFhM2ZhZTllN2VhM2NmNjcyOTBiYTdjMA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- M2ZlMmJhNTMyMTMwYTk2ZTU4Njg5NWViYTUzMzc5YWJjOTEwZDAxN2Y4MmI3
10
- NmZhN2Y4ZWQyMTQ1ZTVjZjc5MGJkMzhhZWUyNzExYzMxYWUyZDNkYmIwYjE4
11
- ZjYzMDM1Mzc0YjgyODkxZmMzMmIwMTY0NGY3ZWIwOWQwMTI0MjI=
9
+ ZDM4MWQyNzVkYmY5ZGU3NmYzNWUxMDlmODczOWMyYjIxZjhlZWQ3ODQzZTRj
10
+ NDc5ZTFhYmJhZjk2ZGMwZmMxZmQ2NTU0MDU2MWIxM2Y5MWMyODcxNzU2ZmNm
11
+ OTljNmUzYTc4ODA3OTYwMWM0ZjhkYWRjOTg4MTNhMjMwZTE2MmI=
12
12
  data.tar.gz: !binary |-
13
- MDQ0Y2Q5MzMxZTg1ZWJkYjZlNTgzOGUwMzYwZGQ3YzFjZTEzYmRlMDA3MWQw
14
- MzY1NzYwOTIwZjYwOWYzZWQxNTFjNzJiNzNkY2RhYjQwZGI3NzhiMTlhYjRk
15
- ZmRkMzVjZDI1ZDczMzY1MzFlOWU0OTk3YzQ4ZDgyYzgyYmNmYTI=
13
+ OTBkYTQ4NWQ2M2EyODdkN2UzOWM3MDU5YmJiZWYxOWM1NGFjMDU3ODE3NmM0
14
+ NzUxNjcxMDlkODU0NDE5NTk5YTkyNDQ1ZmE4MjA2NGM5NjBiMzJlOTQ2MDg5
15
+ ZDEwY2IzNjQ3NGNmYTZkZTI3YjNhYjY0MmJkMWY2MDYwNzEzMmU=
data/HISTORY.md CHANGED
@@ -1,3 +1,8 @@
1
+ ### 0.7.4 (2013-10-25)
2
+
3
+ * Fix relative paths requires. See #59. (Thanks @wadetandy)
4
+
5
+
1
6
  ### 0.7.3 (2013-10-12)
2
7
 
3
8
  * Play nice with other plugins using `static_files`. See #45.
data/lib/jekyll/assets_plugin/patches/context_patch.rb CHANGED
@@ -18,8 +18,9 @@ module Jekyll
18
18
 
19
19
 
20
20
  def asset_path pathname, *args
21
- jekyll_assets << resolve(pathname.to_s[/^[^#?]+/]).to_s
22
- site.asset_path pathname, *args
21
+ asset = resolve(pathname.to_s[/^[^#?]+/]).to_s
22
+ jekyll_assets << asset
23
+ (site.asset_path asset, *args) + (pathname.to_s[/[#?].+/] || '')
23
24
  rescue Sprockets::FileNotFound
24
25
  raise Environment::AssetNotFound, pathname
25
26
  end
data/lib/jekyll/assets_plugin/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Jekyll
2
2
  module AssetsPlugin
3
- VERSION = "0.7.3"
3
+ VERSION = "0.7.4"
4
4
  end
5
5
  end
data/spec/fixtures/_assets/lib/relative.css.scss ADDED
@@ -0,0 +1,12 @@
1
+ /* copy of vapor css framework to test relative asset inclusion*/
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
+ }
data/spec/lib/jekyll/assets_plugin/environment_spec.rb CHANGED
@@ -9,6 +9,13 @@ module Jekyll::AssetsPlugin
9
9
  css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
10
10
  css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.svg#iefix}
11
11
  end
12
+
13
+ it "should properly handle relative paths" do
14
+ css = @site.assets["lib/relative.css"].to_s
15
+ css.should =~ %r{/assets/fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
16
+ css.should =~ %r{/assets/fonts/vapor-[a-f0-9]{32}\.svg#iefix}
17
+ puts css
18
+ end
12
19
  end
13
20
  end
14
21
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.3
4
+ version: 0.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Aleksey V Zapparov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-12 00:00:00.000000000 Z
11
+ date: 2013-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -182,6 +182,7 @@ files:
182
182
  - spec/fixtures/_assets/fonts/vapor.svg
183
183
  - spec/fixtures/_assets/fonts/vapor.ttf
184
184
  - spec/fixtures/_assets/fonts/vapor.woff
185
+ - spec/fixtures/_assets/lib/relative.css.scss
185
186
  - spec/fixtures/_assets/noise.png
186
187
  - spec/fixtures/_assets/should_fail.css.erb
187
188
  - spec/fixtures/_assets/vapor.css.scss
@@ -229,7 +230,7 @@ rubyforge_project:
229
230
  rubygems_version: 2.1.8
230
231
  signing_key:
231
232
  specification_version: 4
232
- summary: jekyll-assets-0.7.3
233
+ summary: jekyll-assets-0.7.4
233
234
  test_files:
234
235
  - spec/fixtures/.gitignore
235
236
  - spec/fixtures/_assets/app.css.erb
@@ -238,6 +239,7 @@ test_files:
238
239
  - spec/fixtures/_assets/fonts/vapor.svg
239
240
  - spec/fixtures/_assets/fonts/vapor.ttf
240
241
  - spec/fixtures/_assets/fonts/vapor.woff
242
+ - spec/fixtures/_assets/lib/relative.css.scss
241
243
  - spec/fixtures/_assets/noise.png
242
244
  - spec/fixtures/_assets/should_fail.css.erb
243
245
  - spec/fixtures/_assets/vapor.css.scss