nanoc 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ca3c26aee827d7103ec7df8af591543ac1e6146
-  data.tar.gz: 1d2b4b6f1cc0082fffef58966079ee19cc6a73ad
+  metadata.gz: 1846757f101a6af4c5ca4162918499723f8aef23
+  data.tar.gz: a98022b27dcd1006ea2302bc55fcf9dcd023930b
 SHA512:
-  metadata.gz: 72d40fe2758cdb63e649596200573aae2ab7cffdc2a96bc5e13b1c4f429b5e4ca630e5884ef493f9614aefaf267f67ed74913ef9bd4e371bb7e433487be50bce
-  data.tar.gz: ffbffec0e7507c4e78be36a9484b0cd010d46d63244d414856574a297e78eff65af7671e07895492195b1927719becc3a81da01ebbd49ce6f00d06c47a4863b4
+  metadata.gz: a6c17a90232a432a8f759c76922a9fee0917cfd79396707df54d6594fb5e665126ba04164d6e58aa42365a080450fdd87c025169b50dced1d0bda5c60501ee84
+  data.tar.gz: 30ca231cbcdb8057aec80cf81462c533d60b151b9618aa08f2596b2c553b8111de2c262bf68b2dd7831b0b726275c494f9cff2a6de12916bb76371ef144a4756

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.7.2)
+    nanoc (3.7.3)
       cri (~> 2.3)
 
 GEM
@@ -18,17 +18,17 @@ GEM
       timers (~> 1.1.0)
     chunky_png (1.3.1)
     coderay (1.1.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
     colored (1.2)
     commonjs (0.2.7)
-    compass (0.12.6)
+    compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    coveralls (0.7.0)
+    coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
@@ -38,29 +38,34 @@ GEM
       safe_yaml (~> 1.0.0)
     cri (2.6.1)
       colored (~> 1.2)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
-    excon (0.36.0)
-    execjs (2.2.0)
+    excon (0.39.5)
+    execjs (2.2.1)
     ffi (1.9.3)
-    fog (1.22.1)
+    fog (1.23.0)
       fog-brightbox
-      fog-core (~> 1.22)
+      fog-core (~> 1.23)
       fog-json
+      fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.0.2)
-      fog-core
+    fog-brightbox (0.4.1)
+      fog-core (~> 1.22)
       fog-json
-    fog-core (1.22.0)
+      inflecto
+    fog-core (1.24.0)
       builder
-      excon (~> 0.33)
+      excon (~> 0.38)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
+    fog-softlayer (0.3.16)
+      fog-core
+      fog-json
     formatador (0.2.5)
     fssm (0.2.10)
     haml (4.0.5)
@@ -69,13 +74,14 @@ GEM
       handlebars-source (~> 1.3.0)
       therubyracer (~> 0.12.0)
     handlebars-source (1.3.0)
+    inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.1)
-    kramdown (1.3.3)
+    kramdown (1.4.1)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.3)
-    listen (2.7.7)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -90,23 +96,24 @@ GEM
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
-    mustache (0.99.5)
+    mustache (0.99.6)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.2.1)
+    netrc (0.7.7)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     pandoc-ruby (0.7.5)
-    parser (2.1.9)
+    parser (2.2.0.pre.4)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
-    posix-spawn (0.3.8)
+    posix-spawn (0.3.9)
     powerpack (0.0.9)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
@@ -121,12 +128,12 @@ GEM
       json (~> 1.4)
     redcarpet (3.1.2)
     ref (1.0.5)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rouge (1.4.0)
-    rubocop (0.23.0)
-      json (>= 1.7.7, < 2)
-      parser (~> 2.1.9)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rouge (1.6.2)
+    rubocop (0.25.0)
+      parser (>= 2.2.0.pre.4, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
@@ -134,16 +141,16 @@ GEM
     rubypants (0.2.0)
     safe_yaml (1.0.3)
     sass (3.2.19)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slim (2.0.2)
+    slim (2.0.3)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.5.0)
-    temple (0.6.7)
+    slop (3.6.0)
+    temple (0.6.8)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     therubyracer (0.12.1)
@@ -152,10 +159,10 @@ GEM
     thor (0.19.1)
     tilt (2.0.1)
     timers (1.1.0)
