nanoc 4.0.0a1 → 4.0.0a2

data/lib/nanoc/data_sources/filesystem_verbose.rb

@@ -45,27 +45,6 @@ module Nanoc::DataSources
 
     private
 
-    # See {Nanoc::DataSources::Filesystem#create_object}.
-    def create_object(dir_name, content, attributes, identifier, params = {})
-      # Determine base path
-      last_component = identifier.split('/')[-1] || dir_name
-
-      # Get filenames
-      ext = params[:extension] || '.html'
-      dir_path         = dir_name + identifier
-      meta_filename    = dir_name + identifier + last_component + '.yaml'
-      content_filename = dir_name + identifier + last_component + ext
-
-      # Notify
-      Nanoc::Int::NotificationCenter.post(:file_created, meta_filename)
-      Nanoc::Int::NotificationCenter.post(:file_created, content_filename)
-
-      # Create files
-      FileUtils.mkdir_p(dir_path)
-      File.open(meta_filename,    'w') { |io| io.write(YAML.dump(attributes.__nanoc_stringify_keys_recursively)) }
-      File.open(content_filename, 'w') { |io| io.write(content) }
-    end
-
     # See {Nanoc::DataSources::Filesystem#filename_for}.
     def filename_for(base_filename, ext)
       return nil if ext.nil?
@@ -82,6 +61,10 @@ module Nanoc::DataSources
 
     # See {Nanoc::DataSources::Filesystem#identifier_for_filename}.
     def identifier_for_filename(filename)
+      if config[:identifier_style] == 'full'
+        return Nanoc::Identifier.new(filename, style: :full)
+      end
+
       filename.sub(/[^\/]+\.yaml$/, '')
     end
   end

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current nanoc version.
-  VERSION = '4.0.0a1'
+  VERSION = '4.0.0a2'
 end

data/nanoc.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ['--main', 'README.md']
   s.extra_rdoc_files = ['ChangeLog', 'LICENSE', 'README.md', 'NEWS.md']
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.add_runtime_dependency('cri', '~> 2.3')
 

data/test/base/test_compiler.rb

@@ -53,7 +53,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Int::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[/.*/] = [:erb, { foo: 'bar' }]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(/.*/)] = [:erb, { foo: 'bar' }]
 
     # Mock layout
     layout = MiniTest::Mock.new
@@ -69,7 +69,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Int::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[/.*/] = [:some_unknown_filter, { foo: 'bar' }]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(/.*/)] = [:some_unknown_filter, { foo: 'bar' }]
 
     # Mock layout
     layout = MiniTest::Mock.new
@@ -85,7 +85,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Int::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[%r{^/foo/$}] = [:erb, { foo: 'bar' }]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/foo/$})] = [:erb, { foo: 'bar' }]
 
     # Mock layout
     layout = MiniTest::Mock.new
@@ -101,10 +101,10 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     # Create compiler
     compiler = Nanoc::Int::Compiler.new(site)
-    compiler.rules_collection.layout_filter_mapping[%r{^/a/b/c/.*/$}] = [:erb, { char: 'd' }]
-    compiler.rules_collection.layout_filter_mapping[%r{^/a/.*/$}]     = [:erb, { char: 'b' }]
-    compiler.rules_collection.layout_filter_mapping[%r{^/a/b/.*/$}]   = [:erb, { char: 'c' }] # never used!
-    compiler.rules_collection.layout_filter_mapping[%r{^/.*/$}]       = [:erb, { char: 'a' }]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/a/b/c/.*/$})] = [:erb, { char: 'd' }]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/a/.*/$})]     = [:erb, { char: 'b' }]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/a/b/.*/$})]   = [:erb, { char: 'c' }] # never used!
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/.*/$})]       = [:erb, { char: 'a' }]
 
     # Mock layout
     layouts = [mock, mock, mock, mock]
@@ -149,7 +149,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       layout '/blah/'
       filter :erb
     end
-    rule = Nanoc::Int::Rule.new(/blah/, :meh, rule_block)
+    rule = Nanoc::Int::Rule.new(Nanoc::Int::Pattern.from(/blah/), :meh, rule_block)
 
     # Create layout
     layout = Nanoc::Int::Layout.new('head <%= yield %> foot', {}, '/blah/')
