nanoc3 3.2.0a4 → 3.2.0b1

data/lib/nanoc3/filters/redcloth.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'redcloth'
+
 module Nanoc3::Filters
   class RedCloth < Nanoc3::Filter
 
@@ -24,8 +26,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'redcloth'
-
       # Create formatter
       r = ::RedCloth.new(content)
 

data/lib/nanoc3/filters/rubypants.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'rubypants'
+
 module Nanoc3::Filters
   class RubyPants < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'rubypants'
-
       # Get result
       ::RubyPants.new(content).to_html
     end

data/lib/nanoc3/filters/sass.rb

@@ -1,8 +1,38 @@
 # encoding: utf-8
 
+require 'sass'
+require 'set'
+
 module Nanoc3::Filters
   class Sass < Nanoc3::Filter
 
+    class << self
+      # The current filter. This is definitely going to bite me if I ever get
+      # to multithreading nanoc.
+      attr_accessor :current
+    end
+
+    # Essentially the {Sass::Importers::Filesystem} but registering each
+    # import file path.
+    class SassFilesystemImporter < ::Sass::Importers::Filesystem
+
+      private
+
+      def _find(dir, name, options)
+        full_filename, syntax = find_real_file(dir, name)
+        return unless full_filename && File.readable?(full_filename)
+
+        filter = Nanoc3::Filters::Sass.current
+        item = filter.imported_filename_to_item(full_filename)
+        filter.depend_on([ item ]) unless item.nil?
+
+        options[:syntax] = syntax
+        options[:filename] = full_filename
+        options[:importer] = self
+        ::Sass::Engine.new(File.read(full_filename), options)
+      end
+    end
+
     # Runs the content through [Sass](http://sass-lang.com/).
     # Parameters passed to this filter will be passed on to Sass.
     #
@@ -10,64 +40,26 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'sass'
-
-      # Add imported_filename read accessor to ImportNode
-      # … but… but… nex3 said I could monkey patch it! :(
-      methods = ::Sass::Tree::ImportNode.instance_methods
-      if !methods.include?(:import_filename) && !methods.include?('import_filename')
-        ::Sass::Tree::ImportNode.send(:attr_reader, :imported_filename)
-      end
-
-      # Get options
+      # Build options
       options = params.dup
-      sass_filename = options[:filename] || (@item && @item[:content_filename])
+      sass_filename = options[:filename] ||
+        (@item && @item[:content_filename])
       options[:filename] ||= sass_filename
+      options[:filesystem_importer] ||=
+        Nanoc3::Filters::Sass::SassFilesystemImporter
 
-      # Build engine
+      # Render
       engine = ::Sass::Engine.new(content, options)
+      self.class.current = self
+      engine.render
+    end
 
-      # Get import nodes
-      imported_nodes = []
-      unprocessed_nodes = Set.new([ engine.to_tree ])
-      until unprocessed_nodes.empty?
-        # Get an unprocessed node
-        node = unprocessed_nodes.each { |n| break n }
-        unprocessed_nodes.delete(node)
-
-        # Add to list of import nodes if necessary
-        imported_nodes << node if node.is_a?(::Sass::Tree::ImportNode)
-
-        # Mark children of this node for processing
-        node.children.each { |c| unprocessed_nodes << c }
-      end
-
-      # Get import paths
-      import_paths = (options[:load_paths] || []).dup
-      import_paths.unshift(File.dirname(sass_filename)) if sass_filename
-      imported_filenames = imported_nodes.map { |node| node.imported_filename }
-
-      # Convert to items
-      imported_items = imported_filenames.map do |filename|
-        pathname = Pathname.new(filename)
-        next unless pathname.file?
-        normalized_filename = pathname.realpath
-        @items.find { |i| i[:content_filename] && Pathname.new(i[:content_filename]).realpath == normalized_filename }
-      end.compact
-
-      # Require compilation of each item
-      imported_items.each do |item|
-        # Notify
-        Nanoc3::NotificationCenter.post(:visit_started, item)
-        Nanoc3::NotificationCenter.post(:visit_ended,   item)
-
-        # Raise unmet dependency error if item is not yet compiled
-        any_uncompiled_rep = item.reps.find { |r| !r.compiled? }
-        raise Nanoc3::Errors::UnmetDependency.new(any_uncompiled_rep) if any_uncompiled_rep
+    def imported_filename_to_item(filename)
+      path = Pathname.new(filename).realpath
+      @items.find do |i|
+        next if i[:content_filename].nil?
+        Pathname.new(i[:content_filename]).realpath == path
       end
-
-      # Done
-      engine.render
     end
 
   end

data/lib/nanoc3/filters/slim.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'slim'
+
 module Nanoc3::Filters
 
   # @since 3.2.0
@@ -12,8 +14,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'slim'
-
       # Create context
       context = ::Nanoc3::Context.new(assigns)
 

data/lib/nanoc3/filters/typogruby.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'typogruby'
+
 module Nanoc3::Filters
 
   # @since 3.2.0
@@ -12,8 +14,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'typogruby'
-
       # Get result
       ::Typogruby.improve(content)
     end

