nanoc 3.4.0 → 3.4.1

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'albino'
+gem 'adsf'
 gem 'bluecloth'
 gem 'builder'
 gem 'coderay'
@@ -16,7 +16,7 @@ gem 'markaby'
 gem 'maruku'
 gem 'mime-types'
 gem 'mustache'
-gem 'nokogiri'
+gem 'nokogiri', '~> 1.5.5'
 gem 'pygments.rb'
 gem 'rack'
 gem 'rake'

data/Gemfile.lock

@@ -8,12 +8,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
+    adsf (1.1.1)
+      rack (>= 1.0.0)
     blankslate (2.1.2.4)
     bluecloth (2.2.0)
     builder (3.0.0)
-    coderay (1.0.6)
+    coderay (1.0.7)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -23,13 +23,13 @@ GEM
     cri (2.3.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.13.4)
+    excon (0.16.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
     ffi (1.0.11)
-    fog (1.3.1)
+    fog (1.5.0)
       builder
-      excon (~> 0.13.0)
+      excon (~> 0.14)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -38,8 +38,8 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.3)
-    haml (3.1.6)
-    json (1.7.3)
+    haml (3.1.7)
+    json (1.7.5)
     kramdown (0.13.7)
     less (2.2.1)
       commonjs (~> 0.2.6)
@@ -48,18 +48,17 @@ GEM
     maruku (0.6.0)
       syntax (>= 1.0.0)
     metaclass (0.0.1)
-    mime-types (1.18)
-    minitest (3.0.1)
-    mocha (0.11.4)
+    mime-types (1.19)
+    minitest (3.3.0)
+    mocha (0.12.3)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     mustache (0.99.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.5.2)
-    nokogiri (1.5.3)
-    posix-spawn (0.3.6)
-    pygments.rb (0.2.12)
+    nokogiri (1.5.5)
+    pygments.rb (0.2.13)
       rubypython (~> 0.5.3)
     rack (1.4.1)
     rainpress (1.0)
@@ -73,23 +72,23 @@ GEM
     rubypython (0.5.3)
       blankslate (>= 2.1.2.3)
       ffi (~> 1.0.7)
-    sass (3.1.19)
-    slim (1.2.1)
+    sass (3.2.1)
+    slim (1.2.2)
       temple (~> 0.4.0)
       tilt (~> 1.3.3)
     syntax (1.0.0)
-    systemu (2.5.1)
+    systemu (2.5.2)
     temple (0.4.0)
     tilt (1.3.3)
     typogruby (1.0.15)
       rubypants
-    uglifier (1.2.4)
+    uglifier (1.2.7)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     w3c_validators (1.2)
       json
       nokogiri
-    yard (0.8.2)
+    yard (0.8.2.1)
     yuicompressor (1.2.0)
 
 PLATFORMS
@@ -97,7 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  albino
+  adsf
   bluecloth
   builder
   coderay

data/NEWS.md

@@ -1,5 +1,22 @@
 # nanoc news
 
+## 3.4.1 (2012-09-22)
+
+Fixes:
+
+* Fixed auto-pruning
+* Made slim filter work with the capturing helper [Bil Bas]
+
+Improvements:
+
+* Made several speed improvements
+* Added prune configuration to config.yaml
+* Made nanoc check for presence of nanoc in Gemfile
+* Made compile command not show identicals (use `--verbose` if you want them)
+* Made relativize_paths filter recognise more paths to relativize [Arnau Siches]
+* Fixed #passthrough for items without extensions [Justin Hileman]
+* Added more IO/File proxy methods to cleaning streams
+
 ## 3.4 (2012-06-09)
 
 * Improved error output and added crash log

data/README.md

