nanoc 4.1.1 → 4.1.2

data/lib/nanoc/extra/deployer.rb

@@ -18,7 +18,7 @@ module Nanoc::Extra
     # @return [Boolean] true if the deployer should only show what would be
     #   deployed instead of doing the actual deployment
     attr_reader :dry_run
-    alias_method :dry_run?, :dry_run
+    alias dry_run? dry_run
 
     # @param [String] source_path The path to the directory that contains the
     #   files to upload. It should not have a trailing slash.

data/lib/nanoc/extra/deployers/fog.rb

@@ -37,7 +37,7 @@ module Nanoc::Extra::Deployers
       error 'The path requires no trailing slash' if path && path[-1, 1] == '/'
 
       # Mock if necessary
-      if self.dry_run?
+      if dry_run?
         puts 'Dry run - simulation'
         ::Fog.mock!
       end
@@ -95,7 +95,7 @@ module Nanoc::Extra::Deployers
         keys_to_invalidate.concat(keys_to_destroy)
         cdn = ::Fog::CDN.new(config)
         # fog cannot mock CDN requests
-        unless self.dry_run?
+        unless dry_run?
           distribution = cdn.get_distribution(cdn_id)
           # usual limit per invalidation: 1000 objects
           keys_to_invalidate.each_slice(1000) do |paths|

data/lib/nanoc/extra/deployers/rsync.rb

@@ -33,7 +33,7 @@ module Nanoc::Extra::Deployers
       '--exclude=".hg"',
       '--exclude=".svn"',
       '--exclude=".git"',
-    ]
+    ].freeze
 
     # @see Nanoc::Extra::Deployer#run
     def run

data/lib/nanoc/extra/jruby_nokogiri_warner.rb

@@ -5,7 +5,7 @@ module Nanoc::Extra
   class JRubyNokogiriWarner
     include Singleton
 
-    TEXT = <<EOS
+    TEXT = <<EOS.freeze
 --------------------------------------------------------------------------------
 Note:
 

data/lib/nanoc/extra/link_collector.rb

@@ -12,7 +12,7 @@ module ::Nanoc::Extra
       'link' => :href,
       'script' => :src,
       'video' => :src,
-    }
+    }.freeze
 
     def initialize(filenames, mode = nil)
       Nanoc::Extra::JRubyNokogiriWarner.check_and_warn

data/lib/nanoc/filters/colorize_syntax.rb

@@ -246,7 +246,7 @@ module Nanoc::Filters
       wrap: '-W',
       include_style: '-I',
       line_numbers: '-l',
-    }
+    }.freeze
 
     # Runs the content through [Highlight](http://www.andre-simon.de/doku/highlight/en/highlight.html).
     #
@@ -347,7 +347,7 @@ module Nanoc::Filters
 
     protected
 
-    KNOWN_COLORIZERS = [:coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight, :rouge]
+    KNOWN_COLORIZERS = [:coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight, :rouge].freeze
 
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)
@@ -367,7 +367,7 @@ module Nanoc::Filters
       colorizer = @colorizers[language.to_sym]
       if KNOWN_COLORIZERS.include?(colorizer)
         sym = (colorizer.to_s + '_postprocess').to_sym
-        if self.respond_to?(sym)
+        if respond_to?(sym)
           send(sym, language, element)
         end
       else

data/lib/nanoc/filters/less.rb

