nanoc 4.0.0b2 → 4.0.0b3

data/test/helpers/test_text.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::TextTest < Nanoc::TestCase
   include Nanoc::Helpers::Text
 

data/test/helpers/test_xml_sitemap.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   include Nanoc::Helpers::XMLSitemap
 

data/test/test_gem.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::GemTest < Nanoc::TestCase
   def setup
     super
@@ -22,9 +20,6 @@ class Nanoc::GemTest < Nanoc::TestCase
     diff = files_after - files_before
     assert_equal 1, diff.size
     assert_match(/^nanoc-.*\.gem$/, diff.to_a[0])
-
-    # Check output
-    assert_match(/Successfully built RubyGem\s+Name: nanoc\s+Version: .*\s+File: nanoc-.*\.gem\s+/, stdout.string)
   ensure
     Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0b2
+  version: 4.0.0b3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -116,6 +116,7 @@ files:
 - 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/mutable_config.rb
@@ -149,7 +150,6 @@ files:
 - lib/nanoc/data_sources.rb
 - lib/nanoc/data_sources/filesystem.rb
 - lib/nanoc/data_sources/filesystem_unified.rb
-- lib/nanoc/data_sources/filesystem_verbose.rb
 - lib/nanoc/extra.rb
 - lib/nanoc/extra/checking.rb
 - lib/nanoc/extra/checking/check.rb
@@ -261,7 +261,6 @@ files:
 - test/cli/test_logger.rb
 - test/data_sources/test_filesystem.rb
 - test/data_sources/test_filesystem_unified.rb
-- test/data_sources/test_filesystem_verbose.rb
 - test/extra/checking/checks/test_css.rb
 - test/extra/checking/checks/test_external_links.rb
 - test/extra/checking/checks/test_html.rb
@@ -337,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -345,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: a web publishing system written in Ruby for building small to medium-sized

data/lib/nanoc/data_sources/filesystem_verbose.rb

@@ -1,71 +0,0 @@
-# encoding: utf-8
-
-module Nanoc::DataSources
-  # The filesystem_verbose data source is the old data source for a new nanoc
-  # site. It stores all data as files on the hard disk.
-  #
-  # None of the methods are documented in this file. See {Nanoc::DataSource}
-  # for documentation on the overridden methods instead.
-  #
-  # The filesystem_verbose data source stores its items and layouts in nested
-  # directories. Each directory represents a single item or layout. The root
-  # directory for items is the `content` directory; for layouts it is the
-  # `layouts` directory.
-  #
-  # Every directory has a content file and a meta file. The content file
-  # contains the actual item content, while the meta file contains the item’s
-  # or the layout’s metadata, formatted as YAML.
-  #
-  # Both content files and meta files are named after its parent directory
-  # (i.e. item). For example, an item/layout named `foo` will have a directory
-  # named `foo`, with e.g. a `foo.markdown` content file and a `foo.yaml` meta
-  # file.
-  #
-  # Content file extensions are not used for determining the filter that
-  # should be run; the meta file defines the list of filters. The meta file
-  # extension must always be `.yaml`, though.
-  #
-  # For backwards compatibility, content files can also have the `index`
-  # basename. Similarly, meta files can have the `meta` basename. For example,
-  # a parent directory named `foo` can have an `index.txt` content file and a
-  # `meta.yaml` meta file.
-  #
-  # The identifier is calculated by stripping the extension; if there is more
-  # than one extension, only the last extension is stripped and the previous
-  # extensions will be part of the identifier.
-  #
-  # It is possible to set an explicit encoding that should be used when reading
-  # files. In the data source configuration, set `encoding` to an encoding
-  # understood by Ruby’s `Encoding`. If no encoding is set in the configuration,
-  # one will be inferred from the environment.
-  #
-  # @api private
-  class FilesystemVerbose < Nanoc::DataSource
-    include Nanoc::DataSources::Filesystem
-
-    private
-
-    # See {Nanoc::DataSources::Filesystem#filename_for}.
-    def filename_for(base_filename, ext)
-      return nil if ext.nil?
-
-      last_component = base_filename[%r{[^/]+$}]
-      possibilities = [
-        base_filename + (ext.empty? ? '' : '.' + ext),                        # foo/bar.html
-        base_filename + '/' + last_component + (ext.empty? ? '' : '.' + ext), # foo/bar/bar.html
-        base_filename + '/' + 'index' + (ext.empty? ? '' : '.' + ext)         # foo/bar/index.html
-      ]
-
-      possibilities.find { |p| File.file?(p) }
-    end
-
-    # See {Nanoc::DataSources::Filesystem#identifier_for_filename}.
-    def identifier_for_filename(filename)
-      if config[:identifier_type] == 'full'
-        return Nanoc::Identifier.new(filename)
-      end
-
-      Nanoc::Identifier.new(filename.sub(/[^\/]+\.yaml$/, ''), type: :legacy)
-    end
-  end
-end

