nanoc 3.4.3 → 3.5.0b1

data/test/filters/test_pandoc.rb

@@ -6,11 +6,15 @@ class Nanoc::Filters::PandocTest < MiniTest::Unit::TestCase
 
   def test_filter
     if_have 'pandoc-ruby' do
+      if `which pandoc`.strip.empty?
+        skip "could not find pandoc"
+      end
+
       # Create filter
       filter = ::Nanoc::Filters::Pandoc.new
 
       # Run filter
-      result = filter.run("# Heading")
+      result = filter.run("# Heading\n")
       assert_equal("<h1 id=\"heading\">Heading</h1>", result)
     end
   end

data/test/helpers/test_blogging.rb

@@ -174,7 +174,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
       @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
 
       # Check
-      error = assert_raises(RuntimeError) do
+      error = assert_raises(Nanoc::Errors::GenericTrivial) do
         atom_feed
       end
       assert_equal(
@@ -200,7 +200,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
       @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
 
       # Check
-      error = assert_raises(RuntimeError) do
+      error = assert_raises(Nanoc::Errors::GenericTrivial) do
         atom_feed
       end
       assert_equal(
@@ -226,7 +226,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
       @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
 
       # Check
-      error = assert_raises(RuntimeError) do
+      error = assert_raises(Nanoc::Errors::GenericTrivial) do
         atom_feed
       end
       assert_equal(
@@ -252,7 +252,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
       @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
 
       # Check
-      error = assert_raises(RuntimeError) do
+      error = assert_raises(Nanoc::Errors::GenericTrivial) do
         atom_feed
       end
       assert_equal(
@@ -326,7 +326,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
       @item.stubs(:[]).with(:author_uri).returns(nil)
 
       # Check
-      error = assert_raises(RuntimeError) do
+      error = assert_raises(Nanoc::Errors::GenericTrivial) do
         atom_feed
       end
       assert_equal(
@@ -354,7 +354,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
       @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
 
       # Check
-      error = assert_raises(RuntimeError) do
+      error = assert_raises(Nanoc::Errors::GenericTrivial) do
         atom_feed
       end
       assert_equal(
@@ -550,6 +550,50 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_atom_feed_with_icon_param
+    if_have 'builder' do
+      # Mock article
+      @items = [ mock_article ]
+
+      # Mock site
+      @site = mock
+      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+
+      # Create feed item
+      @item = mock
+      @item.stubs(:[]).with(:title).returns('My Blog Or Something')
+      @item.stubs(:[]).with(:author_name).returns('J. Doe')
+      @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
+      @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
+
+      # Check
+      result = atom_feed :icon => 'http://example.com/icon.png'
+      assert_match '<icon>http://example.com/icon.png</icon>', result
+    end
+  end
+
+  def test_atom_feed_with_logo_param
+    if_have 'builder' do
+      # Mock article
+      @items = [ mock_article ]
+
+      # Mock site
+      @site = mock
+      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+
+      # Create feed item
+      @item = mock
+      @item.stubs(:[]).with(:title).returns('My Blog Or Something')
+      @item.stubs(:[]).with(:author_name).returns('J. Doe')
+      @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
+      @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
+
+      # Check
+      result = atom_feed :logo => 'http://example.com/logo.png'
+      assert_match '<logo>http://example.com/logo.png</logo>', result
+    end
+  end
+
   def test_atom_feed_with_item_without_path
     if_have 'builder' do
       # Create items
@@ -627,7 +671,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
     @site = Nanoc::Site.new({})
 
     # Check
-    assert_raises(RuntimeError) do
+    assert_raises(Nanoc::Errors::GenericTrivial) do
       url_for(nil)
     end
   end
@@ -682,7 +726,7 @@ class Nanoc::Helpers::BloggingTest < MiniTest::Unit::TestCase
     @site = Nanoc::Site.new({})
 
     # Check
-    assert_raises(RuntimeError) do
+    assert_raises(Nanoc::Errors::GenericTrivial) do
       feed_url
     end
   end

data/test/helpers/test_xml_sitemap.rb

@@ -7,6 +7,7 @@ class Nanoc::Helpers::XMLSitemapTest < MiniTest::Unit::TestCase
   include Nanoc::Helpers::XMLSitemap
 
   def teardown
+    super
     @items = nil
     @item  = nil
     @site  = nil
@@ -106,6 +107,73 @@ class Nanoc::Helpers::XMLSitemapTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_filter
+    if_have 'builder', 'nokogiri' do
+      # Create items
+      @items = [ Nanoc::Item.new('some content 1', {}, '/item-one/') ]
+      self.create_item_rep(@items.last, :one_a, '/item-one/a/')
+      self.create_item_rep(@items.last, :one_b, '/item-one/b/')
+
+      # Create sitemap item
+      @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
+
+      # Create site
+      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+
+      # Build sitemap
+      res = xml_sitemap(:rep_select => lambda { |rep| rep.name == :one_a } )
+
+      # Check
+      doc = Nokogiri::XML(res)
+      urlsets = doc.css('> urlset')
+      assert_equal 1, urlsets.size
+      urls = urlsets.css('> url')
+      assert_equal 1, urls.size
+      assert_equal 'http://example.com/item-one/a/',   urls[0].css('> loc').inner_text
+      assert_equal '',                                 urls[0].css('> changefreq').inner_text
+      assert_equal '',                                 urls[0].css('> priority').inner_text
+      assert_equal '',                                 urls[0].css('> lastmod').inner_text
+    end
+  end
+
+  def test_sorted
+    if_have 'builder', 'nokogiri' do
+      # Create items
+      @items = []
+      @items << Nanoc::Item.new('some content 1', {}, '/george/')
+      self.create_item_rep(@items.last, :a_alice,   '/george/alice/')
+      self.create_item_rep(@items.last, :b_zoey,    '/george/zoey/')
+      @items << Nanoc::Item.new('some content 1', {}, '/walton/')
+      self.create_item_rep(@items.last, :a_eve,     '/walton/eve/')
+      self.create_item_rep(@items.last, :b_bob,     '/walton/bob/')
+      @items << Nanoc::Item.new('some content 1', {}, '/lucas/')
+      self.create_item_rep(@items.last, :a_trudy,   '/lucas/trudy/')
+      self.create_item_rep(@items.last, :b_mallory, '/lucas/mallory/')
+
+      # Create sitemap item
+      @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
+
+      # Create site
+      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+
+      # Build sitemap
+      res = xml_sitemap(:items => @items)
+
+      # Check
+      doc = Nokogiri::XML(res)
+      urlsets = doc.css('> urlset')
+      assert_equal 1, urlsets.size
+      urls = urlsets.css('> url')
+      assert_equal 6, urls.size
+      assert_equal 'http://example.com/george/alice/',  urls[0].css('> loc').inner_text
+      assert_equal 'http://example.com/george/zoey/',   urls[1].css('> loc').inner_text
+      assert_equal 'http://example.com/lucas/trudy/',   urls[2].css('> loc').inner_text
+      assert_equal 'http://example.com/lucas/mallory/', urls[3].css('> loc').inner_text
+      assert_equal 'http://example.com/walton/eve/',    urls[4].css('> loc').inner_text
+      assert_equal 'http://example.com/walton/bob/',    urls[5].css('> loc').inner_text
+    end
+  end
+
 protected
 
   def create_item_rep(item, name, path)

data/test/test_gem.rb

@@ -13,7 +13,7 @@ class Nanoc::GemTest < MiniTest::Unit::TestCase
     require 'systemu'
 
     # Require clean environment
-    assert_empty Dir['nanoc-*.gem'], "Ensure no nanoc-*.gem files exist"
+    Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
 
     # Build
     files_before = Set.new Dir['**/*']

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.4.3
-  prerelease: 
+  version: 3.5.0b1
+  prerelease: 5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -122,6 +122,7 @@ extra_rdoc_files:
 - NEWS.md
 files:
 - ChangeLog
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -171,6 +172,7 @@ files:
 - lib/nanoc/cli/cleaning_stream.rb
 - lib/nanoc/cli/command_runner.rb
 - lib/nanoc/cli/commands/autocompile.rb
+- lib/nanoc/cli/commands/check.rb
 - lib/nanoc/cli/commands/compile.rb
 - lib/nanoc/cli/commands/create-item.rb
 - lib/nanoc/cli/commands/create-layout.rb
@@ -200,8 +202,20 @@ files:
 - lib/nanoc/data_sources/filesystem.rb
 - lib/nanoc/data_sources/filesystem_unified.rb
 - lib/nanoc/data_sources/filesystem_verbose.rb
+- lib/nanoc/data_sources/static.rb
 - lib/nanoc/data_sources.rb
 - lib/nanoc/extra/auto_compiler.rb
+- lib/nanoc/extra/checking/check.rb
+- lib/nanoc/extra/checking/checks/css.rb
+- lib/nanoc/extra/checking/checks/external_links.rb
+- lib/nanoc/extra/checking/checks/html.rb
+- lib/nanoc/extra/checking/checks/internal_links.rb
+- lib/nanoc/extra/checking/checks/stale.rb
+- lib/nanoc/extra/checking/checks.rb
+- lib/nanoc/extra/checking/dsl.rb
+- lib/nanoc/extra/checking/issue.rb
+- lib/nanoc/extra/checking/runner.rb
+- lib/nanoc/extra/checking.rb
 - lib/nanoc/extra/chick.rb
 - lib/nanoc/extra/core_ext/enumerable.rb
 - lib/nanoc/extra/core_ext/pathname.rb
@@ -212,6 +226,7 @@ files:
 - lib/nanoc/extra/deployers/rsync.rb
 - lib/nanoc/extra/deployers.rb
 - lib/nanoc/extra/file_proxy.rb
+- lib/nanoc/extra/link_collector.rb
 - lib/nanoc/extra/pruner.rb
 - lib/nanoc/extra/validators/links.rb
 - lib/nanoc/extra/validators/w3c.rb
@@ -316,6 +331,15 @@ files:
 - test/data_sources/test_filesystem.rb
 - test/data_sources/test_filesystem_unified.rb
 - test/data_sources/test_filesystem_verbose.rb
+- test/data_sources/test_static.rb
+- test/extra/checking/checks/test_css.rb
+- test/extra/checking/checks/test_external_links.rb
+- test/extra/checking/checks/test_html.rb
+- test/extra/checking/checks/test_internal_links.rb
+- test/extra/checking/checks/test_stale.rb
+- test/extra/checking/test_check.rb
+- test/extra/checking/test_dsl.rb
+- test/extra/checking/test_runner.rb
 - test/extra/core_ext/test_enumerable.rb
 - test/extra/core_ext/test_pathname.rb
 - test/extra/core_ext/test_time.rb
@@ -323,6 +347,7 @@ files:
 - test/extra/deployers/test_rsync.rb
 - test/extra/test_auto_compiler.rb
 - test/extra/test_file_proxy.rb
+- test/extra/test_link_collector.rb
 - test/extra/test_vcs.rb
 - test/extra/validators/test_links.rb
 - test/extra/validators/test_w3c.rb
@@ -386,12 +411,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized