nanoc 3.7.4 → 3.7.5

data/lib/nanoc/filters/maruku.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Maruku < Nanoc::Filter
-
     requires 'maruku'
 
     # Runs the content through [Maruku](https://github.com/bhollis/maruku/).
@@ -15,6 +14,5 @@ module Nanoc::Filters
       # Get result
       ::Maruku.new(content, params).to_html
     end
-
   end
 end

data/lib/nanoc/filters/mustache.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.2.0
   class Mustache < Nanoc::Filter
-
     requires 'mustache'
 
     # Runs the content through
@@ -15,10 +13,8 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, _params = {})
-      context = item.attributes.merge({ :yield => assigns[:content] })
+      context = item.attributes.merge({ yield: assigns[:content] })
       ::Mustache.render(content, context)
     end
-
   end
-
 end

data/lib/nanoc/filters/pandoc.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Pandoc < Nanoc::Filter
-
     requires 'pandoc-ruby'
 
     # Runs the content through [Pandoc](http://johnmacfarlane.net/pandoc/)
@@ -15,6 +14,5 @@ module Nanoc::Filters
     def run(content, *params)
       PandocRuby.convert(content, *params)
     end
-
   end
 end

data/lib/nanoc/filters/rainpress.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Rainpress < Nanoc::Filter
-
     requires 'rainpress'
 
     # Runs the content through [Rainpress](http://code.google.com/p/rainpress/).
@@ -14,6 +13,5 @@ module Nanoc::Filters
     def run(content, params = {})
       ::Rainpress.compress(content, params)
     end
-
   end
 end

data/lib/nanoc/filters/rdiscount.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class RDiscount < Nanoc::Filter
-
     requires 'rdiscount'
 
     # Runs the content through [RDiscount](http://github.com/rtomayko/rdiscount).
@@ -17,6 +16,5 @@ module Nanoc::Filters
 
       ::RDiscount.new(content, *extensions).to_html
     end
-
   end
 end

data/lib/nanoc/filters/rdoc.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class RDoc < Nanoc::Filter
-
     requires 'rdoc'
 
     def self.setup
@@ -21,6 +20,5 @@ module Nanoc::Filters
       to_html = ::RDoc::Markup::ToHtml.new(options)
       ::RDoc::Markup.new.convert(content, to_html)
     end
-
   end
 end

data/lib/nanoc/filters/redcarpet.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.2.0
   class Redcarpet < Nanoc::Filter
-
     requires 'redcarpet'
 
     # Runs the content through [Redcarpet](https://github.com/vmg/redcarpet).
@@ -81,7 +79,5 @@ module Nanoc::Filters
         end
       end
     end
-
   end
-
 end

data/lib/nanoc/filters/redcloth.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class RedCloth < Nanoc::Filter
-
     requires 'redcloth'
 
     # Runs the content through [RedCloth](http://redcloth.org/). This method
@@ -42,6 +41,5 @@ module Nanoc::Filters
       # Get result
       r.to_html
     end
-
   end
 end

data/lib/nanoc/filters/relativize_paths.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class RelativizePaths < Nanoc::Filter
-
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo
 
@@ -37,7 +36,7 @@ module Nanoc::Filters
       # Filter
       case params[:type]
       when :css