data/test/data_sources/test_filesystem_verbose.rb

@@ -1,308 +0,0 @@
-# encoding: utf-8
-
-class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
-  def new_data_source(params = nil)
-    # Mock site
-    site = Nanoc::Int::Site.new({})
-
-    # Create data source
-    data_source = Nanoc::DataSources::FilesystemVerbose.new(site, nil, nil, params)
-
-    # Done
-    data_source
-  end
-
-  def test_items
-    # Create data source
-    data_source = new_data_source
-
-    # Create foo item
-    FileUtils.mkdir_p('content/foo')
-    File.open('content/foo/foo.yaml', 'w') do |io|
-      io.write("---\n")
-      io.write("title: Foo\n")
-    end
-    File.open('content/foo/foo.html', 'w') do |io|
-      io.write('Lorem ipsum dolor sit amet...')
-    end
-
-    # Create bar item
-    FileUtils.mkdir_p('content/bar')
-    File.open('content/bar/bar.yaml', 'w') do |io|
-      io.write("---\n")
-      io.write("title: Bar\n")
-    end
-    File.open('content/bar/bar.xml', 'w') do |io|
-      io.write('Lorem ipsum dolor sit amet...')
-    end
-
-    # Load items
-    items = data_source.items
-
-    # Check items
-    assert_equal(2, items.size)
-    assert(items.any? do |a|
-      a[:title]            == 'Foo' &&
-      a[:extension]        == 'html' &&
-      a[:content_filename] == 'content/foo/foo.html' &&
-      a[:meta_filename]    == 'content/foo/foo.yaml'
-    end)
-    assert(items.any? do |a|
-      a[:title]            == 'Bar' &&
-      a[:extension]        == 'xml' &&
-      a[:content_filename] == 'content/bar/bar.xml' &&
-      a[:meta_filename]    == 'content/bar/bar.yaml'
-    end)
-  end
-
-  def test_items_with_period_in_name
-    data_source = new_data_source(allow_periods_in_identifiers: true)
-
-    # Create foo.css
-    FileUtils.mkdir_p('content/foo')
-    File.open('content/foo/foo.yaml', 'w') do |io|
-      io.write(YAML.dump({ 'title' => 'Foo' }))
-    end
-    File.open('content/foo/foo.css', 'w') do |io|
-      io.write('body.foo {}')
-    end
-
-    # Create foo.bar.css
-    FileUtils.mkdir_p('content/foo.bar')
-    File.open('content/foo.bar/foo.bar.yaml', 'w') do |io|
-      io.write(YAML.dump({ 'title' => 'Foo Bar' }))
-    end
-    File.open('content/foo.bar/foo.bar.css', 'w') do |io|
-      io.write('body.foobar {}')
-    end
-
-    # Load
-    items = data_source.items.sort_by { |i| i[:title] }
-
-    # Check
-    assert_equal 2, items.size
-    assert_equal '/foo/',                        items[0].identifier.to_s
-    assert_equal 'Foo',                          items[0][:title]
-    assert_equal 'content/foo/foo.css',          items[0][:content_filename]
-    assert_equal 'content/foo/foo.yaml',         items[0][:meta_filename]
-    assert_equal '/foo.bar/',                    items[1].identifier.to_s
-    assert_equal 'Foo Bar',                      items[1][:title]
-    assert_equal 'content/foo.bar/foo.bar.css',  items[1][:content_filename]
-    assert_equal 'content/foo.bar/foo.bar.yaml', items[1][:meta_filename]
-  end
-
-  def test_items_with_optional_meta_file
-    # Create data source
-    data_source = new_data_source
-
-    # Create foo item
-    FileUtils.mkdir_p('content/foo')
-    File.open('content/foo/foo.html', 'w') do |io|
-      io.write('Lorem ipsum dolor sit amet...')
-    end
-
-    # Create bar item
-    FileUtils.mkdir_p('content/bar')
-    File.open('content/bar/bar.yaml', 'w') do |io|
-      io.write("---\n")
-      io.write("title: Bar\n")
-    end
-
-    # Load items
-    items = data_source.items
-
-    # Check items
-    assert_equal(2, items.size)
-    assert(items.any? do |a|
-      a[:title].nil? &&
-      a[:extension] == 'html' &&
-      a[:content_filename] == 'content/foo/foo.html' &&
-      a[:meta_filename].nil?
-    end)
-    assert(items.any? do |a|
-      a[:title] == 'Bar' &&
-      a[:extension].nil? &&
-      a[:content_filename].nil? &&
-      a[:meta_filename] == 'content/bar/bar.yaml'
-    end)
-  end
-
-  def test_layouts
-    # Create data source
-    data_source = new_data_source
-
-    # Create layout
-    FileUtils.mkdir_p('layouts/foo')
-    File.open('layouts/foo/foo.yaml', 'w') do |io|
-      io.write("---\n")
-      io.write("filter: erb\n")
-    end
-    File.open('layouts/foo/foo.html', 'w') do |io|
-      io.write('Lorem ipsum dolor sit amet...')
-    end
-
-    # Load layouts
-    layouts = data_source.layouts
-
-    # Check layouts
-    assert_equal(1,                       layouts.size)
-    assert_equal('erb',                   layouts[0][:filter])
-    assert_equal('html',                  layouts[0][:extension])
-    assert_equal('layouts/foo/foo.html',  layouts[0][:content_filename])
-    assert_equal('layouts/foo/foo.yaml',  layouts[0][:meta_filename])
-  end
-
-  def test_layouts_with_period_in_name_disallowing_periods_in_identifiers
-    data_source = new_data_source
-
-    # Create foo.html
-    FileUtils.mkdir_p('layouts/foo')
-    File.open('layouts/foo/foo.yaml', 'w') do |io|
-      io.write(YAML.dump({ 'dog' => 'woof' }))
-    end
-    File.open('layouts/foo/foo.html', 'w') do |io|
-      io.write('body.foo {}')
-    end
-
-    # Create bar.html.erb
-    FileUtils.mkdir_p('layouts/bar')
-    File.open('layouts/bar/bar.yaml', 'w') do |io|
-      io.write(YAML.dump({ 'cat' => 'meow' }))
-    end
-    File.open('layouts/bar/bar.html.erb', 'w') do |io|
-      io.write('body.foobar {}')
-    end
-
-    # Load
-    layouts = data_source.layouts.sort_by(&:identifier)
-
-    # Check
-    assert_equal 2, layouts.size
-    assert_equal '/bar/', layouts[0].identifier.to_s
-    assert_equal 'meow',  layouts[0][:cat]
-    assert_equal '/foo/', layouts[1].identifier.to_s
-    assert_equal 'woof',  layouts[1][:dog]
-  end
-
-  def test_layouts_with_period_in_name_allowing_periods_in_identifiers
-    data_source = new_data_source(allow_periods_in_identifiers: true)
-
-    # Create foo.html
-    FileUtils.mkdir_p('layouts/foo')
-    File.open('layouts/foo/foo.yaml', 'w') do |io|
-      io.write(YAML.dump({ 'dog' => 'woof' }))
-    end
-    File.open('layouts/foo/foo.html', 'w') do |io|
-      io.write('body.foo {}')
-    end
-
-    # Create bar.html.erb
-    FileUtils.mkdir_p('layouts/bar.xyz')
-    File.open('layouts/bar.xyz/bar.xyz.yaml', 'w') do |io|
-      io.write(YAML.dump({ 'cat' => 'meow' }))
-    end
-    File.open('layouts/bar.xyz/bar.xyz.html', 'w') do |io|
-      io.write('body.foobar {}')
-    end
-
-    # Load
-    layouts = data_source.layouts.sort_by(&:identifier)
-
-    # Check
-    assert_equal 2, layouts.size
-    assert_equal '/bar.xyz/', layouts[0].identifier.to_s
-    assert_equal 'meow',      layouts[0][:cat]
-    assert_equal '/foo/',     layouts[1].identifier.to_s
-    assert_equal 'woof',      layouts[1][:dog]
-  end
-
-  def test_load_binary_objects
-    # Create data source
-    data_source = new_data_source
-
-    # Create sample files
-    FileUtils.mkdir_p('foo')
-    File.open('foo/stuff.dat', 'w') { |io| io.write('random binary data') }
-
-    # Load
-    items = data_source.send(:load_objects, 'foo', 'item', Nanoc::Int::Item)
-
-    # Check
-    assert_equal 1, items.size
-    assert items[0].binary?
-    assert_equal 'foo/stuff.dat', items[0].raw_filename
-    assert_nil items[0].raw_content
-  end
-
-  def test_filename_for_with_single
-    data_source = new_data_source
-
-    FileUtils.mkdir_p('foo/bar')
-    File.open('foo/bar.ext', 'w') { |io| io.write('o hai') }
-    assert_equal 'foo/bar.ext', data_source.send(:filename_for, 'foo/bar', 'ext')
-  end
-
-  def test_filename_for_with_double
-    data_source = new_data_source
-
-    FileUtils.mkdir_p('foo/bar')
-    File.open('foo/bar/bar.ext', 'w') { |io| io.write('o hai') }
-    assert_equal 'foo/bar/bar.ext', data_source.send(:filename_for, 'foo/bar', 'ext')
-  end
-
-  def test_filename_for_with_index
-    data_source = new_data_source
-
-    FileUtils.mkdir_p('foo/bar')
-    File.open('foo/bar/index.ext', 'w') { |io| io.write('o hai') }
-    assert_equal 'foo/bar/index.ext', data_source.send(:filename_for, 'foo/bar', 'ext')
-  end
-
-  def test_filename_for_with_nil
-    data_source = new_data_source
-
-    assert_equal nil, data_source.send(:filename_for, 'foo/bar', nil)
-  end
-
-  def test_filename_for_with_single_and_empty_ext
-    data_source = new_data_source
-
-    FileUtils.mkdir_p('foo')
-    File.open('foo/bar', 'w') { |io| io.write('o hai') }
-    assert_equal 'foo/bar', data_source.send(:filename_for, 'foo/bar', '')
-  end
-
-  def test_filename_for_with_double_and_empty_ext
-    data_source = new_data_source
-
-    FileUtils.mkdir_p('foo/bar')
-    File.open('foo/bar/bar', 'w') { |io| io.write('o hai') }
-    assert_equal 'foo/bar/bar', data_source.send(:filename_for, 'foo/bar', '')
-  end
-
-  def test_filename_for_with_index_and_empty_ext
-    data_source = new_data_source
-
-    FileUtils.mkdir_p('foo/bar')
-    File.open('foo/bar/index', 'w') { |io| io.write('o hai') }
-    assert_equal 'foo/bar/index', data_source.send(:filename_for, 'foo/bar', '')
-  end
-
-  def test_compile_huge_site
-    if_implemented do
-      # Create data source
-      data_source = new_data_source
-
-      # Create a lot of items
-      count = Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 5
-      count.times do |i|
-        FileUtils.mkdir_p("content/#{i}")
-        File.open("content/#{i}/#{i}.html", 'w') { |io| io << "This is item #{i}." }
-        File.open("content/#{i}/#{i}.yaml", 'w') { |io| io << "title: Item #{i}"   }
-      end
-
-      # Read all items
-      data_source.items
-    end
-  end
-end