@@ -15,7 +15,7 @@ module Nanoc::Filters
       imports.concat(content.scan(/^@import\s+(["'])([^\1]+?)\1;/))
       imports.concat(content.scan(/^@import\s+url\((["']?)([^)]+?)\1\);/))
       imported_filenames = imports.map do |i|
-        i[1].match(/\.(less|css)$/) ? i[1] : i[1] + '.less'
+        i[1] =~ /\.(less|css)$/ ? i[1] : i[1] + '.less'
       end
 
       # Convert to items

data/lib/nanoc/filters/redcarpet.rb

@@ -62,11 +62,12 @@ module Nanoc::Filters
         end
 
         # Create renderer
-        if renderer_class == ::Redcarpet::Render::HTML_TOC
-          renderer = renderer_class.new
-        else
-          renderer = renderer_class.new(renderer_options)
-        end
+        renderer =
+          if renderer_class == ::Redcarpet::Render::HTML_TOC
+            renderer_class.new
+          else
+            renderer_class.new(renderer_options)
+          end
 
         # Render
         if with_toc

data/lib/nanoc/filters/relativize_paths.rb

@@ -4,7 +4,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()'].freeze
 
     # 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
@@ -89,7 +89,7 @@ module Nanoc::Filters
         doc.xpath(selector, namespaces).each do |node|
           if node.name == 'comment'
             nokogiri_process_comment(node, doc, selectors, namespaces, klass, type)
-          elsif self.path_is_relativizable?(node.content)
+          elsif path_is_relativizable?(node.content)
             node.content = relative_path_to(node.content)
           end
         end

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

@@ -1,6 +1,6 @@
 # @api private
 class ::Sass::Importers::Filesystem
-  alias_method :_orig_find, :_find
+  alias _orig_find _find
 
   def _find(dir, name, options)
     # Find filename

data/lib/nanoc/helpers/capturing.rb

@@ -177,7 +177,7 @@ module Nanoc::Helpers
       erbout_length = erbout.length
 
       # Execute block
-      block.call
+      yield
 
       # Get new piece of erbout
       erbout_addition = erbout[erbout_length..-1]

data/lib/nanoc/helpers/html_escape.rb

@@ -34,7 +34,8 @@ module Nanoc::Helpers
         buffer = eval('_erbout', block.binding)
         buffer << escaped_data
       elsif string
-        string.gsub('&', '&amp;')
+        string
+          .gsub('&', '&amp;')
           .gsub('<', '&lt;')
           .gsub('>', '&gt;')
           .gsub('"', '&quot;')
@@ -44,6 +45,6 @@ module Nanoc::Helpers
       end
     end
 
-    alias_method :h, :html_escape
+    alias h html_escape
   end
 end

data/lib/nanoc/helpers/link_to.rb

@@ -123,7 +123,7 @@ module Nanoc::Helpers
       end
 
       # Handle Windows network (UNC) paths
-      if path.start_with?('//') || path.start_with?('\\\\')
+      if path.start_with?('//', '\\\\')
         return path
       end
 
@@ -136,11 +136,12 @@ module Nanoc::Helpers
 
       # Calculate the relative path (method depends on whether destination is
       # a directory or not).
-      if src_path.to_s[-1, 1] != '/'
-        relative_path = dst_path.relative_path_from(src_path.dirname).to_s
-      else
-        relative_path = dst_path.relative_path_from(src_path).to_s
-      end
+      relative_path =
+        if src_path.to_s[-1, 1] != '/'
+          dst_path.relative_path_from(src_path.dirname).to_s
+        else
+          dst_path.relative_path_from(src_path).to_s
+        end
 
       # Add trailing slash if necessary
       if dst_path.to_s[-1, 1] == '/'

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -232,7 +232,7 @@ module Nanoc::RuleDSL
     #     include_rules 'rules/assets'
     #     include_rules 'rules/content'
     def include_rules(name)
-      filename = ["#{name}", "#{name}.rb", "./#{name}", "./#{name}.rb"].find { |f| File.file?(f) }
+      filename = [name.to_s, "#{name}.rb", "./#{name}", "./#{name}.rb"].find { |f| File.file?(f) }
       raise Nanoc::Int::Errors::NoRulesFileFound.new if filename.nil?
 
       Nanoc::RuleDSL::RulesLoader.new(@config, @rules_collection).parse(filename)

data/lib/nanoc/version.rb

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

data/nanoc.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
 
   s.files =
     Dir['[A-Z]*'] +
-      Dir['doc/yardoc_{templates,handlers}/**/*'] +
-      Dir['{bin,lib,tasks,test}/**/*'] +
-      ['nanoc.gemspec']
+  Dir['doc/yardoc_{templates,handlers}/**/*'] +
+  Dir['{bin,lib,tasks,test}/**/*'] +
+  ['nanoc.gemspec']
   s.executables        = ['nanoc']
   s.require_paths      = ['lib']
 

data/tasks/test.rake

@@ -4,7 +4,7 @@ require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
 
-SUBDIRS = %w( * base cli data_sources extra filters helpers )
+SUBDIRS = %w( * base cli data_sources extra filters helpers ).freeze
 
 namespace :test do
   SUBDIRS.each do |dir|

data/test/cli/test_cli.rb

@@ -1,5 +1,5 @@
 class Nanoc::CLITest < Nanoc::TestCase
-  COMMAND_CODE = <<EOS
+  COMMAND_CODE = <<EOS.freeze
 usage       '_test [options]'
 summary     'meh'
 description 'longer meh'
@@ -9,7 +9,7 @@ run do |opts, args, cmd|
 end
 EOS
 
-  SUBCOMMAND_CODE = <<EOS
+  SUBCOMMAND_CODE = <<EOS.freeze
 usage       '_sub [options]'
 summary     'meh sub'
 description 'longer meh sub'

data/test/extra/checking/checks/test_mixed_content.rb

@@ -25,7 +25,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 
@@ -43,7 +43,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 
@@ -61,7 +61,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 
@@ -79,7 +79,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 
@@ -97,7 +97,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 
@@ -115,7 +115,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 
@@ -180,7 +180,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
 
-      assert check.issues.empty?
+      assert_empty check.issues
     end
   end
 end

data/test/filters/test_colorize_syntax.rb

@@ -1,6 +1,6 @@
 class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
-  CODERAY_PRE  = '<div class="CodeRay"><div class="code">'
-  CODERAY_POST = '</div></div>'
+  CODERAY_PRE  = '<div class="CodeRay"><div class="code">'.freeze
+  CODERAY_POST = '</div></div>'.freeze
 
   def test_coderay_simple
     if_have 'coderay', 'nokogiri' do

data/test/filters/test_redcarpet.rb

@@ -56,11 +56,12 @@ class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
       # Run filter
       input           = "![Alt](/path/to/img 'Title')"
       output_expected = %r{<img src="/path/to/img" alt="Alt" title="Title"/>}
-      if ::Redcarpet::VERSION > '2'
-        output_actual   = filter.setup_and_run(input, renderer_options: { xhtml: true })
-      else
-        output_actual   = filter.setup_and_run(input, options: [:xhtml])
-      end
+      output_actual =
+        if ::Redcarpet::VERSION > '2'
+          filter.setup_and_run(input, renderer_options: { xhtml: true })
+        else
+          filter.setup_and_run(input, options: [:xhtml])
+        end
       assert_match(output_expected, output_actual)
     end
   end

data/test/filters/test_redcloth.rb

@@ -17,7 +17,7 @@ class Nanoc::Filters::RedClothTest < Nanoc::TestCase
 
       # Run filter without options
       result = filter.setup_and_run('I am a member of SPECTRE.')
-      assert_equal("<p>I am a member of <span class=\"caps\">SPECTRE</span>.</p>", result)
+      assert_equal('<p>I am a member of <span class="caps">SPECTRE</span>.</p>', result)
 
       # Run filter with options
       result = filter.setup_and_run('I am a member of SPECTRE.', no_span_caps: true)

data/test/filters/test_xsl.rb

@@ -1,7 +1,7 @@
 require 'tempfile'
 
 class Nanoc::Filters::XSLTest < Nanoc::TestCase
-  SAMPLE_XSL = <<-EOS
+  SAMPLE_XSL = <<-EOS.freeze
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"/>
@@ -18,7 +18,7 @@ class Nanoc::Filters::XSLTest < Nanoc::TestCase
 </xsl:stylesheet>
 EOS
 
-  SAMPLE_XML_IN = <<-EOS
+  SAMPLE_XML_IN = <<-EOS.freeze
 <?xml version="1.0" encoding="utf-8"?>
 <report>
   <title>My Report</title>
@@ -27,7 +27,7 @@ EOS
 
   SAMPLE_XML_OUT = %r{\A<\?xml version="1.0" encoding="utf-8"\?>\s*<html>\s*<head>\s*<title>My Report</title>\s*</head>\s*<body>\s*<h1>My Report</h1>\s*</body>\s*</html>\s*\Z}m
 
-  SAMPLE_XSL_WITH_PARAMS = <<-EOS
+  SAMPLE_XSL_WITH_PARAMS = <<-EOS.freeze
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"/>
@@ -45,7 +45,7 @@ EOS
 </xsl:stylesheet>
 EOS
 
-  SAMPLE_XML_IN_WITH_PARAMS = <<-EOS
+  SAMPLE_XML_IN_WITH_PARAMS = <<-EOS.freeze
 <?xml version="1.0" encoding="utf-8"?>
 <report>
   <title>My Report</title>
@@ -54,7 +54,7 @@ EOS
 
   SAMPLE_XML_OUT_WITH_PARAMS = %r{\A<\?xml version="1.0" encoding="utf-8"\?>\s*<html>\s*<head>\s*<title>My Report</title>\s*</head>\s*<body>\s*<h1>bar</h1>\s*</body>\s*</html>\s*\Z}m
 
-  SAMPLE_XSL_WITH_OMIT_XML_DECL = <<-EOS
+  SAMPLE_XSL_WITH_OMIT_XML_DECL = <<-EOS.freeze
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"
@@ -72,7 +72,7 @@ EOS
 </xsl:stylesheet>
 EOS
 
-  SAMPLE_XML_IN_WITH_OMIT_XML_DECL = <<-EOS
+  SAMPLE_XML_IN_WITH_OMIT_XML_DECL = <<-EOS.freeze
 <?xml version="1.0" encoding="utf-8"?>
 <report>
   <title>My Report</title>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri