nanoc 3.6.7 → 3.6.8

data/lib/nanoc/filters/erb.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8                                                                                                           
+# encoding: utf-8
 
 module Nanoc::Filters
   class ERB < Nanoc::Filter
@@ -15,7 +15,7 @@ module Nanoc::Filters
     # @option params [String] trim_mode (nil) The trim mode to use
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       # Add locals
       assigns.merge!(params[:locals] || {})
 
@@ -23,7 +23,7 @@ module Nanoc::Filters
       context = ::Nanoc::Context.new(assigns)
 
       # Get binding
-      proc = assigns[:content] ? lambda { assigns[:content] } : nil 
+      proc = assigns[:content] ? lambda { assigns[:content] } : nil
       assigns_binding = context.get_binding(&proc)
 
       # Get result
@@ -32,7 +32,7 @@ module Nanoc::Filters
       erb = ::ERB.new(content, safe_level, trim_mode)
       erb.filename = filename
       erb.result(assigns_binding)
-    end 
+    end
 
-  end 
+  end
 end

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/haml.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 options
       options = params.merge(:filename => filename)
 

data/lib/nanoc/filters/handlebars.rb

@@ -15,12 +15,12 @@ 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]
       context[:yield]  = assigns[:content]
-      if assigns.has_key?(:layout)
+      if assigns.key?(:layout)
         context[:layout] = assigns[:layout].attributes
       end
 

data/lib/nanoc/filters/kramdown.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
       ::Kramdown::Document.new(content, params).to_html
     end

