nanoc 3.6.3 → 3.6.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjM0ODgwYzY2M2ZkNGUwMDljMGIyNWU3NDRiMDkwNzViMjk1OTI3Zg==
+    NzhlOGM4MmEyNTNlMTNmZGU1Y2MzN2E1MzBjNzE2ZTdmNjgxYTQ2OA==
   data.tar.gz: !binary |-
-    YTlhMTJiY2Q5MWQ5MThjOGY0M2YwNmVlNTgwMzU4Y2MzOGJjYjY5Ng==
+    ZmY2MDVlNjQyMGViOTdlZDg4NDA3YWUzN2E4YjcwODI3YjUwOTZhMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmM0MWE2NmMxNDgwOTJmYmY1YjQ1ZGYzMDY4ODRlMTBiMDFkZmM3ODM0ODVm
-    NzM2YmI5MmVlNzQ0YTE1ODNjNTIyNWQ1M2RmNjBhZTdkMTMxOTBlNDlmZGVk
-    YjEzZjA4NjI5Y2MyODIyNTYwY2ViMDNlOWFiYTJhYTBiZGVhZGI=
+    YzU3ZGNlMTcwOGExMTgzNGQzNmFhNzc2OTc2ZmU2NDJlMDFhZjc0YzMxNGQz
+    NTRiNzk3OWU4ZWIyNTRjMTU2MzRjZDg5YmFmNzQ3MGFkZWNlYmQ1NjYzNzM4
+    ZTY1MjhlN2EzZmQyMTFlOWNkZmFiNDNiNWVlNGU1ZWNiYjcwZTg=
   data.tar.gz: !binary |-
-    Y2Q3ZjJkM2EzNTdmOWUxNjBmNGQ4NGZhODYwZjJjMjhhNzAzY2RiMzMzYjc2
-    ZWQ3OWY4YTIwMzI1NWY1NzUxZGNiNTc2NDE1NTEyMmM0Y2ZiNWI3MWNjOTY4
-    YTdlYjY4MTdiM2UwYWU5NDY2MGUyYmRhODkyOGExODZjZTE0YmM=
+    NzNiMjNjOTA0NTI5NTc0ZjhlOGYwNGIxNTgzZTZkOTNiMGNmMjZhM2MzYmM3
+    ODQwMmQ3NTYwMThhN2QzZTUzMTQ5MmY3MmVmMDAwODEyOWQwMTg4MWNhZDll
+    YjRiMzA3MmJhMTIzMjZiNzYzNTczMGNhNDQ1ZDA5MDhhYmFlNmE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.3)
+    nanoc (3.6.4)
       cri (~> 2.3)
 
 GEM

data/NEWS.md

@@ -1,5 +1,16 @@
 # nanoc news
 