@@ -163,7 +163,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     # Create compiler
     compiler = Nanoc::Int::Compiler.new(site)
     compiler.rules_collection.expects(:compilation_rule_for).times(2).with(rep).returns(rule)
-    compiler.rules_collection.layout_filter_mapping[%r{^/blah/$}] = [:erb, {}]
+    compiler.rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/blah/$})] = [:erb, {}]
     site.stubs(:compiler).returns(compiler)
 
     # Compile
@@ -256,15 +256,15 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     FileUtils.cd('bar') do
       # Create routes
       File.open('Rules', 'w') do |io|
-        io.write "compile '*' do\n"
+        io.write "compile '/**/*' do\n"
         io.write "  layout 'default'\n"
         io.write "end\n"
         io.write "\n"
-        io.write "route '*' do\n"
+        io.write "route '/**/*' do\n"
         io.write "  'index.html'\n"
         io.write "end\n"
         io.write "\n"
-        io.write "layout '*', :erb\n"
+        io.write "layout '/**/*', :erb\n"
       end
 
       # Create site
@@ -317,16 +317,16 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     FileUtils.cd('bar') do
       # Create routes
       File.open('Rules', 'w') do |io|
-        io.write "compile '*' do\n"
+        io.write "compile '/**/*' do\n"
         io.write "  snapshot :aaa\n"
         io.write "  snapshot :aaa\n"
         io.write "end\n"
         io.write "\n"
-        io.write "route '*' do\n"
+        io.write "route '/**/*' do\n"
         io.write "  '/index.html'\n"
         io.write "end\n"
         io.write "\n"
-        io.write "layout '*', :erb\n"
+        io.write "layout '/**/*', :erb\n"
       end
 
       # Compile
@@ -588,4 +588,24 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       assert_empty stack
     end
   end
+
+  def test_find_layouts_by_glob
+    Nanoc::CLI.run %w( create_site bar )
+    FileUtils.cd('bar') do
+      File.open('Rules', 'w') do |io|
+        io.write "compile '/**/*' do\n"
+        io.write "  layout '/default.*'\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '/**/*' do\n"
+        io.write "  '/index.html'\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '/**/*', :erb\n"
+      end
+
+      site = Nanoc::Int::Site.new('.')
+      site.compile
+    end
+  end
 end

data/test/base/test_compiler_dsl.rb

@@ -141,36 +141,6 @@ EOS
     end
   end
 
-  def test_passthrough_with_ext_from_static_data_source
-    with_site do
-      # Create config
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "data_sources:\n"
-        io.write "  - type: static\n"
-      end
-
-      # Create rules
-      File.open('Rules', 'w') do |io|
-        io.write <<EOS
-passthrough "/foo.txt/"
-EOS
-      end
-
-      # Create items
-      FileUtils.mkdir_p('static')
-      File.open('static/foo.txt', 'w') do |io|
-        io.write 'Hello I am foo'
-      end
-
-      # Compile
-      site = Nanoc::Int::Site.new('.')
-      site.compile
-
-      # Check paths
-      assert_equal ['output/foo.txt'], Dir['output/*']
-    end
-  end
-
   def test_passthrough_priority
     with_site do
       # Create rules
@@ -267,6 +237,38 @@ EOS
     end
   end
 
+  def test_create_pattern_with_string
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+
+    pattern = compiler_dsl.create_pattern('/foo/*')
+    assert pattern.match?('/foo/a/a/a/a')
+  end
+
+  def test_create_pattern_with_string_with_glob_pattern_syntax
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { pattern_syntax: 'glob' })
+
+    pattern = compiler_dsl.create_pattern('/foo/*')
+    assert pattern.match?('/foo/aaaa')
+    refute pattern.match?('/foo/aaaa/')
+    refute pattern.match?('/foo/a/a/a/a')
+  end
+
+  def test_create_pattern_with_regex
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+
+    pattern = compiler_dsl.create_pattern(%r<\A/foo/a*/>)
+    assert pattern.match?('/foo/aaaa/')
+  end
+
+  def test_create_pattern_with_string_with_unknown_pattern_syntax
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { pattern_syntax: 'donkey' })
+
+    err = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
+      compiler_dsl.create_pattern('/foo/*')
+    end
+    assert_equal 'Invalid pattern_syntax: donkey', err.message
+  end
+
   def test_identifier_to_regex_without_wildcards
     # Create compiler DSL
     compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})

