nanoc 4.0.0b4 → 4.0.0rc1

data/test/helpers/test_blogging.rb

@@ -113,7 +113,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
       assert_equal(
         'Cannot build Atom feed: no articles',
-        error.message
+        error.message,
       )
     end
   end
@@ -138,7 +138,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
       assert_equal(
         'Cannot build Atom feed: site configuration has no base_url',
-        error.message
+        error.message,
       )
     end
   end
@@ -163,7 +163,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
       assert_equal(
         'Cannot build Atom feed: no title in params, item or site config',
-        error.message
+        error.message,
       )
     end
   end
@@ -188,7 +188,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
       assert_equal(
         'Cannot build Atom feed: no author_name in params, item or site config',
-        error.message
+        error.message,
       )
     end
   end
@@ -221,21 +221,21 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       # Still should keep feed level author
       assert_match(
         /#{Regexp.escape('<name>Denis Defreyne</name>')}/, #'
-        result
+        result,
       )
       assert_match(
         /#{Regexp.escape('<uri>http://stoneship.org/</uri>')}/, #'
-        result
+        result,
       )
 
       # Overrides on specific items
       assert_match(
         /#{Regexp.escape('<name>Don Alias</name>')}/, #'
-        result
+        result,
       )
       assert_match(
         /#{Regexp.escape('<uri>http://don.example.com/</uri>')}/, #'
-        result
+        result,
       )
     end
   end
@@ -260,7 +260,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
       assert_equal(
         'Cannot build Atom feed: no author_uri in params, item or site config',
-        error.message
+        error.message,
       )
     end
   end
@@ -287,7 +287,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
       assert_equal(
         'Cannot build Atom feed: one or more articles lack created_at',
-        error.message
+        error.message,
       )
     end
   end
@@ -312,7 +312,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       atom_feed(
         author_name: 'Bob',
         author_uri: 'http://example.com/~bob/',
-        title: 'My Blog Or Something'
+        title: 'My Blog Or Something',
       )
     end
   end
@@ -328,7 +328,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
         author_name: 'Bob',
         author_uri: 'http://example.com/~bob/',
         title: 'My Blog Or Something',
-        base_url: 'http://example.com'
+        base_url: 'http://example.com',
       })
 
       # Create feed item
@@ -390,11 +390,11 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       result = atom_feed limit: 1, articles: @items
       assert_match(
         Regexp.new('Article 0', Regexp::MULTILINE),
-        result
+        result,
       )
       refute_match(
         Regexp.new('Article 1', Regexp::MULTILINE),
-        result
+        result,
       )
     end
   end
@@ -423,7 +423,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       result = atom_feed
       assert_match(
         Regexp.new('Article 1.*Article 0', Regexp::MULTILINE),
-        result
+        result,
       )
     end
   end
@@ -452,7 +452,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       result = atom_feed(preserve_order: true)
       assert_match(
         Regexp.new('Article 1.*Article 0', Regexp::MULTILINE),
-        result
+        result,
       )
     end
   end

data/test/helpers/test_capturing.rb

@@ -15,9 +15,9 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
               '<% end %> foot'
 
     # Build site
-    site = Nanoc::Int::Site.new({})
+    site = Nanoc::Int::SiteLoader.new.new_empty
     item = Nanoc::Int::Item.new('moo', {}, '/blah/')
-    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
     @item = Nanoc::ItemView.new(item)
 
     # Evaluate content
@@ -32,7 +32,7 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     require 'erb'
 
     # Build site
-    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
     @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'))
 
     # Capture
@@ -66,7 +66,7 @@ head
 foot
 EOS
 
-    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
     @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
 
     result = ::ERB.new(content).result(binding)
@@ -84,7 +84,7 @@ EOS
       io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
     end
 
-    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
     @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
     content = '<% content_for :a do %>Content One<% end %>'
     ::ERB.new(content).result(binding)
@@ -92,7 +92,7 @@ EOS
     assert_equal 'Content One', content_for(@item, :a)
     assert_equal nil,           content_for(@item, :b)
 
-    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
     @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
     content = '<% content_for :b do %>Content Two<% end %>'
     ::ERB.new(content).result(binding)

data/test/helpers/test_link_to.rb

