nanoc 3.7.4 → 3.7.5

data/lib/nanoc/extra/vcses.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc::Extra::VCSes
-
   autoload 'Bazaar',     'nanoc/extra/vcses/bazaar'
   autoload 'Dummy',      'nanoc/extra/vcses/dummy'
   autoload 'Git',        'nanoc/extra/vcses/git'
@@ -13,5 +12,4 @@ module Nanoc::Extra::VCSes
   Nanoc::Extra::VCS.register '::Nanoc::Extra::VCSes::Git',        :git
   Nanoc::Extra::VCS.register '::Nanoc::Extra::VCSes::Mercurial',  :mercurial, :hg
   Nanoc::Extra::VCS.register '::Nanoc::Extra::VCSes::Subversion', :subversion, :svn
-
 end

data/lib/nanoc/extra/vcses/bazaar.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Extra::VCSes
-
   # @see Nanoc::Extra::VCS
   class Bazaar < Nanoc::Extra::VCS
-
     # @see Nanoc::Extra::VCS#add
     def add(filename)
       system('bzr', 'add', filename)
@@ -19,7 +17,5 @@ module Nanoc::Extra::VCSes
     def move(src, dst)
       system('bzr', 'mv', src, dst)
     end
-
   end
-
 end

data/lib/nanoc/extra/vcses/dummy.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Extra::VCSes
-
   # @see Nanoc::Extra::VCS
   class Dummy < Nanoc::Extra::VCS
-
     # @see Nanoc::Extra::VCS#add
     def add(_filename)
     end
@@ -18,7 +16,5 @@ module Nanoc::Extra::VCSes
     def move(src, dst)
       FileUtils.move(src, dst)
     end
-
   end
-
 end

data/lib/nanoc/extra/vcses/git.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Extra::VCSes
-
   # @see Nanoc::Extra::VCS
   class Git < Nanoc::Extra::VCS
-
     # @see Nanoc::Extra::VCS#add
     def add(filename)
       system('git', 'add', filename)
@@ -19,7 +17,5 @@ module Nanoc::Extra::VCSes
     def move(src, dst)
       system('git', 'mv', src, dst)
     end
-
   end
-
 end

data/lib/nanoc/extra/vcses/mercurial.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Extra::VCSes
-
   # @see Nanoc::Extra::VCS
   class Mercurial < Nanoc::Extra::VCS
-
     # @see Nanoc::Extra::VCS#add
     def add(filename)
       system('hg', 'add', filename)
@@ -19,7 +17,5 @@ module Nanoc::Extra::VCSes
     def move(src, dst)
       system('hg', 'mv', src, dst)
     end
-
   end
-
 end

data/lib/nanoc/extra/vcses/subversion.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Extra::VCSes
-
   # @see Nanoc::Extra::VCS
   class Subversion < Nanoc::Extra::VCS
-
     # @see Nanoc::Extra::VCS#add
     def add(filename)
       system('svn', 'add', filename)
@@ -19,7 +17,5 @@ module Nanoc::Extra::VCSes
     def move(src, dst)
       system('svn', 'mv', src, dst)
     end
-
   end
-
 end

data/lib/nanoc/filters.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   autoload 'AsciiDoc',        'nanoc/filters/asciidoc'
   autoload 'BlueCloth',       'nanoc/filters/bluecloth'
   autoload 'CodeRay',         'nanoc/filters/coderay'
@@ -59,5 +58,4 @@ module Nanoc::Filters
   Nanoc::Filter.register '::Nanoc::Filters::UglifyJS',        :uglify_js
   Nanoc::Filter.register '::Nanoc::Filters::XSL',             :xsl
   Nanoc::Filter.register '::Nanoc::Filters::YUICompressor',   :yui_compressor
-
 end

data/lib/nanoc/filters/asciidoc.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.2.0
   class AsciiDoc < Nanoc::Filter
-
     # Runs the content through [AsciiDoc](http://www.methods.co.nz/asciidoc/).
     # This method takes no options.
     #
@@ -14,11 +12,9 @@ module Nanoc::Filters
     def run(content, _params = {})
       stdout = StringIO.new
       stderr = $stderr
-      piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+      piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
       piper.run(%w( asciidoc -o - - ), content)
       stdout.string
     end
-
   end
-
 end

data/lib/nanoc/filters/bluecloth.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class BlueCloth < Nanoc::Filter
-
     requires 'bluecloth'
 
     # Runs the content through [BlueCloth](http://deveiate.org/projects/BlueCloth).
