nanoc3 3.1.5 → 3.1.6

data/NEWS.md

@@ -1,5 +1,9 @@
 # nanoc news
 
+## 3.1.6 (2010-11-21)
+
+* Fixed issues with incompatible encodings
+
 ## 3.1.5 (2010-08-24)
 
 * Improved `#render` documentation

data/lib/nanoc3/data_sources/filesystem.rb

@@ -229,14 +229,14 @@ module Nanoc3::DataSources
     def parse(content_filename, meta_filename, kind)
       # Read content and metadata from separate files
       if meta_filename
-        content = content_filename ? File.read(content_filename) : ''
-        meta    = YAML.load_file(meta_filename) || {}
+        content = content_filename ? read(content_filename) : ''
+        meta    = YAML.load(read(meta_filename)) || {}
 
         return [ meta, content ]
       end
 
       # Read data
-      data = File.read(content_filename)
+      data = read(content_filename)
 
       # Check presence of metadata section
       if data !~ /\A-{3,5}\s*$/
@@ -259,6 +259,20 @@ module Nanoc3::DataSources
       [ meta, content ]
     end
 
+    # Reads the content of the file with the given name and returns a string
+    # in UTF-8 encoding. The original encoding of the string is derived from
+    # the default external encoding, but this can be overridden by the
+    # “encoding” configuration attribute in the data source configuration.
+    def read(filename)
+      data = File.read(filename)
+      if data.respond_to?(:encode)
+        data.force_encoding(@config[:encoding]) if @config && @config[:encoding]
+        data.encode('UTF-8')
+      else
+        data
+      end
+    end
+
   end
 
 end

data/lib/nanoc3/data_sources/filesystem_unified.rb

@@ -14,10 +14,10 @@ module Nanoc3::DataSources
   # itself can start with a metadata section: it can be stored at the top of
   # the file, between `---` (three dashes) separators. For example:
   #
-  #   ---
-  #   title: "Moo!"
-  #   ---
-  #   h1. Hello!
+  #     ---
+  #     title: "Moo!"
+  #     ---
+  #     h1. Hello!
   #
   # The metadata section can be omitted. If the file does not start with
   # three or five dashes, the entire file will be considered as content.
@@ -26,7 +26,7 @@ module Nanoc3::DataSources
   # an `index.*` filename, such as `index.txt`, will have the filesystem path
   # with the `index.*` part stripped as a identifier. For example:
   #
-  #   foo/bar/index.html → /foo/bar/
+  #     foo/bar/index.html → /foo/bar/
   #
   # In other cases, the identifier is calculated by stripping the extension.
   # If the `allow_periods_in_identifiers` attribute in the configuration is
@@ -34,24 +34,24 @@ module Nanoc3::DataSources
   # extensions; if it is false or unset, all extensions will be stripped.
   # For example:
   #
-  #   (`allow_periods_in_identifiers` set to true)
-  #   foo.entry.html → /foo.entry/
-  #   
-  #   (`allow_periods_in_identifiers` set to false)
-  #   foo.html.erb → /foo/
+  #     (`allow_periods_in_identifiers` set to true)
+  #     foo.entry.html → /foo.entry/
+  #     
+  #     (`allow_periods_in_identifiers` set to false)
+  #     foo.html.erb → /foo/
   #
   # Note that it is possible for two different, separate files to have the
   # same identifier. It is recommended to avoid such situations.
   #
   # Some more examples:
   #
-  #   content/index.html          → /
-  #   content/foo.html            → /foo/
-  #   content/foo/index.html      → /foo/
-  #   content/foo/bar.html        → /foo/bar/
-  #   content/foo/bar.baz.html    → /foo/bar/ OR /foo/bar.baz/
-  #   content/foo/bar/index.html  → /foo/bar/
-  #   content/foo.bar/index.html  → /foo.bar/
+  #     content/index.html          → /
+  #     content/foo.html            → /foo/
+  #     content/foo/index.html      → /foo/
+  #     content/foo/bar.html        → /foo/bar/
+  #     content/foo/bar.baz.html    → /foo/bar/ OR /foo/bar.baz/
+  #     content/foo/bar/index.html  → /foo/bar/
+  #     content/foo.bar/index.html  → /foo.bar/
   #
   # The file extension does not determine the filters to run on items; the
   # Rules file is used to specify processing instructors for each item.

data/lib/nanoc3/filters/colorize_syntax.rb

@@ -63,7 +63,7 @@ module Nanoc3::Filters
         element.inner_html = highlighted_code
       end
 
-      doc.to_s
+      doc.to_html(:encoding => 'UTF-8')
     end
 
   private

data/lib/nanoc3.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc3
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-11-21 00:00:00 +01:00
 default_executable: nanoc3
 dependencies: 
 - !ruby/object:Gem::Dependency