data/test/base/test_data_source.rb

@@ -28,8 +28,8 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
     data_source.down
 
     # Test methods - loading data
-    assert_equal [],  data_source.items
-    assert_equal [],  data_source.layouts
+    assert_equal [], data_source.items
+    assert_equal [], data_source.layouts
   end
 
   def test_new_item

data/test/base/test_item_array.rb

@@ -7,7 +7,7 @@ class Nanoc::Int::ItemArrayTest < Nanoc::TestCase
     @one = Nanoc::Int::Item.new('Item One', {}, '/one/')
     @two = Nanoc::Int::Item.new('Item Two', {}, '/two/')
 
-    @items = Nanoc::Int::ItemArray.new
+    @items = Nanoc::Int::ItemArray.new({})
     @items << @one
     @items << @two
   end
@@ -44,6 +44,15 @@ class Nanoc::Int::ItemArrayTest < Nanoc::TestCase
     assert_equal @two, @items.at(-1)
   end
 
+  def test_brackets_with_glob
+    @items = Nanoc::Int::ItemArray.new({ pattern_syntax: 'glob' })
+    @items << @one
+    @items << @two
+
+    assert_equal @one, @items['/on*/']
+    assert_equal @two, @items['/*wo/']
+  end
+
   def test_brackets_and_slice_with_range
     assert_equal [@one, @two], @items[0..1]
     assert_equal [@one, @two], @items[0, 2]

data/test/base/test_rule.rb

@@ -14,11 +14,11 @@ class Nanoc::Int::RuleTest < Nanoc::TestCase
   end
 
   def test_matches
-    regexp     = %r</(.*)/(.*)/>
+    pattern    = Nanoc::Int::Pattern.from(%r</(.*)/(.*)/>)
     identifier = '/anything/else/'
     expected   = ['anything', 'else']
 
-    rule = Nanoc::Int::Rule.new(regexp, :string, Proc.new {})
+    rule = Nanoc::Int::Rule.new(pattern, :string, Proc.new {})
 
     assert_equal expected, rule.send(:matches, identifier)
   end

data/test/base/test_site.rb

@@ -185,6 +185,9 @@ EOF
       FileUtils.mkdir_p('content/parent')
       FileUtils.mkdir_p('content/parent/bar')
 
+      data = File.read('nanoc.yaml').sub('identifier_style: full', 'identifier_style: stripped')
+      File.open('nanoc.yaml', 'w') { |io| io << data }
+
       File.open('content/parent.md', 'w') { |io| io << 'asdf' }
       File.open('content/parent/foo.md', 'w') { |io| io << 'asdf' }
       File.open('content/parent/bar.md', 'w') { |io| io << 'asdf' }
@@ -211,6 +214,35 @@ EOF
     end
   end
 
+  def test_setup_child_parent_links_for_full_style_identifiers
+    Nanoc::CLI.run %w( create_site bar)
+    FileUtils.cd('bar') do
+      FileUtils.mkdir_p('content/parent')
+      FileUtils.mkdir_p('content/parent/bar')
+
+      File.open('content/parent.md', 'w') { |io| io << 'asdf' }
+      File.open('content/parent/foo.md', 'w') { |io| io << 'asdf' }
+      File.open('content/parent/bar/qux.md', 'w') { |io| io << 'asdf' }
+
+      site = Nanoc::Int::Site.new('.')
+
+      root   = site.items.find { |i| i.identifier == '/index.html' }
+      parent = site.items.find { |i| i.identifier == '/parent.md' }
+      foo    = site.items.find { |i| i.identifier == '/parent/foo.md' }
+      qux    = site.items.find { |i| i.identifier == '/parent/bar/qux.md' }
+
+      assert_equal Set.new([]), Set.new(root.children)
+      assert_equal Set.new([]), Set.new(parent.children)
+      assert_equal Set.new([]), Set.new(foo.children)
+      assert_equal Set.new([]), Set.new(qux.children)
+
+      assert_equal nil, root.parent
+      assert_equal nil, parent.parent
+      assert_equal nil, foo.parent
+      assert_equal nil, qux.parent
+    end
+  end
+
   def test_multiple_items_with_same_identifier
     with_site do
       File.open('content/sam.html', 'w') { |io| io.write('I am Sam!') }