@@ -14,6 +13,5 @@ module Nanoc::Filters
     def run(content, _params = {})
       ::BlueCloth.new(content).to_html
     end
-
   end
 end

data/lib/nanoc/filters/coderay.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class CodeRay < Nanoc::Filter
-
     requires 'coderay'
 
     # @deprecated Use the `:colorize_syntax` filter instead.
@@ -16,6 +15,5 @@ module Nanoc::Filters
       # Get result
       ::CodeRay.scan(content, params[:language]).html
     end
-
   end
 end

data/lib/nanoc/filters/coffeescript.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.3.0
   class CoffeeScript < Nanoc::Filter
-
     requires 'coffee-script'
 
     # Runs the content through [CoffeeScript](http://coffeescript.org/).
@@ -16,7 +14,5 @@ module Nanoc::Filters
     def run(content, _params = {})
       ::CoffeeScript.compile(content)
     end
-
   end
-
 end

data/lib/nanoc/filters/colorize_syntax.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class ColorizeSyntax < Nanoc::Filter
-
     requires 'nokogiri', 'stringio', 'open3'
 
     # The default colorizer to use for a language if the colorizer for that
@@ -142,7 +141,7 @@ module Nanoc::Filters
       end
 
       method = "to_#{syntax}".to_sym
-      doc.send(method, :encoding => 'UTF-8')
+      doc.send(method, encoding: 'UTF-8')
     end
 
     # Parses the given content using the given class. This method also handles
@@ -197,7 +196,7 @@ module Nanoc::Filters
     #
     # @return [String] The colorized output, which is identical to the input
     #   in this case
-    def dummy(code, _language, _params = {})
+    def dummy(code, language, params = {}) # rubocop:disable Lint/UnusedMethodArgument
       code
     end
 
@@ -224,7 +223,7 @@ module Nanoc::Filters
 
       stdout = StringIO.new
       stderr = $stderr
-      piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+      piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
       piper.run(cmd, code)
 
       stdout.string
@@ -253,9 +252,9 @@ module Nanoc::Filters
     end
 
     SIMON_HIGHLIGHT_OPT_MAP = {
-        :wrap => '-W',
-        :include_style => '-I',
-        :line_numbers  => '-l',
+        wrap: '-W',
+        include_style: '-I',
+        line_numbers: '-l',
     }
 
     # Runs the content through [Highlight](http://www.andre-simon.de/doku/highlight/en/highlight.html).
@@ -279,7 +278,7 @@ module Nanoc::Filters
         if SIMON_HIGHLIGHT_OPT_MAP[key]
           cmd << SIMON_HIGHLIGHT_OPT_MAP[key]
         else
-          # TODO allow passing other options
+          # TODO: allow passing other options
           case key
           when :style
             cmd << '--style' << params[:style]
@@ -289,7 +288,7 @@ module Nanoc::Filters
 
       stdout = StringIO.new
       stderr = $stderr
-      piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+      piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
       piper.run(cmd, code)
 
       stdout.string
@@ -327,7 +326,7 @@ module Nanoc::Filters
       require 'rouge'
 
       formatter_options = {
-        :css_class => params.fetch(:css_class, 'highlight'),
+        css_class: params.fetch(:css_class, 'highlight'),
       }
       formatter = Rouge::Formatters::HTML.new(formatter_options)
       lexer = Rouge::Lexer.find_fancy(language, code) || Rouge::Lexers::PlainText
@@ -338,7 +337,7 @@ module Nanoc::Filters
     #
     # Before:
     #
-    #   <pre><code class="language-ruby"><pre><code class="highlight">
+    #   <pre><code class="language-ruby"><pre class="highlight"><code>
     #
     # After:
     #
@@ -348,11 +347,15 @@ module Nanoc::Filters
 
       code1 = element.xpath('code').first
       return if code1.nil?
-      code2 = code1.xpath('pre/code').first
+
+      pre = code1.xpath('pre').first
+      return if pre.nil?
+
+      code2 = pre.xpath('code').first
       return if code2.nil?
 
       code1.inner_html = code2.inner_html
-      code1['class'] = [code1['class'], code2['class']].compact.join(' ')
+      code1['class'] = [code1['class'], pre['class']].compact.join(' ')
     end
 
     protected