@@ -16,6 +16,10 @@ the following places will help you out:
 * The [discussion group](http://groups.google.com/group/nanoc)
 * The [IRC channel](irc://chat.freenode.net/#nanoc)
 
+## Versioning
+
+nanoc uses [Semantic Versioning](semver.org).
+
 ## Source Code Documentation
 
 The source code is located in `lib/nanoc` and is structured in a few

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

@@ -184,7 +184,7 @@ module Nanoc
 
       # Create routing rule
       routing_block = proc do
-        item.identifier.chop + '.' + item[:extension]
+        item[:extension].nil? ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
       end
       routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, routing_block)
       @rules_collection.add_item_routing_rule(routing_rule, :before)

data/lib/nanoc/base/plugin_registry.rb

@@ -7,6 +7,8 @@ module Nanoc
   # ({Nanoc::Extra::VCS}).
   class PluginRegistry
 
+    extend Nanoc::Memoization
+
     # A module that contains class methods for plugins. It provides functions
     # for setting identifiers, registering plugins and finding plugins. Plugin
     # classes should extend this module.
@@ -178,6 +180,7 @@ module Nanoc
         class_or_name
       end
     end
+    memoize :resolve
   
   end
 

data/lib/nanoc/base/source_data/site.rb

@@ -36,7 +36,8 @@ module Nanoc
       :output_dir         => 'output',
       :data_sources       => [ {} ],
       :index_filenames    => [ 'index.html' ],
-      :enable_output_diff => false
+      :enable_output_diff => false,
+      :prune              => { :auto_prune => false, :exclude => [ '.git', '.hg', '.svn', 'CVS' ] }
     }
 
     # Creates a site object for the site specified by the given

data/lib/nanoc/cli/cleaning_stream.rb

@@ -51,7 +51,7 @@ module Nanoc::CLI
 
     # @see IO#tty?
     def tty?
-      @stream.tty?
+      @cached_is_tty ||= @stream.tty?
     end
 
     # @see IO#flush
@@ -79,6 +79,21 @@ module Nanoc::CLI
       @stream.string
     end
 
+    # @see IO#reopen
+    def reopen(*a)
+      @stream.reopen(*a)
+    end
+
+    # @see File#exist?
+    def exist?
+      @stream.exist?
+    end
+
+    # @see File.exists?
+    def exists?
+      @stream.exists?
+    end
+
   protected
 
     def clean(s)

data/lib/nanoc/cli/commands/compile.rb

@@ -50,9 +50,17 @@ module Nanoc::CLI::Commands
       @filter_times  = {}
       setup_notifications
 
+      # Set up progress indicator threads
+      @progress_locks   = {}
+      @progress_threads = {}
+
       # Prepare for generating diffs
       setup_diffs
 
+      # Set up GC control
+      @gc_lock = Mutex.new
+      @gc_count = 0
+
       # Compile
       self.site.compile
 
@@ -72,7 +80,7 @@ module Nanoc::CLI::Commands
       teardown_diffs
 
       # Prune
-      if self.site.config[:auto_prune]
+      if self.site.config[:prune][:auto_prune]
         Nanoc::Extra::Pruner.new(self.site).run
       end
 
@@ -106,8 +114,9 @@ module Nanoc::CLI::Commands
       # File notifications
       Nanoc::NotificationCenter.on(:rep_written) do |rep, path, is_created, is_modified|
         action = (is_created ? :create : (is_modified ? :update : :identical))
+        level  = (is_created ? :high   : (is_modified ? :high   : :low))
         duration = Time.now - @rep_times[rep.raw_path] if @rep_times[rep.raw_path]
-        Nanoc::CLI::Logger.instance.file(:high, action, path, duration)
+        Nanoc::CLI::Logger.instance.file(level, action, path, duration)
       end
 
       # Debug notifications
@@ -144,6 +153,12 @@ module Nanoc::CLI::Commands
 
       # Timing notifications
       Nanoc::NotificationCenter.on(:compilation_started) do |rep|
+        if @gc_count % 20 == 0 && !ENV.has_key?('TRAVIS')
+          GC.enable
+          GC.start
+          GC.disable
+        end
+        @gc_count += 1
         @rep_times[rep.raw_path] = Time.now
       end
       Nanoc::NotificationCenter.on(:compilation_ended) do |rep|
@@ -217,27 +232,30 @@ module Nanoc::CLI::Commands
       # Only show progress on terminals
       return if !$stdout.tty?
 
-      @progress_thread = Thread.new do
-        delay = 1.0
-        step  = 0
+      @progress_locks[rep.inspect + filter_name.inspect] = lock = Mutex.new
+      lock.synchronize do
+        @progress_threads[rep.inspect + filter_name.inspect] = Thread.new do
+          delay = 1.0
+          step  = 0
 