@@ -5,7 +5,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a href="/foo/">Foo</a>',
-      link_to('Foo', '/foo/')
+      link_to('Foo', '/foo/'),
     )
   end
 
@@ -17,7 +17,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a href="/bar/">Bar</a>',
-      link_to('Bar', rep)
+      link_to('Bar', rep),
     )
   end
 
@@ -29,7 +29,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a href="/bar/">Bar</a>',
-      link_to('Bar', item)
+      link_to('Bar', item),
     )
   end
 
@@ -37,7 +37,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a title="Dis mai foo!" href="/foo/">Foo</a>',
-      link_to('Foo', '/foo/', title: 'Dis mai foo!')
+      link_to('Foo', '/foo/', title: 'Dis mai foo!'),
     )
   end
 
@@ -45,7 +45,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a title="Foo &amp; Bar" href="/foo&amp;bar/">Foo &amp; Bar</a>',
-      link_to('Foo &amp; Bar', '/foo&bar/', title: 'Foo & Bar')
+      link_to('Foo &amp; Bar', '/foo&bar/', title: 'Foo & Bar'),
     )
   end
 
@@ -68,7 +68,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<span class="active" title="You\'re here.">Bar</span>',
-      link_to_unless_current('Bar', @item_rep)
+      link_to_unless_current('Bar', @item_rep),
     )
   ensure
     @item = nil
@@ -82,7 +82,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a href="/abc/xyz/">Bar</a>',
-      link_to_unless_current('Bar', '/abc/xyz/')
+      link_to_unless_current('Bar', '/abc/xyz/'),
     )
   end
 
@@ -94,7 +94,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Test
     assert_equal(
       './',
-      relative_path_to('/foo/bar/baz/')
+      relative_path_to('/foo/bar/baz/'),
     )
   end
 
@@ -106,7 +106,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Test
     assert_equal(
       '../../../',
-      relative_path_to('/')
+      relative_path_to('/'),
     )
   end
 
@@ -118,7 +118,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Test
     assert_equal(
       '../../quux',
-      relative_path_to('/foo/quux')
+      relative_path_to('/foo/quux'),
     )
   end
 
@@ -130,7 +130,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Test
     assert_equal(
       '../../quux/',
-      relative_path_to('/foo/quux/')
+      relative_path_to('/foo/quux/'),
     )
   end
 
@@ -146,7 +146,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Test
     assert_equal(
       '../../quux/',
-      relative_path_to(other_item_rep)
+      relative_path_to(other_item_rep),
     )
   end
 
@@ -162,7 +162,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Test
     assert_equal(
       '../../quux/',
-      relative_path_to(other_item)
+      relative_path_to(other_item),
     )
   end
 

data/test/helpers/test_rendering.rb

@@ -11,6 +11,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write 'This is the <%= @layout.identifier %> layout.'
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
@@ -28,6 +30,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write 'This is the <%= @layout.identifier %> layout.'
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
@@ -45,6 +49,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write 'I am the <%= @layout.class %> class.'
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
@@ -52,8 +58,29 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
     end
   end
 
+  def test_render_wrapped_class
+    with_site do |site|
+      File.open('Rules', 'w') do |io|
+        io.write("layout '/foo/', :erb\n")
+      end
+
+      File.open('layouts/foo.erb', 'w') do |io|
+        io.write 'I am the <%= @layout.unwrap.class %> class.'
+      end
+
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
+      assert_equal('I am the Nanoc::Int::Layout class.', render('/foo/'))
+    end
+  end
+
   def test_render_with_unknown_layout
     with_site do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
@@ -71,6 +98,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
       File.open('layouts/foo.erb', 'w').close
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
@@ -88,6 +117,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
       File.open('layouts/foo.erb', 'w').close
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
@@ -107,6 +138,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write '[partial-before]<%= yield %>[partial-after]'
       end
 
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.load
       @site = Nanoc::SiteView.new(site)
       @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 

data/test/helpers/test_tagging.rb

@@ -8,7 +8,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     # Check
     assert_equal(
       '(none)',
-      tags_for(item, base_url: 'http://example.com/tag/')
+      tags_for(item, base_url: 'http://example.com/tag/'),
     )
   end
 
