nanoc 3.6.2 → 3.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAwNTU0YThiMWVmNzIyNDQyY2VkMDVmNTAxY2U3NGI3NDFlODE4Yg==
+    MjM0ODgwYzY2M2ZkNGUwMDljMGIyNWU3NDRiMDkwNzViMjk1OTI3Zg==
   data.tar.gz: !binary |-
-    ODNmZjI4ZjM2YzBhMGVhMTMyYWViMDM3OGI4NGQ5ZTI2ZjUwNzNmMw==
+    YTlhMTJiY2Q5MWQ5MThjOGY0M2YwNmVlNTgwMzU4Y2MzOGJjYjY5Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmRkMzY0ZGE4YzY5ZmU2ODdhMTZmYTFiNjQ2MTQ2MWI3MzQ4MGNiOTZkZDhh
-    OTIzYTRiYWIwMjYzNTE3NmI0MzFiYzdlNmRlZTljOWMyNWE2NjQ4ZDA2YzNh
-    NWExYzkzNDcwNTk1OTM2YmU0ZTQ2NDY0OWU5YmE0NmUwNGM2NGU=
+    NmM0MWE2NmMxNDgwOTJmYmY1YjQ1ZGYzMDY4ODRlMTBiMDFkZmM3ODM0ODVm
+    NzM2YmI5MmVlNzQ0YTE1ODNjNTIyNWQ1M2RmNjBhZTdkMTMxOTBlNDlmZGVk
+    YjEzZjA4NjI5Y2MyODIyNTYwY2ViMDNlOWFiYTJhYTBiZGVhZGI=
   data.tar.gz: !binary |-
-    ZTRiYTAzYTA2OWZjZjNkYTlmMTY4ZGQxZmM2NzNlMGVmYWU3N2M3MGUxZDE5
-    YmNkYmUyMDE4MmY4NWU1MmJhYWU3MTUyOWM2MzJhMmNjMjNlYTlmOGNiNGU3
-    YjBmOGUxZDg5YjkyYzNmYjQxNTA1YmIwYmNmMWIwMmJiNGFkZjA=
+    Y2Q3ZjJkM2EzNTdmOWUxNjBmNGQ4NGZhODYwZjJjMjhhNzAzY2RiMzMzYjc2
+    ZWQ3OWY4YTIwMzI1NWY1NzUxZGNiNTc2NDE1NTEyMmM0Y2ZiNWI3MWNjOTY4
+    YTdlYjY4MTdiM2UwYWU5NDY2MGUyYmRhODkyOGExODZjZTE0YmM=

data/Architecture.md

@@ -0,0 +1,70 @@
+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/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.2)
+    nanoc (3.6.3)
       cri (~> 2.3)
 
 GEM
@@ -16,95 +16,104 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.5.0)
+    coffee-script-source (1.6.2)
     colored (1.2)
     commonjs (0.2.6)
     cri (2.3.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.18.5)
+    excon (0.20.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    fog (1.9.0)
+    ffi (1.8.1)
+    fog (1.10.1)
       builder
-      excon (~> 0.14)
+      excon (~> 0.20)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
-      net-scp (~> 1.0.4)
+      net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    haml (4.0.0)
+    haml (4.0.2)
       tilt
     handlebars (0.4.0)
       commonjs (~> 0.2.3)
       therubyracer (~> 0.11.1)
     json (1.7.7)
-    kramdown (0.14.2)
-    less (2.2.2)
+    kramdown (1.0.1)
+    less (2.3.2)
       commonjs (~> 0.2.6)
-    libv8 (3.11.8.13)
-    listen (0.7.3)
+    libv8 (3.11.8.17)
+    listen (1.0.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     markaby (0.7.2)
       builder (>= 2.0.0)
     maruku (0.6.1)
       syntax (>= 1.0.0)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (1.21)
-    minitest (4.6.1)
-    mocha (0.13.2)
+    mime-types (1.23)
+    minitest (4.7.3)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.6.1)
+    multi_json (1.7.2)
     mustache (0.99.4)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.6.5)
-    nokogiri (1.5.6)
-    pandoc-ruby (0.6.0)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    nokogiri (1.5.9)
+    pandoc-ruby (0.6.1)
     posix-spawn (0.3.6)
