nanoc 3.6.4 → 3.6.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.4)
+    nanoc (3.6.5)
       cri (~> 2.3)
 
 GEM
@@ -11,43 +11,42 @@ GEM
     adsf (1.1.1)
       rack (>= 1.0.0)
     bluecloth (2.2.0)
-    builder (3.2.0)
+    builder (3.2.2)
     coderay (1.0.9)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     colored (1.2)
     commonjs (0.2.6)
-    cri (2.3.0)
+    cri (2.4.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.20.1)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.8.1)
-    fog (1.10.1)
+    excon (0.25.3)
+    execjs (2.0.1)
+    ffi (1.9.0)
+    fog (1.15.0)
       builder
-      excon (~> 0.20)
+      excon (~> 0.25.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
+      nokogiri (~> 1.5)
       ruby-hmac
     formatador (0.2.4)
-    haml (4.0.2)
+    haml (4.0.3)
       tilt
     handlebars (0.4.0)
       commonjs (~> 0.2.3)
       therubyracer (~> 0.11.1)
-    json (1.7.7)
-    kramdown (1.0.1)
-    less (2.3.2)
+    json (1.8.0)
+    kramdown (1.2.0)
+    less (2.3.3)
       commonjs (~> 0.2.6)
     libv8 (3.11.8.17)
-    listen (1.0.2)
+    listen (1.3.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
@@ -56,63 +55,63 @@ GEM
     maruku (0.6.1)
       syntax (>= 1.0.0)
     metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (1.23)
-    minitest (4.7.3)
-    mocha (0.13.3)
+    method_source (0.8.2)
+    mime-types (1.25)
+    minitest (4.7.5)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
+    multi_json (1.7.9)
     mustache (0.99.4)
-    net-scp (1.1.0)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
-    nokogiri (1.5.9)
-    pandoc-ruby (0.6.1)
+    net-ssh (2.6.8)
+    nokogiri (1.5.10)
+    pandoc-ruby (0.7.5)
     posix-spawn (0.3.6)
-    pry (0.9.12.1)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.5.0)
+    pygments.rb (0.5.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rainpress (1.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.1)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
-    rdiscount (2.0.7.2)
+    rdiscount (2.1.6)
     rdoc (4.0.1)
       json (~> 1.4)
-    redcarpet (2.2.2)
-    ref (1.0.4)
+    redcarpet (3.0.0)
+    ref (1.0.5)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    sass (3.2.8)
-    slim (1.3.8)
-      temple (~> 0.6.3)
-      tilt (~> 1.3.3)
-    slop (3.4.4)
+    sass (3.2.10)
+    slim (2.0.1)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    slop (3.4.6)
     syntax (1.0.0)
     systemu (2.5.2)
-    temple (0.6.4)
+    temple (0.6.6)
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
-    tilt (1.3.7)
-    typogruby (1.0.15)
+    tilt (1.4.1)
+    typogruby (1.0.16)
       rubypants
-    uglifier (2.0.1)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     w3c_validators (1.2)
       json
       nokogiri
     yajl-ruby (1.1.0)
-    yard (0.8.6.1)
+    yard (0.8.7)
     yuicompressor (1.2.1)
 
 PLATFORMS
@@ -135,7 +134,7 @@ DEPENDENCIES
   markaby
   maruku
   mime-types
-  minitest
+  minitest (~> 4.0)
   mocha
   mustache
   nanoc!

data/NEWS.md

@@ -1,5 +1,12 @@
 # nanoc news
 
+## 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
+
 ## 3.6.4 (2013-05-29)
 
 Enhancements:
@@ -154,7 +161,7 @@ Improvements:
 ## 3.4 (2012-06-09)
 
 * Improved error output and added crash log
-* Renamed `debug` and `info` commands to `show-data` and `show-plugins`, respectively 
+* Renamed `debug` and `info` commands to `show-data` and `show-plugins`, respectively
 * Added `show-rules` command (aka `explain`)
 
 Extensions:

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.6.4'
+  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).

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

@@ -389,13 +389,14 @@ module Nanoc
       rep.compiled = true
       compiled_content_cache[rep] = rep.content
 
-      Nanoc::NotificationCenter.post(:visit_ended,       rep.item)
       Nanoc::NotificationCenter.post(:processing_ended,  rep)
       Nanoc::NotificationCenter.post(:compilation_ended, rep)
     rescue => e
       rep.forget_progress
       Nanoc::NotificationCenter.post(:compilation_failed, rep, e)
       raise e
+    ensure
+      Nanoc::NotificationCenter.post(:visit_ended,       rep.item)
     end
 
     # Clears the list of dependencies for items that will be recompiled.

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

@@ -70,6 +70,11 @@ module Nanoc
     #
     # @return [void]
     def stop
+      # Sanity check
+      if !@stack.empty?
+        raise "Internal inconsistency: dependency tracker stack not empty at end of compilation"
+      end
+
       # Unregister
       Nanoc::NotificationCenter.remove(:visit_started, self)
       Nanoc::NotificationCenter.remove(:visit_ended,   self)

data/lib/nanoc/data_sources/filesystem_unified.rb

@@ -36,7 +36,7 @@ module Nanoc::DataSources
   #
   #     (`allow_periods_in_identifiers` set to true)
   #     foo.entry.html → /foo.entry/
-  #     
+  #
   #     (`allow_periods_in_identifiers` set to false)
   #     foo.html.erb → /foo/
   #
@@ -108,8 +108,8 @@ module Nanoc::DataSources
     # Returns the identifier derived from the given filename, first stripping
     # the given directory name off the filename.
     def identifier_for_filename(filename)
-      if filename =~ /(^|\/)index\.[^\/]+$/
-        regex = ((@config && @config[:allow_periods_in_identifiers]) ? /\/?index\.[^\/\.]+$/ : /\/?index\.[^\/]+$/)
+      if filename =~ /(^|\/)index(\.[^\/]+)?$/
+        regex = ((@config && @config[:allow_periods_in_identifiers]) ? /\/?(index)?(\.[^\/\.]+)?$/ : /\/?index(\.[^\/]+)?$/)
       else
         regex = ((@config && @config[:allow_periods_in_identifiers]) ? /\.[^\/\.]+$/         : /\.[^\/]+$/)
       end

data/nanoc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('cri', '~> 2.3')
 
-  s.add_development_dependency('minitest')
+  s.add_development_dependency('minitest', '~> 4.0')
   s.add_development_dependency('mocha')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdiscount')

data/test/base/test_compiler.rb

@@ -556,4 +556,38 @@ class Nanoc::CompilerTest < Nanoc::TestCase
     end
   end
 
+  def test_compiler_dependency_on_unmet_dependency
+    with_site do
+      File.open('content/a.html', 'w') do |io|
+        io.write('<% @items["/b/"].compiled_content %>')
+      end
+      File.open('content/b.html', 'w') do |io|
+        io.write('I am feeling so dependent!')
+      end
+      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 "  item.identifier.chop + '.' + item[:extension]\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '*', :erb\n"
+      end
+
+      site = Nanoc::Site.new('.')
+      rep = site.items['/a/'].reps[0]
+      dt = site.compiler.dependency_tracker
+      dt.start
+      assert_raises Nanoc::Errors::UnmetDependency do
+        site.compiler.send :compile_rep, rep
+      end
+      dt.stop
+
+      stack = dt.instance_eval { @stack }
+      assert_empty stack
+    end
+  end
+
 end

data/test/data_sources/test_filesystem_unified.rb

@@ -238,6 +238,46 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     end
   end
 
+  def test_identifier_for_filename_with_index_filenames_allowing_periods_in_identifier
+    expected = {
+      '/index.html.erb'       => '/index.html/',
+      '/index.html'           => '/',
+      '/index'                => '/',
+      '/foo/index.html.erb'   => '/foo/index.html/',
+      '/foo/index.html'       => '/foo/',
+      '/foo/index'            => '/foo/',
+    }
+
+    data_source = new_data_source(:allow_periods_in_identifiers => true)
+    expected.each_pair do |input, expected_output|
+      actual_output = data_source.send(:identifier_for_filename, input)
+      assert_equal(
+        expected_output, actual_output,
+        "identifier_for_filename(#{input.inspect}) should equal #{expected_output.inspect}, not #{actual_output.inspect}"
+      )
+    end
+  end
+
+  def test_identifier_for_filename_with_index_filenames_disallowing_periods_in_identifier
+    expected = {
+      '/index.html.erb'       => '/',
+      '/index.html'           => '/',
+      '/index'                => '/',
+      '/foo/index.html.erb'   => '/foo/',
+      '/foo/index.html'       => '/foo/',
+      '/foo/index'            => '/foo/',
+    }
+
+    data_source = new_data_source
+    expected.each_pair do |input, expected_output|
+      actual_output = data_source.send(:identifier_for_filename, input)
+      assert_equal(
+        expected_output, actual_output,
+        "identifier_for_filename(#{input.inspect}) should equal #{expected_output.inspect}, not #{actual_output.inspect}"
+      )
+    end
+  end
+
   def test_load_objects_allowing_periods_in_identifiers
     # Create data source
     data_source = new_data_source(:allow_periods_in_identifiers => true)

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.5
+  prerelease: 
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -108,7 +121,6 @@ extra_rdoc_files:
 - README.md
 - NEWS.md
 files:
-- Architecture.md
 - ChangeLog
 - CONTRIBUTING.md
 - Gemfile
@@ -117,7 +129,6 @@ files:
 - NEWS.md
 - Rakefile
 - README.md
-- TODO.md
 - doc/yardoc_templates/default/layout/html/footer.erb
 - bin/nanoc
 - lib/nanoc/base/compilation/checksum_store.rb
@@ -395,7 +406,6 @@ files:
 homepage: http://nanoc.ws/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -403,20 +413,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized
   websites.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzhlOGM4MmEyNTNlMTNmZGU1Y2MzN2E1MzBjNzE2ZTdmNjgxYTQ2OA==
-  data.tar.gz: !binary |-
-    ZmY2MDVlNjQyMGViOTdlZDg4NDA3YWUzN2E4YjcwODI3YjUwOTZhMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzU3ZGNlMTcwOGExMTgzNGQzNmFhNzc2OTc2ZmU2NDJlMDFhZjc0YzMxNGQz
-    NTRiNzk3OWU4ZWIyNTRjMTU2MzRjZDg5YmFmNzQ3MGFkZWNlYmQ1NjYzNzM4
-    ZTY1MjhlN2EzZmQyMTFlOWNkZmFiNDNiNWVlNGU1ZWNiYjcwZTg=
-  data.tar.gz: !binary |-
-    NzNiMjNjOTA0NTI5NTc0ZjhlOGYwNGIxNTgzZTZkOTNiMGNmMjZhM2MzYmM3
-    ODQwMmQ3NTYwMThhN2QzZTUzMTQ5MmY3MmVmMDAwODEyOWQwMTg4MWNhZDll
-    YjRiMzA3MmJhMTIzMjZiNzYzNTczMGNhNDQ1ZDA5MDhhYmFlNmE=

data/Architecture.md

@@ -1,70 +0,0 @@
-nanoc Architecture
-==================
-
-Independent
------------
-
-* Context
-* DirectedGraph
-* NotificationCenter
-* PluginRegistry
-* Memoization
-
-Interactors
------------
-
-* Compiler
-
-Entities
---------
-
-* Site
-* Item
-* ItemRep
-* Layout
-* Rule
-* RulesCollection 
-* CodeSnippet
-* Configuration
-
-Stores
-------
-
-* DataSource
-	* FilesystemDataSource
-* RulesStore
-	* FilesystemRulesStore + CompilerDSL
-* SnapshotStore
-	* InMemorySnapshotStore
-	* SQLite3SnapshotStore
-
-### Ugly
-
-* ChecksumStore
-* CompiledContentCache
-* RuleMemoryStore
-
-Meh
----
-
-* proxies
-    * ItemRepProxy (used in Rules)
-    * ItemRepRecorderProxy (used in determining Rules changes)
-* DependencyTracker
-* Filter
-* OutdatednessChecker
-* RuleContext
-* RuleMemoryCalculator
-* Store
-
-### Not classes
-
-* OutdatednessReasons
-* Errors
-
-### Extensions
-
-* ArrayExtensions
-* HashExtensions
-* PathnameExtensions
-* StringExtensions

data/TODO.md

@@ -1,114 +0,0 @@
-To Do for nanoc 4.0
-===================
-
-New
----
-
-* [3.x] assert that textual filter must return string 
-* 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
-------------------------
-
-`Nanoc::DEFAULT_CONTENT`
-
-all data sources are told to populate
-
-Finding modified items
-----------------------
-
-Data sources should be queried to find out removed, added and changed items.
-
-Item proxies
-------------
-
-Maybe this can be implemented as decorators.
-
-* core
-* proxies
-    * while in rules
-    * while being filtered
-
-### Core
-
-    Nanoc::Core::Item
-        identifier
-        content
-        attributes
-
-    Nanoc::Core::ItemRep
-        item_identifier
-        name
-
-    Nanoc::Core::ItemRepSnapshot
-        item_identifier
-        item_rep_name
-        name
-        content
-
-### Proxies
-
-    Nanoc::???::Item
-        site
-        children
-        parent
-        reps
-        compiled_content
-
-    Nanoc::???::ItemRep
-        item_identifier
-        item (weak ref?)
-        compiled_content
-
-    Nanoc::???::ItemRepSnapshot
-        item_identifier
-        item_rep_name
-        item_rep (weak ref?)
-
-Dependency types
-----------------
-
-* Item -> Item
-* Item -> All items (@items.select { ... })
-* Item -> Pattern (@item.children)
-
-Query language
---------------
-
-Is this strictly necessary? Maybe create an @items proxy that detects whether #find, #detect, #select, #each, ... are called. #[] would create a direct dependency. @items.children would also create a dependency on all its children and possible future ones (pattern dependency?).
-
-### Capabilities
-
-* @item.parent
-* @item.children
-* @items.select{ |i| i[:kind] == 'article' }
-
-### Examples
-
-    @items.query(:identifier, equals: '/foo/')
-    @items.query(:identifier, starts_with: '/reviews/')
-    @items.query(
-
--> how to distinguish between identifier and attributes?