+## 3.6.4 (2013-05-29)
+
+Enhancements:
+
+* Deprecated `watch` and `autocompile` commands in favour of [`guard-nanoc`](https://github.com/nanoc/guard-nanoc)
+
+Fixes:
+
+* Fixed bug which could cause the `tmp/` dir to blow up in size
+* Unescaped URLs when checking internal links
+
 ## 3.6.3 (2013-04-24)
 
 Fixes:

data/TODO.md

@@ -5,10 +5,29 @@ New
 ---
 
 * [3.x] assert that textual filter must return string 
-* Get rid of notification center
+* Get rid of notification center (use delegation)
 * Get rid of core ext
 	* Don't recursively clean attributes
 * All stores should be pluggable 
+* filters should accept content, not a string
+* Layouts could be binary too! (maybe not super useful)
+
+Proxies
+-------
+
+Item should not contain a list of item reps
+Instead, there should be an ItemRepsCollection that you can query
+    item_reps_for(item)
+
+Item-per-item compilation
+-------------------------
+
+There should be a transaction around each item compilation, instead of around the entire site.
+
+True partials?
+--------------
+
+Rendering layouts is ugly! What about partial layouts though? (render box do ... end)
 
 Populate in data sources
 ------------------------
@@ -22,16 +41,16 @@ Finding modified items
 
 Data sources should be queried to find out removed, added and changed items.
 
-Abstractions
-------------
-
-ItemRepWriter
-
 Item proxies
 ------------
 
 Maybe this can be implemented as decorators.
 
+* core
+* proxies
+    * while in rules
+    * while being filtered
+
 ### Core
 
     Nanoc::Core::Item

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

@@ -92,6 +92,7 @@ module Nanoc
     ensure
       # Cleanup
       FileUtils.rm_rf(Nanoc::Filter::TMP_BINARY_ITEMS_DIR)
+      FileUtils.rm_rf(Nanoc::ItemRep::TMP_TEXT_ITEMS_DIR)
     end
 
     # @group Private instance methods

data/lib/nanoc/base/core_ext/array.rb

@@ -8,9 +8,11 @@ module Nanoc::ArrayExtensions
   #
   # @return [Array] The converted array
   def symbolize_keys_recursively
-    inject([]) do |array, element|
-      array + [ element.respond_to?(:symbolize_keys_recursively) ? element.symbolize_keys_recursively : element ]
+    array = []
+    self.each do |element|
+      array << (element.respond_to?(:symbolize_keys_recursively) ? element.symbolize_keys_recursively : element)
     end
+    array
   end
 
   # @deprecated Renamed to {#symbolize_keys_recursively}

data/lib/nanoc/base/core_ext/hash.rb

@@ -8,9 +8,13 @@ module Nanoc::HashExtensions
   #
   # @return [Hash] The converted hash
   def symbolize_keys_recursively
-    inject({}) do |hash, (key, value)|
-      hash.merge(key.to_sym => value.respond_to?(:symbolize_keys_recursively) ? value.symbolize_keys_recursively : value)
+    hash = {}
+    self.each_pair do |key, value|
+      new_key   = key.respond_to?(:to_sym) ? key.to_sym : key
+      new_value = value.respond_to?(:symbolize_keys_recursively) ? value.symbolize_keys_recursively : value
+      hash[new_key] = new_value
     end
+    hash
   end
 
   # @deprecated Renamed to {#symbolize_keys_recursively}

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

@@ -27,6 +27,8 @@ module Nanoc::CLI::Commands
   class AutoCompile < ::Nanoc::CLI::CommandRunner
 
     def run
+      warn 'WARNING: The `autocompile` command is deprecated. Please consider using `guard-nanoc` instead (see https://github.com/nanoc/guard-nanoc).'
+
       require 'rack'
 
       # Make sure we are in a nanoc site directory

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

@@ -11,6 +11,8 @@ module Nanoc::CLI::Commands
   class Watch < ::Nanoc::CLI::CommandRunner
 
     def run
+      warn 'WARNING: The `watch` command is deprecated. Please consider using `guard-nanoc` instead (see https://github.com/nanoc/guard-nanoc).'
+
       require 'listen'
       require 'pathname'
 
@@ -66,30 +68,30 @@ module Nanoc::CLI::Commands
       rebuilder.call(nil)
 
       # Get directories to watch
-      dirs_to_watch  = watcher_config[:dirs_to_watch]  || ['content', 'layouts', 'lib']
-      files_to_watch = watcher_config[:files_to_watch] || ['nanoc.yaml', 'config.yaml', 'Rules', 'rules', 'Rules.rb', 'rules.rb']
-      files_to_watch = Regexp.new(files_to_watch.map { |name| "#{Regexp.quote(name)}$"}.join("|"))
-      ignore_dir = Regexp.new(Dir.glob("*").map{|dir| dir if File::ftype(dir) == "directory" }.compact.join("|"))
+      dirs_to_watch  = watcher_config[:dirs_to_watch]  || [ 'content', 'layouts', 'lib' ]
+      files_to_watch = watcher_config[:files_to_watch] || [ 'nanoc.yaml', 'config.yaml', 'Rules', 'rules', 'Rules.rb', 'rules.rb' ]
+      files_to_watch = Regexp.new(files_to_watch.map { |name| Regexp.quote(name) + '$' }.join('|'))
+      ignore_dir = Regexp.new(Dir.glob('*').map { |dir| dir if File.dir?(dir) }.compact.join('|'))
 
       # Watch
       puts "Watching for changes…"
 
-        callback = Proc.new do |modified, added, removed|
-          rebuilder.call(modified[0]) if modified[0]
-          rebuilder.call(added[0]) if added[0]
-          rebuilder.call(removed[0]) if removed[0]
-        end
+      callback = Proc.new do |modified, added, removed|
+        rebuilder.call(modified[0]) if modified[0]
+        rebuilder.call(added[0]) if added[0]
+        rebuilder.call(removed[0]) if removed[0]
+      end
 
-        listener = Listen::Listener.new(*dirs_to_watch).change(&callback)
-        listener_root = Listen::Listener.new('.', :filter => files_to_watch, :ignore => ignore_dir).change(&callback)
+      listener = Listen::Listener.new(*dirs_to_watch).change(&callback)
+      listener_root = Listen::Listener.new('.', :filter => files_to_watch, :ignore => ignore_dir).change(&callback)
 
-        begin
-          listener_root.start
-          listener.start!
-        rescue Interrupt
-          listener.stop
-          listener_root.stop
-        end
+      begin
+        listener_root.start
+        listener.start!
+      rescue Interrupt
+        listener.stop
+        listener_root.stop
+      end
     end
 
     # Allows sending user notifications in a cross-platform way.
@@ -111,7 +113,7 @@ module Nanoc::CLI::Commands
         end
       end
 
-    protected
+      protected
 
       def have_tool_nix?(tool)
         !`which #{tool}`.empty?

data/lib/nanoc/extra/checking/checks/internal_links.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'uri'
+
 module Nanoc::Extra::Checking::Checks
 
   # A check that verifies that all internal links point to a location that exists.
@@ -38,6 +40,9 @@ module Nanoc::Extra::Checking::Checks
       path = path.sub(/\?.*$/, '')
       return true if path.empty?
 
+      # Decode URL (e.g. '%20' -> ' ')
+      path = URI.unescape(path)
+
       # Make absolute
       if path[0, 1] == '/'
         path = @site.config[:output_dir] + path

data/lib/nanoc/filters/coffeescript.rb

@@ -3,7 +3,7 @@ module Nanoc::Filters
   # @since 3.3.0
   class CoffeeScript < Nanoc::Filter
 
-    require 'coffee-script'
+    requires 'coffee-script'
 
     # Runs the content through [CoffeeScript](http://coffeescript.org/).
     # This method takes no options.

data/lib/nanoc.rb

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

data/test/base/core_ext/hash_spec.rb

@@ -8,6 +8,12 @@ describe 'Hash#symbolize_keys_recursively' do
     hash_old.symbolize_keys_recursively.must_equal hash_new
   end
 
+  it 'should not require string keys' do
+    hash_old = { Time.now => 'abc' }
+    hash_new = hash_old
+    hash_old.symbolize_keys_recursively.must_equal hash_new
+  end
+
 end
 
 describe 'Hash#stringify_keys_recursively' do

data/test/base/test_compiler.rb

@@ -540,4 +540,20 @@ class Nanoc::CompilerTest < Nanoc::TestCase
     end
   end
 
+  def test_tmp_text_items_are_removed_after_compilation
+    with_site do |site|
+      # Create item
+      File.open('content/index.html', 'w') do |io|
+        io.write('stuff')
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check
+      assert Dir['tmp/text_items/*'].empty?
+    end
+  end
+
 end

data/test/cli/commands/test_watch.rb

@@ -18,30 +18,6 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
     end
   end
 
-  def test_change_nanoc_dot_yaml
-    Nanoc::CLI.run %w( create-site bleh )
-    Dir.chdir('bleh') do
-      File.open('Rules', 'w') do |io|
-        io.write("compile '*' do ; filter :erb ; end\n")
-        io.write("route '*' do ; item.identifier + 'index.html' ; end\n")
-      end
-
-      config_contents = File.read('nanoc.yaml')
-
-      watch_thread = Thread.new do
-        Nanoc::CLI.run %w( watch )
-      end
-
-      File.open('content/index.html', 'w') { |io| io.write('<%= @config[:blah].inspect %>!!!') }
-      self.wait_until_content_equals('output/index.html', 'nil!!!')
-
-      File.open('nanoc.yaml', 'w') { |io| io.write(config_contents + "\nblah: 456\n") }
-      self.wait_until_content_equals('output/index.html', '456!!!')
-
-      watch_thread.kill
-    end
-  end
-
   def test_notify
     with_site do |s|
       watch_thread = Thread.new do

data/test/extra/checking/checks/test_internal_links.rb

@@ -53,4 +53,15 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
     end
   end
 
+  def test_unescape_url
+    with_site do |site|
+      FileUtils.mkdir_p('output/stuff')
+      File.open('output/stuff/right foo', 'w') { |io| io.write('hi') }
+
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+
+      assert check.send(:valid?, 'stuff/right%20foo', 'output/origin')
+      refute check.send(:valid?, 'stuff/wrong%20foo', 'output/origin')
+    end
+  end
 end

data/test/filters/test_uglify_js.rb

@@ -19,10 +19,10 @@ class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::UglifyJS.new
       input = "if(donkey) alert('It is a donkey!');"
 
-      result = filter.setup_and_run(input, output: { beautify: false })
+      result = filter.setup_and_run(input, :output => { :beautify => false })
       assert_equal 'donkey&&alert("It is a donkey!");', result
 
-      result = filter.setup_and_run(input, output: { beautify: true })
+      result = filter.setup_and_run(input, :output => { :beautify => true })
       assert_equal 'donkey && alert("It is a donkey!");', result
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri