nanoc3 3.1.2 → 3.1.3

data/NEWS.md

@@ -1,5 +1,13 @@
 # nanoc news
 
+## 3.1.3 (???)
+
+* Removed annoying win32console warning [Eric Sunshine]
+* Removed color codes when not writing to a terminal, or when writing to
+  Windows’ console when win32console is not installed [Eric Sunshine]
+* Added .xhtml and .xml to list of text extensions
+* Improved support for relative Sass @imports [Chris Eppstein]
+
 ## 3.1.2 (2010-04-07)
 
 * Fixed bug which could cause incorrect output when compilation of an item is

data/README.md

@@ -58,20 +58,23 @@ components, however, do have dependencies:
 * The **autocompiler** depends on `mime-types` and `rack`.
 * For **documentation generation** you’ll need `yard`.
 * For **packaging** you’ll need `rubygems` (1.3 or newer).
-* For **testing** you’ll need `mocha`.
+* For **testing** you’ll need `mocha` and `minitest`.
 
 ## Contributors
 
 (In alphabetical order)
 
+* Ben Armston
 * Colin Barrett
 * Dmitry Bilunov
 * Brian Candler
 * Chris Eppstein
+* Felix Hanley
 * Starr Horne
 * Nicky Peeters
 * Christian Plessl
 * Šime Ramov
+* Xavier Shay
 * “Soryu”
 * Eric Sunshine
 * Dennis Sutch

data/lib/nanoc3.rb

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

data/lib/nanoc3/base/item_rep.rb

@@ -354,7 +354,7 @@ module Nanoc3
       if self.binary?
         # Calculate hash of old content
         if File.file?(self.raw_path)
-          hash_old = hash(self.raw_path)
+          hash_old = hash_for_file(self.raw_path)
           size_old = File.size(self.raw_path)
         end
 
@@ -364,7 +364,7 @@ module Nanoc3
 
         # Check if file was modified
         size_new = File.size(self.raw_path)
-        hash_new = hash(self.raw_path) if size_old == size_new
+        hash_new = hash_for_file(self.raw_path) if size_old == size_new
         @modified = (size_old != size_new || hash_old != hash_new)
       else
         # Remember old content
@@ -488,7 +488,7 @@ module Nanoc3
     end
 
     # Returns a hash of the given filename
-    def hash(filename)
+    def hash_for_file(filename)
       digest = Digest::SHA1.new
       File.open(filename, 'r') do |io|
         until io.eof

data/lib/nanoc3/base/site.rb

