nanoc 3.7.4 → 3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15684f17b89e23c06fbe52df15a80529390df3a1
-  data.tar.gz: fcac628a29b82a5783020594f69a5b738d0fdc9b
+  metadata.gz: 271aacd59754102c8bd997df253a98ca21f7fac3
+  data.tar.gz: 37db9384d0b9dbcbc80bb22714d856766fa9af42
 SHA512:
-  metadata.gz: 37fde883c3804bd00defeb90266326921e79a4077454402c511acd0988a948361642db481019fa3f29a8708a07abaa5accd8000f08e773363156fcd409b75fff
-  data.tar.gz: fbb6f99a16f66438e70918a0f058b0f3089c41908595270d7d9e68ed5bb29be8feb9c1adff7207c096162a42e33fb15cfb47e7a53b3b08c58b3965eeab599dc7
+  metadata.gz: 2b38d502d8dc8d17401312089add955515c7807e1b85bf7c9993fa68350cf9201b859eb305425fa69e2cb13b40d10d2ac2487150d0a3678f444883fb069e0ad0
+  data.tar.gz: a468ae8a49f2d3a025f0946aae7a58ee8e4328b3f188c5052e6d64a91751fb55c41077e64d025adff3bac3dfa40c886ca2a77a33f9baa7489249158808e52a09

data/Gemfile

@@ -1,45 +1,46 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-# FIXME we may be missing some mswin dependencies here
-all_rubies = Bundler::Dependency::PLATFORM_MAP.keys
-ruby_19_plus               = [:ruby_19, :ruby_20, :ruby_21, :jruby] & all_rubies
-ruby_19_plus_without_jruby = [:ruby_19, :ruby_20, :ruby_21]         & all_rubies
+# FIXME: we may be missing some mswin dependencies here
 
 gem 'adsf'
-gem 'bluecloth', :platforms => :ruby
+gem 'bluecloth', platforms: :ruby
 gem 'builder'
 gem 'coderay'
 gem 'compass'
 gem 'coffee-script'
-gem 'coveralls', :require => false
+gem 'coveralls', require: false
 gem 'erubis'
-gem 'fog', :platforms => ruby_19_plus
+gem 'fog'
 gem 'haml'
-gem 'handlebars', :platforms => ruby_19_plus_without_jruby
+gem 'handlebars', platforms: :ruby
 gem 'kramdown'
-gem 'less', '~> 2.0', :platforms => :ruby
-gem 'listen', :platforms => ruby_19_plus
+gem 'less', '~> 2.0', platforms: :ruby
+gem 'listen'
 gem 'markaby'
 gem 'maruku'
-gem 'mime-types', :platforms => ruby_19_plus
+gem 'mime-types'
 gem 'minitest', '~> 4.0'
 gem 'mocha'
-gem 'mustache'
+if RUBY_VERSION >= '2.0.0'
+  gem 'mustache', '~> 1.0'
+else
+  gem 'mustache', '~> 0.99'
+end
 gem 'nokogiri', '~> 1.6'
 gem 'pandoc-ruby'
 gem 'pry'
-gem 'pygments.rb', :platforms => [:ruby, :mswin]
+gem 'pygments.rb', platforms: [:ruby, :mswin]
 gem 'rack'
 gem 'rake'
 gem 'rainpress'
-gem 'rdiscount', :platforms => [:ruby, :mswin]
+gem 'rdiscount', platforms: [:ruby, :mswin]
 gem 'rdoc'
-gem 'redcarpet', :platforms => ruby_19_plus_without_jruby + [:mswin]
+gem 'redcarpet', platforms: [:ruby, :mswin]
 gem 'RedCloth'
 gem 'rouge'
-gem 'rubocop', :platforms => ruby_19_plus
+gem 'rubocop'
 gem 'rubypants'
 gem 'sass', '~> 3.2.2'
 gem 'slim'
@@ -48,5 +49,5 @@ gem 'uglifier'
 gem 'vcr'
 gem 'w3c_validators'
 gem 'webmock'
