nanoc 2.2.1 → 2.2.2

data/lib/nanoc.rb

@@ -1,7 +1,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 
   # Generic error. Superclass for all nanoc-specific errors.
   class Error < RuntimeError ; end

data/lib/nanoc/base/asset.rb

@@ -108,6 +108,10 @@ module Nanoc
       end
     end
 
+    def inspect
+      "<#{self.class} path=#{self.path}>"
+    end
+
   end
 
 end

data/lib/nanoc/base/asset_rep.rb

@@ -203,13 +203,14 @@ module Nanoc
   private
 
     # Computes and returns the MD5 digest for the given file.
-    def digest(file)
+    def digest(filename)
       # Create hash
       incr_digest = Digest::MD5.new()
 
       # Collect data
-      file.rewind
-      incr_digest << file.read(1000) until file.eof?
+      File.open(filename, 'r') do |io|
+        incr_digest << io.read(1000) until io.eof?
+      end
 
       # Calculate hex hash
       incr_digest.hexdigest
@@ -218,7 +219,7 @@ module Nanoc
     # Compiles the asset rep, treating its contents as binary data.
     def compile_binary
       # Calculate digest before
-      digest_before = File.file?(disk_path) ? digest(File.open(disk_path, 'r')) : nil
+      digest_before = File.file?(disk_path) ? digest(disk_path) : nil
 
       # Run filters
       current_file = @asset.file
@@ -242,7 +243,7 @@ module Nanoc
       FileUtils.cp(current_file.path, disk_path)
 
       # Calculate digest after
-      digest_after = digest(current_file)
+      digest_after = digest(disk_path)
       @modified = (digest_after != digest_before)
     end
 
@@ -272,6 +273,10 @@ module Nanoc
       File.open(self.disk_path, 'w') { |io| io.write(current_content) }
     end
 
+    def inspect
+      "<#{self.class} name=#{self.name} asset.path=#{self.asset.path}>"
+    end
+
   end
 
 end

data/lib/nanoc/base/layout.rb

@@ -82,6 +82,10 @@ module Nanoc
       end
     end
 
+    def inspect
+      "<#{self.class} path=#{self.path}>"
+    end
+
   end
 
 end

data/lib/nanoc/base/page.rb

@@ -123,6 +123,10 @@ module Nanoc
       end
     end
 
+    def inspect
+      "<#{self.class} path=#{self.path}>"
+    end
+
   end
 
 end

data/lib/nanoc/base/page_rep.rb

@@ -315,6 +315,10 @@ module Nanoc
       end
     end
 
+    def inspect
+      "<#{self.class} name=#{self.name} page.path=#{self.page.path}>"
+    end
+
   end
 
 end

data/lib/nanoc/data_sources/filesystem.rb

@@ -216,7 +216,7 @@ module Nanoc::DataSources
 
         # Get content file
         content_filename = content_filename_for_dir(File.dirname(meta_filename))
-        content_file = File.new(content_filename)
+        content_file = Nanoc::Extra::FileProxy.new(content_filename)
 
         # Get attributes
         attributes = { 'extension' => File.extname(content_filename)[1..-1] }.merge(meta)

data/lib/nanoc/filters.rb

@@ -9,6 +9,7 @@ require 'nanoc/filters/rainpress'
 require 'nanoc/filters/rdiscount'
 require 'nanoc/filters/rdoc'
 require 'nanoc/filters/redcloth'
+require 'nanoc/filters/relativize_paths'
 require 'nanoc/filters/relativize_paths_in_css'
 require 'nanoc/filters/relativize_paths_in_html'
 require 'nanoc/filters/rubypants'

data/lib/nanoc/filters/relativize_paths.rb

@@ -0,0 +1,16 @@
+module Nanoc::Filters
+  class RelativizePaths < Nanoc::Filter
+
+    identifier :relativize_paths
+
+    def run(content)
+      raise RuntimeError.new(
+        "The relativize_paths filter itself does not exist anymore. " +
+        "If you want to relativize paths in HTML, use the " +
+        "relativize_paths_in_html filter; if you want to relativize paths " +
+        "in CSS, use the relativize_paths_in_css filter."
+      )
+    end
+
+  end
+end

data/lib/nanoc/filters/relativize_paths_in_html.rb

@@ -1,7 +1,7 @@
 module Nanoc::Filters
   class RelativizePathsInHTML < Nanoc::Filter
 
-    identifiers :relativize_paths, :relativize_paths_in_html
+    identifier :relativize_paths_in_html
 
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo

data/lib/nanoc/helpers/link_to.rb

@@ -89,7 +89,7 @@ module Nanoc::Helpers
 
       # Get source and destination paths
       dst_path   = Pathname.new(path)
-      src_path   = Pathname.new((@page || @asset).path)
+      src_path   = Pathname.new((defined?(@page) ? @page : @asset).path)
 
       # Calculate elative path (method depends on whether destination is a
       # directory or not).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 +02:00
+date: 2009-05-18 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,15 +27,12 @@ files:
 - ChangeLog
 - Rakefile
 - bin/nanoc
-- lib/nanoc
-- lib/nanoc/base
 - lib/nanoc/base/asset.rb
 - lib/nanoc/base/asset_defaults.rb
 - lib/nanoc/base/asset_rep.rb
 - lib/nanoc/base/binary_filter.rb
 - lib/nanoc/base/code.rb
 - lib/nanoc/base/compiler.rb
-- lib/nanoc/base/core_ext
 - lib/nanoc/base/core_ext/hash.rb
 - lib/nanoc/base/core_ext/string.rb
 - lib/nanoc/base/core_ext.rb
@@ -48,7 +45,6 @@ files:
 - lib/nanoc/base/page_defaults.rb
 - lib/nanoc/base/page_rep.rb
 - lib/nanoc/base/plugin.rb
-- lib/nanoc/base/proxies
 - lib/nanoc/base/proxies/asset_proxy.rb
 - lib/nanoc/base/proxies/asset_rep_proxy.rb
 - lib/nanoc/base/proxies/layout_proxy.rb
@@ -60,12 +56,9 @@ files:
 - lib/nanoc/base/site.rb
 - lib/nanoc/base/template.rb
 - lib/nanoc/base.rb
-- lib/nanoc/binary_filters
 - lib/nanoc/binary_filters/image_science_thumbnail.rb
 - lib/nanoc/binary_filters.rb
-- lib/nanoc/cli
 - lib/nanoc/cli/base.rb
-- lib/nanoc/cli/commands
 - lib/nanoc/cli/commands/autocompile.rb
 - lib/nanoc/cli/commands/compile.rb
 - lib/nanoc/cli/commands/create_layout.rb
@@ -79,20 +72,16 @@ files:
 - lib/nanoc/cli/commands.rb
 - lib/nanoc/cli/logger.rb
 - lib/nanoc/cli.rb
-- lib/nanoc/data_sources
 - lib/nanoc/data_sources/filesystem.rb
 - lib/nanoc/data_sources/filesystem_combined.rb
 - lib/nanoc/data_sources.rb
-- lib/nanoc/extra
 - lib/nanoc/extra/auto_compiler.rb
 - lib/nanoc/extra/context.rb
-- lib/nanoc/extra/core_ext
 - lib/nanoc/extra/core_ext/hash.rb
 - lib/nanoc/extra/core_ext/time.rb
 - lib/nanoc/extra/core_ext.rb
 - lib/nanoc/extra/file_proxy.rb
 - lib/nanoc/extra/vcs.rb
-- lib/nanoc/extra/vcses
 - lib/nanoc/extra/vcses/bazaar.rb
 - lib/nanoc/extra/vcses/dummy.rb
 - lib/nanoc/extra/vcses/git.rb
@@ -100,7 +89,6 @@ files:
 - lib/nanoc/extra/vcses/subversion.rb
 - lib/nanoc/extra/vcses.rb
 - lib/nanoc/extra.rb
-- lib/nanoc/filters
 - lib/nanoc/filters/bluecloth.rb
 - lib/nanoc/filters/erb.rb
 - lib/nanoc/filters/erubis.rb
@@ -112,12 +100,12 @@ files:
 - lib/nanoc/filters/rdiscount.rb
 - lib/nanoc/filters/rdoc.rb
 - lib/nanoc/filters/redcloth.rb
+- lib/nanoc/filters/relativize_paths.rb
 - lib/nanoc/filters/relativize_paths_in_css.rb
 - lib/nanoc/filters/relativize_paths_in_html.rb
 - lib/nanoc/filters/rubypants.rb
 - lib/nanoc/filters/sass.rb
 - lib/nanoc/filters.rb
-- lib/nanoc/helpers
 - lib/nanoc/helpers/blogging.rb
 - lib/nanoc/helpers/capturing.rb
 - lib/nanoc/helpers/filtering.rb
@@ -128,19 +116,14 @@ files:
 - lib/nanoc/helpers/text.rb
 - lib/nanoc/helpers/xml_sitemap.rb
 - lib/nanoc/helpers.rb
-- lib/nanoc/routers
 - lib/nanoc/routers/default.rb
 - lib/nanoc/routers/no_dirs.rb
 - lib/nanoc/routers/versioned.rb
 - lib/nanoc/routers.rb
 - lib/nanoc.rb
-- vendor/cri
 - vendor/cri/ChangeLog
-- vendor/cri/lib
-- vendor/cri/lib/cri
 - vendor/cri/lib/cri/base.rb
 - vendor/cri/lib/cri/command.rb
-- vendor/cri/lib/cri/core_ext
 - vendor/cri/lib/cri/core_ext/string.rb
 - vendor/cri/lib/cri/core_ext.rb
 - vendor/cri/lib/cri/option_parser.rb
@@ -149,13 +132,14 @@ files:
 - vendor/cri/NEWS
 - vendor/cri/Rakefile
 - vendor/cri/README
-- vendor/cri/test
 - vendor/cri/test/test_base.rb
 - vendor/cri/test/test_command.rb
 - vendor/cri/test/test_core_ext.rb
 - vendor/cri/test/test_option_parser.rb
 has_rdoc: true
 homepage: http://nanoc.stoneship.org/
+licenses: []
+
 post_install_message: |-
   ------------------------------------------------------------------------------
   Thanks for installing nanoc 2.2! Here are some resources to help you get started:
@@ -208,9 +192,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nanoc
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: a tool that runs on your local computer and compiles Markdown, Textile, Haml, ... documents into static web pages
 test_files: []