nanoc 4.1.0a1 → 4.1.0b1

data/test/{base → rule_dsl}/test_compiler_dsl.rb

@@ -1,4 +1,4 @@
-class Nanoc::Int::CompilerDSLTest < Nanoc::TestCase
+class Nanoc::RuleDSL::CompilerDSLTest < Nanoc::TestCase
   def test_compile
     # TODO: implement
   end
@@ -12,8 +12,8 @@ class Nanoc::Int::CompilerDSLTest < Nanoc::TestCase
   end
 
   def test_preprocess_twice
-    rules_collection = Nanoc::Int::RulesCollection.new
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(rules_collection, {})
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(rules_collection, {})
 
     # first time
     io = capturing_stdio do
@@ -31,8 +31,8 @@ class Nanoc::Int::CompilerDSLTest < Nanoc::TestCase
   end
 
   def test_postprocess_twice
-    rules_collection = Nanoc::Int::RulesCollection.new
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(rules_collection, {})
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(rules_collection, {})
 
     # first time
     io = capturing_stdio do
@@ -49,62 +49,6 @@ class Nanoc::Int::CompilerDSLTest < Nanoc::TestCase
     assert_match(/WARNING: A postprocess block is already defined./, io[:stderr])
   end
 
-  def test_per_rules_file_preprocessor
-    # Create site
-    Nanoc::CLI.run %w( create_site foo )
-    FileUtils.cd('foo') do
-      # Create a bonus rules file
-      File.write(
-        'more_rules.rb',
-        "preprocess { @items['/index.*'][:preprocessed] = true }")
-
-      # Adjust normal rules file
-      File.write(
-        'Rules',
-        "include_rules 'more_rules'\n\npreprocess {}\n\n" + File.read('Rules'))
-
-      # Create site and compiler
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      compiler = Nanoc::Int::CompilerLoader.new.load(site)
-
-      # Check that the two preprocess blocks have been added
-      assert_equal 2, compiler.rules_collection.preprocessors.size
-      refute_nil compiler.rules_collection.preprocessors.first
-      refute_nil compiler.rules_collection.preprocessors.to_a.last
-
-      # Apply preprocess blocks
-      Nanoc::Int::Preprocessor
-        .new(site: site, rules_collection: compiler.rules_collection)
-        .run
-      assert site.items['/index.*'].attributes[:preprocessed]
-    end
-  end
-
-  def test_per_rules_file_postprocessor
-    # Create site
-    Nanoc::CLI.run %w( create_site foo )
-    FileUtils.cd('foo') do
-      # Create a bonus rules file
-      File.write(
-        'more_rules.rb',
-        'postprocess {}')
-
-      # Adjust normal rules file
-      File.write(
-        'Rules',
-        "include_rules 'more_rules'\n\npostprocess {}\n\n" + File.read('Rules'))
-
-      # Create site and compiler
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      compiler = Nanoc::Int::CompilerLoader.new.load(site)
-
-      # Check that the two postprocess blocks have been added
-      assert_equal 2, compiler.rules_collection.postprocessors.size
-      refute_nil compiler.rules_collection.postprocessors.first
-      refute_nil compiler.rules_collection.postprocessors.to_a.last
-    end
-  end
-
   def test_postprocessor_modified_method
     with_site do |site|
       # Create rules
@@ -132,9 +76,7 @@ EOS
   end
 
   def test_include_rules
-    # Create site
-    Nanoc::CLI.run %w( create_site foo )
-    FileUtils.cd('foo') do
+    with_site(legacy: false) do |site|
       # Create a bonus rules file
       File.write(
         'more_rules.rb',
@@ -147,18 +89,15 @@ EOS
           "route '/**/*' do ; nil ; end\n\n" \
           "compile '/**/*' do ; end\n")
 
-      # Create site and compiler
+      # Create items
+      File.write('content/index.html', 'hello!')
+
+      # Compile
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      compiler = Nanoc::Int::CompilerLoader.new.load(site)
-      compiler.build_reps
+      site.compile
 
       # Check
-      rep = compiler.reps[site.items['/index.*']][0]
-      routing_rules = site.compiler.rules_collection.routing_rules_for(rep)
-      routing_rule = routing_rules[:last]
-      refute_nil routing_rule
-      assert_equal Nanoc::Int::StringPattern, routing_rule.pattern.class
-      assert_equal '/index.*', routing_rule.pattern.to_s
+      assert File.file?('output/index.html')
     end
   end
 