-    tins (1.3.0)
-    typogruby (1.0.16)
+    tins (1.3.2)
+    typogruby (1.0.17)
       rubypants
-    uglifier (2.5.0)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     vcr (2.9.2)

data/NEWS.md

@@ -1,12 +1,18 @@
 # nanoc news
 
+## 3.7.3 (2014-08-31)
+
+Fixes:
+
+* Fixed issue which caused metadata sections not be recognised in files that use CRLF line endings (#470, #471) [Gregory Pakosz]
+
 ## 3.7.2 (2014-08-17)
 
 Fixes:
 
 * Fixed broken links to the now defunct RubyForge (#454, #467)
 * Fixed crash when Gemfile is missing but Bundler is installed (#464)
-* Made filesystem data source strip only leading newlines, not all whitespace (#463) [Gregory Pakosz]
+* Made filesystem data source not strip any whitespace (#463) [Gregory Pakosz]
 
 Enhancements:
 

data/lib/nanoc/data_sources/filesystem.rb

@@ -257,7 +257,7 @@ module Nanoc::DataSources
       end
 
       # Split data
-      pieces = data.split(/^(-{5}|-{3})[ \t]*\n/)
+      pieces = data.split(/^(-{5}|-{3})[ \t]*\r?\n?/, 3)
       if pieces.size < 4
         raise RuntimeError.new(
           "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."
@@ -270,7 +270,7 @@ module Nanoc::DataSources
       rescue Exception => e
         raise "Could not parse YAML for #{content_filename}: #{e.message}"
       end
-      content = pieces[4..-1].join
+      content = pieces[4]
 
       # Done
       [ meta, content ]

data/lib/nanoc/version.rb

@@ -3,6 +3,6 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.7.2'
+  VERSION = '3.7.3'
 
 end

data/test/data_sources/test_filesystem.rb

@@ -277,6 +277,57 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     end
   end
 
+  def test_parse_embedded_meta_only_1
+    # Create a file
+    File.open('test.html', 'w') do |io|
+      io.write "-----\r\n"
+      io.write "foo: bar\n"
+      io.write "-----\n"
+    end
+
+    # Create data source
+    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, nil)
+
+    # Parse it
+    result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
+    assert_equal({ 'foo' => 'bar' }, result[0])
+    assert_equal("", result[1])
+  end
+
+  def test_parse_embedded_meta_only_2
+    # Create a file
+    File.open('test.html', 'w') do |io|
+      io.write "-----\n"
+      io.write "foo: bar\r\n"
+      io.write "-----\r"
+    end
+
+    # Create data source
+    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, nil)
+
+    # Parse it
+    result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
+    assert_equal({ 'foo' => 'bar' }, result[0])
+    assert_equal("", result[1])
+  end
+
+  def test_parse_embedded_meta_only_3
+    # Create a file
+    File.open('test.html', 'w') do |io|
+      io.write "-----\r\n"
+      io.write "foo: bar\n"
+      io.write "-----"
+    end
+
+    # Create data source
+    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, nil)
+
+    # Parse it
+    result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
+    assert_equal({ 'foo' => 'bar' }, result[0])
+    assert_equal("", result[1])
+  end
+
   def test_parse_embedded_invalid_2
     # Create a file
     File.open('test.html', 'w') do |io|
@@ -313,7 +364,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
   def test_parse_embedded_full_meta
     # Create a file
     File.open('test.html', 'w') do |io|
-      io.write "-----\n"
+      io.write "-----\r\n"
       io.write "foo: bar\n"
       io.write "-----\n"
       io.write "  \t\n  blah blah\n"
@@ -352,6 +403,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       io.write "-----\n"
       io.write "-----\n"
       io.write "\nblah blah\n"
+      io.write "-----"
     end
 
     # Create data source
@@ -360,7 +412,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({}, result[0])
-    assert_equal("\nblah blah\n", result[1])
+    assert_equal("\nblah blah\n-----", result[1])
   end
 
   def test_parse_utf8_bom

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri