nanoc3 3.1.6 → 3.1.7

data/NEWS.md

@@ -1,5 +1,9 @@
 # nanoc news
 
+## 3.1.7 (2011-05-03)
+
+* Restored compatibility with Sass 3.1
+
 ## 3.1.6 (2010-11-21)
 
 * Fixed issues with incompatible encodings

data/lib/nanoc3.rb

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

data/lib/nanoc3/base/item_rep.rb

@@ -442,7 +442,7 @@ module Nanoc3
     def filter_for_layout(layout)
       # Get filter name and args
       filter_name, filter_args  = @item.site.compiler.filter_for_layout(layout)
-      raise Nanoc3::Errors::CannotDetermineFilter.new(layout_identifier) if filter_name.nil?
+      raise Nanoc3::Errors::CannotDetermineFilter.new(layout.identifier) if filter_name.nil?
 
       # Get filter class
       filter_class = Nanoc3::Filter.named(filter_name)

data/lib/nanoc3/base/plugin_registry.rb

@@ -159,7 +159,7 @@ module Nanoc3
 
   end
 
-  # @deprecated Use {Nanoc3::PluginRegistry.instace} instead
+  # @deprecated Use {Nanoc3::PluginRegistry.instance} instead
   Plugin = PluginRegistry.instance
 
 end

data/lib/nanoc3/cli/commands/create_site.rb

@@ -156,18 +156,20 @@ a:hover {
   line-height: 20px;
 }
 
-#main ul {
+#main ul, #main ol {
   margin: 20px;
 }
 
 #main li {
-  list-style-type: square;
-
   font-size: 15px;
   
   line-height: 20px;
 }
 
+#main ul li {
+  list-style-type: square;
+}
+
 #sidebar {
   position: absolute;
 

data/lib/nanoc3/filters/erb.rb

@@ -15,10 +15,14 @@ module Nanoc3::Filters
       # Create context
       context = ::Nanoc3::Context.new(assigns)
 
+      # Get binding
+      proc = assigns[:content] ? lambda { assigns[:content] } : nil
+      assigns_binding = context.get_binding(&proc)
+
       # Get result
       erb = ::ERB.new(content)
       erb.filename = filename
-      erb.result(context.get_binding { assigns[:content] })
+      erb.result(assigns_binding)
     end
 
   end

data/lib/nanoc3/filters/erubis.rb

@@ -15,8 +15,12 @@ module Nanoc3::Filters
       # Create context
       context = ::Nanoc3::Context.new(assigns)
 
+      # Get binding
+      proc = assigns[:content] ? lambda { assigns[:content] } : nil
+      assigns_binding = context.get_binding(&proc)
+
       # Get result
-      ::Erubis::Eruby.new(content, :filename => filename).result(context.get_binding { assigns[:content] })
+      ::Erubis::Eruby.new(content, :filename => filename).result(assigns_binding)
     end
 
   end

data/lib/nanoc3/filters/haml.rb

@@ -19,7 +19,8 @@ module Nanoc3::Filters
       context = ::Nanoc3::Context.new(assigns)
 
       # Get result
-      ::Haml::Engine.new(content, options).render(context, assigns) { assigns[:content] }
+      proc = assigns[:content] ? lambda { assigns[:content] } : nil
+      ::Haml::Engine.new(content, options).render(context, assigns, &proc)
     end
 
   end

data/lib/nanoc3/filters/sass.rb

@@ -46,10 +46,7 @@ module Nanoc3::Filters
       # Get import paths
       import_paths = (options[:load_paths] || []).dup
       import_paths.unshift(File.dirname(sass_filename)) if sass_filename
-      # Get imported filenames
-      imported_filenames = imported_nodes.map do |node|
-        ::Sass::Files.find_file_to_import(node.imported_filename, import_paths)
-      end
+      imported_filenames = imported_nodes.map { |node| node.imported_filename }
 
       # Convert to items
       imported_items = imported_filenames.map do |filename|

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc3
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 3
-  - 1
-  - 6
-  version: 3.1.6
+  prerelease: 
+  version: 3.1.7
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +01:00
+date: 2011-05-03 00:00:00 +02:00
 default_executable: nanoc3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -179,23 +169,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized websites.