nanoc 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c0263d7b1a82695a400be99ff361742a79f205
-  data.tar.gz: 9e037c0b7f6dd9e0dde26ee2e17c5b0b512c108b
+  metadata.gz: 1f6ba850197dc445a7c7ff2155f172cf559429e4
+  data.tar.gz: 6ffcc91296268720adf1290c403b41d73c0fc762
 SHA512:
-  metadata.gz: d878758c199d21225f6ab0a893f248b2f51cd47d4e740fe2fad232f92ccdcfebc05921252271cd3f4123e6bb9d6eb5f033aa859387d6e196242ea2aea81286d5
-  data.tar.gz: ec1f03f5120a5c3cbab4c49bb785edafc0c8eaa7b100fc37a66dda63f313281242adf1fe1b701b2ecebd2c69e81519975b40f3e99703e91a23a4a7f5c0651b31
+  metadata.gz: 6d87f9120c1c06ef221dc59d7b33a5c5d05deeedb008927232420d0a466a96b37048f25c706d389d393905b46b7bcd19f8487d8818db881d0d100d89b9443a5d
+  data.tar.gz: f4da8a98b02735de58c7d7c57a09ea3f49af3323cb887e31112c5019dd5245ef686949a12540eb8ff469c0cb8544515544a881a53dd12505c0ad2da663c77e1a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.5)
+    nanoc (4.1.6)
       cri (~> 2.3)
 
 GEM
@@ -48,24 +48,27 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.48.0)
+    excon (0.49.0)
     execjs (2.6.0)
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.37.0)
+    fog (1.38.0)
       fog-aliyun (>= 0.1.0)
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
+      fog-cloudatcost (~> 0.1.0)
       fog-core (~> 1.32)
       fog-dynect (~> 0.0.2)
       fog-ecloud (~> 0.1)
       fog-google (<= 0.1.0)
       fog-json
       fog-local
+      fog-openstack
       fog-powerdns (>= 0.1.1)
       fog-profitbricks
+      fog-rackspace
       fog-radosgw (>= 0.0.2)
       fog-riakcs
       fog-sakuracloud (>= 0.0.4)
@@ -96,7 +99,12 @@ GEM
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.36.0)
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.37.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
@@ -116,6 +124,11 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
+    fog-openstack (0.1.2)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
@@ -124,6 +137,11 @@ GEM
       fog-core
       fog-xml
       nokogiri
+    fog-rackspace (0.1.1)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
     fog-radosgw (0.0.5)
       fog-core (>= 1.21.0)
       fog-json
@@ -177,10 +195,10 @@ GEM
       rake
     haml (4.0.7)
       tilt
-    handlebars (0.7.0)
-      handlebars-source (~> 3.0.0)
+    handlebars (0.8.0)
+      handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
-    handlebars-source (3.0.3)
+    handlebars-source (4.0.5)
     hashdiff (0.3.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
@@ -213,8 +231,8 @@ GEM
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pandoc-ruby (1.0.0)
-    parser (2.3.0.6)
+    pandoc-ruby (2.0.0)
+    parser (2.3.0.7)
       ast (~> 2.2)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
@@ -228,7 +246,7 @@ GEM
     rack (1.6.4)
     rainbow (2.1.0)
     rainpress (1.0)
-    rake (11.1.1)
+    rake (11.1.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -255,8 +273,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -264,7 +282,7 @@ GEM
     ruby-progressbar (1.7.5)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
-    sass (3.4.21)
+    sass (3.4.22)
     shellany (0.0.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -289,12 +307,12 @@ GEM
       rubypants
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.0.3)
     vcr (3.0.1)
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.24.2)
+    webmock (1.24.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/NEWS.md

@@ -1,5 +1,12 @@
 # Nanoc news
 
+## 4.1.6 (2016-04-17)
+
+Fixes:
+
+* Strip index.html only if it is a full component (#850, #851)
+* Force UTF-8 for item rep paths (#837, #852)
+
 ## 4.1.5 (2016-03-24)
 
 Fixes:

data/lib/nanoc/base/services/item_rep_router.rb

@@ -28,6 +28,7 @@ module Nanoc::Int
     def route_rep(rep, snapshot_action, paths_to_reps)
       basic_path = snapshot_action.path
       return if basic_path.nil?
+      basic_path = basic_path.encode('UTF-8')
 
       # Check for duplicate paths
       if paths_to_reps.key?(basic_path)
@@ -42,10 +43,10 @@ module Nanoc::Int
 
     def strip_index_filename(basic_path)
       @site.config[:index_filenames].each do |index_filename|
-        rep_path_ending = basic_path[-index_filename.length..-1]
-        next unless rep_path_ending == index_filename
-
-        return basic_path[0..-index_filename.length - 1]
+        slashed_index_filename = '/' + index_filename
+        if basic_path.end_with?(slashed_index_filename)
+          return basic_path[0..-index_filename.length - 1]
+        end
       end
 
       basic_path

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.1.5'.freeze
+  VERSION = '4.1.6'.freeze
 end

data/test/cli/commands/test_create_site.rb

@@ -74,7 +74,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
 
     FileUtils.cd('foo') do
       # Try with encoding = default encoding = utf-8
-      File.open('content/index.html', 'w') { |io| io.write("Hello <\xD6>!\n") }
+      File.open('content/index.html', 'w') { |io| io.write('Hello ' + 0xD6.chr + "!\n") }
       exception = assert_raises(RuntimeError) do
         Nanoc::Int::SiteLoader.new.new_from_cwd
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -377,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.