-        text = "Running #{filter_name} filter… "
+          text = "Running #{filter_name} filter… "
 
-        while !Thread.current[:stopped]
-          sleep 0.1
+          while !Thread.current[:stopped]
+            sleep 0.1
 
-          # Wait for a while before showing text
-          delay -= 0.1
-          next if delay > 0.05
+            # Wait for a while before showing text
+            delay -= 0.1
+            next if delay > 0.05
 
-          # Print progress
-          $stdout.print text + %w( | / - \\ )[step] + "\r"
-          step = (step + 1) % 4
-        end
+            # Print progress
+            $stdout.print text + %w( | / - \\ )[step] + "\r"
+            step = (step + 1) % 4
+          end
 
-        # Clear text
-        if delay < 0.05
-          $stdout.print ' ' * (text.length + 1 + 1) + "\r"
+          # Clear text
+          if delay < 0.05
+            $stdout.print ' ' * (text.length + 1 + 1) + "\r"
+          end
         end
       end
     end
@@ -246,7 +264,10 @@ module Nanoc::CLI::Commands
       # Only show progress on terminals
       return if !$stdout.tty?
 
-      @progress_thread[:stopped] = true
+      lock = @progress_locks[rep.inspect + filter_name.inspect]
+      lock.synchronize do
+        @progress_threads[rep.inspect + filter_name.inspect][:stopped] = true
+      end
     end
 
     def print_profiling_feedback(reps)

data/lib/nanoc/cli/error_handler.rb

@@ -201,6 +201,16 @@ module Nanoc::CLI
       stream.puts Nanoc.version_information
       stream.puts
 
+      # System information
+      begin
+        uname = `uname -a`
+        stream.puts '=== SYSTEM INFORMATION:'
+        stream.puts
+        stream.puts uname
+        stream.puts
+      rescue Errno::ENOENT
+      end
+
       # Installed gems
       stream.puts '=== INSTALLED GEMS:'
       stream.puts

data/lib/nanoc/cli.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 
-require 'cri'
+begin
+  require 'cri'
+rescue LoadError => e
+  $stderr.puts e
+  $stderr.puts "If you are using a Gemfile, make sure that the Gemfile contains nanoc ('gem \"nanoc\"')."
+  exit 1
+end
 
 module Nanoc::CLI
 

data/lib/nanoc/filters/relativize_paths.rb

@@ -6,7 +6,7 @@ module Nanoc::Filters
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo
 
-    SELECTORS = [ 'a/@href', 'img/@src', 'script/@src', 'link/@href' ]
+    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
@@ -20,8 +20,8 @@ module Nanoc::Filters
     #   `:html`, `:xhtml`, `:xml` or `:css`.
     #
     # @option params [Array] :select The XPath expressions that matches the
-    #   nodes to modify. This param is useful only for the `:xml` and `:xhtml`
-    #   types.
+    #   nodes to modify. This param is useful only for the `:html`, `:xml` and
+    #   `:xhtml` types.
     #
     # @option params [Hash] :namespaces The pairs `prefix => uri` to define
     #   any namespace you want to use in the XPath expressions. This param 
@@ -76,7 +76,16 @@ module Nanoc::Filters
       doc = content =~ /<html[\s>]/ ? klass.parse(content) : klass.fragment(content)
       selectors.map { |sel| "descendant-or-self::#{sel}" }.each do |selector|
         doc.xpath(selector, namespaces).each do |node|
-          if self.path_is_relativizable?(node.content)
+          if node.name == 'comment'
+            content = node.content.dup
+            content = content.sub(%r{^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])}m) do |m|
+              fragment = nokogiri_process($2, selectors, namespaces, klass, type)
+              $1 + fragment + $3
+            end
+            comment = Nokogiri::XML::Comment.new(doc, content)
+            # Works w/ Nokogiri 1.5.5 but fails w/ Nokogiri 1.5.2
+            node.replace(comment)
+          elsif self.path_is_relativizable?(node.content)
             node.content = relative_path_to(node.content)
           end
         end
@@ -97,3 +106,4 @@ module Nanoc::Filters
 
   end
 end