data/test/cli/commands/test_create_site.rb

@@ -50,7 +50,13 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
       assert_equal 'Could not read content/index.html because the file is not valid UTF-8.', exception.message
 
       # Try with encoding = specific
-      File.open('nanoc.yaml', 'w') { |io| io.write("meh: true\n") }
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write("pattern_syntax: glob\n")
+        io.write("data_sources:\n")
+        io.write("  -\n")
+        io.write("    type: filesystem_unified\n")
+        io.write("    identifier_style: full\n")
+      end
       site = Nanoc::Int::Site.new('.')
       site.compile
     end

data/test/cli/commands/test_prune.rb

@@ -93,8 +93,8 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
 
   def test_run_with_symlink_to_output_dir
     skip_unless_symlinks_supported
-    if defined?(JRUBY_VERSION) && JRUBY_VERSION == '1.7.11'
-      skip 'JRuby 1.7.11 has buggy File.find behavior (see https://github.com/jruby/jruby/issues/1647)'
+    if defined?(JRUBY_VERSION)
+      skip 'JRuby has buggy File.find behavior (see https://github.com/jruby/jruby/issues/1647)'
     end
 
     with_site do |_site|

data/test/data_sources/test_filesystem.rb

@@ -40,9 +40,9 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Get all files
     output_expected = {
-      './foo'       => %w(yaml html),
-      './bar.entry' => [nil,    'html'],
-      './foo/qux'   => ['yaml', nil]
+      './foo'       => ['yaml', ['html']],
+      './bar.entry' => [nil,    ['html']],
+      './foo/qux'   => ['yaml', [nil]]
     }
     output_actual = data_source.send :all_split_files_in, '.'
 
@@ -67,9 +67,9 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Get all files
     output_expected = {
-      './foo'       => %w(yaml html),
-      './bar'       => [nil,    'html.erb'],
-      './foo/qux'   => ['yaml', nil]
+      './foo'       => ['yaml', ['html']],
+      './bar'       => [nil,    ['html.erb']],
+      './foo/qux'   => ['yaml', [nil]]
     }
     output_actual = data_source.send :all_split_files_in, '.'
 
@@ -89,13 +89,33 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Check
     expected = {
-      './aaa/foo' => [nil, 'html'],
-      './bbb/foo' => [nil, 'html'],
-      './ccc/foo' => [nil, 'html']
+      './aaa/foo' => [nil, ['html']],
+      './bbb/foo' => [nil, ['html']],
+      './ccc/foo' => [nil, ['html']]
     }
     assert_equal expected, data_source.send(:all_split_files_in, '.')
   end
 
+  def test_all_split_files_in_with_same_extensions
+    # Create data source
+    config = { identifier_style: 'full' }
+    data_source = Nanoc::DataSources::FilesystemUnified.new(nil, nil, nil, config)
+
+    # Write sample files
+    %w( stuff/foo.html stuff/foo.md stuff/foo.yaml ).each do |filename|
+      FileUtils.mkdir_p(File.dirname(filename))
+      File.open(filename, 'w') { |io| io.write('test') }
+    end
+
+  # Check - { './stuff/foo' => ['yaml', ['html', 'md']] }
+    res = data_source.send(:all_split_files_in, '.')
+    assert_equal ['./stuff/foo'], res.keys
+    assert_equal 2, res.values[0].size
+    assert_equal 'yaml', res.values[0][0]
+    assert_equal Array, res.values[0][1].class
+    assert_equal ['html', 'md'], res.values[0][1].sort
+  end
+
   def test_all_split_files_in_with_multiple_content_files
     # Create data source
     data_source = Nanoc::DataSources::FilesystemUnified.new(nil, nil, nil, nil)

data/test/data_sources/test_filesystem_unified.rb

@@ -12,38 +12,6 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     data_source
   end
 