@@ -340,7 +279,7 @@ EOS
   end
 
   def test_create_pattern_with_string_with_no_config
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     err = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
       compiler_dsl.create_pattern('/foo/*')
@@ -349,7 +288,7 @@ EOS
   end
 
   def test_create_pattern_with_string_with_glob_string_pattern_type
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
 
     pattern = compiler_dsl.create_pattern('/foo/*')
     assert pattern.match?('/foo/aaaa')
@@ -358,14 +297,14 @@ EOS
   end
 
   def test_create_pattern_with_regex
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
 
     pattern = compiler_dsl.create_pattern(%r{\A/foo/a*/})
     assert pattern.match?('/foo/aaaa/')
   end
 
   def test_create_pattern_with_string_with_unknown_string_pattern_type
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { string_pattern_type: 'donkey' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { string_pattern_type: 'donkey' })
 
     err = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
       compiler_dsl.create_pattern('/foo/*')
@@ -375,7 +314,7 @@ EOS
 
   def test_identifier_to_regex_without_wildcards
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('foo') }
     expected = %r{^/foo/$}
@@ -389,7 +328,7 @@ EOS
 
   def test_identifier_to_regex_with_one_wildcard
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('foo/*/bar') }
     expected = %r{^/foo/(.*?)/bar/$}
@@ -403,7 +342,7 @@ EOS
 
   def test_identifier_to_regex_with_two_wildcards
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('foo/*/bar/*/qux') }
     expected = %r{^/foo/(.*?)/bar/(.*?)/qux/$}
@@ -417,7 +356,7 @@ EOS
 
   def test_identifier_to_regex_with_just_one_wildcard
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('*') }
     expected = %r{^/(.*?)$}
@@ -431,7 +370,7 @@ EOS
 
   def test_identifier_to_regex_with_root
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('/') }
     expected = %r{^/$}
@@ -445,7 +384,7 @@ EOS
 
   def test_identifier_to_regex_with_only_children
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('/foo/*/') }
     expected = %r{^/foo/(.*?)/$}
@@ -459,7 +398,7 @@ EOS
 
   def test_identifier_to_regex_with_plus_wildcard
     # Create compiler DSL
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('/foo/+') }
     expected = %r{^/foo/(.+?)/$}
@@ -474,7 +413,7 @@ EOS
   end
 
   def test_dsl_has_no_access_to_compiler
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
     assert_raises(NameError) do
       compiler_dsl.instance_eval { compiler }
     end
@@ -482,7 +421,7 @@ EOS
 
   def test_config
     $venetian = 'unsnares'
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { venetian: 'snares' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { venetian: 'snares' })
     compiler_dsl.instance_eval { $venetian = @config[:venetian] }
     assert_equal 'snares', $venetian
   end

data/test/{base → rule_dsl}/test_rule.rb

@@ -16,7 +16,7 @@ class Nanoc::Int::RuleTest < Nanoc::TestCase
     identifier = '/anything/else/'
     expected   = %w(anything else)
 
-    rule = Nanoc::Int::Rule.new(pattern, :string, proc {})
+    rule = Nanoc::RuleDSL::Rule.new(pattern, :string, proc {})
 
     assert_equal expected, rule.send(:matches, identifier)
   end

data/test/rule_dsl/test_rules_collection.rb