+

data/lib/nanoc/filters/slim.rb

@@ -14,10 +14,15 @@ 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
+      }.merge params
+
       # Create context
       context = ::Nanoc::Context.new(assigns)
 
-      ::Slim::Template.new { content }.render(context) { assigns[:content] }
+      ::Slim::Template.new(params) { content }.render(context) { assigns[:content] }
     end
 
   end

data/lib/nanoc/helpers/capturing.rb

@@ -162,7 +162,11 @@ module Nanoc::Helpers
       # Remove addition
       erbout[erbout_length..-1] = ''
 
-      # Done
+      # Depending on how the filter outputs, the result might be a
+      # single string or an array of strings (slim outputs the latter).
+      erbout_addition = erbout_addition.join if erbout_addition.is_a? Array
+
+      # Done.
       erbout_addition
     end
 

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 
   # @return [String] A string containing information about this nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).

data/test/base/test_compiler_dsl.rb

@@ -44,6 +44,34 @@ class Nanoc::CompilerDSLTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_passthrough_no_ext
+    # Create site
+    Nanoc::CLI.run %w( create_site bar)
+    FileUtils.cd('bar') do
+      # Create rep
+      item = Nanoc::Item.new('foo', { :extension => nil }, '/foo/')
+      rep = Nanoc::ItemRep.new(item, :default)
+
+      # Create other necessary stuff
+      site = Nanoc::Site.new('.')
+      site.items << item
+      compiler = site.compiler
+      dsl = site.compiler.rules_collection.dsl
+
+      # Create rule
+      dsl.passthrough '/foo/'
+
+      # Route and compile
+      rule = compiler.rules_collection.routing_rule_for(rep)
+      path = rule.apply_to(rep, :compiler => compiler)
+      compiler.send :compile_rep, rep
+
+      # Check result
+      assert_equal 'foo', rep.compiled_content
+      assert_equal '/foo', path
+    end
+  end
+
   def test_identifier_to_regex_without_wildcards
     # Create compiler DSL
     compiler_dsl = Nanoc::CompilerDSL.new(nil, {})

data/test/cli/commands/test_compile.rb

@@ -30,4 +30,45 @@ class Nanoc::CLI::Commands::CompileTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_auto_prune
+    with_site do |site|
+      Nanoc::CLI.run %w( create_item foo )
+      Nanoc::CLI.run %w( create_item bar )
+      Nanoc::CLI.run %w( create_item baz )
+
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "  filter :erb\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  if item.binary?\n"
+        io.write "    item.identifier.chop + '.' + item[:extension]\n"
+        io.write "  else\n"
+        io.write "    item.identifier + 'index.html'\n"
+        io.write "  end\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '*', :erb\n"
+      end
+
+      File.open('output/stray.html', 'w') do |io|
+        io.write 'I am a stray file and I am about to be deleted!'
+      end
+
+      assert File.file?('output/stray.html')
+      Nanoc::CLI.run %w( compile )
+      assert File.file?('output/stray.html')
+
+      File.open('config.yaml', 'w') do |io|
+        io.write "prune:\n"
+        io.write "  auto_prune: true\n"
+      end
+
+      assert File.file?('output/stray.html')
+      Nanoc::CLI.run %w( compile )
+      refute File.file?('output/stray.html')
+    end
+  end
+
 end

data/test/cli/test_cleaning_stream.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+class Nanoc::CLI::CleaningStreamTest < MiniTest::Unit::TestCase
+
+  include Nanoc::TestHelpers
+
+  class Stream
+
+    attr_accessor :called_methods
+
+    def initialize
+      @called_methods = Set.new
+    end
+    
+    def method_missing(symbol, *args)
+      @called_methods << symbol
+    end
+
+  end
+
+  def test_forward
+    methods = [ :write, :<<, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists? ]
+
+    s = Stream.new
+    cs = Nanoc::CLI::CleaningStream.new(s)
+
+    cs.write('aaa')
+    cs << 'bb'
+    cs.tty?
+    cs.flush
+    cs.tell
+    cs.print('cc')
+    cs.puts('dd')
+    cs.string
+    cs.reopen('/dev/null', 'r')
+    cs.exist?
+    cs.exists?
+
+    methods.each do |m|
+      assert s.called_methods.include?(m), "expected #{m} to be called"
+    end
+  end
+
+end
+

