nanoc3 3.2.0a4 → 3.2.0b1

data/test/filters/test_rubypants.rb

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

data/test/filters/test_sass.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'test/helper'
-
 class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
 
   include Nanoc3::TestHelpers
@@ -9,7 +7,7 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
   def test_filter
     if_have 'sass' do
       # Get filter
-      filter = ::Nanoc3::Filters::Sass.new({ :foo => 'bar' })
+      filter = create_filter({ :foo => 'bar' })
 
       # Run filter
       result = filter.run(".foo #bar\n  color: #f00")
@@ -20,7 +18,7 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
   def test_filter_with_params
     if_have 'sass' do
       # Create filter
-      filter = ::Nanoc3::Filters::Sass.new({ :foo => 'bar' })
+      filter = create_filter({ :foo => 'bar' })
 
       # Check with compact
       result = filter.run(".foo #bar\n  color: #f00", :style => 'compact')
@@ -35,7 +33,7 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
   def test_filter_error
     if_have 'sass' do
       # Create filter
-      filter = ::Nanoc3::Filters::Sass.new({ :foo => 'bar' })
+      filter = create_filter
 
       # Run filter
       raised = false
@@ -52,7 +50,7 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
   def test_filter_can_import_external_files
     if_have 'sass' do
       # Create filter
-      filter = ::Nanoc3::Filters::Sass.new(:items => [])
+      filter = create_filter
 
       # Create sample file
       File.open('moo.sass', 'w') { |io| io.write "body\n  color: red" }
@@ -65,7 +63,7 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
   def test_filter_can_import_relative_files
     if_have 'sass' do
       # Create filter
-      filter = ::Nanoc3::Filters::Sass.new(:items => [])
+      filter = create_filter
 
       # Create sample file
       File.open('moo.sass', 'w') { |io| io.write %Q{@import subdir/relative} }
@@ -80,7 +78,7 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
   def test_filter_will_skip_items_without_filename
     if_have 'sass' do
       # Create filter
-      filter = ::Nanoc3::Filters::Sass.new(:items => [ Nanoc3::Item.new('blah', {}, '/blah/') ])
+      filter = create_filter
 
       # Create sample file
       File.open('moo.sass', 'w') { |io| io.write "body\n  color: red" }
@@ -89,15 +87,143 @@ class Nanoc3::Filters::SassTest < MiniTest::Unit::TestCase
       filter.run('@import moo')
     end
   end
-  
+
   def test_css_imports_work
     if_have 'sass' do
       # Create filter
-      filter = ::Nanoc3::Filters::Sass.new(:items => [ Nanoc3::Item.new('blah', {}, '/blah/') ])
+      filter = create_filter
 
       # Run filter
       filter.run('@import moo.css')
     end
   end
 
+  def test_recompile_includes
+    if_have 'sass' do
+      with_site do |site|
+        # Create two Sass files
+        Dir['content/*'].each { |i| FileUtils.rm(i) }
+        File.open('content/a.sass', 'w') do |io|
+          io.write('@import b.sass')
+        end
+        File.open('content/b.sass', 'w') do |io|
+          io.write("p\n  color: red")
+        end
+
+        # Update rules
+        File.open('Rules', 'w') do |io|
+          io.write "compile '*' do\n"
+          io.write "  filter :sass\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/a/' do\n"
+          io.write "  item.identifier.chop + '.css'\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/b/' do\n"
+          io.write "  nil\n"
+          io.write "end\n"
+        end
+
+        # Compile
+        site = Nanoc3::Site.new('.')
+        site.compile
+
+        # Check
+        assert Dir['output/*'].size == 1
+        assert File.file?('output/a.css')
+        refute File.file?('output/b.css')
+        assert_match /^p\s*\{\s*color:\s*red;?\s*\}/,
+          File.read('output/a.css')
+
+        # Update included file
+        File.open('content/b.sass', 'w') do |io|
+          io.write("p\n  color: blue")
+        end
+
+        # Recompile
+        site = Nanoc3::Site.new('.')
+        site.compile
+
+        # Recheck
+        assert Dir['output/*'].size == 1
+        assert File.file?('output/a.css')
+        refute File.file?('output/b.css')
+        assert_match /^p\s*\{\s*color:\s*blue;?\s*\}/,
+          File.read('output/a.css')
+      end
+    end
+  end
+
+  def test_recompile_includes_with_underscore_without_extension
+    if_have 'sass' do
+      with_site do |site|
+        # Create two Sass files
+        Dir['content/*'].each { |i| FileUtils.rm(i) }
+        File.open('content/a.sass', 'w') do |io|
+          io.write('@import b')
+        end
+        File.open('content/_b.sass', 'w') do |io|
+          io.write("p\n  color: red")
+        end
+
+        # Update rules
+        File.open('Rules', 'w') do |io|
+          io.write "compile '*' do\n"
+          io.write "  filter :sass\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/a/' do\n"
+          io.write "  item.identifier.chop + '.css'\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/_b/' do\n"
+          io.write "  nil\n"
+          io.write "end\n"
+        end
+
+        # Compile
+        site = Nanoc3::Site.new('.')
+        site.compile
+
+        # Check
+        assert Dir['output/*'].size == 1
+        assert File.file?('output/a.css')
+        refute File.file?('output/b.css')
+        assert_match /^p\s*\{\s*color:\s*red;?\s*\}/,
+          File.read('output/a.css')
+
+        # Update included file
+        File.open('content/_b.sass', 'w') do |io|
+          io.write("p\n  color: blue")
+        end
+
+        # Recompile
+        site = Nanoc3::Site.new('.')
+        site.compile
+
+        # Recheck
+        assert Dir['output/*'].size == 1
+        assert File.file?('output/a.css')
+        refute File.file?('output/b.css')
+        assert_match /^p\s*\{\s*color:\s*blue;?\s*\}/,
+          File.read('output/a.css')
+      end
+    end
+  end
+
+private
+
+  def create_filter(params={})
+    FileUtils.mkdir_p('content')
+    File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green')}
+
+    items = [ Nanoc3::Item.new(
+      'blah',
+      { :content_filename => 'content/xyzzy.sass' },
+      '/blah/') ]
+    params = { :item => items[0], :items => items }.merge(params)
+    ::Nanoc3::Filters::Sass.new(params)
+  end
+
 end