@@ -0,0 +1,89 @@
+class Nanoc::RuleDSL::RulesCollectionTest < Nanoc::TestCase
+  def test_compilation_rule_for
+    # Mock rules
+    rules = [mock, mock, mock]
+    rules[0].expects(:applicable_to?).returns(false)
+    rules[1].expects(:applicable_to?).returns(true)
+    rules[1].expects(:rep_name).returns('wrong')
+    rules[2].expects(:applicable_to?).returns(true)
+    rules[2].expects(:rep_name).returns('right')
+
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    rules_collection.instance_eval { @item_compilation_rules = rules }
+
+    # Mock rep
+    rep = mock
+    rep.stubs(:name).returns('right')
+    item = mock
+    rep.stubs(:item).returns(item)
+
+    # Test
+    assert_equal rules[2], rules_collection.compilation_rule_for(rep)
+  end
+
+  def test_filter_for_layout_with_existant_layout
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(/.*/)] = [:erb, { foo: 'bar' }]
+
+    # Mock layout
+    layout = MiniTest::Mock.new
+    layout.expect(:identifier, '/some_layout/')
+
+    # Check
+    assert_equal([:erb, { foo: 'bar' }], rules_collection.filter_for_layout(layout))
+  end
+
+  def test_filter_for_layout_with_existant_layout_and_unknown_filter
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(/.*/)] = [:some_unknown_filter, { foo: 'bar' }]
+
+    # Mock layout
+    layout = MiniTest::Mock.new
+    layout.expect(:identifier, '/some_layout/')
+
+    # Check
+    assert_equal([:some_unknown_filter, { foo: 'bar' }], rules_collection.filter_for_layout(layout))
+  end
+
+  def test_filter_for_layout_with_nonexistant_layout
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/foo/$})] = [:erb, { foo: 'bar' }]
+
+    # Mock layout
+    layout = MiniTest::Mock.new
+    layout.expect(:identifier, '/bar/')
+
+    # Check
+    assert_equal(nil, rules_collection.filter_for_layout(layout))
+  end
+
+  def test_filter_for_layout_with_many_layouts
+    rules_collection = Nanoc::RuleDSL::RulesCollection.new
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/a/b/c/.*/$})] = [:erb, { char: 'd' }]
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/a/.*/$})]     = [:erb, { char: 'b' }]
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/a/b/.*/$})]   = [:erb, { char: 'c' }] # never used!
+    rules_collection.layout_filter_mapping[Nanoc::Int::Pattern.from(%r{^/.*/$})]       = [:erb, { char: 'a' }]
+
+    # Mock layout
+    layouts = [mock, mock, mock, mock]
+    layouts[0].stubs(:identifier).returns('/a/b/c/d/')
+    layouts[1].stubs(:identifier).returns('/a/b/c/')
+    layouts[2].stubs(:identifier).returns('/a/b/')
+    layouts[3].stubs(:identifier).returns('/a/')
+
+    # Get expectations
+    expectations = {
+      0 => 'd',
+      1 => 'b', # never used! not c, because b takes priority
+      2 => 'b',
+      3 => 'a',
+    }
+
+    # Check
+    expectations.each_pair do |num, char|
+      filter_and_args = rules_collection.filter_for_layout(layouts[num])
+      refute_nil(filter_and_args)
+      assert_equal(char, filter_and_args[1][:char])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.0a1
+  version: 4.1.0b1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -74,14 +74,11 @@ files:
 - lib/nanoc/base.rb
 - lib/nanoc/base/checksummer.rb
 - lib/nanoc/base/compilation/compiler.rb
-- lib/nanoc/base/compilation/compiler_dsl.rb
 - lib/nanoc/base/compilation/dependency_tracker.rb
 - lib/nanoc/base/compilation/filter.rb
 - lib/nanoc/base/compilation/item_rep_repo.rb
 - lib/nanoc/base/compilation/outdatedness_checker.rb
 - lib/nanoc/base/compilation/outdatedness_reasons.rb
-- lib/nanoc/base/compilation/rule.rb
-- lib/nanoc/base/compilation/rule_context.rb
 - lib/nanoc/base/context.rb
 - lib/nanoc/base/core_ext.rb
 - lib/nanoc/base/core_ext/array.rb
@@ -106,7 +103,6 @@ files:
 - lib/nanoc/base/entities/rule_memory_actions/filter.rb
 - lib/nanoc/base/entities/rule_memory_actions/layout.rb
 - lib/nanoc/base/entities/rule_memory_actions/snapshot.rb
-- lib/nanoc/base/entities/rules_collection.rb
 - lib/nanoc/base/entities/site.rb
 - lib/nanoc/base/entities/snapshot_def.rb
 - lib/nanoc/base/error.rb
@@ -123,6 +119,7 @@ files:
 - lib/nanoc/base/repos/site_loader.rb
 - lib/nanoc/base/repos/store.rb
 - lib/nanoc/base/services.rb
+- lib/nanoc/base/services/action_provider.rb
 - lib/nanoc/base/services/compiler_loader.rb
 - lib/nanoc/base/services/executor.rb
 - lib/nanoc/base/services/item_rep_builder.rb
@@ -130,11 +127,6 @@ files:
 - lib/nanoc/base/services/item_rep_selector.rb
 - lib/nanoc/base/services/item_rep_writer.rb
 - lib/nanoc/base/services/notification_center.rb