@@ -386,9 +389,8 @@ module Nanoc::Filters
     end
 
     def check_availability(*cmd)
-      piper = Nanoc::Extra::Piper.new(:stdout => StringIO.new, :stderr => StringIO.new)
+      piper = Nanoc::Extra::Piper.new(stdout: StringIO.new, stderr: StringIO.new)
       piper.run(cmd, nil)
     end
-
   end
 end

data/lib/nanoc/filters/erb.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class ERB < Nanoc::Filter
-
     requires 'erb'
 
     # Runs the content through [ERB](http://ruby-doc.org/stdlib/libdoc/erb/rdoc/classes/ERB.html).
@@ -23,7 +22,7 @@ module Nanoc::Filters
       context = ::Nanoc::Context.new(assigns)
 
       # Get binding
-      proc = assigns[:content] ? lambda { assigns[:content] } : nil
+      proc = assigns[:content] ? -> { assigns[:content] } : nil
       assigns_binding = context.get_binding(&proc)
 
       # Get result
@@ -33,6 +32,5 @@ module Nanoc::Filters
       erb.filename = filename
       erb.result(assigns_binding)
     end
-
   end
 end

data/lib/nanoc/filters/erubis.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Erubis < Nanoc::Filter
-
     requires 'erubis'
 
     # The same as `::Erubis::Eruby` but adds `_erbout` as an alias for the
@@ -23,12 +22,11 @@ module Nanoc::Filters
       context = ::Nanoc::Context.new(assigns)
 
       # Get binding
-      proc = assigns[:content] ? lambda { assigns[:content] } : nil
+      proc = assigns[:content] ? -> { assigns[:content] } : nil
       assigns_binding = context.get_binding(&proc)
 
       # Get result
-      ErubisWithErbout.new(content, :filename => filename).result(assigns_binding)
+      ErubisWithErbout.new(content, filename: filename).result(assigns_binding)
     end
-
   end
 end

data/lib/nanoc/filters/haml.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Haml < Nanoc::Filter
-
     requires 'haml'
 
     # Runs the content through [Haml](http://haml-lang.com/).
@@ -13,15 +12,14 @@ module Nanoc::Filters
     # @return [String] The filtered content
     def run(content, params = {})
       # Get options
-      options = params.merge(:filename => filename)
+      options = params.merge(filename: filename)
 
       # Create context
       context = ::Nanoc::Context.new(assigns)
 
       # Get result
-      proc = assigns[:content] ? lambda { assigns[:content] } : nil
+      proc = assigns[:content] ? -> { assigns[:content] } : nil
       ::Haml::Engine.new(content, options).render(context, assigns, &proc)
     end
-
   end
 end

data/lib/nanoc/filters/handlebars.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.4.0
   class Handlebars < Nanoc::Filter
-
     requires 'handlebars'
 
     # Runs the content through
@@ -28,7 +26,5 @@ module Nanoc::Filters
       template = handlebars.compile(content)
       template.call(context)
     end
-
   end
-
 end

data/lib/nanoc/filters/kramdown.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Kramdown < Nanoc::Filter
-
     requires 'kramdown'
 
     # Runs the content through [Kramdown](http://kramdown.gettalong.org/).
@@ -12,9 +11,13 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params = {})
-      # Get result
-      ::Kramdown::Document.new(content, params).to_html
-    end
+      document = ::Kramdown::Document.new(content, params)
 
+      document.warnings.each do |warning|
+        $stderr.puts "kramdown warning: #{warning}"
+      end
+
+      document.to_html
+    end
   end
 end

data/lib/nanoc/filters/less.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Less < Nanoc::Filter
-
     requires 'less'
 
     # Runs the content through [LESS](http://lesscss.org/).
@@ -45,9 +44,8 @@ module Nanoc::Filters
 
       # Add filename to load path
       paths = [File.dirname(@item[:content_filename])]
-      parser = ::Less::Parser.new(:paths => paths)
+      parser = ::Less::Parser.new(paths: paths)
       parser.parse(content).to_css params
     end
-
   end
 end

data/lib/nanoc/filters/markaby.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Markaby < Nanoc::Filter
-
     requires 'markaby'
 
     # Runs the content through [Markaby](http://markaby.github.io/).
@@ -15,6 +14,5 @@ module Nanoc::Filters
       # Get result
       ::Markaby::Builder.new(assigns).instance_eval(content).to_s
     end
-
   end
 end