jekyll-assets 0.7.3 → 0.7.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTY5MmJlYzIyMzc3ZWVjMzA2MjVkYWZjN2JmODNiZTFjNjA1YzFkMg==
+    Zjk3MTMwZWI5OTI0YmY1NDY5MzM2OTAxMDM2OWRjYjE1M2RhM2ViMA==
   data.tar.gz: !binary |-
-    MGIwODUxYjA1MGFjYzAyZjZkN2UwOWEzMWExNjVkOGY1ZTlhMjkxOQ==
+    YzhlMmJhZmRhNDY0OGEyMWFhM2ZhZTllN2VhM2NmNjcyOTBiYTdjMA==
 SHA512:
   metadata.gz: !binary |-
-    M2ZlMmJhNTMyMTMwYTk2ZTU4Njg5NWViYTUzMzc5YWJjOTEwZDAxN2Y4MmI3
-    NmZhN2Y4ZWQyMTQ1ZTVjZjc5MGJkMzhhZWUyNzExYzMxYWUyZDNkYmIwYjE4
-    ZjYzMDM1Mzc0YjgyODkxZmMzMmIwMTY0NGY3ZWIwOWQwMTI0MjI=
+    ZDM4MWQyNzVkYmY5ZGU3NmYzNWUxMDlmODczOWMyYjIxZjhlZWQ3ODQzZTRj
+    NDc5ZTFhYmJhZjk2ZGMwZmMxZmQ2NTU0MDU2MWIxM2Y5MWMyODcxNzU2ZmNm
+    OTljNmUzYTc4ODA3OTYwMWM0ZjhkYWRjOTg4MTNhMjMwZTE2MmI=
   data.tar.gz: !binary |-
-    MDQ0Y2Q5MzMxZTg1ZWJkYjZlNTgzOGUwMzYwZGQ3YzFjZTEzYmRlMDA3MWQw
-    MzY1NzYwOTIwZjYwOWYzZWQxNTFjNzJiNzNkY2RhYjQwZGI3NzhiMTlhYjRk
-    ZmRkMzVjZDI1ZDczMzY1MzFlOWU0OTk3YzQ4ZDgyYzgyYmNmYTI=
+    OTBkYTQ4NWQ2M2EyODdkN2UzOWM3MDU5YmJiZWYxOWM1NGFjMDU3ODE3NmM0
+    NzUxNjcxMDlkODU0NDE5NTk5YTkyNDQ1ZmE4MjA2NGM5NjBiMzJlOTQ2MDg5
+    ZDEwY2IzNjQ3NGNmYTZkZTI3YjNhYjY0MmJkMWY2MDYwNzEzMmU=

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.7.4 (2013-10-25)
+
+* Fix relative paths requires. See #59. (Thanks @wadetandy)
+
+
 ### 0.7.3 (2013-10-12)
 
 * Play nice with other plugins using `static_files`. See #45.

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

@@ -18,8 +18,9 @@ module Jekyll
 
 
         def asset_path pathname, *args
-          jekyll_assets << resolve(pathname.to_s[/^[^#?]+/]).to_s
-          site.asset_path pathname, *args
+          asset = resolve(pathname.to_s[/^[^#?]+/]).to_s
+          jekyll_assets << asset
+          (site.asset_path asset, *args) + (pathname.to_s[/[#?].+/] || '')
         rescue Sprockets::FileNotFound
           raise Environment::AssetNotFound, pathname
         end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end

data/spec/fixtures/_assets/lib/relative.css.scss

@@ -0,0 +1,12 @@
+/* copy of vapor css framework to test relative asset inclusion*/
+
+@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

@@ -9,6 +9,13 @@ module Jekyll::AssetsPlugin
         css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
         css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.svg#iefix}
       end
+
+      it "should properly handle relative paths" do
+        css = @site.assets["lib/relative.css"].to_s
+        css.should =~ %r{/assets/fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
+        css.should =~ %r{/assets/fonts/vapor-[a-f0-9]{32}\.svg#iefix}
+        puts css
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -182,6 +182,7 @@ files:
 - spec/fixtures/_assets/fonts/vapor.svg
 - spec/fixtures/_assets/fonts/vapor.ttf
 - spec/fixtures/_assets/fonts/vapor.woff
+- spec/fixtures/_assets/lib/relative.css.scss
 - spec/fixtures/_assets/noise.png
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css.scss
@@ -229,7 +230,7 @@ rubyforge_project:
 rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
-summary: jekyll-assets-0.7.3
+summary: jekyll-assets-0.7.4
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
@@ -238,6 +239,7 @@ test_files:
 - spec/fixtures/_assets/fonts/vapor.svg
 - spec/fixtures/_assets/fonts/vapor.ttf
 - spec/fixtures/_assets/fonts/vapor.woff
+- spec/fixtures/_assets/lib/relative.css.scss
 - spec/fixtures/_assets/noise.png
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css.scss