-    pry (0.9.12)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.4.2)
+    pygments.rb (0.5.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rainpress (1.0)
-    rake (10.0.3)
-    rdiscount (2.0.7.1)
-    rdoc (4.0.0)
+    rake (10.0.4)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    rdiscount (2.0.7.2)
+    rdoc (4.0.1)
       json (~> 1.4)
     redcarpet (2.2.2)
-    ref (1.0.2)
+    ref (1.0.4)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    sass (3.2.6)
-    slim (1.3.6)
-      temple (~> 0.5.5)
+    sass (3.2.8)
+    slim (1.3.8)
+      temple (~> 0.6.3)
       tilt (~> 1.3.3)
-    slop (3.4.3)
+    slop (3.4.4)
     syntax (1.0.0)
     systemu (2.5.2)
-    temple (0.5.5)
+    temple (0.6.4)
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
-    tilt (1.3.3)
+    tilt (1.3.7)
     typogruby (1.0.15)
       rubypants
-    uglifier (1.3.0)
+    uglifier (2.0.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.5.2)
-    yuicompressor (1.2.0)
+    yard (0.8.6.1)
+    yuicompressor (1.2.1)
 
 PLATFORMS
   ruby

data/NEWS.md

@@ -1,5 +1,20 @@
 # nanoc news
 
+## 3.6.3 (2013-04-24)
+
+Fixes:
+
+* Added support for growlnotify on Windows (#253, #267)
+* Fixed bug which caused the external links checker to ignore the query string (#279, #297)
+* Removed weird treatment of `DOCTYPE`s in the `relativize_paths` filter (#296)
+* Fixed CodeRay syntax coloring on Ruby 2.0
+* Silenced "Could not find files for the given pattern(s)" message on Windows (#298)
+* Fixed issue which could cause `output.diff` not to be generated correctly (#255, #301)
+* Let filesystem and static data sources follow symlinks (#299, #302)
+* Added compatibility with Listen 1.0 (#309)
+* Let `#passthrough` in Rules work well with the static data source (#251) [Gregory Pakosz]
+* Made timing information be more accurate (#303)
+
 ## 3.6.2 (2013-03-23)
 
 Fixes:
@@ -121,7 +136,7 @@ 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]
+* 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
 
@@ -209,7 +224,7 @@ Extensions:
 * Made data source configuration location a bit more obvious
 * Fixed watch command under Windows
 * Made filesystem data source ignore UTF-8 BOM
-* Improved compatibility of colorize_syntax filter with older libxml versions
+* Improved compatibility of `colorize_syntax` filter with older libxml versions
 
 ## 3.2.3 (2011-10-31)
 
@@ -221,7 +236,7 @@ Extensions:
 ## 3.2.2 (2011-09-04)
 
 * Fixed command usage printing
-* Made relativize_paths filter handle Windows network paths [Ruben Verborgh]
+* Made `relativize_paths` filter handle Windows network paths [Ruben Verborgh]
 * Made watcher use correct configuration
 * Allowed code blocks to start with a non-language shebang line
 
@@ -262,7 +277,7 @@ Extensions:
 
 * Really fixed dependency generation between Sass partials this time
 * Updated Less filter to 2.0
-* Made colorize_syntax filter throw an error if pygmentize is not available
+* Made `colorize_syntax` filter throw an error if pygmentize is not available
 
 ## 3.1.8 (2011-06-25)
 
@@ -359,10 +374,10 @@ Deprecated:
 
 ## 3.0.8 (2010-02-24)
 
-* `#atom_tag_for` now works with base_urls that contain a path [Eric Sunshine]
+* `#atom_tag_for` now works with `base_url`s that contain a path [Eric Sunshine]
 * Generated root URLs in `#atom_feed` now end with a slash [Eric Sunshine]
 * Autocompiler now recognises requests to index files
-* `Blogging` helper now allows created_at to be a Time instance
+* `Blogging` helper now allows `created_at` to be a Time instance
 
 ## 3.0.7 (2010-01-29)
 

data/TODO.md

@@ -0,0 +1,95 @@
+To Do for nanoc 4.0
+===================
+
+New
+---
+
+* [3.x] assert that textual filter must return string 
+* Get rid of notification center
+* Get rid of core ext
+	* Don't recursively clean attributes
+* All stores should be pluggable 
+
+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.
+
+Abstractions
+------------
+
+ItemRepWriter
+
+Item proxies
+------------
+
+Maybe this can be implemented as decorators.
+
+### 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?

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.6.2'
+  VERSION = '3.6.3'
 
   # @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_dsl.rb

@@ -184,7 +184,11 @@ module Nanoc
 
       # Create routing rule
       routing_block = proc do
-        item[:extension].nil? ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
+        # This is a temporary solution until an item can map back to its data
+        # source.
+        # ATM item[:content_filename] is nil for items coming from the static
+        # data source.
+        item[:extension].nil? || (item[:content_filename].nil? && item.identifier =~ %r{#{item[:extension]}/$}) ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
       end
       routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, routing_block, :snapshot_name => :last)
       @rules_collection.add_item_routing_rule(routing_rule)

data/lib/nanoc/cli/command_runner.rb

@@ -64,8 +64,6 @@ module Nanoc::CLI
       puts "done"
     end
 
-  protected
-
     # @return [Boolean] true if debug output is enabled, false if not
     #
     # @see Nanoc::CLI.debug?
@@ -73,6 +71,8 @@ module Nanoc::CLI
       Nanoc::CLI.debug?
     end
 
+  protected
+
     # Sets the data source's VCS to the VCS with the given name. Does nothing
     # when the site's data source does not support VCSes (i.e. does not
     # implement #vcs=).