data/test/filters/test_relativize_paths.rb

@@ -305,6 +305,32 @@ EOS
     assert_equal(expected_content, actual_content)
   end
 
+
+  def test_filter_html_object_with_relative_path
+    # Create filter with mock item
+    filter = Nanoc::Filters::RelativizePaths.new
+
+    # Mock item
+    filter.instance_eval do
+      @item_rep = Nanoc::ItemRep.new(
+        Nanoc::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/woof/meow/'
+    end
+
+    # Set content
+    raw_content      = %[<object data="/example"><param name="movie" content="/example"></object>]
+    expected_content = %[<object data="../../example"><param name="movie" content="../../example"></object>]
+
+    # Test
+    actual_content = filter.run(raw_content, :type => :html)
+    assert_equal(expected_content, actual_content)
+  end
+
+
   def test_filter_implicit
     # Create filter with mock item
     filter = Nanoc::Filters::RelativizePaths.new
@@ -659,5 +685,77 @@ XML
     end
   end
 
+  def test_filter_fragment_xhtml_with_comments
+    if_have 'nokogiri' do
+      # Create filter with mock item
+      filter = Nanoc::Filters::RelativizePaths.new
+
+      # Mock item
+      filter.instance_eval do
+        @item_rep = Nanoc::ItemRep.new(
+          Nanoc::Item.new(
+            'content',
+            {},
+            '/foo/baz/'),
+          :blah)
+        @item_rep.path = '/foo/baz/'
+      end
+
+      # Set content
+      raw_content = %[
+<link rel="stylesheet" href="/foo.css" />
+<!--[if lt IE 9]>
+    <script src="/js/lib/html5shiv.js"></script>
+<![endif]-->
+]
+
+      expected_content = %[
+<link rel="stylesheet" href="../../foo.css" />
+<!--[if lt IE 9]>
+    <script src="../../js/lib/html5shiv.js"></script>
+<![endif]-->
+]
+
+      # Test
+      actual_content = filter.run(raw_content.freeze, :type => :xhtml)
+      assert_equal(expected_content, actual_content)
+    end
+  end
+
+
+  def test_filter_fragment_html_with_comments
+    if_have 'nokogiri' do
+      # Create filter with mock item
+      filter = Nanoc::Filters::RelativizePaths.new
+
+      # Mock item
+      filter.instance_eval do
+        @item_rep = Nanoc::ItemRep.new(
+          Nanoc::Item.new(
+            'content',
+            {},
+            '/foo/baz/'),
+          :blah)
+        @item_rep.path = '/foo/baz/'
+      end
+
+      # Set content
+      raw_content = %[
+<!--[if lt IE 9]>
+    <script src="/js/lib/html5shiv.js"></script>
+<![endif]-->
+]
+
+      expected_content = %[
+<!--[if lt IE 9]>
+    <script src="../../js/lib/html5shiv.js"></script>
+<![endif]-->]
+
+      # Test
+      actual_content = filter.run(raw_content.freeze, :type => :html)
+      assert_equal(expected_content, actual_content)
+    end
+  end
+
 
 end

data/test/filters/test_uglify_js.rb

@@ -11,7 +11,7 @@ class Nanoc::Filters::UglifyJSTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)")
-      assert_equal("foo=1,function(a){alert(a)}(foo);", result)
+      assert_match(/foo=1,function\((.)\){alert\(\1\)}\(foo\);/, result)
     end
   end
 
@@ -23,7 +23,7 @@ class Nanoc::Filters::UglifyJSTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)", :toplevel => true)
-      assert_equal("foo=1,function(a){alert(a)}(foo);", result)
+      assert_match(/foo=1,function\((.)\){alert\(\1\)}\(foo\);/, result)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -308,6 +308,7 @@ files:
 - test/cli/commands/test_info.rb
 - test/cli/commands/test_prune.rb
 - test/cli/commands/test_update.rb
+- test/cli/test_cleaning_stream.rb
 - test/cli/test_cli.rb
 - test/cli/test_error_handler.rb
 - test/cli/test_logger.rb