@@ -20,7 +20,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     assert_equal(
       "#{link_for_tag('foo', 'http://stoneship.org/tag/')}, " \
       "#{link_for_tag('bar', 'http://stoneship.org/tag/')}",
-      tags_for(item, base_url: 'http://stoneship.org/tag/')
+      tags_for(item, base_url: 'http://stoneship.org/tag/'),
     )
   end
 
@@ -31,7 +31,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     # Check
     assert_equal(
       'no tags for you, fool',
-      tags_for(item, none_text: 'no tags for you, fool', base_url: 'http://example.com/tag/')
+      tags_for(item, none_text: 'no tags for you, fool', base_url: 'http://example.com/tag/'),
     )
   end
 
@@ -43,7 +43,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     assert_equal(
       "#{link_for_tag('foo', 'http://example.com/tag/')} ++ " \
       "#{link_for_tag('bar', 'http://example.com/tag/')}",
-      tags_for(item, separator: ' ++ ', base_url: 'http://example.com/tag/')
+      tags_for(item, separator: ' ++ ', base_url: 'http://example.com/tag/'),
     )
   end
 
@@ -52,7 +52,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     @items = Nanoc::ItemCollectionView.new([
       Nanoc::Int::Item.new('item 1', { tags: [:foo]       }, '/item1/'),
       Nanoc::Int::Item.new('item 2', { tags: [:bar]       }, '/item2/'),
-      Nanoc::Int::Item.new('item 3', { tags: [:foo, :bar] }, '/item3/')
+      Nanoc::Int::Item.new('item 3', { tags: [:foo, :bar] }, '/item3/'),
     ])
 
     # Find items
