nanoc 3.7.3 → 3.7.4

data/lib/nanoc/extra/file_proxy.rb

@@ -16,12 +16,12 @@ module Nanoc::Extra
     def freeze
     end
 
-    def respond_to?(meth, include_all = false)
+    def respond_to?(meth, _include_all = false)
       file_instance_methods.include?(meth.to_sym)
     end
 
     def method_missing(sym, *args, &block)
-      if !@@deprecation_warning_shown
+      unless @@deprecation_warning_shown
         $stderr.puts 'WARNING: The :file attribute is deprecated and will be removed in a future version of nanoc. Instead of using this :file attribute, consider manually creating a File object when it’s needed, using the :content_filename, :meta_filename or :filename attributes.'
         @@deprecation_warning_shown = true
       end
@@ -29,7 +29,7 @@ module Nanoc::Extra
       File.open(@path, 'r') { |io| io.__send__(sym, *args, &block) }
     end
 
-  private
+    private
 
     def file_instance_methods
       @@file_instance_methods ||= Set.new(File.instance_methods.map { |m| m.to_sym })

data/lib/nanoc/extra/jruby_nokogiri_warner.rb

@@ -35,7 +35,7 @@ EOS
     end
 
     def check_and_warn
-      return if !defined?(RUBY_ENGINE)
+      return unless defined?(RUBY_ENGINE)
       return if RUBY_ENGINE != 'jruby'
       return if @warned
 

data/lib/nanoc/extra/link_collector.rb

@@ -13,7 +13,7 @@ module ::Nanoc::Extra
       @filter =
         case mode
         when nil
-          lambda { |h| true }
+          lambda { |_h| true }
         when :external
           lambda { |h| external_href?(h) }
         when :internal
@@ -36,7 +36,7 @@ module ::Nanoc::Extra
     end
 
     def external_href?(href)
-      !!(href =~ %r{^(\/\/|[a-z\-]+:)})
+      href =~ %r{^(\/\/|[a-z\-]+:)}
     end
 
     def hrefs_in_file(filename)
@@ -47,7 +47,7 @@ module ::Nanoc::Extra
 
       # Convert protocol-relative urls
       # e.g. //example.com => http://example.com