data/lib/nanoc/filters/less.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 = {})
       # Find imports (hacky)
       imports = []
       imports.concat(content.scan(/^@import\s+(["'])([^\1]+?)\1;/))

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/maruku.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
       ::Maruku.new(content, params).to_html
     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/pandoc.rb

@@ -12,7 +12,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       PandocRuby.convert(content, params)
     end
 

data/lib/nanoc/filters/rainpress.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 = {})
       ::Rainpress.compress(content, params)
     end
 

data/lib/nanoc/filters/rdiscount.rb

@@ -12,7 +12,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       extensions = params[:extensions] || []
 
       ::RDiscount.new(content, *extensions).to_html

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/redcarpet.rb

@@ -20,7 +20,7 @@ module Nanoc::Filters
     #     Redcarpet
     #
     #   @return [String] The filtered content
-    #   
+    #
     # @overload run(content, params={})
     #
     #   For Redcarpet 2.x
@@ -39,7 +39,7 @@ module Nanoc::Filters
     #     on to the Redcarpet renderer
     #
     #   @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       if ::Redcarpet::VERSION > '2'
         options          = params[:options]          || {}
         renderer_class   = params[:renderer]         || ::Redcarpet::Render::HTML

data/lib/nanoc/filters/redcloth.rb

@@ -25,19 +25,19 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       # Create formatter
       r = ::RedCloth.new(content)
 
       # Set options
-      r.filter_classes = params[:filter_classes] if params.has_key?(:filter_classes)
-      r.filter_html    = params[:filter_html]    if params.has_key?(:filter_html)
-      r.filter_ids     = params[:filter_ids]     if params.has_key?(:filter_ids)
-      r.filter_styles  = params[:filter_styles]  if params.has_key?(:filter_styles)
-      r.hard_breaks    = params[:hard_breaks]    if params.has_key?(:hard_breaks)
-      r.lite_mode      = params[:lite_mode]      if params.has_key?(:lite_mode)
-      r.no_span_caps   = params[:no_span_caps]   if params.has_key?(:no_span_caps)
-      r.sanitize_html  = params[:sanitize_html]  if params.has_key?(:sanitize_html)
+      r.filter_classes = params[:filter_classes] if params.key?(:filter_classes)
+      r.filter_html    = params[:filter_html]    if params.key?(:filter_html)
+      r.filter_ids     = params[:filter_ids]     if params.key?(:filter_ids)
+      r.filter_styles  = params[:filter_styles]  if params.key?(:filter_styles)
+      r.hard_breaks    = params[:hard_breaks]    if params.key?(:hard_breaks)
+      r.lite_mode      = params[:lite_mode]      if params.key?(:lite_mode)
+      r.no_span_caps   = params[:no_span_caps]   if params.key?(:no_span_caps)
+      r.sanitize_html  = params[:sanitize_html]  if params.key?(:sanitize_html)
 
       # Get result
       r.to_html

data/lib/nanoc/filters/relativize_paths.rb

@@ -24,11 +24,11 @@ module Nanoc::Filters
     #   `:xhtml` types.
     #
     # @option params [Hash] :namespaces The pairs `prefix => uri` to define
-    #   any namespace you want to use in the XPath expressions. This param 
+    #   any namespace you want to use in the XPath expressions. This param
     #   is useful only for the `:xml` and `:xhtml` types.
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       # Set assigns so helper function can be used
       @item_rep = assigns[:item_rep] if @item_rep.nil?
 
@@ -61,9 +61,9 @@ 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, " +
-          ":xhtml for XHTML, :xml for XML, or :css for CSS).")
+          '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
 
@@ -71,7 +71,7 @@ module Nanoc::Filters
 
     def nokogiri_process(content, selectors, namespaces, klass, type)
       # Ensure that all prefixes are strings
-      namespaces = namespaces.inject({}) { |new, (prefix, uri)| new.merge(prefix.to_s => uri) }
+      namespaces = namespaces.reduce({}) { |new, (prefix, uri)| new.merge(prefix.to_s => uri) }
 
       doc = content =~ /<html[\s>]/ ? klass.parse(content) : klass.fragment(content)
       selectors.map { |sel| "descendant-or-self::#{sel}" }.each do |selector|
@@ -94,9 +94,8 @@ module Nanoc::Filters
     end
 
     def path_is_relativizable?(s)
-      s[0,1] == '/'
+      s[0, 1] == '/'
     end
 
   end
 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

@@ -6,7 +6,7 @@ class ::Sass::Importers::Filesystem
 
   def _find(dir, name, options)
     # Find filename
-    full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
+    full_filename, _syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
     return nil if full_filename.nil?
 
     # Create dependency

data/lib/nanoc/filters/sass.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 = {})
       options = params.merge({
         :nanoc_current_filter => self,
         :filename => @item && @item.raw_filename,

data/lib/nanoc/filters/slim.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 = {})
       params = {
         :disable_capture => true,      # Capture managed by nanoc
         :buffer          => '_erbout', # Force slim to output to the buffer used by nanoc

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/uglify_js.rb

@@ -13,7 +13,7 @@ module Nanoc::Filters
     # @option params [Array] :options ([]) A list of options to pass on to Uglifier
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       # Add filename to load path
       Uglifier.new(params).compile(content)
     end

data/lib/nanoc/filters/xsl.rb

@@ -7,7 +7,7 @@ module Nanoc::Filters
 
     requires 'nokogiri'
 
-    # Runs the item content through an [XSLT](http://www.w3.org/TR/xslt) 
+    # Runs the item content through an [XSLT](http://www.w3.org/TR/xslt)
     # stylesheet using  [Nokogiri](http://nokogiri.org/).
     #
     # This filter can only be run for layouts, because it will need both the
@@ -22,24 +22,26 @@ module Nanoc::Filters
     #     compile '/reports/*/' do
     #       layout 'xsl-report'
     #     end
-    #     
+    #
     #     layout 'xsl-report', :xsl, :awesome => 'definitely'
     #
-    # @param [String] content The XML content to transform
+    # @param [String] content Ignored. As the filter can be run only as a
+    #   layout, the value of the `:content` parameter passed to the class at
+    #   initialization is used as the content to transform.
     #
     # @param [Hash] params The parameters that will be stored in corresponding
     #   `xsl:param` elements.
     #
     # @return [String] The transformed content
-    def run(content, params={})
+    def run(content, params = {})
       if assigns[:layout].nil?
-        raise "The XSL filter can only be run as a layout"
+        raise 'The XSL filter can only be run as a layout'
       end
 
-      xml = ::Nokogiri::XML(content)
+      xml = ::Nokogiri::XML(assigns[:content])
       xsl = ::Nokogiri::XSLT(assigns[:layout].raw_content)
 
-      xsl.transform(xml, ::Nokogiri::XSLT.quote_params(params)).to_s
+      xsl.apply_to(xml, ::Nokogiri::XSLT.quote_params(params))
     end
 
   end

data/lib/nanoc/filters/yui_compressor.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Nanoc::Filters
 
   # @since 3.3.0

data/lib/nanoc/helpers/blogging.rb

@@ -64,15 +64,15 @@ module Nanoc::Helpers
       end
 
       def validate
-        self.validate_config
-        self.validate_feed_item
-        self.validate_articles
+        validate_config
+        validate_feed_item
+        validate_articles
       end
 
       def build
         buffer = ''
         xml = Builder::XmlMarkup.new(:target => buffer, :indent => 2)
-        self.build_for_feed(xml)
+        build_for_feed(xml)
         buffer
       end
 
@@ -143,7 +143,7 @@ module Nanoc::Helpers
 
           # Add articles
           sorted_relevant_articles.each do |a|
-            self.build_for_article(a, xml)
+            build_for_article(a, xml)
           end
         end
       end
@@ -289,7 +289,7 @@ module Nanoc::Helpers
     # @option params [String] :logo The URI of the feed's logo.
     #
     # @return [String] The generated feed content
-    def atom_feed(params={})
+    def atom_feed(params = {})
       require 'builder'
 
       # Create builder

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -22,7 +22,7 @@ module Nanoc::Helpers
         idx = @item.identifier.index('/', idx_start)
         break if idx.nil?
 
-        idx_start = idx+1
+        idx_start = idx + 1
         identifier = @item.identifier[0..idx]
         trail << @items[identifier]
       end

data/lib/nanoc/helpers/capturing.rb

@@ -101,7 +101,7 @@ module Nanoc::Helpers
       if block_given? # Set content
         # Get args
         if args.size != 1
-          raise ArgumentError, "expected 1 argument (the name " +
+          raise ArgumentError, 'expected 1 argument (the name ' +
             "of the capture) but got #{args.size} instead"
         end
         name = args[0]
@@ -112,7 +112,7 @@ module Nanoc::Helpers
       else # Get content
         # Get args
         if args.size != 2
-          raise ArgumentError, "expected 2 arguments (the item " +
+          raise ArgumentError, 'expected 2 arguments (the item ' +
             "and the name of the capture) but got #{args.size} instead"
         end
         item = args[0]

data/lib/nanoc/helpers/filtering.rb

@@ -28,7 +28,7 @@ module Nanoc::Helpers
     # @param [Hash] arguments Arguments to pass to the filter
     #
     # @return [void]
-    def filter(filter_name, arguments={}, &block)
+    def filter(filter_name, arguments = {}, &block)
       # Capture block
       data = capture(&block)
 

data/lib/nanoc/helpers/html_escape.rb

@@ -28,7 +28,7 @@ module Nanoc::Helpers
     # @param [String] string The string to escape
     #
     # @return [String] The escaped string
-    def html_escape(string=nil, &block)
+    def html_escape(string = nil, &block)
       if block_given?
         # Capture and escape block
         data = capture(&block)
@@ -43,12 +43,12 @@ module Nanoc::Helpers
                gsub('>', '>').
                gsub('"', '"')
       else
-        raise RuntimeError, "The #html_escape or #h function needs either a " \
+        raise "The #html_escape or #h function needs either a " \
           "string or a block to HTML-escape, but neither a string nor a block was given"
       end
     end
 
-    alias h html_escape
+    alias_method :h, :html_escape
 
   end
 

data/lib/nanoc/helpers/link_to.rb

@@ -45,17 +45,17 @@ module Nanoc::Helpers
     #
     #   link_to('Blog', '/blog/', :title => 'My super cool blog')
     #   # => '<a title="My super cool blog" href="/blog/">Blog</a>'
-    def link_to(text, target, attributes={})
+    def link_to(text, target, attributes = {})
       # Find path
       if target.is_a?(String)
         path = target
       else
         path = target.path
-        raise RuntimeError, "Cannot create a link to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if path.nil?
+        raise "Cannot create a link to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if path.nil?
       end
 
       # Join attributes
-      attributes = attributes.inject('') do |memo, (key, value)|
+      attributes = attributes.reduce('') do |memo, (key, value)|
         memo + key.to_s + '="' + h(value) + '" '
       end
 
@@ -87,7 +87,7 @@ module Nanoc::Helpers
     #
     #   link_to_unless_current('This Item', @item)
     #   # => '<span class="active" title="You\'re here.">This Item</span>'
-    def link_to_unless_current(text, target, attributes={})
+    def link_to_unless_current(text, target, attributes = {})
       # Find path
       path = target.is_a?(String) ? target : target.path
 
@@ -140,14 +140,14 @@ module Nanoc::Helpers
 
       # Calculate the relative path (method depends on whether destination is
       # a directory or not).
-      if src_path.to_s[-1,1] != '/'
+      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
 
       # Add trailing slash if necessary
-      if dst_path.to_s[-1,1] == '/'
+      if dst_path.to_s[-1, 1] == '/'
         relative_path << '/'
       end
 

data/lib/nanoc/helpers/rendering.rb

@@ -38,7 +38,7 @@ module Nanoc::Helpers
     # @example Rendering a head and a foot partial around some text
     #
     #   <%= render 'head' %> - MIDDLE - <%= render 'foot' %>
-    #   # => "HEAD - MIDDLE - FOOT" 
+    #   # => "HEAD - MIDDLE - FOOT"
     #
     # @example Rendering a head partial with a custom title
     #
@@ -77,7 +77,7 @@ module Nanoc::Helpers
     #
     # @return [String, nil] The rendered partial, or nil if this method was
     #   invoked with a block
-    def render(identifier, other_assigns={}, &block)
+    def render(identifier, other_assigns = {}, &block)
       # Find layout
       layout = @site.layouts.find { |l| l.identifier == identifier.cleaned_identifier }
       raise Nanoc::Errors::UnknownLayout.new(identifier.cleaned_identifier) if layout.nil?

data/lib/nanoc/helpers/tagging.rb

@@ -30,12 +30,12 @@ module Nanoc::Helpers
     #   tags
     #
     # @return [String] A hyperlinked list of tags for the given item
-    def tags_for(item, params={})
+    def tags_for(item, params = {})
       base_url  = params[:base_url]  || 'http://technorati.com/tag/'
       none_text = params[:none_text] || '(none)'
       separator = params[:separator] || ', '
 
-      if item[:tags].nil? or item[:tags].empty?
+      if item[:tags].nil? || item[:tags].empty?
         none_text
       else
         item[:tags].map { |tag| link_for_tag(tag, base_url) }.join(separator)

data/lib/nanoc/helpers/text.rb

@@ -18,7 +18,7 @@ module Nanoc::Helpers
     #   excerpt when the excerpt is shorter than the original string
     #
     # @return [String] The excerpt of the given string
-    def excerptize(string, params={})
+    def excerptize(string, params = {})
       # Initialize params
       params[:length]   ||= 25
       params[:omission] ||= '...'

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -39,7 +39,7 @@ module Nanoc::Helpers
     #   proc returns true, the rep will be included; otherwise, it will not.
     #
     # @return [String] The XML sitemap
-    def xml_sitemap(params={})
+    def xml_sitemap(params = {})
       require 'builder'
 
       # Extract parameters
@@ -52,7 +52,7 @@ module Nanoc::Helpers
 
       # Check for required attributes
       if @site.config[:base_url].nil?
-        raise RuntimeError.new("The Nanoc::Helpers::XMLSitemap helper requires the site configuration to specify the base URL for the site.")
+        raise RuntimeError.new('The Nanoc::Helpers::XMLSitemap helper requires the site configuration to specify the base URL for the site.')
       end
 
       # Build sitemap

data/lib/nanoc/version.rb

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

data/lib/nanoc.rb

@@ -5,8 +5,8 @@ module Nanoc
   # @return [String] A string containing information about this nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).
   def self.version_information
-    gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : "without RubyGems"
-    engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+    gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : 'without RubyGems'
+    engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
     res = ''
     res << "nanoc #{Nanoc::VERSION} © 2007-2013 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
@@ -34,6 +34,7 @@ require 'tempfile'
 require 'thread'
 require 'time'
 require 'yaml'
+require 'English'
 
 # Load nanoc
 require 'nanoc/version'

data/nanoc.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.files              = Dir['[A-Z]*'] +
-                         Dir['doc/yardoc_templates/**/*'] +
+                         Dir['doc/yardoc_{templates,handlers}/**/*'] +
                          Dir['{bin,lib,tasks,test}/**/*'] +
                          [ 'nanoc.gemspec' ]
   s.executables        = [ 'nanoc' ]
@@ -26,9 +26,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('cri', '~> 2.3')
 
-  s.add_development_dependency('minitest', '~> 4.0')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rdiscount')
-  s.add_development_dependency('yard')
+  s.add_development_dependency('bundler', '~> 1.5')
 end

data/tasks/rubocop.rake

@@ -0,0 +1,5 @@
+require 'rubocop/rake_task'
+
+Rubocop::RakeTask.new(:rubocop) do |task|
+  task.patterns = ['lib/**/*.rb']
+end