RubyGems - nanoc - Versions diffs - 3.6.5 → 3.6.6 - Mend

nanoc 3.6.5 → 3.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/NEWS.md +15 -2
data/lib/nanoc.rb +1 -3
data/lib/nanoc/base/source_data/item.rb +2 -1
data/lib/nanoc/cli.rb +2 -2
data/lib/nanoc/cli/commands/create-site.rb +1 -19
data/lib/nanoc/cli/commands/view.rb +8 -4
data/lib/nanoc/filters/sass.rb +6 -12
data/lib/nanoc/filters/sass/sass_filesystem_importer.rb +1 -1
data/lib/nanoc/helpers/capturing.rb +3 -3
data/lib/nanoc/version.rb +8 -0
data/test/cli/test_cli.rb +43 -0
data/test/helper.rb +9 -1
data/test/helpers/test_capturing.rb +2 -3
metadata +3 -2

data/NEWS.md CHANGED

@@ -1,11 +1,24 @@
 # nanoc news
+## 3.6.6 (2013-11-08)
+Enhancements:
+* Reduced number of dependencies generated by Sass filter (#306) [Gregory Pakosz]
+* Recognised lowercase `utf` in language value (e.g. `en_US.utf8`) as being UTF-8 (#335)
+* Set [Thin](http://code.macournoyer.com/thin/) as the default server for `nanoc view` (#342, #345)
+* Removed watcher section from the default configuration file (#343, #344)
+Fixes:
+* Prevented capturing helper from erroneously compiling items twice (#337)
 ## 3.6.5 (2013-09-29)
 Fixes:
-* Fixed bug which could cause incorrect dependencies to be generated in some cases
-* Fixed handling of index filenames when allowing periods in identifiers
+* Fixed bug which could cause incorrect dependencies to be generated in some cases (#329)
+* Fixed handling of index filenames when allowing periods in identifiers (#330)
 ## 3.6.4 (2013-05-29)

data/lib/nanoc.rb CHANGED

@@ -2,9 +2,6 @@
 module Nanoc
-  # The current nanoc version.
-  VERSION = '3.6.5'
   # @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
@@ -34,6 +31,7 @@ require 'time'
 require 'yaml'
 # Load nanoc
+require 'nanoc/version'
 require 'nanoc/base'
 require 'nanoc/extra'
 require 'nanoc/data_sources'

data/lib/nanoc/base/source_data/item.rb CHANGED

@@ -33,7 +33,7 @@ module Nanoc
     attr_reader   :raw_content
     # @return [String] The filename pointing to the file containing this
-    #   item’s content (only available for binary items)
+    #   item’s content
     attr_reader   :raw_filename
     # @return [Nanoc::Site] The site this item belongs to
@@ -82,6 +82,7 @@ module Nanoc
       if @is_binary
         @raw_filename = raw_content_or_raw_filename
       else
+        @raw_filename = attributes[:content_filename]
         @raw_content  = raw_content_or_raw_filename
       end

data/lib/nanoc/cli.rb CHANGED

@@ -184,7 +184,7 @@ protected
   def self.enable_utf8?(io)
     return true if !io.tty?
-    %w( LC_ALL LC_CTYPE LANG ).any? { |e| ENV[e] =~ /UTF/ }
+    %w( LC_ALL LC_CTYPE LANG ).any? { |e| ENV[e] =~ /UTF/i }
   end
   # @return [Boolean] true if color support is present, false if not
@@ -196,7 +196,7 @@ protected
     rescue LoadError
       return false
     end
     return true
   end

data/lib/nanoc/cli/commands/create-site.rb CHANGED

@@ -84,24 +84,6 @@ data_sources:
     # will have the identifier “/about/” when turned off, but when turned on
     # it will become “/about.html/” instead.
     allow_periods_in_identifiers: false
-# Configuration for the “watch” command, which watches a site for changes and
-# recompiles if necessary.
-watcher:
-  # A list of directories to watch for changes. When editing this, make sure
-  # that the “output/” and “tmp/” directories are _not_ included in this list,
-  # because recompiling the site will cause these directories to change, which
-  # will cause the site to be recompiled, which will cause these directories
-  # to change, which will cause the site to be recompiled again, and so on.
-  dirs_to_watch: [ 'content', 'layouts', 'lib' ]
-  # A list of single files to watch for changes. As mentioned above, don’t put
-  # any files from the “output/” or “tmp/” directories in here.
-  files_to_watch: [ 'nanoc.yaml', 'Rules' ]
-  # When to send notifications (using Growl or notify-send).
-  notify_on_compilation_success: true
-  notify_on_compilation_failure: true
 EOS
     DEFAULT_RULES = <<EOS unless defined? DEFAULT_RULES
@@ -276,7 +258,7 @@ EOS
     <link rel="stylesheet" href="/style.css">
     <!-- you don't need to keep this, but it's cool for stats! -->
-    <meta name="generator" content="nanoc <%= Nanoc::VERSION %>">
+    <meta name="generator" content="nanoc <%= Nanoc::VERSION %>">
   </head>
   <body>
     <div id="main">

data/lib/nanoc/cli/commands/view.rb CHANGED

@@ -14,6 +14,8 @@ module Nanoc::CLI::Commands
   class View < ::Nanoc::CLI::CommandRunner
+    DEFAULT_HANDLER_NAME = :thin
     def run
       load_adsf
       require 'rack'
@@ -27,11 +29,13 @@ module Nanoc::CLI::Commands
         :Host      => (options[:host] || '0.0.0.0')
       }
-      # Guess which handler we should use
-      unless handler = Rack::Handler.get(options[:handler])
+      # Get handler
+      if options.has_key?(:handler)
+        handler = Rack::Handler.get(options[:handler])
+      else
         begin
-          handler = Rack::Handler::Mongrel
-        rescue LoadError => e
+          handler = Rack::Handler.get(DEFAULT_HANDLER_NAME)
+        rescue LoadError
           handler = Rack::Handler::WEBrick
         end
       end

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

@@ -5,12 +5,6 @@ module Nanoc::Filters
     requires 'sass', 'nanoc/filters/sass/sass_filesystem_importer'
-    class << self
-      # The current filter. This is definitely going to bite me if I ever get
-      # to multithreading nanoc.
-      attr_accessor :current
-    end
     # Runs the content through [Sass](http://sass-lang.com/).
     # Parameters passed to this filter will be passed on to Sass.
     #
@@ -28,22 +22,22 @@ module Nanoc::Filters
       # Find items
       item_dirglob = Pathname.new(sass_filename).dirname.realpath.to_s + '**'
-      clean_items = @items.reject { |i| i[:content_filename].nil? }
+      clean_items = @items.reject { |i| i.raw_filename.nil? }
       @scoped_items, @rest_items = clean_items.partition do |i|
-        i[:content_filename] &&
-          Pathname.new(i[:content_filename]).realpath.fnmatch(item_dirglob)
+        i.raw_filename &&
+          Pathname.new(i.raw_filename).realpath.fnmatch(item_dirglob)
       end
       # Render
+      options[:nanoc_current_filter] = self
       engine = ::Sass::Engine.new(content, options)
-      self.class.current = self
       engine.render
     end
     def imported_filename_to_item(filename)
       filematch = lambda do |i|
-        i[:content_filename] &&
-          Pathname.new(i[:content_filename]).realpath == Pathname.new(filename).realpath
+        i.raw_filename &&
+          Pathname.new(i.raw_filename).realpath == Pathname.new(filename).realpath
       end
       @scoped_items.find(&filematch) || @rest_items.find(&filematch)
     end

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

@@ -13,7 +13,7 @@ module Nanoc::Filters
         full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
         return unless full_filename && File.readable?(full_filename)
-        filter = Nanoc::Filters::Sass.current # FIXME ew global
+        filter = options[:nanoc_current_filter]
         item = filter.imported_filename_to_item(full_filename)
         filter.depend_on([ item ]) unless item.nil?

data/lib/nanoc/helpers/capturing.rb CHANGED

@@ -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]
@@ -129,12 +129,12 @@ module Nanoc::Helpers
           # the content attribute to reset it. :(
           # FIXME clean this up
           if !@site.captures_store_compiled_items.include? item
-            @site.captures_store_compiled_items << item
+            @site.captures_store_compiled_items << item
             item.forced_outdated = true
             item.reps.each do |r|
               raw_content = item.raw_content
               r.content = { :raw => raw_content, :last => raw_content }
-              @site.compiler.send(:compile_rep, r)
+              raise Nanoc::Errors::UnmetDependency.new(r)
             end
           end
         end

data/lib/nanoc/version.rb ADDED

@@ -0,0 +1,8 @@
+# encoding: utf-8
+module Nanoc
+  # The current nanoc version.
+  VERSION = '3.6.6'
+end

data/test/cli/test_cli.rb CHANGED

@@ -102,4 +102,47 @@ EOS
     end
   end
+  def test_enable_utf8_only_on_tty
+    new_env_diff = {
+      'LC_ALL'   => 'en_US.ISO-8859-1',
+      'LC_CTYPE' => 'en_US.ISO-8859-1',
+      'LANG'     => 'en_US.ISO-8859-1',
+    }
+    with_env_vars(new_env_diff) do
+      io = StringIO.new
+      def io.tty? ; true ; end
+      refute Nanoc::CLI.enable_utf8?(io)
+      io = StringIO.new
+      def io.tty? ; false ; end
+      assert Nanoc::CLI.enable_utf8?(io)
+    end
+  end
+  def test_enable_utf8
+    io = StringIO.new
+    def io.tty? ; true ; end
+    new_env_diff = {
+      'LC_ALL'   => 'en_US.ISO-8859-1',
+      'LC_CTYPE' => 'en_US.ISO-8859-1',
+      'LANG'     => 'en_US.ISO-8859-1',
+    }
+    with_env_vars(new_env_diff) do
+      refute Nanoc::CLI.enable_utf8?(io)
+      with_env_vars({ 'LC_ALL'   => 'en_US.UTF-8' }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LC_CTYPE' => 'en_US.UTF-8' }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LANG'     => 'en_US.UTF-8' }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LC_ALL'   => 'en_US.utf-8' }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LC_CTYPE' => 'en_US.utf-8' }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LANG'     => 'en_US.utf-8' }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LC_ALL'   => 'en_US.utf8'  }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LC_CTYPE' => 'en_US.utf8'  }) { assert Nanoc::CLI.enable_utf8?(io) }
+      with_env_vars({ 'LANG'     => 'en_US.utf8'  }) { assert Nanoc::CLI.enable_utf8?(io) }
+    end
+  end
 end

data/test/helper.rb CHANGED

@@ -181,7 +181,7 @@ EOS
       lines.each_slice(2) do |pair|
         actual_out   = eval(pair.first, b)
         expected_out = eval(pair.last.match(/# ?=>(.*)/)[1], b)
         assert_equal expected_out, actual_out,
           "Incorrect example:\n#{pair.first}"
       end
@@ -205,6 +205,14 @@ EOS
     assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, error.message)
   end
+  def with_env_vars(hash, &block)
+    orig_env_hash = ENV.to_hash
+    hash.each_pair { |k,v| ENV[k] = v }
+    yield
+  ensure
+    orig_env_hash.each_pair { |k,v| ENV[k] = v }
+  end
 end
 class Nanoc::TestCase < MiniTest::Unit::TestCase

data/test/helpers/test_capturing.rb CHANGED

@@ -209,18 +209,17 @@ EOS
         io.write 'Old-<%= content_for(@items.find { |i| i.identifier == \'/includee/\' }, :blah) %>'
       end
       Nanoc::CLI.run(%w(compile))
+      assert_equal '{}', File.read('output/includee/index.html')
       assert_equal 'Old-Content', File.read('output/includer/index.html')
       # Compile again
-      $LOUD = true
       File.open('content/includer.erb', 'w') do |io|
         io.write 'New-<%= content_for(@items.find { |i| i.identifier == \'/includee/\' }, :blah) %>'
       end
       Nanoc::CLI.run(%w(compile))
+      assert_equal '{}', File.read('output/includee/index.html')
       assert_equal 'New-Content', File.read('output/includer/index.html')
     end
-  ensure
-    $LOUD = false
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -289,6 +289,7 @@ files:
 - lib/nanoc/tasks/deploy/rsync.rake
 - lib/nanoc/tasks/validate.rake
 - lib/nanoc/tasks.rb
+- lib/nanoc/version.rb
 - lib/nanoc.rb
 - lib/nanoc3/cli.rb
 - lib/nanoc3/tasks.rb