-      hrefs_in_file.map! { |href| href.gsub /^\/\//, 'http://' }
+      hrefs_in_file.map! { |href| href.gsub(/^\/\//, 'http://') }
 
       # Strip fragment
       hrefs_in_file.map! { |href| href.gsub(/#.*$/, '') }

data/lib/nanoc/extra/piper.rb

@@ -21,7 +21,7 @@ module Nanoc::Extra
 
     # @option [IO] :stdout ($stdout)
     # @option [IO] :stderr ($stderr)
-    def initialize(params={})
+    def initialize(params = {})
       @stdout = params.fetch(:stdout, $stdout)
       @stderr = params.fetch(:stderr, $stderr)
     end
@@ -43,7 +43,7 @@ module Nanoc::Extra
         stderr_thread.join
 
         exit_status = wait_thr.value
-        if !exit_status.success?
+        unless exit_status.success?
           raise Error.new(cmd, exit_status.to_i)
         end
       end

data/lib/nanoc/extra/pruner.rb

@@ -27,11 +27,12 @@ module Nanoc::Extra
       require 'find'
 
       # Get compiled files
-      compiled_files = site.items.map do |item|
+      all_raw_paths = site.items.map do |item|
         item.reps.map do |rep|
           rep.raw_path
         end
-      end.flatten.compact.select { |f| File.file?(f) }
+      end
+      compiled_files = all_raw_paths.flatten.compact.select { |f| File.file?(f) }
 
       # Get present files and dirs
       present_files = []
@@ -64,7 +65,7 @@ module Nanoc::Extra
       @exclude.any? { |e| pathname.include_component?(e) }
     end
 
-  protected
+    protected
 
     def delete_file(file)
       if @dry_run

data/lib/nanoc/extra/validators/links.rb

@@ -5,7 +5,7 @@ module Nanoc::Extra::Validators
   # @deprecated Use the Checking API or the `check` command instead
   class Links
 
-    def initialize(dir, index_filenames, params = {})
+    def initialize(_dir, _index_filenames, params = {})
       @include_internal = params.key?(:internal) && params[:internal]
       @include_external = params.key?(:external) && params[:external]
     end
@@ -14,7 +14,7 @@ module Nanoc::Extra::Validators
       checks = []
       checks << 'ilinks' if options[:internal]
       checks << 'elinks' if options[:external]
-      Nanoc::CLI.run [ 'check', checks ].flatten
+      Nanoc::CLI.run ['check', checks].flatten
     end
 
   end

data/lib/nanoc/extra/validators/w3c.rb

@@ -19,7 +19,7 @@ module Nanoc::Extra::Validators
         raise Nanoc::Errors::GenericTrivial, "unknown type(s) specified: #{types.join(', ')}"
       end
 
-      Nanoc::CLI.run([ 'check', args ].flatten)
+      Nanoc::CLI.run(['check', args].flatten)
     end
 
   end

data/lib/nanoc/extra/vcs.rb

@@ -20,7 +20,7 @@ module Nanoc::Extra
     # @return [void]
     #
     # @abstract
-    def add(filename)
+    def add(_filename)
       not_implemented('add')
     end
 
@@ -33,7 +33,7 @@ module Nanoc::Extra
     # @return [void]
     #
     # @abstract
-    def remove(filename)
+    def remove(_filename)
       not_implemented('remove')
     end
 
@@ -48,15 +48,15 @@ module Nanoc::Extra
     # @return [void]
     #
     # @abstract
-    def move(src, dst)
+    def move(_src, _dst)
       not_implemented('move')
     end
 
-  private
+    private
 
     def not_implemented(name)
       raise NotImplementedError.new(
-        "#{self.class} does not override ##{name}, which is required for " +
+        "#{self.class} does not override ##{name}, which is required for " \
         'this data source to be used.'
       )
     end

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

@@ -6,7 +6,7 @@ module Nanoc::Extra::VCSes
   class Dummy < Nanoc::Extra::VCS
 
     # @see Nanoc::Extra::VCS#add
-    def add(filename)
+    def add(_filename)
     end
 
     # @see Nanoc::Extra::VCS#remove

data/lib/nanoc/filters/asciidoc.rb

@@ -11,7 +11,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       stdout = StringIO.new
       stderr = $stderr
       piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)

data/lib/nanoc/filters/bluecloth.rb

@@ -11,7 +11,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       ::BlueCloth.new(content).to_html
     end
 

data/lib/nanoc/filters/coffeescript.rb

@@ -13,7 +13,7 @@ module Nanoc::Filters
     # @param [String] content The CoffeeScript content to turn into JavaScript
     #
     # @return [String] The resulting JavaScript
-    def run(content, params = {})
+    def run(content, _params = {})
       ::CoffeeScript.compile(content)
     end
 

data/lib/nanoc/filters/colorize_syntax.rb

@@ -159,18 +159,16 @@ module Nanoc::Filters
     #
     # @api private
     def parse(content, klass, is_fullpage)
-      begin
-        if is_fullpage
-          klass.parse(content, nil, 'UTF-8')
-        else
-          klass.fragment(content)
-        end
-      rescue => e
-        if e.message =~ /can't modify frozen string/
-          parse(content.dup, klass, is_fullpage)
-        else
-          raise e
-        end
+      if is_fullpage
+        klass.parse(content, nil, 'UTF-8')
+      else
+        klass.fragment(content)
+      end
+    rescue => e
+      if e.message =~ /can't modify frozen string/
+        parse(content.dup, klass, is_fullpage)
+      else
+        raise e
       end
     end
 
@@ -199,7 +197,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 = {})
       code
     end
 
@@ -221,7 +219,7 @@ module Nanoc::Filters
       params[:encoding] ||= 'utf-8'
       params[:nowrap]   ||= 'True'
 
-      cmd = [ 'pygmentize', '-l', language, '-f', 'html' ]
+      cmd = ['pygmentize', '-l', language, '-f', 'html']
       cmd << '-O' << params.map { |k, v| "#{k}=#{v}" }.join(',') unless params.empty?
 
       stdout = StringIO.new
@@ -276,8 +274,8 @@ module Nanoc::Filters
     def simon_highlight(code, language, params = {})
       check_availability('highlight', '--version')
 
-      cmd = [ 'highlight', '--syntax', language, '--fragment' ]
-      params.each do |key, value|
+      cmd = ['highlight', '--syntax', language, '--fragment']
+      params.each do |key, _value|
         if SIMON_HIGHLIGHT_OPT_MAP[key]
           cmd << SIMON_HIGHLIGHT_OPT_MAP[key]
         else
@@ -298,7 +296,7 @@ module Nanoc::Filters
     end
 
     # Wraps the element in <div class="CodeRay"><div class="code">
-    def coderay_postprocess(language, element)
+    def coderay_postprocess(_language, element)
       # Skip if we're a free <code>
       return if element.parent.nil?
 
@@ -345,7 +343,7 @@ module Nanoc::Filters
     # After:
     #
     #   <pre><code class="language-ruby highlight">
-    def rouge_postprocess(language, element)
+    def rouge_postprocess(_language, element)
       return if element.name != 'pre'
 
       code1 = element.xpath('code').first
@@ -354,12 +352,12 @@ module Nanoc::Filters
       return if code2.nil?
 
       code1.inner_html = code2.inner_html
-      code1['class'] = [ code1['class'], code2['class'] ].compact.join(' ')
+      code1['class'] = [code1['class'], code2['class']].compact.join(' ')
     end
 
-  protected
+    protected
 
-    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight, :rouge ]
+    KNOWN_COLORIZERS = [:coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight, :rouge]
 
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)

data/lib/nanoc/filters/erubis.rb

@@ -18,7 +18,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       # Create context
       context = ::Nanoc::Context.new(assigns)
 

data/lib/nanoc/filters/handlebars.rb

@@ -15,7 +15,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       context = item.attributes.dup
       context[:item]   = assigns[:item].attributes
       context[:config] = assigns[:config]

data/lib/nanoc/filters/less.rb

@@ -30,7 +30,7 @@ module Nanoc::Filters
         if imported_pathname.relative?
           imported_pathname = current_dir_pathname + imported_pathname
         end
-        next if !imported_pathname.exist?
+        next unless imported_pathname.exist?
         imported_filename = imported_pathname.realpath
 
         # Find matching item
@@ -44,7 +44,7 @@ module Nanoc::Filters
       depend_on(imported_items)
 
       # Add filename to load path
-      paths = [ File.dirname(@item[:content_filename]) ]
+      paths = [File.dirname(@item[:content_filename])]
       parser = ::Less::Parser.new(:paths => paths)
       parser.parse(content).to_css params
     end

data/lib/nanoc/filters/markaby.rb

@@ -11,7 +11,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       # Get result
       ::Markaby::Builder.new(assigns).instance_eval(content).to_s
     end

data/lib/nanoc/filters/mustache.rb

@@ -14,7 +14,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       context = item.attributes.merge({ :yield => assigns[:content] })
       ::Mustache.render(content, context)
     end

data/lib/nanoc/filters/rdoc.rb

@@ -16,7 +16,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       options = ::RDoc::Options.new
       to_html = ::RDoc::Markup::ToHtml.new(options)
       ::RDoc::Markup.new.convert(content, to_html)

data/lib/nanoc/filters/relativize_paths.rb

@@ -6,7 +6,7 @@ module Nanoc::Filters
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo
 
-    SELECTORS = [ '*/@href', '*/@src', 'object/@data', 'param[@name="movie"]/@content', 'comment()' ]
+    SELECTORS = ['*/@href', '*/@src', 'object/@data', 'param[@name="movie"]/@content', 'comment()']
 
     # Relativizes all paths in the given content, which can be HTML, XHTML, XML
     # or CSS. This filter is quite useful if a site needs to be hosted in a
@@ -63,13 +63,13 @@ module Nanoc::Filters
         nokogiri_process(content, selectors, namespaces, klass, params[:type])
       else
         raise RuntimeError.new(
-          'The relativize_paths needs to know the type of content to ' +
-          'process. Pass a :type to the filter call (:html for HTML, ' +
+          'The relativize_paths needs to know the type of content to ' \
+          'process. Pass a :type to the filter call (:html for HTML, ' \
           ':xhtml for XHTML, :xml for XML, or :css for CSS).')
       end
     end
 
-  protected
+    protected
 
     def nokogiri_process(content, selectors, namespaces, klass, type)
       # Ensure that all prefixes are strings
@@ -80,7 +80,7 @@ module Nanoc::Filters
         doc.xpath(selector, namespaces).each do |node|
           if node.name == 'comment'
             content = node.content.dup
-            content = content.sub(%r{^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])}m) do |m|
+            content = content.sub(%r{^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])}m) do |_m|
               fragment = nokogiri_process($2, selectors, namespaces, klass, type)
               $1 + fragment + $3
             end

