nanoc3 3.0.4 → 3.0.5

data/NEWS.rdoc

@@ -1,5 +1,13 @@
 = nanoc News
 
+== 3.0.5
+
+* Restored pre-3.0.3 behaviour of periods in identifiers. By default, a file
+  can have multiple extensions (e.g. content/foo.html.erb will have the
+  identifier /foo/), but if `allow_periods_in_identifiers` in the site
+  configuration is true, a file can have only one extension (e.g.
+  content/blog/stuff.entry.html will have the identifier /blog/stuff.entry/).
+
 == 3.0.4
 
 * Fixed a bug which would cause the filesystem_compact data source to

data/lib/nanoc3/data_sources/filesystem_combined.rb

@@ -95,11 +95,15 @@ module Nanoc3::DataSources
         attributes = meta.merge(:file => Nanoc3::Extra::FileProxy.new(filename))
 
         # Get actual identifier
+        identifier = filename.sub(/^content/, '')
         if filename =~ /\/index\.[^\/]+$/
-          identifier = filename.sub(/^content/, '').sub(/index\.[^\/\.]+$/, '') + '/'
+          regex = ((@config && @config[:allow_periods_in_identifiers]) ? /index\.[^\/\.]+$/ : /index\.[^\/]+$/)
+          identifier.sub!(regex, '')
         else
-          identifier = filename.sub(/^content/, '').sub(/\.[^\/\.]+$/, '') + '/'
+          regex = ((@config && @config[:allow_periods_in_identifiers]) ? /\.[^\/\.]+$/      : /\.[^\/]+$/)
+          identifier.sub!(regex, '')
         end
+        identifier << '/'
 
         # Get mtime
         mtime = File.stat(filename).mtime

data/lib/nanoc3/data_sources/filesystem_compact.rb

@@ -222,9 +222,13 @@ module Nanoc3::DataSources
     # '.rej' or '.bak')
     def content_filename_for_meta_filename(meta_filename)
       # Find all files
-    	base_filename = File.basename(meta_filename, '.yaml')
-    	dirname       = File.dirname(meta_filename)
-    	filenames     = Dir.entries(dirname).select { |f| f =~ /^#{base_filename}\.[^.]+$/ }.map { |f| "#{dirname}/#{f}" }
+      if @config && @config[:allow_periods_in_identifiers]
+      	base_filename = File.basename(meta_filename, '.yaml')
+      	dirname       = File.dirname(meta_filename)
+      	filenames     = Dir.entries(dirname).select { |f| f =~ /^#{base_filename}\.[^.]+$/ }.map { |f| "#{dirname}/#{f}" }
+      else
+        filenames = Dir[meta_filename.sub(/\.yaml$/, '.*')]
+      end
 
       # Reject meta files
       filenames.reject! { |f| f =~ /\.yaml$/ }

data/lib/nanoc3/extra/file_proxy.rb

@@ -19,11 +19,17 @@ module Nanoc3::Extra
       @path = path
     end
 
+    # Returns true if File instances respond to the given method; false if
+    # they do not.
+    def respond_to?(meth)
+      File.instance_methods.any? { |m| m == meth.to_s || m == meth.to_sym }
+    end
+
     # Makes sure all method calls are relayed to a File object, which will
     # be created right before the method call takes place and destroyed
     # right after.
     def method_missing(sym, *args, &block)
-      File.new(@path).__send__(sym, *args, &block)
+      File.open(@path, 'r') { |io| io.__send__(sym, *args, &block) }
     end
 
   end

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc3
 version: !ruby/object:Gem::Version 
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: []