-        # FIXME parse CSS the proper way using csspool or something
+        # FIXME: parse CSS the proper way using csspool or something
         content.gsub(/url\((['"]?)(\/(?:[^\/].*?)?)\1\)/) do
           'url(' + $1 + relative_path_to($2) + $1 + ')'
         end
@@ -53,7 +52,7 @@ module Nanoc::Filters
           klass = ::Nokogiri::XML
         when :xhtml
           klass = ::Nokogiri::XML
-          # FIXME cleanup because it is ugly
+          # FIXME: cleanup because it is ugly
           # this cleans the XHTML namespace to process fragments and full
           # documents in the same way. At least, Nokogiri adds this namespace
           # if detects the `html` element.
@@ -98,6 +97,5 @@ module Nanoc::Filters
     def path_is_relativizable?(s)
       s[0, 1] == '/'
     end
-
   end
 end

data/lib/nanoc/filters/rubypants.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class RubyPants < Nanoc::Filter
-
     requires 'rubypants'
 
     # Runs the content through [RubyPants](http://rubydoc.info/gems/rubypants/).
@@ -15,6 +14,5 @@ module Nanoc::Filters
       # Get result
       ::RubyPants.new(content).to_html
     end
-
   end
 end

data/lib/nanoc/filters/sass.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class Sass < Nanoc::Filter
-
     requires 'sass', 'nanoc/filters/sass/sass_filesystem_importer'
 
     # Runs the content through [Sass](http://sass-lang.com/).
@@ -13,8 +12,8 @@ module Nanoc::Filters
     # @return [String] The filtered content
     def run(content, params = {})
       options = params.merge({
-        :nanoc_current_filter => self,
-        :filename => @item && @item.raw_filename,
+        nanoc_current_filter: self,
+        filename: @item && @item.raw_filename,
       })
       engine = ::Sass::Engine.new(content, options)
       engine.render
@@ -26,6 +25,5 @@ module Nanoc::Filters
           Pathname.new(i.raw_filename).realpath == Pathname.new(filename).realpath
       end
     end
-
   end
 end

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class ::Sass::Importers::Filesystem
-
   alias_method :_orig_find, :_find
 
   def _find(dir, name, options)
@@ -17,5 +16,4 @@ class ::Sass::Importers::Filesystem
     # Call original _find
     _orig_find(dir, name, options)
   end
-
 end

data/lib/nanoc/filters/slim.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.2.0
   class Slim < Nanoc::Filter
-
     requires 'slim'
 
     # Runs the content through [Slim](http://slim-lang.com/).
@@ -15,8 +13,8 @@ module Nanoc::Filters
     # @return [String] The filtered content
     def run(content, params = {})
       params = {
-        :disable_capture => true,      # Capture managed by nanoc
-        :buffer          => '_erbout', # Force slim to output to the buffer used by nanoc
+        disable_capture: true,      # Capture managed by nanoc
+        buffer: '_erbout', # Force slim to output to the buffer used by nanoc
       }.merge params
 
       # Create context
@@ -24,7 +22,5 @@ module Nanoc::Filters
 
       ::Slim::Template.new(params) { content }.render(context) { assigns[:content] }
     end
-
   end
-
 end

data/lib/nanoc/filters/typogruby.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.2.0
   class Typogruby < Nanoc::Filter
-
     requires 'typogruby'
 
     # Runs the content through [Typogruby](http://avdgaag.github.com/typogruby/).
@@ -17,7 +15,5 @@ module Nanoc::Filters
       # Get result
       ::Typogruby.improve(content)
     end
-
   end
-
 end

data/lib/nanoc/filters/uglify_js.rb

@@ -2,7 +2,6 @@
 
 module Nanoc::Filters
   class UglifyJS < Nanoc::Filter
-
     requires 'uglifier'
 
     # Runs the content through [UglifyJS](https://github.com/mishoo/UglifyJS2/).
@@ -17,6 +16,5 @@ module Nanoc::Filters
       # Add filename to load path
       Uglifier.new(params).compile(content)
     end
-
   end
 end

data/lib/nanoc/filters/xsl.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.3.0
   class XSL < Nanoc::Filter
-
     requires 'nokogiri'
 
     # Runs the item content through an [XSLT](http://www.w3.org/TR/xslt)
@@ -25,7 +23,7 @@ module Nanoc::Filters
     #
     #     layout 'xsl-report', :xsl, :awesome => 'definitely'
     #
-    # @param [String] content Ignored. As the filter can be run only as a
+    # @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.
     #
@@ -45,7 +43,5 @@ module Nanoc::Filters
 
       xsl.apply_to(xml, ::Nokogiri::XSLT.quote_params(params))
     end
-
   end
-
 end

data/lib/nanoc/filters/yui_compressor.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc::Filters
-
   # @since 3.3.0
   class YUICompressor < Nanoc::Filter
-
     requires 'yuicompressor'
 
     # Compress Javascript or CSS using [YUICompressor](http://rubydoc.info/gems/yuicompressor).
@@ -19,7 +17,5 @@ module Nanoc::Filters
     def run(content, params = {})
       ::YUICompressor.compress(content, params)
     end
-
   end
-
 end

data/lib/nanoc/helpers.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc::Helpers
-
   autoload 'Blogging',    'nanoc/helpers/blogging'
   autoload 'Breadcrumbs', 'nanoc/helpers/breadcrumbs'
   autoload 'Capturing',   'nanoc/helpers/capturing'
@@ -12,5 +11,4 @@ module Nanoc::Helpers
   autoload 'Tagging',     'nanoc/helpers/tagging'
   autoload 'Text',        'nanoc/helpers/text'
   autoload 'XMLSitemap',  'nanoc/helpers/xml_sitemap'
-
 end

data/lib/nanoc/helpers/blogging.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc::Helpers
-
   # Provides functionality for building blogs, such as finding articles and
   # constructing feeds.
   #
@@ -22,13 +21,12 @@ module Nanoc::Helpers
   #
   # The two main functions are {#sorted_articles} and {#atom_feed}.
   module Blogging
-
     # Returns an unsorted list of articles, i.e. items where the `kind`
     # attribute is set to `"article"`.
     #
     # @return [Array] An array containing all articles
     def articles
-      blk = lambda { @items.select { |item| item[:kind] == 'article' } }
+      blk = -> { @items.select { |item| item[:kind] == 'article' } }
       if @items.frozen?
         @article_items ||= blk.call
       else
@@ -42,9 +40,7 @@ module Nanoc::Helpers
     #
     # @return [Array] A sorted array containing all articles
     def sorted_articles
-      blk = lambda do
-        articles.sort_by { |a| attribute_to_time(a[:created_at]) }.reverse
-      end
+      blk = -> { articles.sort_by { |a| attribute_to_time(a[:created_at]) }.reverse }
 
       if @items.frozen?
         @sorted_article_items ||= blk.call
@@ -54,7 +50,6 @@ module Nanoc::Helpers
     end
 
     class AtomFeedBuilder
-
       include Nanoc::Helpers::Blogging
 
       attr_accessor :site
@@ -82,7 +77,7 @@ module Nanoc::Helpers
 
       def build
         buffer = ''
-        xml = Builder::XmlMarkup.new(:target => buffer, :indent => 2)
+        xml = Builder::XmlMarkup.new(target: buffer, indent: 2)
         build_for_feed(xml)
         buffer
       end
@@ -128,7 +123,7 @@ module Nanoc::Helpers
 
       def build_for_feed(xml)
         xml.instruct!
-        xml.feed(:xmlns => 'http://www.w3.org/2005/Atom') do
+        xml.feed(xmlns: 'http://www.w3.org/2005/Atom') do
           root_url = @site.config[:base_url] + '/'
 
           # Add primary attributes
@@ -139,8 +134,8 @@ module Nanoc::Helpers
           xml.updated(attribute_to_time(last_article[:created_at]).to_iso8601_time)
 
           # Add links
-          xml.link(:rel => 'alternate', :href => root_url)
-          xml.link(:rel => 'self',      :href => feed_url)
+          xml.link(rel: 'alternate', href: root_url)
+          xml.link(rel: 'self',      href: feed_url)
 
           # Add author information
           xml.author do
@@ -167,7 +162,7 @@ module Nanoc::Helpers
         xml.entry do
           # Add primary attributes
           xml.id atom_tag_for(a)
-          xml.title a[:title], :type => 'html'
+          xml.title a[:title], type: 'html'
 
           # Add dates
           xml.published attribute_to_time(a[:created_at]).to_iso8601_time
@@ -182,15 +177,14 @@ module Nanoc::Helpers
           end
 
           # Add link
-          xml.link(:rel => 'alternate', :href => url)
+          xml.link(rel: 'alternate', href: url)
 
           # 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
-
     end
 
     # Returns a string representing the atom feed containing recent articles,
@@ -309,8 +303,8 @@ module Nanoc::Helpers
       # Fill builder
       builder.limit             = params[:limit] || 5
       builder.relevant_articles = params[:articles] || articles || []
-      builder.content_proc      = params[:content_proc] || lambda { |a| a.compiled_content(:snapshot => :pre) }
-      builder.excerpt_proc      = params[:excerpt_proc] || lambda { |a| a[:excerpt] }
+      builder.content_proc      = params[:content_proc] || ->(a) { a.compiled_content(snapshot: :pre) }
+      builder.excerpt_proc      = params[:excerpt_proc] || ->(a) { a[:excerpt] }
       builder.title             = params[:title] || @item[:title] || @site.config[:title]
       builder.author_name       = params[:author_name] || @item[:author_name] || @site.config[:author_name]
       builder.author_uri        = params[:author_uri] || @item[:author_uri] || @site.config[:author_uri]
@@ -386,7 +380,5 @@ module Nanoc::Helpers
       time = Time.parse(time) if time.is_a?(String)
       time
     end
-
   end
-
 end