data/lib/nanoc/filters/rubypants.rb

@@ -11,7 +11,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       # Get result
       ::RubyPants.new(content).to_html
     end

data/lib/nanoc/filters/sass/sass_filesystem_importer.rb

@@ -12,7 +12,7 @@ class ::Sass::Importers::Filesystem
     # Create dependency
     filter = options[:nanoc_current_filter]
     item = filter.imported_filename_to_item(full_filename)
-    filter.depend_on([ item ]) unless item.nil?
+    filter.depend_on([item]) unless item.nil?
 
     # Call original _find
     _orig_find(dir, name, options)

data/lib/nanoc/filters/typogruby.rb

@@ -13,7 +13,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params = {})
+    def run(content, _params = {})
       # Get result
       ::Typogruby.improve(content)
     end

data/lib/nanoc/filters/xsl.rb

@@ -33,7 +33,7 @@ module Nanoc::Filters
     #   `xsl:param` elements.
     #
     # @return [String] The transformed content
-    def run(content, params = {})
+    def run(_content, params = {})
       Nanoc::Extra::JRubyNokogiriWarner.check_and_warn
 
       if assigns[:layout].nil?

data/lib/nanoc/helpers/blogging.rb

@@ -87,7 +87,7 @@ module Nanoc::Helpers
         buffer
       end
 