@@ -61,21 +61,21 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     # Check
     assert_equal(
       [@items[0], @items[2]],
-      items_with_foo_tag
+      items_with_foo_tag,
     )
   end
 
   def test_link_for_tag
     assert_equal(
       %(<a href="http://stoneship.org/tags/foobar" rel="tag">foobar</a>),
-      link_for_tag('foobar', 'http://stoneship.org/tags/')
+      link_for_tag('foobar', 'http://stoneship.org/tags/'),
     )
   end
 
   def test_link_for_tag_escape
     assert_equal(
       %(<a href="http://stoneship.org/tags&amp;stuff/foo&amp;bar" rel="tag">foo&amp;bar</a>),
-      link_for_tag('foo&bar', 'http://stoneship.org/tags&stuff/')
+      link_for_tag('foo&bar', 'http://stoneship.org/tags&stuff/'),
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0b4
+  version: 4.0.0rc1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -44,10 +44,10 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-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
-  “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown,
-  etc.
+description: nanoc is a static-site generator focused on flexibility. It transforms
+  content from a format such as Markdown or AsciiDoc into another format, usually
+  HTML, and lays out pages consistently to retain the site’s look and feel throughout.
+  Static sites built with nanoc can be deployed to any web server.
 email: denis.defreyne@stoneship.org
 executables:
 - nanoc
@@ -73,8 +73,6 @@ files:
 - lib/nanoc.rb
 - lib/nanoc/base.rb
 - lib/nanoc/base/checksummer.rb
-- lib/nanoc/base/compilation/checksum_store.rb
-- lib/nanoc/base/compilation/compiled_content_cache.rb
 - lib/nanoc/base/compilation/compiler.rb
 - lib/nanoc/base/compilation/compiler_dsl.rb
 - lib/nanoc/base/compilation/dependency_tracker.rb
@@ -84,7 +82,6 @@ files:
 - lib/nanoc/base/compilation/rule.rb
 - lib/nanoc/base/compilation/rule_context.rb
 - lib/nanoc/base/compilation/rule_memory_calculator.rb
-- lib/nanoc/base/compilation/rule_memory_store.rb
 - lib/nanoc/base/compilation/rules_collection.rb
 - lib/nanoc/base/context.rb
 - lib/nanoc/base/core_ext.rb
@@ -99,11 +96,19 @@ files:
 - lib/nanoc/base/entities/identifier.rb
 - lib/nanoc/base/entities/layout.rb
 - lib/nanoc/base/entities/pattern.rb
+- lib/nanoc/base/entities/snapshot_def.rb
 - lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
 - lib/nanoc/base/identifiable_collection.rb
 - lib/nanoc/base/memoization.rb
 - lib/nanoc/base/plugin_registry.rb
+- lib/nanoc/base/repos.rb
+- lib/nanoc/base/repos/checksum_store.rb
+- lib/nanoc/base/repos/compiled_content_cache.rb
+- lib/nanoc/base/repos/config_loader.rb
+- lib/nanoc/base/repos/rule_memory_store.rb
+- lib/nanoc/base/repos/site_loader.rb
+- lib/nanoc/base/repos/store.rb
 - lib/nanoc/base/result_data/item_rep.rb
 - lib/nanoc/base/services.rb
 - lib/nanoc/base/services/executor.rb
@@ -116,25 +121,24 @@ files:
 - lib/nanoc/base/source_data/data_source.rb
 - lib/nanoc/base/source_data/item.rb
 - lib/nanoc/base/source_data/site.rb
-- lib/nanoc/base/store.rb
 - lib/nanoc/base/views.rb
-- lib/nanoc/base/views/config.rb
-- lib/nanoc/base/views/identifiable_collection.rb
-- lib/nanoc/base/views/item.rb
-- lib/nanoc/base/views/item_collection.rb
-- lib/nanoc/base/views/item_rep.rb
-- lib/nanoc/base/views/item_rep_collection.rb
-- lib/nanoc/base/views/layout.rb
-- lib/nanoc/base/views/layout_collection.rb
-- lib/nanoc/base/views/mixins/document.rb
-- lib/nanoc/base/views/mixins/mutable_document.rb
-- lib/nanoc/base/views/mutable_config.rb
-- lib/nanoc/base/views/mutable_identifiable_collection.rb
-- lib/nanoc/base/views/mutable_item.rb
-- lib/nanoc/base/views/mutable_item_collection.rb
-- lib/nanoc/base/views/mutable_layout.rb
-- lib/nanoc/base/views/mutable_layout_collection.rb
-- lib/nanoc/base/views/site.rb
+- lib/nanoc/base/views/config_view.rb
+- lib/nanoc/base/views/identifiable_collection_view.rb
+- lib/nanoc/base/views/item_collection_view.rb
+- lib/nanoc/base/views/item_rep_collection_view.rb
+- lib/nanoc/base/views/item_rep_view.rb
+- lib/nanoc/base/views/item_view.rb
+- lib/nanoc/base/views/layout_collection_view.rb
+- lib/nanoc/base/views/layout_view.rb
+- lib/nanoc/base/views/mixins/document_view_mixin.rb
+- lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb
+- lib/nanoc/base/views/mutable_config_view.rb
+- lib/nanoc/base/views/mutable_identifiable_collection_view.rb
+- lib/nanoc/base/views/mutable_item_collection_view.rb
+- lib/nanoc/base/views/mutable_item_view.rb
+- lib/nanoc/base/views/mutable_layout_collection_view.rb
+- lib/nanoc/base/views/mutable_layout_view.rb
+- lib/nanoc/base/views/site_view.rb
 - lib/nanoc/cli.rb
 - lib/nanoc/cli/ansi_string_colorizer.rb
 - lib/nanoc/cli/cleaning_stream.rb
@@ -316,7 +320,6 @@ files:
 - test/fixtures/vcr_cassettes/css_run_parse_error.yml
 - test/fixtures/vcr_cassettes/html_run_error.yml
 - test/fixtures/vcr_cassettes/html_run_ok.yml
-- test/gem_loader.rb
 - test/helper.rb
 - test/helpers/test_blogging.rb
 - test/helpers/test_breadcrumbs.rb
@@ -354,7 +357,6 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: a web publishing system written in Ruby for building small to medium-sized
-  websites.
+summary: A static-site generator with a focus on flexibility.
 test_files: []
 has_rdoc: 

data/test/gem_loader.rb

@@ -1,9 +0,0 @@
-begin
-  require 'rubygems'
-
-  gemspec = File.expand_path('nanoc.gemspec', Dir.pwd)
-  Gem::Specification.load(gemspec).dependencies.each do |dep|
-    gem dep.name, *dep.requirement.as_list
-  end
-rescue LoadError
-end