data/lib/nanoc3/filters/uglify_js.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require 'uglifier'
+
+module Nanoc3::Filters
+  class UglifyJS < Nanoc3::Filter
+
+    # Runs the content through [UglifyJS](https://github.com/mishoo/UglifyJS/).
+    # This method optionally takes options to pass directly to Uglifier:
+    #
+    #   {
+    #     :mangle => true, # Mangle variables names
+    #     :toplevel => false, # Mangle top-level variable names
+    #     :except => [], # Variable names to be excluded from mangling
+    #     :max_line_length => 32 * 1024, # Maximum line length
+    #     :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
+    #     :seqs => true, # Reduce consecutive statements in blocks into single statement
+    #     :dead_code => true, # Remove dead code (e.g. after return)
+    #     :unsafe => false, # Optimizations known to be unsafe in some situations
+    #     :copyright => true, # Show copyright message
+    #     :beautify => false, # Ouput indented code
+    #     :beautify_options => {
+    #       :indent_level => 4,
+    #       :indent_start => 0,
+    #       :quote_keys => false,
+    #       :space_colon => 0,
+    #       :ascii_only => false
+    #     }
+    #   }
+    #
+    # @param [String] content The content to filter
+    #
+    # @option params [Array] :options ([]) A list of options to pass on to Uglifier
+    #
+    # @return [String] The filtered content
+    def run(content, params={})
+      # Add filename to load path
+      Uglifier.new(params).compile(content)
+    end
+
+  end
+end

data/nanoc3.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = [ '--main', 'README.md' ]
   s.extra_rdoc_files = [ 'ChangeLog', 'LICENSE', 'README.md', 'NEWS.md' ]
 
-  s.add_runtime_dependency('cri', '>= 1.0.0')
+  s.add_runtime_dependency('cri', '~> 2.0')
 
   s.post_install_message = %q{------------------------------------------------------------------------------
 Thanks for installing nanoc 3.2! Here are some resources to help you get

data/tasks/test.rake

@@ -11,6 +11,9 @@ test = namespace :test do
 
     $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/..'))
 
+    # require our test helper so we don't have to in each individual test
+    require 'test/helper'
+
     MiniTest::Unit.autorun
 
     test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
@@ -25,6 +28,9 @@ test = namespace :test do
 
       $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/..'))
 
+      # require our test helper so we don't have to in each individual test
+      require 'test/helper'
+
       MiniTest::Unit.autorun
 
       test_files = Dir["test/#{dir}/**/*_spec.rb"] + Dir["test/#{dir}/**/test_*.rb"]

data/test/base/core_ext/array_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 describe 'Array#symbolize_keys' do
 
   it 'should convert keys to symbols' do

data/test/base/core_ext/hash_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 describe 'Hash#symbolize_keys' do
 
   it 'should convert keys to symbols' do

data/test/base/core_ext/pathname_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 describe 'Pathname#checksum' do
 
   it 'should work on empty files' do

data/test/base/core_ext/string_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 describe 'String#cleaned_identifier' do
 
   it 'should not convert already clean paths' do

data/test/base/test_checksum_store.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::ChecksumStoreTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_code_snippet.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CodeSnippetTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_compiler.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CompilerTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -256,7 +254,7 @@ class Nanoc3::CompilerTest < MiniTest::Unit::TestCase
 
   def test_disallow_routes_not_starting_with_slash
     # Create site
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+    Nanoc3::CLI.run %w( create_site bar)
 
     FileUtils.cd('bar') do
       # Create routes
@@ -283,7 +281,7 @@ class Nanoc3::CompilerTest < MiniTest::Unit::TestCase
 
   def test_load_should_be_idempotent
     # Create site
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+    Nanoc3::CLI.run %w( create_site bar)
 
     FileUtils.cd('bar') do
       site = Nanoc3::Site.new('.')

data/test/base/test_compiler_dsl.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::CompilerDSLTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -20,7 +18,7 @@ class Nanoc3::CompilerDSLTest < MiniTest::Unit::TestCase
 
   def test_passthrough
     # Create site
-    Nanoc3::CLI::Base.new.run([ 'create_site', 'bar' ])
+    Nanoc3::CLI.run %w( create_site bar)
     FileUtils.cd('bar') do
       # Create rep
       item = Nanoc3::Item.new('foo', { :extension => 'bar' }, '/foo/')

data/test/base/test_context.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::ContextTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_data_source.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::DataSourceTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_dependency_tracker.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::DependencyTrackerTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_directed_graph.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::DirectedGraphTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_filter.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::FilterTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers

data/test/base/test_item.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::ItemTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -22,10 +20,14 @@ class Nanoc3::ItemTest < MiniTest::Unit::TestCase
   def test_frozen_identifier
     item = Nanoc3::Item.new("foo", {}, '/foo')
 
-    error = assert_raises(RuntimeError) do
+    raised = false
+    begin
       item.identifier.chop!
+    rescue => error
+      raised = true
+      assert_equal "can't modify frozen string", error.message
     end
-    assert_equal "can't modify frozen string", error.message
+    assert raised, 'Should have raised when trying to modify a frozen string'
   end
 
   def test_lookup
@@ -161,4 +163,17 @@ class Nanoc3::ItemTest < MiniTest::Unit::TestCase
     assert raised
   end
 
+  def test_dump_and_load
+    item = Nanoc3::Item.new(
+      "foobar",
+      { :a => { :b => 123 }},
+      '/foo/')
+
+    item = Marshal.load(Marshal.dump(item))
+
+    assert_equal '/foo/', item.identifier
+    assert_equal 'foobar', item.raw_content
+    assert_equal({ :a => { :b => 123 }}, item.attributes)
+  end
+
 end

data/test/base/test_item_rep.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::ItemRepTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers