nanoc 4.0.0a1 → 4.0.0a2

data/test/helper.rb

@@ -19,6 +19,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'nanoc'
 require 'nanoc/cli'
 require 'nanoc/tasks'
+Nanoc::CLI.setup
 
 # Load miscellaneous requirements
 require 'tmpdir'

data/test/helpers/test_breadcrumbs.rb

@@ -4,7 +4,7 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
   include Nanoc::Helpers::Breadcrumbs
 
   def test_breadcrumbs_trail_at_root
-    @items = Nanoc::Int::ItemArray.new
+    @items = Nanoc::Int::ItemArray.new({})
     @items << Nanoc::Int::Item.new('root', {}, '/')
     @item = @items.last
 
@@ -12,7 +12,7 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
   end
 
   def test_breadcrumbs_trail_with_1_parent
-    @items = Nanoc::Int::ItemArray.new
+    @items = Nanoc::Int::ItemArray.new({})
     @items << Nanoc::Int::Item.new('parent', {}, '/')
     @items << Nanoc::Int::Item.new('child',  {}, '/foo/')
     @item = @items.last
@@ -21,7 +21,7 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
   end
 
   def test_breadcrumbs_trail_with_many_parents
-    @items = Nanoc::Int::ItemArray.new
+    @items = Nanoc::Int::ItemArray.new({})
     @items << Nanoc::Int::Item.new('grandparent', {}, '/')
     @items << Nanoc::Int::Item.new('parent',      {}, '/foo/')
     @items << Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
@@ -31,7 +31,7 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
   end
 
   def test_breadcrumbs_trail_with_nils
-    @items = Nanoc::Int::ItemArray.new
+    @items = Nanoc::Int::ItemArray.new({})
     @items << Nanoc::Int::Item.new('grandparent', {}, '/')
     @items << Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
     @item = @items.last

data/test/test_gem.rb

@@ -25,7 +25,6 @@ class Nanoc::GemTest < Nanoc::TestCase
 
     # Check output
     assert_match(/Successfully built RubyGem\s+Name: nanoc\s+Version: .*\s+File: nanoc-.*\.gem\s+/, stdout.string)
-    assert_equal '', stderr.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.0a1
+  version: 4.0.0a2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -98,6 +98,7 @@ files:
 - lib/nanoc/base/errors.rb
 - lib/nanoc/base/memoization.rb
 - lib/nanoc/base/notification_center.rb
+- lib/nanoc/base/pattern.rb
 - lib/nanoc/base/plugin_registry.rb
 - lib/nanoc/base/result_data/item_rep.rb
 - lib/nanoc/base/source_data/code_snippet.rb
@@ -147,7 +148,6 @@ 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/extra.rb
 - lib/nanoc/extra/checking.rb
 - lib/nanoc/extra/checking/check.rb
@@ -265,7 +265,6 @@ 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
@@ -343,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/nanoc/data_sources/static.rb

@@ -1,62 +0,0 @@
-# encoding: utf-8
-
-module Nanoc::DataSources
-  # The static data source provides items from a single directory. Unlike the
-  # filesystem data sources, static provides no additional item metadata. In
-  # addition, all items are treated as 'binary', regardless of their extension
-  # or content. As such, it is most useful for simple assets, not for normal
-  # content.
-  #
-  # The identifier for static items is the full item path. For example, if your
-  # static data source item_root is `static`, an item named `foo.css` would have
-  # the identifier `/static/foo.css/`. Note that, unlike the filesystem data
-  # sources, `foo/index.html` and `foo.yaml` receive no special treatment. They
-  # are simple static items, just like `foo.css`.
-  #
-  # The default data source directory is `static/`, but this can be overridden
-  # in the data source configuration:
-  #
-  #     data_sources:
-  #       - type:   static
-  #         prefix: assets
-  #
-  # Unless the `hide_items` configuration attribute is false, items from static
-  # data sources will have the :is_hidden attribute set by default, which will
-  # exclude them from the Blogging helper's atom feed generator, among other
-  # things.
-  #
-  # @api private
-  class Static < Nanoc::DataSource
-    identifier :static
-
-    def items
-      # Get prefix
-      prefix = config[:prefix] || 'static'
-
-      # Convert filenames to items
-      all_files_in(prefix).map do |filename|
-        attributes = {
-          extension: File.extname(filename)[1..-1],
-          filename: filename,
-        }
-        attributes[:is_hidden] = true unless config[:hide_items] == false
-        identifier = filename[(prefix.length + 1)..-1] + '/'
-        mtime      = File.mtime(filename)
-        checksum   = Pathname.new(filename).__nanoc_checksum
-
-        Nanoc::Int::Item.new(
-          filename,
-          attributes,
-          identifier,
-          binary: true, mtime: mtime, checksum: checksum
-        )
-      end
-    end
-
-    protected
-
-    def all_files_in(dir_name)
-      Nanoc::Extra::FilesystemTools.all_files_in(dir_name, config[:extra_files])
-    end
-  end
-end