-  def test_create_object_not_at_root
-    # Create item
-    data_source = new_data_source
-    data_source.send(:create_object, 'foobar', 'content here', { foo: 'bar' }, '/asdf/')
-
-    # Check file existance
-    assert File.directory?('foobar')
-    assert !File.directory?('foobar/content')
-    assert !File.directory?('foobar/asdf')
-    assert File.file?('foobar/asdf.html')
-
-    # Check file content
-    expected = /^--- ?\nfoo: bar\n---\ncontent here$/
-    assert_match expected, File.read('foobar/asdf.html')
-  end
-
-  def test_create_object_at_root
-    # Create item
-    data_source = new_data_source
-    data_source.send(:create_object, 'foobar', 'content here', { foo: 'bar' }, '/')
-
-    # Check file existance
-    assert File.directory?('foobar')
-    assert !File.directory?('foobar/index')
-    assert !File.directory?('foobar/foobar')
-    assert File.file?('foobar/index.html')
-
-    # Check file content
-    expected = /^--- ?\nfoo: bar\n---\ncontent here$/
-    assert_match expected, File.read('foobar/index.html')
-  end
-
   def test_load_objects
     # Create data source
     data_source = new_data_source
@@ -105,6 +73,32 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     end
   end
 
+  def test_load_objects_with_same_extensions
+    # Create data source
+    data_source = new_data_source({ identifier_style: 'full' })
+
+    # Create a fake class
+    klass = Class.new do
+      attr_reader :stuff
+      def initialize(*stuff)
+        @stuff = stuff
+      end
+
+      def ==(other)
+        @stuff == other.stuff
+      end
+    end
+
+    # Create sample files
+    FileUtils.mkdir_p('foo')
+    File.open('foo/bar.html', 'w') { |io| io.write("---\nnum: 1\n---\ntest 1") }
+    File.open('foo/bar.md',   'w') { |io| io.write("---\nnum: 1\n---\ntest 1") }
+
+    # Check
+    actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass)
+    assert_equal 2, actual_out.size
+  end
+
   def test_load_binary_objects
     # Create data source
     data_source = new_data_source
@@ -137,6 +131,28 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     end
   end
 
+  def test_identifier_for_filename_with_full_style_identifier
+    # Create data source
+    data_source = new_data_source({ identifier_style: 'full' })
+
+    # Get input and expected output
+    expected = {
+      '/foo'            => Nanoc::Identifier.new('/foo',            style: :full),
+      '/foo.html'       => Nanoc::Identifier.new('/foo.html',       style: :full),
+      '/foo/index.html' => Nanoc::Identifier.new('/foo/index.html', style: :full),
+      '/foo.html.erb'   => Nanoc::Identifier.new('/foo.html.erb',   style: :full),
+    }
+
+    # Check
+    expected.each_pair do |input, expected_output|
+      actual_output = data_source.send(:identifier_for_filename, input)
+      assert_equal(
+        expected_output, actual_output,
+        "identifier_for_filename(#{input.inspect}) should equal #{expected_output.inspect}, not #{actual_output.inspect}"
+      )
+    end
+  end
+
   def test_identifier_for_filename_allowing_periods_in_identifiers
     # Create data source
     data_source = new_data_source(allow_periods_in_identifiers: true)
@@ -439,42 +455,6 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     end
   end
 
-  def test_create_object_allowing_periods_in_identifiers
-    # Create data source
-    data_source = new_data_source(allow_periods_in_identifiers: true)
-
-    # Create object without period
-    data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/asdf/')
-    assert File.file?('foo/asdf.html')
-    data = data_source.send(:parse, 'foo/asdf.html', nil, 'moo')
-    assert_equal({ 'some' => 'attributes' }, data[0])
-    assert_equal('some content',             data[1])
-
-    # Create object with period
-    data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/as.df/')
-    assert File.file?('foo/as.df.html')
-    data = data_source.send(:parse, 'foo/as.df.html', nil, 'moo')
-    assert_equal({ 'some' => 'attributes' }, data[0])
-    assert_equal('some content',             data[1])
-  end
-
-  def test_create_object_disallowing_periods_in_identifiers
-    # Create data source
-    data_source = new_data_source
-
-    # Create object without period
-    data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/asdf/')
-    assert File.file?('foo/asdf.html')
-    data = data_source.send(:parse, 'foo/asdf.html', nil, 'moo')
-    assert_equal({ 'some' => 'attributes' }, data[0])
-    assert_equal('some content',             data[1])
-
-    # Create object with period
-    assert_raises(RuntimeError) do
-      data_source.send(:create_object, 'foo', 'some content', { some: 'attributes' }, '/as.df/')
-    end
-  end
-
   def test_filename_for
     data_source = new_data_source