-gem 'yuicompressor', :platforms => ruby_19_plus
+gem 'yuicompressor'
 gem 'yard'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2013 Denis Defreyne and contributors
+Copyright (c) 2007-2015 Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,19 @@
 # nanoc news
 
+## 3.7.5 (2015-01-12)
+
+Enhancements:
+
+* Allowed extra patterns to be specified in the data source configuration, so that dotfiles are no longer necessary ignored (e.g. `extra_files: ['.htaccess']`) (#492, #498) [Andy Drop, Michal Papis]
+* Removed Ruby 1.8.x support ([details](https://groups.google.com/forum/#!topic/nanoc/pSL1i15EFz8)) (#517)
+* Improved CSS and HTML error messages (#484, #504)
+* Let kramdown filter print warnings (#459, #519)
+
+Fixes:
+
+* Fixed HTML class names for recent Rouge versions (#502)
+* Fixed crash when using items or layouts in attributes (#469, #518)
+
 ## 3.7.4 (2014-11-23)
 
 Enhancements:

data/Rakefile

@@ -11,4 +11,4 @@ require 'nanoc'
 Dir.glob('tasks/**/*.rake').each { |r| Rake.application.add_import r }
 
 # Set default task
-task :default => :test
+task default: :test

data/doc/yardoc_handlers/identifier.rb

@@ -1,5 +1,4 @@
 class NanocIdentifierHandler < ::YARD::Handlers::Ruby::AttributeHandler
-
   # e.g. identifier :foo, :bar
 
   handles method_call(:identifier), method_call(:identifiers)
@@ -9,11 +8,9 @@ class NanocIdentifierHandler < ::YARD::Handlers::Ruby::AttributeHandler
     identifiers = statement.parameters(false).map { |param| param.jump(:ident)[0] }
     namespace['nanoc_identifiers'] = identifiers
   end
-
 end
 
 class NanocRegisterFilterHandler < ::YARD::Handlers::Ruby::AttributeHandler
-
   # e.g. Nanoc::Filter.register '::Nanoc::Filters::AsciiDoc', :asciidoc
 
   handles method_call(:register)
@@ -21,7 +18,7 @@ class NanocRegisterFilterHandler < ::YARD::Handlers::Ruby::AttributeHandler
 
   def process
     target = statement.jump(:const_path_ref)
-    return if target != s(:const_path_ref, s(:var_ref, s(:const, "Nanoc")), s(:const, "Filter"))
+    return if target != s(:const_path_ref, s(:var_ref, s(:const, 'Nanoc')), s(:const, 'Filter'))
 
     class_name = statement.jump(:string_literal).jump(:tstring_content)[0]
     identifier = statement.jump(:symbol_literal).jump(:ident)[0]
@@ -30,5 +27,4 @@ class NanocRegisterFilterHandler < ::YARD::Handlers::Ruby::AttributeHandler
     obj['nanoc_identifiers'] ||= []
     obj['nanoc_identifiers'] << identifier
   end
-
 end

data/lib/nanoc.rb

@@ -1,14 +1,13 @@
 # encoding: utf-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'
     res = ''
-    res << "nanoc #{Nanoc::VERSION} © 2007-2014 Denis Defreyne.\n"
+    res << "nanoc #{Nanoc::VERSION} © 2007-2015 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
     res
   end
@@ -17,7 +16,6 @@ module Nanoc
   def self.on_windows?
     RUBY_PLATFORM =~ /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
   end
-
 end
 
 Nanoc3 = Nanoc

data/lib/nanoc/base.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
 module Nanoc
-
   require 'nanoc/base/core_ext'
-  require 'nanoc/base/ordered_hash'
 
   # Load helper classes
   autoload 'Context',              'nanoc/base/context'
@@ -46,7 +44,6 @@ module Nanoc
   autoload 'RulesCollection',      'nanoc/base/compilation/rules_collection'
 
   # Deprecated; use PluginRepository instead
-  # TODO [in nanoc 4.0] remove me
+  # TODO: [in nanoc 4.0] remove me
   autoload 'Plugin',               'nanoc/base/plugin_registry'
-
 end

data/lib/nanoc/base/checksummer.rb

@@ -1,15 +1,12 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Creates checksums for given objects.
   #
   # A checksum is a string, such as “mL+TaqNsEeiPkWloPgCtAofT1yg=”, that is used
   # to determine whether a piece of data has changed.
   class Checksummer
-
     class << self
-
       # @param obj The object to create a checksum for
       #
       # @return [String] The digest
@@ -21,23 +18,28 @@ module Nanoc
 
       private
 
-      def update(obj, digest)
+      def update(obj, digest, visited = Set.new)
         digest.update(obj.class.to_s)
 
+        if visited.include?(obj)
+          digest.update('recur')
+          return
+        end
+
         case obj
         when String
           digest.update(obj)
         when Array
           obj.each do |el|
             digest.update('elem')
-            update(el, digest)
+            update(el, digest, visited + [obj])
           end
         when Hash
           obj.each do |key, value|
             digest.update('key')
-            update(key, digest)
+            update(key, digest, visited + [obj])
             digest.update('value')
-            update(value, digest)
+            update(value, digest, visited + [obj])
           end
         when Pathname
           filename = obj.to_s
@@ -62,7 +64,7 @@ module Nanoc
           digest.update('attributes')
           attributes = obj.attributes.dup
           attributes.delete(:file)
-          update(attributes, digest)
+          update(attributes, digest, visited + [obj])
         else
           data = begin
             Marshal.dump(obj)
@@ -72,11 +74,7 @@ module Nanoc
 
           digest.update(data)
         end
-
       end
-
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/checksum_store.rb

@@ -1,13 +1,11 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Stores checksums for objects in order to be able to detect whether a file
   # has changed since the last site compilation.
   #
   # @api private
   class ChecksumStore < ::Nanoc::Store
-
     # @option params [Nanoc::Site] site The site where this checksum store
     #   belongs to
     def initialize(params = {})
@@ -51,7 +49,5 @@ module Nanoc
     def data=(new_data)
       @checksums = new_data
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/compiled_content_cache.rb

@@ -1,13 +1,11 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Represents a cache than can be used to store already compiled content,
   # to prevent it from being needlessly recompiled.
   #
   # @api private
   class CompiledContentCache < ::Nanoc::Store
-
     def initialize
       super('tmp/compiled_content', 1)
 
@@ -56,7 +54,5 @@ module Nanoc
     def data=(new_data)
       @cache = new_data
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/compiler.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Responsible for compiling a site’s item representations.
   #
   # The compilation process makes use of notifications (see
@@ -39,7 +38,6 @@ module Nanoc
   # * `processing_ended` — indicates that the compiler has finished processing
   #   the specified object.
   class Compiler
-
     extend Nanoc::Memoization
 
     # @group Accessors
@@ -125,7 +123,7 @@ module Nanoc
       route_reps
 
       # Load auxiliary stores
-      stores.each { |s| s.load }
+      stores.each(&:load)
 
       @loaded = true
     rescue => e
@@ -144,7 +142,7 @@ module Nanoc
       return if @unloading
       @unloading = true
 
-      stores.each { |s| s.unload }
+      stores.each(&:unload)
 
       @stack = []
 
@@ -175,7 +173,7 @@ module Nanoc
       end
 
       # Store
-      stores.each { |s| s.store }
+      stores.each(&:store)
     end
 
     # Returns the dependency tracker for this site, creating it first if it
@@ -220,7 +218,7 @@ module Nanoc
         raise Nanoc::Errors::NoMatchingCompilationRuleFound.new(item) if matching_rules.empty?
 
         # Create reps
-        rep_names = matching_rules.map { |r| r.rep_name }.uniq
+        rep_names = matching_rules.map(&:rep_name).uniq
         rep_names.each do |rep_name|
           item.reps << ItemRep.new(item, rep_name)
         end
@@ -238,7 +236,7 @@ module Nanoc
 
         rules.each_pair do |snapshot, rule|
           # Get basic path by applying matching rule
-          basic_path = rule.apply_to(rep, :compiler => self)
+          basic_path = rule.apply_to(rep, compiler: self)
           next if basic_path.nil?
           if basic_path !~ %r{^/}
             raise "The path returned for the #{rep.inspect} item representation, “#{basic_path}”, does not start with a slash. Please ensure that all routing rules return a path that starts with a slash."
@@ -270,28 +268,28 @@ module Nanoc
     # @api private
     def assigns_for(rep)
       if rep.binary?
-        content_or_filename_assigns = { :filename => rep.temporary_filenames[:last] }
+        content_or_filename_assigns = { filename: rep.temporary_filenames[:last] }
       else
-        content_or_filename_assigns = { :content => rep.content[:last] }
+        content_or_filename_assigns = { content: rep.content[:last] }
       end
 
       content_or_filename_assigns.merge({
-        :item       => rep.item,
-        :rep        => rep,
-        :item_rep   => rep,
-        :items      => site.items,
-        :layouts    => site.layouts,
-        :config     => site.config,
-        :site       => site
+        item: rep.item,
+        rep: rep,
+        item_rep: rep,
+        items: site.items,
+        layouts: site.layouts,
+        config: site.config,
+        site: site
       })
     end
 
     # @return [Nanoc::OutdatednessChecker] The outdatedness checker
     def outdatedness_checker
       Nanoc::OutdatednessChecker.new(
-        :site => @site,
-        :checksum_store => checksum_store,
-        :dependency_tracker => dependency_tracker)
+        site: @site,
+        checksum_store: checksum_store,
+        dependency_tracker: dependency_tracker)
     end
     memoize :outdatedness_checker
 
@@ -305,7 +303,7 @@ module Nanoc
 
     # @return [Array<Nanoc::ItemRep>] The site’s item representations
     def reps
-      items.map { |i| i.reps }.flatten
+      items.map(&:reps).flatten
     end
     memoize :reps
 
@@ -383,8 +381,8 @@ module Nanoc
       else
         # Recalculate content
         rep.snapshot(:raw)
-        rep.snapshot(:pre, :final => false)
-        rules_collection.compilation_rule_for(rep).apply_to(rep, :compiler => self)
+        rep.snapshot(:pre, final: false)
+        rules_collection.compilation_rule_for(rep).apply_to(rep, compiler: self)
         rep.snapshot(:post) if rep.has_snapshot?(:post)
         rep.snapshot(:last)
       end
@@ -419,10 +417,10 @@ module Nanoc
     # Returns a preprocessor context, creating one if none exists yet.
     def preprocessor_context
       Nanoc::Context.new({
-        :site    => @site,
-        :config  => @site.config,
-        :items   => @site.items,
-        :layouts => @site.layouts
+        site: @site,
+        config: @site.config,
+        items: @site.items,
+        layouts: @site.layouts
       })
     end
     memoize :preprocessor_context
@@ -435,19 +433,19 @@ module Nanoc
 
     # @return [ChecksumStore] The checksum store
     def checksum_store
-      Nanoc::ChecksumStore.new(:site => @site)
+      Nanoc::ChecksumStore.new(site: @site)
     end
     memoize :checksum_store
 
     # @return [RuleMemoryStore] The rule memory store
     def rule_memory_store
-      Nanoc::RuleMemoryStore.new(:site => @site)
+      Nanoc::RuleMemoryStore.new(site: @site)
     end
     memoize :rule_memory_store
 
     # @return [RuleMemoryCalculator] The rule memory calculator
     def rule_memory_calculator
-      Nanoc::RuleMemoryCalculator.new(:rules_collection => rules_collection)
+      Nanoc::RuleMemoryCalculator.new(rules_collection: rules_collection)
     end
     memoize :rule_memory_calculator
 
@@ -461,7 +459,5 @@ module Nanoc
         rule_memory_store
       ]
     end
-
   end
-
 end