data/test/data_sources/test_static.rb

@@ -1,93 +0,0 @@
-# encoding: utf-8
-
-class Nanoc::DataSources::StaticTest < Nanoc::TestCase
-  def new_data_source(params = nil)
-    # Mock site
-    site = Nanoc::Int::Site.new({})
-
-    # Create data source
-    data_source = Nanoc::DataSources::Static.new(site, nil, nil, params)
-
-    # Done
-    data_source
-  end
-
-  def test_items_with_symlinks
-    skip_unless_symlinks_supported
-
-    # Create data source
-    data_source = new_data_source(prefix: 'foo')
-
-    # Create sample files
-    FileUtils.mkdir_p('foo')
-    FileUtils.mkdir_p('foo-outside-1')
-    FileUtils.mkdir_p('foo-outside-2')
-    File.open('foo/a.png',           'w') { |io| io.write('random binary data') }
-    File.open('foo-outside-1/b.png', 'w') { |io| io.write('more binary data') }
-    File.open('foo-outside-2/c.png', 'w') { |io| io.write('yet more binary data') }
-
-    # Create symlinks
-    File.symlink('../foo-outside-1', 'foo/1')
-    File.symlink('../foo-outside-2/c.png', 'foo/c.png')
-
-    # Check all files
-    expected_filenames = ['foo/a.png', 'foo/1/b.png', 'foo/c.png'].sort
-    actual_filenames   = Nanoc::Extra::FilesystemTools.all_files_in('foo', nil).sort
-    assert_equal expected_filenames, actual_filenames
-
-    # Check items
-    items = data_source.send(:items).sort_by(&:identifier)
-    actual_item_identifiers   = items.map(&:identifier).map(&:to_s).sort
-    expected_item_identifiers = %w( /a.png/ /1/b.png/ /c.png/ ).sort
-    assert_equal expected_item_identifiers, actual_item_identifiers
-  end
-
-  def test_items
-    # Create data source
-    data_source = new_data_source(prefix: 'foo')
-
-    # Create sample files
-    FileUtils.mkdir_p('foo')
-    FileUtils.mkdir_p('foo/a/b')
-    File.open('foo/bar.png',   'w') { |io| io.write('random binary data') }
-    File.open('foo/b.c.css',   'w') { |io| io.write('more binary data') }
-    File.open('foo/a/b/c.gif', 'w') { |io| io.write('yet more binary data') }
-
-    # Get expected and actual output
-    expected_out = [
-      Nanoc::Int::Item.new(
-        'foo/bar.png',
-        { extension: 'png', filename: 'foo/bar.png' },
-        '/bar.png/',
-        binary: true,
-        mtime: File.mtime('foo/bar.png'),
-        checksum: Pathname.new('foo/bar.png').__nanoc_checksum
-      ),
-      Nanoc::Int::Item.new(
-        'foo/b.c.css',
-        { extension: 'css', filename: 'foo/b.c.css' },
-        '/b.c.css/',
-        binary: true,
-        mtime: File.mtime('foo/b.c.css'),
-        checksum: Pathname.new('foo/b.c.css').__nanoc_checksum
-      ),
-      Nanoc::Int::Item.new(
-        'foo/a/b/c.gif',
-        { extension: 'gif', filename: 'foo/a/b/c.gif' },
-        '/a/b/c.gif/',
-        binary: true,
-        mtime: File.mtime('foo/a/b/c.gif'),
-        checksum: Pathname.new('foo/a/b/c.gif').__nanoc_checksum
-      )
-    ].sort_by(&:identifier)
-
-    actual_out = data_source.send(:items).sort_by(&:identifier)
-
-    (0..expected_out.size - 1).each do |i|
-      assert_equal expected_out[i].raw_content, actual_out[i].raw_content, 'content must match'
-      assert_equal expected_out[i].identifier, actual_out[i].identifier, 'identifier must match'
-      assert_equal expected_out[i].attributes[:mtime], actual_out[i].attributes[:mtime], 'mtime must match'
-      assert_equal expected_out[i].raw_filename, actual_out[i].raw_filename, 'file paths must match'
-    end
-  end
-end