-    protected
+      protected
 
       def sorted_relevant_articles
         relevant_articles.sort_by do |a|
@@ -132,8 +132,8 @@ module Nanoc::Helpers
           root_url = @site.config[:base_url] + '/'
 
           # Add primary attributes
-          xml.id      root_url
-          xml.title   title
+          xml.id root_url
+          xml.title title
 
           # Add date
           xml.updated(attribute_to_time(last_article[:created_at]).to_iso8601_time)
@@ -144,8 +144,8 @@ module Nanoc::Helpers
 
           # Add author information
           xml.author do
-            xml.name  author_name
-            xml.uri   author_uri
+            xml.name author_name
+            xml.uri author_uri
           end
 
           # Add icon and logo
@@ -166,18 +166,18 @@ module Nanoc::Helpers
 
         xml.entry do
           # Add primary attributes
-          xml.id        atom_tag_for(a)
-          xml.title     a[:title], :type => 'html'
+          xml.id atom_tag_for(a)
+          xml.title a[:title], :type => 'html'
 
           # Add dates
           xml.published attribute_to_time(a[:created_at]).to_iso8601_time
-          xml.updated   attribute_to_time(a[:updated_at] || a[:created_at]).to_iso8601_time
+          xml.updated attribute_to_time(a[:updated_at] || a[:created_at]).to_iso8601_time
 
           # Add specific author information
           if a[:author_name] || a[:author_uri]
             xml.author do
-              xml.name  a[:author_name] || author_name
-              xml.uri   a[:author_uri]  || author_uri
+              xml.name a[:author_name] || author_name
+              xml.uri a[:author_uri]  || author_uri
             end
           end
 
@@ -186,8 +186,8 @@ module Nanoc::Helpers
 
           # Add content
           summary = excerpt_proc.call(a)
-          xml.content   content_proc.call(a), :type => 'html'
-          xml.summary   summary, :type => 'html' unless summary.nil?
+          xml.content content_proc.call(a), :type => 'html'
+          xml.summary summary, :type => 'html' unless summary.nil?
         end
       end