@@ -39,7 +39,7 @@ module Nanoc3
     # that lacks some options, the default value will be taken from
     # `DEFAULT_CONFIG`.
     DEFAULT_CONFIG = {
-      :text_extensions    => %w( css erb haml htm html js less markdown md php rb sass txt ),
+      :text_extensions    => %w( css erb haml htm html js less markdown md php rb sass txt xhtml xml ),
       :output_dir         => 'output',
       :data_sources       => [ {} ],
       :index_filenames    => [ 'index.html' ],

data/lib/nanoc3/cli/logger.rb

@@ -28,13 +28,13 @@ module Nanoc3::CLI
 
     def initialize
       @level = :high
-      @color = true
+      @color = $stdout.tty?
 
       # Try enabling color support on Windows
       begin
         require 'Win32/Console/ANSI' if RUBY_PLATFORM =~/mswin|mingw/
       rescue LoadError
-        warn 'The win32console gem is not available. Install it to enable color support on Windows.'
+        @color = false
       end
     end
 

data/lib/nanoc3/data_sources/filesystem.rb

@@ -166,8 +166,8 @@ module Nanoc3::DataSources
         end
 
         # Reorder elements and convert to extnames
-        filenames[0] = meta_filenames[0]    ? ext_of(meta_filenames[0])[1..-1]    : nil
-        filenames[1] = content_filenames[0] ? ext_of(content_filenames[0])[1..-1] : nil
+        filenames[0] = meta_filenames[0]    ? 'yaml'                                   : nil
+        filenames[1] = content_filenames[0] ? ext_of(content_filenames[0])[1..-1] || '': nil
       end
 
       # Done
@@ -239,15 +239,15 @@ module Nanoc3::DataSources
       data = File.read(content_filename)
 
       # Check presence of metadata section
-      if data !~ /^(-{5}|-{3})/
+      if data[0, 3] != '-'*3 && data[0, 5] != '-'*5
         return [ {}, data ]
       end
 
       # Split data
-      pieces = data.split(/^(-{5}|-{3})/)
+      pieces = data.split(/^(-{5}|-{3})\s*$/)
       if pieces.size < 4
         raise RuntimeError.new(
-          "The file '#{content_filename}' does not seem to be a nanoc #{kind}"
+          "The file '#{content_filename}' appears to start with a metadata section (three or five dashes at the top) but it does not seem to be in the correct format."
         )
       end
 

data/lib/nanoc3/data_sources/filesystem_unified.rb

@@ -91,7 +91,13 @@ module Nanoc3::DataSources
 
     # See {Nanoc3::DataSources::Filesystem#filename_for}.
     def filename_for(base_filename, ext)
-      ext ? base_filename + '.' + ext : nil
+      if ext.nil?
+        nil
+      elsif ext.empty?
+        base_filename
+      else
+        base_filename + '.' + ext
+      end
     end
 
     # Returns the identifier derived from the given filename, first stripping

data/lib/nanoc3/data_sources/filesystem_verbose.rb

@@ -64,10 +64,16 @@ module Nanoc3::DataSources
 
     # See {Nanoc3::DataSources::Filesystem#filename_for}.
     def filename_for(base_filename, ext)
-      last_part = base_filename.split('/')[-1]
-      base_glob = base_filename.split('/')[0..-2].join('/') + "/{index,#{last_part}}."
+      return nil if ext.nil?
 
-      ext ? Dir[base_glob + ext][0] : nil
+      last_component = base_filename[%r{[^/]+$}]
+      possibilities = [
+        base_filename + (ext.empty? ? '' : '.' + ext),                        # foo/bar.html
+        base_filename + '/' + last_component + (ext.empty? ? '' : '.' + ext), # foo/bar/bar.html
+        base_filename + '/' + 'index' + (ext.empty? ? '' : '.' + ext)         # foo/bar/index.html
+      ]
+
+      possibilities.find { |p| File.file?(p) }
     end
 
     # See {Nanoc3::DataSources::Filesystem#identifier_for_filename}.

data/lib/nanoc3/filters/sass.rb

@@ -20,7 +20,9 @@ module Nanoc3::Filters
       end
 
       # Get options
-      options = params.merge(:filename => filename)
+      options = params.dup
+      sass_filename = options[:filename] || (@item && @item[:content_filename])
+      options[:filename] ||= sass_filename
 
       # Build engine
       engine = ::Sass::Engine.new(content, options)
@@ -43,8 +45,7 @@ module Nanoc3::Filters
 
       # Get import paths
       import_paths = (options[:load_paths] || []).dup
-      import_paths.unshift(File.dirname(options[:filename])) if options[:filename]
-
+      import_paths.unshift(File.dirname(sass_filename)) if sass_filename
       # Get imported filenames
       imported_filenames = imported_nodes.map do |node|
         ::Sass::Files.find_file_to_import(node.imported_filename, import_paths)
@@ -52,8 +53,10 @@ module Nanoc3::Filters
 
       # Convert to items
       imported_items = imported_filenames.map do |filename|
-        normalized_filename = Pathname.new(filename).realpath
-        @items.find { |i| i[:filename] && Pathname.new(i[:filename]).realpath == normalized_filename }
+        pathname = Pathname.new(filename)
+        next unless pathname.file?
+        normalized_filename = pathname.realpath
+        @items.find { |i| i[:content_filename] && Pathname.new(i[:content_filename]).realpath == normalized_filename }
       end.compact
 
       # Require compilation of each item

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-25 00:00:00 +02:00
 default_executable: nanoc3
 dependencies: 
 - !ruby/object:Gem::Dependency