nanoc-cachebuster 0.2.0 → 0.3.0

data/HISTORY.md

@@ -1,6 +1,11 @@
+# 0.3.0
+
+* Fixed naming collisions with Nanoc3
+
 # 0.2.0
 
 * Nanoc 3.3 compatibility (by John Nishinaga)
+* Fixed spec suite (by Robert J Whitney)
 
 # 0.1.1
 

data/README.md

@@ -71,6 +71,8 @@ to do is set some far-future expires header in your server configuration.
 Development
 ===========
 
+Development happens in the `develop` branch, with stable code being merged to `master` to be released.
+
 Changes
 -------
 

data/lib/nanoc-cachebuster.rb

@@ -0,0 +1 @@
+require 'nanoc/cachebuster'

data/lib/nanoc/cachebuster.rb

@@ -1,9 +1,10 @@
 require 'nanoc'
 require 'digest'
 
+require 'nanoc/cachebuster/version'
+
 module Nanoc
   module Cachebuster
-    autoload :VERSION,  'cachebuster/version'
 
     # List of file extensions that the routing system should regard
     # as needing a fingerprint. These are input file extensions, so
@@ -38,7 +39,8 @@ module Nanoc
     end
   end
 
-  require File.expand_path('../filters', __FILE__)
-  require File.expand_path('../helpers', __FILE__)
-  require File.expand_path('../cachebuster/strategy', __FILE__)
 end
+
+require 'nanoc/cachebuster/strategy'
+require 'nanoc/filters/cache_buster'
+require 'nanoc/helpers/cache_busting'

data/lib/nanoc/cachebuster/strategy.rb

@@ -110,7 +110,7 @@ module Nanoc
         if current_item[:content_filename]
           File.expand_path(File.join(File.dirname(current_item[:content_filename]), path)).sub(/^#{Dir.pwd}/, '').sub(/^\/content/, '')
         else
-          File.expand_path(File.dirname(current_item.path), path)
+          File.join(File.dirname(current_item.path), path)
         end
       end
     end
@@ -157,4 +157,3 @@ module Nanoc
     end
   end
 end
-

data/lib/nanoc/cachebuster/version.rb

@@ -1,5 +1,5 @@
 module Nanoc
   module Cachebuster
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/nanoc/filters/cache_buster_spec.rb

@@ -147,10 +147,7 @@ describe Nanoc::Filters::CacheBuster do
 
       it_should_not_filter %Q{background: url(foo.png);}
     end
-    
-    # Needs documentation on what this test is actually testing, and thinking on convention.
-    # This is currently responding to the else on line 113 of cachebuster#strategy.rb which is not adding the cb hash to the end of the file name.
-    # Need to discover under what condition does an item has no :content_filename and consider what is best convention to handle this case.
+
     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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cachebuster
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc
-  requirement: &70096428299300 !ruby/object:Gem::Requirement
+  requirement: &70312252439040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096428299300
+  version_requirements: *70312252439040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70096428298460 !ruby/object:Gem::Requirement
+  requirement: &70312252438620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096428298460
+  version_requirements: *70312252438620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096428297900 !ruby/object:Gem::Requirement
+  requirement: &70312252438160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096428297900
+  version_requirements: *70312252438160
 description: ! 'Your website should use far-future expires headers on static assets,
   to make
 
@@ -81,12 +81,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/nanoc-cachebuster.rb
 - lib/nanoc/cachebuster.rb
 - lib/nanoc/cachebuster/strategy.rb
 - lib/nanoc/cachebuster/version.rb
-- lib/nanoc/filters.rb
 - lib/nanoc/filters/cache_buster.rb
-- lib/nanoc/helpers.rb
 - lib/nanoc/helpers/cache_busting.rb
 - nanoc-cachebuster.gemspec
 - spec/nanoc/filters/cache_buster_spec.rb
@@ -106,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1070542068596424145
+      hash: -1449409011190348151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,10 +114,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1070542068596424145
+      hash: -1449409011190348151
 requirements: []
 rubyforge_project: nanoc-cachebuster
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Adds filters and helpers for cache busting to Nanoc

data/lib/nanoc/filters.rb

@@ -1,4 +0,0 @@
-module Nanoc::Filters
-  autoload 'CacheBuster', 'nanoc/filters/cache_buster'
-  Nanoc::Filter.register '::Nanoc::Filters::CacheBuster', :cache_buster
-end

data/lib/nanoc/helpers.rb

@@ -1,3 +0,0 @@
-module Nanoc::Helpers
-  autoload 'CacheBusting', 'nanoc/helpers/cache_busting'
-end