nanoc3 3.1.1 → 3.1.2

data/Gemfile

@@ -0,0 +1,31 @@
+source "http://rubygems.org"
+
+gem "cri"
+
+group :development do
+  gem "minitest"
+  gem "mocha"
+  gem "yard"
+end
+
+group :extra do
+  gem "adsf"
+  gem "bluecloth"
+  gem "builder"
+  gem "coderay"
+  gem "erubis"
+  gem "haml"
+  gem "kramdown"
+  gem "less"
+  gem "markaby"
+  gem "maruku"
+  gem "mime-types"
+  gem "nokogiri"
+  gem "rack"
+  gem "rainpress"
+  gem "rdiscount"
+  gem "rdoc"
+  gem "RedCloth"
+  gem "rubypants"
+  gem "w3c_validators"
+end

data/NEWS.md

@@ -1,5 +1,10 @@
 # nanoc news
 
+## 3.1.2 (2010-04-07)
+
+* Fixed bug which could cause incorrect output when compilation of an item is
+  delayed due to an unmet dependency
+
 ## 3.1.1 (2010-04-05)
 
 * Sass `@import`s now work for files not managed by nanoc

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 
 end
 

data/lib/nanoc3/base/compiler.rb

@@ -156,6 +156,9 @@ module Nanoc3
           rescue Nanoc3::Errors::UnmetDependency => e
             puts "*** Attempt failed due to unmet dependency on #{e.rep.inspect}" if $DEBUG
 
+            # Reinitialize rep
+            rep.forget_progress
+
             # Save rep to compile it later
             inactive_reps << rep
 

data/lib/nanoc3/base/item_rep.rb

@@ -95,20 +95,7 @@ module Nanoc3
       @binary = @item.binary?
 
       # Initialize content and filenames
-      if self.binary?
-        @filenames = {
-          :raw  => @item.raw_filename,
-          :last => @item.raw_filename
-        }
-        @content = {}
-      else
-        @content = {
-          :raw  => @item.raw_content,
-          :last => @item.raw_content,
-          :pre  => @item.raw_content
-        }
-        @filenames = {}
-      end
+      initialize_content
       @old_content = nil
 
       # Reset flags
@@ -248,6 +235,15 @@ module Nanoc3
       compiled_content(:snapshot => snapshot)
     end
 
+    # Resets the compilation progress for this item representation. This is
+    # necessary when an unmet dependency is detected during compilation.
+    # This method should probably not be called directly.
+    #
+    # @return [void]
+    def forget_progress
+      initialize_content
+    end
+
     # Runs the item content through the given filter with the given arguments.
     # This method will replace the content of the `:last` snapshot with the
     # filtered content of the last snapshot.
@@ -410,6 +406,24 @@ module Nanoc3
 
   private
 
+    def initialize_content
+      # Initialize content and filenames
+      if self.binary?
+        @filenames = {
+          :raw  => @item.raw_filename,
+          :last => @item.raw_filename
+        }
+        @content = {}
+      else
+        @content = {
+          :raw  => @item.raw_content,
+          :last => @item.raw_content,
+          :pre  => @item.raw_content
+        }
+        @filenames = {}
+      end
+    end
+
     def filter_named(name)
       Nanoc3::Filter.named(name)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +02:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: nanoc3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - NEWS.md
 files: 
 - ChangeLog
+- Gemfile
 - LICENSE
 - NEWS.md
 - Rakefile