data/test/filters/test_slim.rb

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

data/test/filters/test_typogruby.rb

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

data/test/filters/test_uglify_js.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+class Nanoc3::Filters::UglifyJSTest < MiniTest::Unit::TestCase
+
+  include Nanoc3::TestHelpers
+
+  def test_filter
+    if_have 'uglifier' do
+      # Create filter
+      filter = ::Nanoc3::Filters::UglifyJS.new
+
+      # Run filter
+      result = filter.run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)")
+      assert_equal("foo=1,function(a){alert(a)}(foo)", result)
+    end
+  end
+
+  def test_filter_with_options
+
+    if_have 'uglifier' do
+      # Create filter
+      filter = ::Nanoc3::Filters::UglifyJS.new
+
+      # Run filter
+      result = filter.run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)", :toplevel => true)
+      assert_equal("foo=1,function(a){alert(a)}(foo)", result)
+    end
+  end
+
+end

data/test/gem_loader.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+begin
+  require 'rubygems'
+
+  gemspec = File.expand_path("nanoc3.gemspec", Dir.pwd)
+  Gem::Specification.load(gemspec).dependencies.each do |dep|
+    gem dep.name, *dep.requirement.as_list
+  end
+rescue LoadError => e
+end

data/test/helper.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+# Set up gem loading (necessary for cri dependency)
+require File.dirname(__FILE__) + '/gem_loader.rb'
+
 # Load unit testing stuff
 begin
   require 'minitest/unit'

data/test/helpers/test_blogging.rb

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

data/test/helpers/test_breadcrumbs.rb

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

data/test/helpers/test_capturing.rb

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

data/test/helpers/test_filtering.rb

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

data/test/helpers/test_html_escape.rb

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

data/test/helpers/test_link_to.rb

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

data/test/helpers/test_rendering.rb

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

data/test/helpers/test_tagging.rb

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

data/test/helpers/test_text.rb

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

data/test/helpers/test_xml_sitemap.rb

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

data/test/tasks/test_clean.rb

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

metadata

@@ -2,7 +2,7 @@
 name: nanoc3
 version: !ruby/object:Gem::Version 
   prerelease: 5
-  version: 3.2.0a4
+  version: 3.2.0b1
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 Z
+date: 2011-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cri
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 description: "nanoc is a simple but very flexible static site generator written in Ruby. It operates on local files, and therefore does not run on the server. nanoc \xE2\x80\x9Ccompiles\xE2\x80\x9D the local source files into HTML (usually), by evaluating eRuby, Markdown, etc."
@@ -78,19 +78,18 @@ files:
 - lib/nanoc3/base/source_data/site.rb
 - lib/nanoc3/base/store.rb
 - lib/nanoc3/base.rb
-- lib/nanoc3/cli/base.rb
+- lib/nanoc3/cli/command.rb
 - lib/nanoc3/cli/commands/autocompile.rb
 - lib/nanoc3/cli/commands/compile.rb
 - lib/nanoc3/cli/commands/create_item.rb
 - lib/nanoc3/cli/commands/create_layout.rb
 - lib/nanoc3/cli/commands/create_site.rb
 - lib/nanoc3/cli/commands/debug.rb
-- lib/nanoc3/cli/commands/help.rb
 - lib/nanoc3/cli/commands/info.rb
+- lib/nanoc3/cli/commands/nanoc.rb
 - lib/nanoc3/cli/commands/update.rb
 - lib/nanoc3/cli/commands/view.rb
 - lib/nanoc3/cli/commands/watch.rb
-- lib/nanoc3/cli/commands.rb
 - lib/nanoc3/cli/logger.rb
 - lib/nanoc3/cli.rb
 - lib/nanoc3/data_sources/deprecated/delicious.rb
@@ -141,6 +140,7 @@ files:
 - lib/nanoc3/filters/sass.rb
 - lib/nanoc3/filters/slim.rb
 - lib/nanoc3/filters/typogruby.rb
+- lib/nanoc3/filters/uglify_js.rb
 - lib/nanoc3/filters.rb
 - lib/nanoc3/helpers/blogging.rb
 - lib/nanoc3/helpers/breadcrumbs.rb
@@ -159,7 +159,6 @@ files:
 - lib/nanoc3/tasks/validate.rake
 - lib/nanoc3/tasks.rb
 - lib/nanoc3.rb
-- tasks/clean.rake
 - tasks/doc.rake
 - tasks/test.rake
 - test/base/core_ext/array_spec.rb
@@ -192,6 +191,7 @@ files:
 - test/cli/commands/test_help.rb
 - test/cli/commands/test_info.rb
 - test/cli/commands/test_update.rb
+- test/cli/test_cli.rb
 - test/cli/test_logger.rb
 - test/data_sources/test_filesystem.rb
 - test/data_sources/test_filesystem_unified.rb
@@ -226,6 +226,8 @@ files:
 - test/filters/test_sass.rb
 - test/filters/test_slim.rb
 - test/filters/test_typogruby.rb
+- test/filters/test_uglify_js.rb
+- test/gem_loader.rb
 - test/helper.rb
 - test/helpers/test_blogging.rb
 - test/helpers/test_breadcrumbs.rb
@@ -279,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized websites.