nanoc 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eabd0579cb5e3995fa5a2decbba989f11cee9820
-  data.tar.gz: 2a60be2b6497cba542fcf9d519dc6768327086b8
+  metadata.gz: 1ca3c26aee827d7103ec7df8af591543ac1e6146
+  data.tar.gz: 1d2b4b6f1cc0082fffef58966079ee19cc6a73ad
 SHA512:
-  metadata.gz: b4d52d2ff4bdbf14152861179ed5de3a07845093670388b5b2cc470adcc9690ff8754c2c2d6452fc9e06894beb07d415fb6d9b6bbdad3cdcb0538a399a5a7c01
-  data.tar.gz: 09037be35e6a561c46df061ba56dad18bc12a5b65bab02402099588eee76cc823506d7abcfce347f5e6425818e7dd2744d9c0faabf99fa440f63564a0e43732f
+  metadata.gz: 72d40fe2758cdb63e649596200573aae2ab7cffdc2a96bc5e13b1c4f429b5e4ca630e5884ef493f9614aefaf267f67ed74913ef9bd4e371bb7e433487be50bce
+  data.tar.gz: ffbffec0e7507c4e78be36a9484b0cd010d46d63244d414856574a297e78eff65af7671e07895492195b1927719becc3a81da01ebbd49ce6f00d06c47a4863b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.7.1)
+    nanoc (3.7.2)
       cri (~> 2.3)
 
 GEM

data/NEWS.md

@@ -1,5 +1,18 @@
 # nanoc news
 
+## 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]
+
+Enhancements:
+
+* Fixed issue which could cause items to be unnecessarily marked as outdated (#461) [Gregory Pakosz]
+* Prevented binary layouts from being generated (#468) [Gregory Pakosz]
+
 ## 3.7.1 (2014-06-16)
 
 Fixes:
@@ -459,7 +472,7 @@ New:
 * A new “+” wildcard in rule patterns that matches one or more characters
 * A `view` command that starts a web server in the output directory
 * A `debug` command that shows information about the items, reps and layouts
-* A `kramdown` filter ([kramdown site](http://kramdown.rubyforge.org/))
+* A `kramdown` filter ([kramdown site](http://kramdown.gettalong.org/))
 * A diff between the previously compiled content and the last compiled content is now written to `output.diff` if the `enable_output_diff` site configuration attribute is true
 * Assigns, such as `@items`, `@layouts`, `@item`, … are accessible without `@`
 * Support for binary items
@@ -647,7 +660,7 @@ updated manual will be useful.
 New:
 
 * New `rdiscount` filter ([RDiscount site](http://github.com/rtomayko/rdiscount))
-* New `maruku` filter ([Maruku site](http://maruku.rubyforge.org/))
+* New `maruku` filter ([Maruku site](https://github.com/bhollis/maruku/))
 * New `erubis` filter ([Erubis site](http://www.kuwata-lab.com/erubis/))
 * A better commandline frontend
 * A new filesystem data source named `filesystem_combined`

data/bin/nanoc

@@ -3,6 +3,7 @@
 
 # Try loading bundler if it's possible
 begin
+  require 'bundler'
   require 'bundler/setup'
   begin
     Bundler.require(:default)

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -198,9 +198,9 @@ module Nanoc
     end
     memoize :new_rule_memory_for_rep
 
-    # Makes the given rule memory serializable by calling `#inspect` on the
-    # filter arguments, so that objects such as classes and filenames can be
-    # serialized.
+    # Makes the given rule memory serializable by calling
+    # `Nanoc::Checksummer#calc` on the filter arguments, so that objects such as
+    # classes and filenames can be serialized.
     #
     # @param [Array] rs The rule memory for a certain item rep
     #
@@ -208,7 +208,7 @@ module Nanoc
     def make_rule_memory_serializable(rs)
       rs.map do |r|
         if r[0] == :filter
-          [ r[0], r[1], r[2].to_a.map { |a| a.inspect }  ]
+          [ r[0], r[1], r[2].to_a.map { |a| Nanoc::Checksummer.calc(a) }  ]
         else
           r
         end

data/lib/nanoc/data_sources/filesystem.rb

@@ -93,6 +93,8 @@ module Nanoc::DataSources
         if is_binary && klass == Nanoc::Item
           meta                = (meta_filename && YAML.load_file(meta_filename)) || {}
           content_or_filename = content_filename
+        elsif is_binary && klass == Nanoc::Layout
+          raise "The layout file '#{content_filename}' is a binary file, but layouts can only be textual"
         else
           meta, content_or_filename = parse(content_filename, meta_filename, kind)
         end
@@ -255,7 +257,7 @@ module Nanoc::DataSources
       end
 
       # Split data
-      pieces = data.split(/^(-{5}|-{3})\s*$/)
+      pieces = data.split(/^(-{5}|-{3})[ \t]*\n/)
       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."
@@ -268,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.strip
+      content = pieces[4..-1].join
 
       # Done
       [ meta, content ]

data/lib/nanoc/data_sources/filesystem_unified.rb

@@ -94,7 +94,7 @@ module Nanoc::DataSources
         meta = attributes.stringify_keys_recursively
         unless meta == {}
           io.write(YAML.dump(meta).strip + "\n")
-          io.write("---\n\n")
+          io.write("---\n")
         end
         io.write(content)
       end

data/lib/nanoc/extra/auto_compiler.rb

@@ -25,7 +25,7 @@ module Nanoc::Extra
     end
 
     # Calls the autocompiler. The behaviour of this method is defined by the
-    # [Rack specification](http://rack.rubyforge.org/doc/SPEC.html).
+    # [Rack specification](http://rubydoc.info/github/rack/rack/master/file/SPEC).
     #
     # @param [Hash] env The environment, as defined by the Rack specification
     #

data/lib/nanoc/extra/chick.rb

@@ -8,12 +8,12 @@ module Nanoc::Extra
 
   # @deprecated Use a HTTP library such as
   #   [Net::HTTP](http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/) or
-  #   [Curb](http://curb.rubyforge.org/) instead.
+  #   [Curb](https://github.com/taf2/curb) instead.
   module CHiCk
 
     # @deprecated Use a HTTP library such as
     #   [Net::HTTP](http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/) or
-    #   [Curb](http://curb.rubyforge.org/) instead.
+    #   [Curb](https://github.com/taf2/curb) instead.
     class Client
 
       DEFAULT_OPTIONS = {
@@ -62,7 +62,7 @@ module Nanoc::Extra
 
     # @deprecated Use a HTTP library such as
     #   [Net::HTTP](http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/) or
-    #   [Curb](http://curb.rubyforge.org/) instead.
+    #   [Curb](https://github.com/taf2/curb) instead.
     class CacheController
 
       def initialize(app, options = {})
@@ -82,7 +82,7 @@ module Nanoc::Extra
 
     # @deprecated Use a HTTP library such as
     #   [Net::HTTP](http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/) or
-    #   [Curb](http://curb.rubyforge.org/) instead.
+    #   [Curb](https://github.com/taf2/curb) instead.
     class RackClient
 
       METHOD_TO_CLASS_MAPPING = {

data/lib/nanoc/filters/kramdown.rb

@@ -5,7 +5,7 @@ module Nanoc::Filters
 
     requires 'kramdown'
 
-    # Runs the content through [Kramdown](http://kramdown.rubyforge.org/).
+    # Runs the content through [Kramdown](http://kramdown.gettalong.org/).
     # Parameters passed to this filter will be passed on to Kramdown.
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/markaby.rb

@@ -5,7 +5,7 @@ module Nanoc::Filters
 
     requires 'markaby'
 
-    # Runs the content through [Markaby](http://markaby.rubyforge.org/).
+    # Runs the content through [Markaby](http://markaby.github.io/).
     # This method takes no options.
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/maruku.rb

@@ -5,7 +5,7 @@ module Nanoc::Filters
 
     requires 'maruku'
 
-    # Runs the content through [Maruku](http://maruku.rubyforge.org/).
+    # Runs the content through [Maruku](https://github.com/bhollis/maruku/).
     # Parameters passed to this filter will be passed on to Maruku.
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/rdoc.rb

@@ -10,7 +10,7 @@ module Nanoc::Filters
       super
     end
 
-    # Runs the content through [RDoc::Markup](http://rdoc.rubyforge.org/RDoc/Markup.html).
+    # Runs the content through [RDoc::Markup](http://docs.seattlerb.org/rdoc/RDoc/Markup.html).
     # This method takes no options.
     #
     # @param [String] content The content to filter

data/lib/nanoc/version.rb

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

data/test/data_sources/test_filesystem.rb

@@ -316,7 +316,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       io.write "-----\n"
       io.write "foo: bar\n"
       io.write "-----\n"
-      io.write "blah blah\n"
+      io.write "  \t\n  blah blah\n"
     end
 
     # Create data source
@@ -325,7 +325,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'foo' => 'bar' }, result[0])
-    assert_equal('blah blah', result[1])
+    assert_equal("  \t\n  blah blah\n", result[1])
   end
 
   def test_parse_embedded_with_extra_spaces
@@ -334,7 +334,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       io.write "-----             \n"
       io.write "foo: bar\n"
       io.write "-----\t\t\t\t\t\n"
-      io.write "blah blah\n"
+      io.write "  blah blah\n"
     end
 
     # Create data source
@@ -343,7 +343,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'foo' => 'bar' }, result[0])
-    assert_equal('blah blah', result[1])
+    assert_equal("  blah blah\n", result[1])
   end
 
   def test_parse_embedded_empty_meta
@@ -351,7 +351,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     File.open('test.html', 'w') do |io|
       io.write "-----\n"
       io.write "-----\n"
-      io.write "blah blah\n"
+      io.write "\nblah blah\n"
     end
 
     # Create data source
@@ -360,7 +360,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('blah blah', result[1])
+    assert_equal("\nblah blah\n", result[1])
   end
 
   def test_parse_utf8_bom
@@ -376,7 +376,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'utf8bomawareness' => 'high' }, result[0])
-    assert_equal('content goes here', result[1])
+    assert_equal("content goes here\n", result[1])
   end
 
   def test_parse_embedded_no_meta

data/test/data_sources/test_filesystem_unified.rb

@@ -25,7 +25,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     assert File.file?('foobar/asdf.html')
 
     # Check file content
-    expected = /^--- ?\nfoo: bar\n---\n\ncontent here$/
+    expected = /^--- ?\nfoo: bar\n---\ncontent here$/
     assert_match expected, File.read('foobar/asdf.html')
   end
 
@@ -41,7 +41,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     assert File.file?('foobar/index.html')
 
     # Check file content
-    expected = /^--- ?\nfoo: bar\n---\n\ncontent here$/
+    expected = /^--- ?\nfoo: bar\n---\ncontent here$/
     assert_match expected, File.read('foobar/index.html')
   end
 
@@ -135,11 +135,9 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     File.open('foo/stuff.dat', 'w') { |io| io.write("random binary data") }
 
     # Load
-    items = data_source.send(:load_objects, 'foo', 'item', Nanoc::Layout)
-
-    # Check
-    assert_equal 1, items.size
-    assert_equal 'random binary data', items[0].raw_content
+    assert_raises(RuntimeError) do
+      data_source.send(:load_objects, 'foo', 'item', Nanoc::Layout)
+    end
   end
 
   def test_identifier_for_filename_allowing_periods_in_identifiers

data/test/data_sources/test_filesystem_verbose.rb

@@ -138,7 +138,7 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
       io.write("---\n")
       io.write("filter: erb\n")
     end
-    File.open('layouts/foo/foo.rhtml', 'w') do |io|
+    File.open('layouts/foo/foo.html', 'w') do |io|
       io.write('Lorem ipsum dolor sit amet...')
     end
 
@@ -148,8 +148,8 @@ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
     # Check layouts
     assert_equal(1,                       layouts.size)
     assert_equal('erb',                   layouts[0][:filter])
-    assert_equal('rhtml',                 layouts[0][:extension])
-    assert_equal('layouts/foo/foo.rhtml', layouts[0][:content_filename])
+    assert_equal('html',                  layouts[0][:extension])
+    assert_equal('layouts/foo/foo.html',  layouts[0][:content_filename])
     assert_equal('layouts/foo/foo.yaml',  layouts[0][:meta_filename])
   end
 

data/test/helpers/test_rendering.rb

@@ -12,7 +12,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', :erb\n")
       end
 
-      File.open('layouts/foo.xyz', 'w') do |io|
+      File.open('layouts/foo.erb', 'w') do |io|
         io.write 'This is the <%= @layout.identifier %> layout.'
       end
 
@@ -38,7 +38,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', nil\n")
       end
 
-      File.open('layouts/foo.xyz', 'w').close()
+      File.open('layouts/foo.erb', 'w').close()
 
       assert_raises(Nanoc::Errors::CannotDetermineFilter) do
         render '/foo/'
@@ -54,7 +54,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', :asdf\n")
       end
 
-      File.open('layouts/foo.xyz', 'w').close()
+      File.open('layouts/foo.erb', 'w').close()
 
       assert_raises(Nanoc::Errors::UnknownFilter) do
         render '/foo/'
@@ -70,7 +70,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', :erb\n")
       end
 
-      File.open('layouts/foo.xyz', 'w') do |io|
+      File.open('layouts/foo.erb', 'w') do |io|
         io.write '[partial-before]<%= yield %>[partial-after]'
       end
 

metadata

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