-- lib/nanoc/base/services/postprocessor.rb
-- lib/nanoc/base/services/preprocessor.rb
-- lib/nanoc/base/services/recording_executor.rb
-- lib/nanoc/base/services/rule_memory_calculator.rb
-- lib/nanoc/base/services/rules_loader.rb
 - lib/nanoc/base/services/temp_filename_factory.rb
 - lib/nanoc/base/views.rb
 - lib/nanoc/base/views/config_view.rb
@@ -247,10 +239,17 @@ files:
 - lib/nanoc/helpers/tagging.rb
 - lib/nanoc/helpers/text.rb
 - lib/nanoc/helpers/xml_sitemap.rb
+- lib/nanoc/rule_dsl.rb
+- lib/nanoc/rule_dsl/action_provider.rb
+- lib/nanoc/rule_dsl/compiler_dsl.rb
+- lib/nanoc/rule_dsl/recording_executor.rb
+- lib/nanoc/rule_dsl/rule.rb
+- lib/nanoc/rule_dsl/rule_context.rb
+- lib/nanoc/rule_dsl/rule_memory_calculator.rb
+- lib/nanoc/rule_dsl/rules_collection.rb
+- lib/nanoc/rule_dsl/rules_loader.rb
 - lib/nanoc/version.rb
-- nanoc-4.0.2.gem
 - nanoc.gemspec
-- tags
 - tasks/doc.rake
 - tasks/rubocop.rake
 - tasks/test.rake
@@ -262,7 +261,6 @@ files:
 - test/base/test_checksum_store.rb
 - test/base/test_code_snippet.rb
 - test/base/test_compiler.rb
-- test/base/test_compiler_dsl.rb
 - test/base/test_context.rb
 - test/base/test_data_source.rb
 - test/base/test_dependency_tracker.rb
@@ -276,7 +274,6 @@ files:
 - test/base/test_notification_center.rb
 - test/base/test_outdatedness_checker.rb
 - test/base/test_plugin.rb
-- test/base/test_rule.rb
 - test/base/test_site.rb
 - test/base/test_store.rb
 - test/cli/commands/test_check.rb
@@ -351,6 +348,10 @@ files:
 - test/helpers/test_tagging.rb
 - test/helpers/test_text.rb
 - test/helpers/test_xml_sitemap.rb
+- test/rule_dsl/test_action_provider.rb
+- test/rule_dsl/test_compiler_dsl.rb
+- test/rule_dsl/test_rule.rb
+- test/rule_dsl/test_rules_collection.rb
 - test/test_gem.rb
 homepage: http://nanoc.ws/
 licenses:
@@ -374,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

data/lib/nanoc/base/services/postprocessor.rb

@@ -1,26 +0,0 @@
-module Nanoc::Int
-  # @api private
-  class Postprocessor
-    def initialize(context, site:, rules_collection:)
-      @context = context
-      @site = site
-      @rules_collection = rules_collection
-    end
-
-    def run
-      ctx = new_postprocessor_context
-
-      @rules_collection.postprocessors.each_value do |postprocessor|
-        ctx.instance_eval(&postprocessor)
-      end
-    end
-
-    # @api private
-    def new_postprocessor_context
-      Nanoc::Int::Context.new(
-        config: Nanoc::ConfigView.new(@site.config, @context),
-        items: Nanoc::PostCompileItemCollectionView.new(@site.items, @context),
-      )
-    end
-  end
-end

data/lib/nanoc/base/services/preprocessor.rb

@@ -1,26 +0,0 @@
-module Nanoc::Int
-  # @api private
-  class Preprocessor
-    def initialize(site:, rules_collection:)
-      @site = site
-      @rules_collection = rules_collection
-    end
-
-    def run
-      ctx = new_preprocessor_context
-
-      @rules_collection.preprocessors.each_value do |preprocessor|
-        ctx.instance_eval(&preprocessor)
-      end
-    end
-
-    # @api private
-    def new_preprocessor_context
-      Nanoc::Int::Context.new(
-        config: Nanoc::MutableConfigView.new(@site.config, nil),
-        items: Nanoc::MutableItemCollectionView.new(@site.items, nil),
-        layouts: Nanoc::MutableLayoutCollectionView.new(@site.layouts, nil),
-      )
-    end
-  end
-end