nanoc-cachebuster 0.1.1 → 0.1.2

data/HISTORY.md

@@ -1,12 +1,5 @@
-# 0.1.1
-
-* Bugfix: no longer raise exception when an item has no content_filename attribute.
-
-# 0.1.0
+# 0.0.1
 
 * No more re-calculation of fingerprints, just use the routed filename.
-
-# 0.1.0
-
 * Refactored into separate strategies.
-* First, direct extraction.
+* First, direct extraction.

data/Rakefile

@@ -31,7 +31,7 @@ task :log do
   end
 end
 
-desc 'Tag the code, push upstream, build and push the gem'
+desc 'Push code upstream, build and publish the gem'
 task :release => [:install, :push] do
   sh "gem push nanoc-cachebuster-#{Nanoc3::Cachebuster::VERSION}.gem"
 end

data/lib/nanoc3/cachebuster/strategy.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Nanoc3
   module Cachebuster
     # The Strategy is a way to deal with an input file. The Cache busting filter
@@ -76,11 +78,14 @@ module Nanoc3
           raise Nanoc3::Cachebuster::NoSuchSourceFile, 'No source file found matching ' + input_path
         end
 
-        # Make sure to keep or remove the first slash, as the input path
-        # does.
-        matching_item.path.tap do |p|
-          p.sub!(/^\//, '') unless input_path =~ /^\//
-        end
+        # keep using an absolute path if the input reference did so...
+        return matching_item.path if input_path =~ /^\//
+
+        # ... if not, recreate the relative path to referenced file from
+        # the current file path.
+        current_path = Pathname.new(File.dirname(current_item.path))
+        target_path  = Pathname.new(File.dirname(matching_item.path))
+        output_reference = target_path.relative_path_from(current_path).join(File.basename(matching_item.path))
       end
 
       # Get the absolute path to a file, whereby absolute means relative to the root.
@@ -103,9 +108,9 @@ module Nanoc3
       def absolutize(path)
         return path if path =~ /^\//
         if current_item[:content_filename]
-          File.join(File.dirname(current_item[:content_filename]), path).sub(/^content/, '')
+          File.expand_path(File.join(File.dirname(current_item[:content_filename]), path)).sub(/^#{Dir.pwd}/, '').sub(/^\/content/, '')
         else
-          File.join(File.dirname(current_item.path), path)
+          File.dirname(current_item.path)
         end
       end
     end

data/lib/nanoc3/cachebuster/version.rb

@@ -1,5 +1,5 @@
 module Nanoc3
   module Cachebuster
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/nanoc3/filters/cache_buster_spec.rb

@@ -3,18 +3,22 @@ require 'ostruct'
 class MockItem
   attr_reader :path, :content
 
-  def self.generated_css_file
-    new '/styles-cb123456789.css', 'example content', { :extension => 'css' }
-  end
-
   def self.css_file(content = 'example content')
     new '/styles-cb123456789.css', content, { :extension => 'css', :content_filename => 'content/styles.css' }
   end
 
+  def self.css_file_in_folder(folder_name = 'assets')
+    new "/#{folder_name}/styles-cb123456789.css", 'example content', { :extension => 'css', :content_filename => "content/#{folder_name}/styles.css" }
+  end
+
   def self.html_file(content = 'example content')
     new '/output_file.html', content, { :extension => 'html', :content_filename => 'content/input_file.html' }
   end
 
+  def self.html_file_in_folder(folder_name = 'baz', content = 'example content')
+    new "/#{folder_name}/output_file.html", content, { :extension => 'html', :content_filename => "content/#{folder_name}/input_file.html" }
+  end
+
   def self.image_file(input = '/foo.png', output = '/foo-cb123456789.png')
     new output, 'hello, world', { :extension => 'png', :content_filename => input }
   end
@@ -117,10 +121,11 @@ describe Nanoc3::Filters::CacheBuster do
     end
 
     describe 'when using a relative path' do
-      let(:target) { MockItem.image_file '/foo.png', '/../images/foo-cb123456789.png' }
+      let(:item) { MockItem.css_file_in_folder }
+      let(:target) { MockItem.image_file '/images/foo.png', '/images/foo-cb123456789.png' }
 
       before(:each) do
-        File.stub!(:read).with(File.join(Dir.pwd, 'content', 'foo.png')).and_return(context[:content])
+        File.stub!(:read).with(File.join(Dir.pwd, 'content', 'images', 'foo.png')).and_return(context[:content])
       end
 
       it_should_filter %Q{background: url("../images/foo.png");} => %Q{background: url("../images/foo-cb123456789.png");}
@@ -137,13 +142,6 @@ describe Nanoc3::Filters::CacheBuster do
 
       it_should_not_filter %Q{background: url(foo.png);}
     end
-
-    describe 'when the current item has no content path' do
-      let(:target) { MockItem.image_file '/foo.png', '/../images/foo-cb123456789.png' }
-      let(:item) { MockItem.generated_css_file }
-
-      it_should_filter %Q{background: url("../images/foo.png");} => %Q{background: url("../images/foo-cb123456789.png");}
-    end
   end
 
   describe 'filtering HTML' do
@@ -179,7 +177,8 @@ describe Nanoc3::Filters::CacheBuster do
       end
 
       describe 'when using a relative path' do
-        let(:target) { MockItem.image_file '/foo.png', '/../images/foo-cb123456789.png' }
+        let(:item) { MockItem.html_file_in_folder }
+        let(:target) { MockItem.image_file '/foo.png', '/images/foo-cb123456789.png' }
 
         before(:each) do
           File.stub!(:read).with(File.join(Dir.pwd, 'content', 'foo.png')).and_return(context[:content])
@@ -233,7 +232,8 @@ describe Nanoc3::Filters::CacheBuster do
       end
 
       describe 'when using a relative path' do
-        let(:target) { MockItem.image_file '/foo.png', '/../images/foo-cb123456789.png' }
+        let(:item) { MockItem.html_file_in_folder }
+        let(:target) { MockItem.image_file '/foo.png', '/images/foo-cb123456789.png' }
 
         before(:each) do
           File.stub!(:read).with(File.join(Dir.pwd, 'content', 'foo.png')).and_return(context[:content])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc-cachebuster
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 Z
+date: 2011-05-27 00:00:00 Z
 dependencies: []
 
 description: |