nanoc 4.1.0a1 → 4.1.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b94aa5a5e85a4af832830570cce9b72348c5adb9
-  data.tar.gz: 6b3673b4bb01436955145ae3b431f167d1ce755a
+  metadata.gz: 97c006e6e64be4a26d31842364fcc8a5377264a3
+  data.tar.gz: 96a6fb9d6ca291ddbdc8efe52564326a1691e601
 SHA512:
-  metadata.gz: 1865850b88750976c1f682ce6b0aa7449c1d5ddc267bbe44f04de861456724a119bafe5eed0ede7054a14416b100d43bfe5062495a259e82e694dcefaa3ab918
-  data.tar.gz: c1a98668b8491a04f194c87ee00c59f2c61deb0127dba2d2be6aa0ab5daf74708d56fc3f9f1bc3a4ac170e1384d06b8397a5763f4fa7744d0f983c9426aa4283
+  metadata.gz: 3966392f10098cc3d5d386d8e7004b130f11c9b54365542b4912fdba467c1847c00f4cc3861ae2de7d5f5c2286117a5498770772694d0e147de77ba5a07ac11e
+  data.tar.gz: 34175a88270c6c092c22ac8a30b90674489bf98d971a7984c3731653ff3b3f259e8dcbcc76fd247c187a85509c40593a45ca247808b8eb9fd029ca22946c9c9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.0a1)
+    nanoc (4.1.0b1)
       cri (~> 2.3)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     CFPropertyList (2.3.2)
     RedCloth (4.2.9)
-    addressable (2.3.8)
+    addressable (2.4.0)
     adsf (1.2.0)
       rack (>= 1.0.0)
     ast (2.1.0)
@@ -137,7 +137,7 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.4.0)
+    fog-sakuracloud (1.5.0)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
@@ -267,7 +267,7 @@ GEM
     ruby-progressbar (1.7.5)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
-    sass (3.4.19)
+    sass (3.4.20)
     shellany (0.0.1)
     simplecov (0.11.1)
       docile (~> 1.1.0)

data/NEWS.md

@@ -1,5 +1,15 @@
 # Nanoc news
 
+## 4.1.0b1 (2015-12-11)
+
+Fixes:
+
+* Fixed issue with `:pre` snapshot not being generated properly (#764)
+
+Enhancements:
+
+* Updated default site to use `#write` (#759)
+
 ## 4.1.0a1 (2015-12-05)
 
 Features:

data/lib/nanoc/base/checksummer.rb

@@ -83,7 +83,8 @@ module Nanoc::Int
           digest.update(obj.to_i.to_s)
         when Nanoc::Identifier
           update(obj.to_s, digest)
-        when Nanoc::Int::RulesCollection, Nanoc::Int::CodeSnippet
+        # TODO: Use RuleMemory rather than RulesCollection
+        when Nanoc::RuleDSL::RulesCollection, Nanoc::Int::CodeSnippet
           update(obj.data, digest)
         when Nanoc::Int::TextualContent
           update(obj.string, digest)

data/lib/nanoc/base/compilation/compiler.rb

@@ -48,9 +48,6 @@ module Nanoc::Int
     # @return [Array] The compilation stack
     attr_reader :stack
 
-    # @api private
-    attr_reader :rules_collection
-
     # @api private
     attr_reader :compiled_content_cache
 
@@ -61,7 +58,7 @@ module Nanoc::Int
     attr_reader :rule_memory_store
 
     # @api private
-    attr_reader :rule_memory_calculator
+    attr_reader :action_provider
 
     # @api private
     attr_reader :dependency_store
@@ -72,41 +69,25 @@ module Nanoc::Int
     # @api private
     attr_reader :reps
 
-    def initialize(site, rules_collection, compiled_content_cache:, checksum_store:, rule_memory_store:, rule_memory_calculator:, dependency_store:, outdatedness_checker:, reps:)
+    def initialize(site, compiled_content_cache:, checksum_store:, rule_memory_store:, action_provider:, dependency_store:, outdatedness_checker:, reps:)
       @site = site
-      @rules_collection = rules_collection
 
       @compiled_content_cache = compiled_content_cache
       @checksum_store         = checksum_store
       @rule_memory_store      = rule_memory_store
-      @rule_memory_calculator = rule_memory_calculator
       @dependency_store       = dependency_store
       @outdatedness_checker   = outdatedness_checker
       @reps                   = reps
+      @action_provider        = action_provider
 
       @stack = []
     end
 
-    # 1. Load site
-    # 2. Load rules
-    # 3. Preprocess
-    # 4. Build item reps
-    # 5. Compile
-    # 6. Postprocess
-
-    # TODO: move elsewhere
     def run_all
-      # Preprocess
-      Nanoc::Int::Preprocessor.new(site: @site, rules_collection: @rules_collection).run
-
-      # Build reps
+      @action_provider.preprocess(@site)
       build_reps
-
-      # Compile
       run
-
-      # Postprocess
-      Nanoc::Int::Postprocessor.new(create_view_context, site: @site, rules_collection: @rules_collection).run
+      @action_provider.postprocess(@site, @reps)
     end
 
     def run
@@ -139,11 +120,13 @@ module Nanoc::Int
     def store
       # Calculate rule memory
       (@reps.to_a + @site.layouts.to_a).each do |obj|
-        rule_memory_store[obj] = rule_memory_calculator[obj].serialize
+        rule_memory_store[obj] = action_provider.memory_for(obj).serialize
       end
 
       # Calculate checksums
-      objects.each do |obj|
+      objects_to_checksum =
+        site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
+      objects_to_checksum.each do |obj|
         checksum_store[obj] = Nanoc::Int::Checksummer.calc(obj)
       end
 
@@ -151,18 +134,9 @@ module Nanoc::Int
       stores.each(&:store)
     end
 
-    # Returns all objects managed by the site (items, layouts, code snippets,
-    # site configuration and the rules).
-    #
-    # @api private
-    def objects
-      site.items.to_a + site.layouts.to_a + site.code_snippets +
-        [site.config, rules_collection]
-    end
-
     def build_reps
       builder = Nanoc::Int::ItemRepBuilder.new(
-        site, rules_collection, rule_memory_calculator, @reps)
+        site, action_provider, @reps)
       builder.run
     end
 
@@ -198,6 +172,16 @@ module Nanoc::Int
       Nanoc::ViewContext.new(reps: @reps, items: @site.items)
     end
 
+    # @api private
+    def filter_name_and_args_for_layout(layout)
+      mem = action_provider.memory_for(layout)
+      if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::RuleMemoryActions::Filter)
+        # FIXME: Provide a nicer error message
+        raise Nanoc::Int::Errors::Generic, "No rule memory found for #{layout.identifier}"
+      end
+      [mem[0].filter_name, mem[0].params]
+    end
+
     private
 
     def compile_reps
@@ -207,7 +191,7 @@ module Nanoc::Int
 
       # Assign snapshots
       @reps.each do |rep|
-        rep.snapshot_defs = rule_memory_calculator.snapshots_defs_for(rep)
+        rep.snapshot_defs = action_provider.snapshots_defs_for(rep)
       end
 
       # Find item reps to compile and compile them
@@ -264,12 +248,18 @@ module Nanoc::Int
     def recalculate_content_for_rep(rep)
       executor = Nanoc::Int::Executor.new(self)
 
-      executor.snapshot(rep, :raw)
-      executor.snapshot(rep, :pre, final: false)
-      rules_collection.compilation_rule_for(rep)
-        .apply_to(rep, executor: executor, site: @site, view_context: create_view_context)
-      executor.snapshot(rep, :post) if rep.has_snapshot?(:post)
-      executor.snapshot(rep, :last)
+      action_provider.memory_for(rep).each do |action|
+        case action
+        when Nanoc::Int::RuleMemoryActions::Filter
+          executor.filter(rep, action.filter_name, action.params)
+        when Nanoc::Int::RuleMemoryActions::Layout
+          executor.layout(rep, action.layout_identifier, action.params)
+        when Nanoc::Int::RuleMemoryActions::Snapshot
+          executor.snapshot(rep, action.snapshot_name, final: action.final?, path: action.path)
+        else
+          raise "Internal inconsistency: unknown action #{action.inspect}"
+        end
+      end
     end
 
     # Clears the list of dependencies for items that will be recompiled.

data/lib/nanoc/base/compilation/outdatedness_checker.rb

@@ -7,9 +7,7 @@ module Nanoc::Int
 
     attr_reader :checksum_store
     attr_reader :dependency_store
-    attr_reader :rule_memory_calculator
     attr_reader :rule_memory_store
-    attr_reader :rules_collection
     attr_reader :site
 
     Reasons = Nanoc::Int::OutdatednessReasons
@@ -17,17 +15,15 @@ module Nanoc::Int
     # @param [Nanoc::Int::Site] site
     # @param [Nanoc::Int::ChecksumStore] checksum_store
     # @param [Nanoc::Int::DependencyStore] dependency_store
-    # @param [Nanoc::Int::RulesCollection] rules_collection
     # @param [Nanoc::Int::RuleMemoryStore] rule_memory_store
-    # @param [Nanoc::Int::RuleMemoryCalculator] rule_memory_calculator
+    # @param [Nanoc::Int::ActionProvider] action_provider
     # @param [Nanoc::Int::ItemRepRepo] reps
-    def initialize(site:, checksum_store:, dependency_store:, rules_collection:, rule_memory_store:, rule_memory_calculator:, reps:)
+    def initialize(site:, checksum_store:, dependency_store:, rule_memory_store:, action_provider:, reps:)
       @site = site
       @checksum_store = checksum_store
       @dependency_store = dependency_store
-      @rules_collection = rules_collection
       @rule_memory_store = rule_memory_store
-      @rule_memory_calculator = rule_memory_calculator
+      @action_provider = action_provider
       @reps = reps
 
       @basic_outdatedness_reasons = {}
@@ -172,7 +168,7 @@ module Nanoc::Int
     # @return [Boolean] true if the rule memory for the given item
     #   represenation has changed, false otherwise
     def rule_memory_differs_for(obj)
-      !rule_memory_store[obj].eql?(rule_memory_calculator[obj].serialize)
+      !rule_memory_store[obj].eql?(@action_provider.memory_for(obj).serialize)
     end
     memoize :rule_memory_differs_for
 

data/lib/nanoc/base/entities/rule_memory.rb

@@ -24,7 +24,7 @@ module Nanoc::Int
     end
 
     def add_snapshot(snapshot_name, final, path)
-      will_add_snapshot(snapshot_name)
+      will_add_snapshot(snapshot_name) if final
       @actions << Nanoc::Int::RuleMemoryActions::Snapshot.new(snapshot_name, final, path)
     end
 
@@ -32,6 +32,10 @@ module Nanoc::Int
       @actions.select { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Snapshot) }
     end
 
+    def any_layouts?
+      @actions.any? { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Layout) }
+    end
+
     def serialize
       map(&:serialize)
     end

data/lib/nanoc/base/entities.rb

@@ -11,6 +11,5 @@ require_relative 'entities/pattern'
 require_relative 'entities/rule_memory'
 require_relative 'entities/rule_memory_action'
 require_relative 'entities/rule_memory_actions'
-require_relative 'entities/rules_collection'
 require_relative 'entities/site'
 require_relative 'entities/snapshot_def'

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

@@ -0,0 +1,22 @@
+module Nanoc::Int
+  # @private
+  class ActionProvider
+    extend Nanoc::Int::PluginRegistry::PluginMethods
+
+    def self.for(_site)
+      raise NotImplementedError
+    end
+
+    def rep_names_for(_item)
+      raise NotImplementedError
+    end
+
+    def memory_for(_rep)
+      raise NotImplementedError
+    end
+
+    def snapshots_defs_for(_rep)
+      raise NotImplementedError
+    end
+  end
+end

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

@@ -2,14 +2,8 @@ module Nanoc::Int
   # @api private
   class CompilerLoader
     def load(site)
-      rules_collection = Nanoc::Int::RulesCollection.new
-
       rule_memory_store = Nanoc::Int::RuleMemoryStore.new
 
-      rule_memory_calculator =
-        Nanoc::Int::RuleMemoryCalculator.new(
-          rules_collection: rules_collection, site: site)
-
       dependency_store =
         Nanoc::Int::DependencyStore.new(site.items.to_a + site.layouts.to_a)
 
@@ -18,14 +12,15 @@ module Nanoc::Int
 
       item_rep_repo = Nanoc::Int::ItemRepRepo.new
 
+      action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
+
       outdatedness_checker =
         Nanoc::Int::OutdatednessChecker.new(
           site: site,
           checksum_store: checksum_store,
           dependency_store: dependency_store,
-          rules_collection: rules_collection,
           rule_memory_store: rule_memory_store,
-          rule_memory_calculator: rule_memory_calculator,
+          action_provider: action_provider,
           reps: item_rep_repo,
         )
 
@@ -33,17 +28,13 @@ module Nanoc::Int
         compiled_content_cache: Nanoc::Int::CompiledContentCache.new,
         checksum_store: checksum_store,
         rule_memory_store: rule_memory_store,
-        rule_memory_calculator: rule_memory_calculator,
         dependency_store: dependency_store,
         outdatedness_checker: outdatedness_checker,
         reps: item_rep_repo,
+        action_provider: action_provider,
       }
 
-      compiler = Nanoc::Int::Compiler.new(site, rules_collection, params)
-
-      Nanoc::Int::RulesLoader.new(site.config, rules_collection).load
-
-      compiler
+      Nanoc::Int::Compiler.new(site, params)
     end
   end
 end

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

@@ -55,7 +55,7 @@ module Nanoc
 
       def layout(rep, layout_identifier, extra_filter_args = nil)
         layout = find_layout(layout_identifier)
-        filter_name, filter_args = @compiler.rules_collection.filter_for_layout(layout)
+        filter_name, filter_args = *@compiler.filter_name_and_args_for_layout(layout)
         if filter_name.nil?
           raise Nanoc::Int::Errors::Generic, "Cannot find rule for layout matching #{layout_identifier}"
         end

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

@@ -3,28 +3,20 @@ module Nanoc::Int
   class ItemRepBuilder
     attr_reader :reps
 
-    def initialize(site, rules_collection, rule_memory_calculator, reps)
+    def initialize(site, action_provider, reps)
       @site = site
-      @rules_collection = rules_collection
-      @rule_memory_calculator = rule_memory_calculator
+      @action_provider = action_provider
       @reps = reps
     end
 
     def run
       @site.items.each do |item|
-        rep_names_for(item).each do |rep_name|
+        @action_provider.rep_names_for(item).each do |rep_name|
           @reps << Nanoc::Int::ItemRep.new(item, rep_name)
         end
       end
 
-      Nanoc::Int::ItemRepRouter.new(@reps, @rule_memory_calculator, @site).run
-    end
-
-    def rep_names_for(item)
-      matching_rules = @rules_collection.item_compilation_rules_for(item)
-      raise Nanoc::Int::Errors::NoMatchingCompilationRuleFound.new(item) if matching_rules.empty?
-
-      matching_rules.map(&:rep_name).uniq
+      Nanoc::Int::ItemRepRouter.new(@reps, @action_provider, @site).run
     end
   end
 end

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

@@ -9,17 +9,16 @@ module Nanoc::Int
       end
     end
 
-    # TODO: Replace rule_memory_calculator with { rep => rule_memory }
-    def initialize(reps, rule_memory_calculator, site)
+    def initialize(reps, action_provider, site)
       @reps = reps
-      @rule_memory_calculator = rule_memory_calculator
+      @action_provider = action_provider
       @site = site
     end
 
     def run
       paths_to_reps = {}
       @reps.each do |rep|
-        mem = @rule_memory_calculator[rep]
+        mem = @action_provider.memory_for(rep)
         mem.snapshot_actions.each do |snapshot_action|
           route_rep(rep, snapshot_action, paths_to_reps)
         end

data/lib/nanoc/base/services.rb

@@ -1,3 +1,4 @@
+require_relative 'services/action_provider'
 require_relative 'services/compiler_loader'
 require_relative 'services/executor'
 require_relative 'services/item_rep_builder'
@@ -5,9 +6,4 @@ require_relative 'services/item_rep_router'
 require_relative 'services/item_rep_selector'
 require_relative 'services/item_rep_writer'
 require_relative 'services/notification_center'
-require_relative 'services/preprocessor'
-require_relative 'services/postprocessor'
-require_relative 'services/recording_executor'
-require_relative 'services/rule_memory_calculator'
-require_relative 'services/rules_loader'
 require_relative 'services/temp_filename_factory'

data/lib/nanoc/base.rb

@@ -15,13 +15,10 @@ module Nanoc::Int
 
   # Load compilation classes
   autoload 'Compiler',             'nanoc/base/compilation/compiler'
-  autoload 'CompilerDSL',          'nanoc/base/compilation/compiler_dsl'
   autoload 'DependencyTracker',    'nanoc/base/compilation/dependency_tracker'
   autoload 'ItemRepRepo',          'nanoc/base/compilation/item_rep_repo'
   autoload 'OutdatednessChecker',  'nanoc/base/compilation/outdatedness_checker'
   autoload 'OutdatednessReasons',  'nanoc/base/compilation/outdatedness_reasons'
-  autoload 'Rule',                 'nanoc/base/compilation/rule'
-  autoload 'RuleContext',          'nanoc/base/compilation/rule_context'
 end
 
 require_relative 'base/core_ext'

data/lib/nanoc/cli/commands/create-site.rb

@@ -124,9 +124,6 @@ end
 #  layout '/default.*'
 #end
 
-compile '/**/*' do
-end
-
 route '/**/*.{html,md}' do
   if item.identifier =~ '/index.*'
     '/index.html'
@@ -135,8 +132,8 @@ route '/**/*.{html,md}' do
   end
 end
 
-route '/**/*' do
-  item.identifier.to_s
+compile '/**/*' do
+  write item.identifier.to_s
 end
 
 layout '/**/*', :erb

data/lib/nanoc/cli/commands/show-rules.rb

@@ -11,9 +11,17 @@ module Nanoc::CLI::Commands
       require_site
 
       @c = Nanoc::CLI::ANSIStringColorizer
-      @rules = site.compiler.rules_collection
       @reps = site.compiler.reps
 
+      action_provider = site.compiler.action_provider
+      unless action_provider.respond_to?(:rules_collection)
+        raise(
+          ::Nanoc::Int::Errors::GenericTrivial,
+          'The show-rules command can only be used for sites with the Rule DSL action provider.',
+        )
+      end
+      @rules = action_provider.rules_collection
+
       site.items.sort_by(&:identifier).each   { |e| explain_item(e) }
       site.layouts.sort_by(&:identifier).each { |e| explain_layout(e) }
     end

data/lib/nanoc/helpers/rendering.rb

@@ -99,7 +99,7 @@ module Nanoc::Helpers
       }.merge(other_assigns)
 
       # Get filter name
-      filter_name, filter_args = @site.unwrap.compiler.rules_collection.filter_for_layout(layout)
+      filter_name, filter_args = *@site.unwrap.compiler.filter_name_and_args_for_layout(layout)
       raise Nanoc::Int::Errors::CannotDetermineFilter.new(layout.identifier) if filter_name.nil?
 
       # Get filter class

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -0,0 +1,76 @@
+module Nanoc::RuleDSL
+  class ActionProvider < Nanoc::Int::ActionProvider
+    identifier :rule_dsl
+
+    # @api private
+    attr_reader :rules_collection
+
+    def self.for(site)
+      rules_collection = Nanoc::RuleDSL::RulesCollection.new
+
+      rule_memory_calculator =
+        Nanoc::RuleDSL::RuleMemoryCalculator.new(
+          rules_collection: rules_collection, site: site)
+
+      action_provider = new(rules_collection, rule_memory_calculator)
+
+      Nanoc::RuleDSL::RulesLoader.new(site.config, rules_collection).load
+
+      action_provider
+    end
+
+    def initialize(rules_collection, rule_memory_calculator)
+      @rules_collection = rules_collection
+      @rule_memory_calculator = rule_memory_calculator
+    end
+
+    def rep_names_for(item)
+      matching_rules = @rules_collection.item_compilation_rules_for(item)
+      raise Nanoc::Int::Errors::NoMatchingCompilationRuleFound.new(item) if matching_rules.empty?
+
+      matching_rules.map(&:rep_name).uniq
+    end
+
+    def memory_for(rep)
+      @rule_memory_calculator[rep]
+    end
+
+    def snapshots_defs_for(rep)
+      @rule_memory_calculator.snapshots_defs_for(rep)
+    end
+
+    def preprocess(site)
+      ctx = new_preprocessor_context(site)
+
+      @rules_collection.preprocessors.each_value do |preprocessor|
+        ctx.instance_eval(&preprocessor)
+      end
+    end
+
+    def postprocess(site, reps)
+      view_context = Nanoc::ViewContext.new(reps: reps, items: site.items)
+      ctx = new_postprocessor_context(site, view_context)
+
+      @rules_collection.postprocessors.each_value do |postprocessor|
+        ctx.instance_eval(&postprocessor)
+      end
+    end
+
+    # @api private
+    def new_preprocessor_context(site)
+      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
+
+    # @api private
+    def new_postprocessor_context(site, view_context)
+      Nanoc::Int::Context.new(
+        config: Nanoc::ConfigView.new(site.config, view_context),
+        items: Nanoc::PostCompileItemCollectionView.new(site.items, view_context),
+      )
+    end
+  end
+end

data/lib/nanoc/{base/compilation → rule_dsl}/compiler_dsl.rb

@@ -1,4 +1,4 @@
-module Nanoc::Int
+module Nanoc::RuleDSL
   # Contains methods that will be executed by the site’s `Rules` file.
   #
   # @api private
@@ -14,7 +14,7 @@ module Nanoc::Int
     #
     # @api private
     #
-    # @param [Nanoc::Int::RulesCollection] rules_collection The collection of
+    # @param [Nanoc::RuleDSL::RulesCollection] rules_collection The collection of
     #   rules to modify when loading this DSL
     #
     # @param [Hash] config The site configuration
@@ -71,7 +71,7 @@ module Nanoc::Int
     def compile(identifier, rep: :default, &block)
       raise ArgumentError.new('#compile requires a block') unless block_given?
 
-      rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep, block)
+      rule = Nanoc::RuleDSL::Rule.new(create_pattern(identifier), rep, block)
       @rules_collection.add_item_compilation_rule(rule)
     end
 
@@ -109,7 +109,7 @@ module Nanoc::Int
     def route(identifier, rep: :default, snapshot: :last, &block)
       raise ArgumentError.new('#route requires a block') unless block_given?
 
-      rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep, block, snapshot_name: snapshot)
+      rule = Nanoc::RuleDSL::Rule.new(create_pattern(identifier), rep, block, snapshot_name: snapshot)
       @rules_collection.add_item_routing_rule(rule)
     end
 
@@ -170,7 +170,7 @@ module Nanoc::Int
       raise ArgumentError.new('#passthrough does not require a block') if block_given?
 
       compilation_block = proc {}
-      compilation_rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep, compilation_block)
+      compilation_rule = Nanoc::RuleDSL::Rule.new(create_pattern(identifier), rep, compilation_block)
       @rules_collection.add_item_compilation_rule(compilation_rule)
 
       # Create routing rule
@@ -185,7 +185,7 @@ module Nanoc::Int
           item[:extension].nil? || (item[:content_filename].nil? && item.identifier =~ %r{#{item[:extension]}/$}) ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
         end
       end
-      routing_rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep, routing_block, snapshot_name: :last)
+      routing_rule = Nanoc::RuleDSL::Rule.new(create_pattern(identifier), rep, routing_block, snapshot_name: :last)
       @rules_collection.add_item_routing_rule(routing_rule)
     end
 
@@ -210,10 +210,10 @@ module Nanoc::Int
     def ignore(identifier, rep: :default)
       raise ArgumentError.new('#ignore does not require a block') if block_given?
 
-      compilation_rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep, proc {})
+      compilation_rule = Nanoc::RuleDSL::Rule.new(create_pattern(identifier), rep, proc {})
       @rules_collection.add_item_compilation_rule(compilation_rule)
 
-      routing_rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep, proc {}, snapshot_name: :last)
+      routing_rule = Nanoc::RuleDSL::Rule.new(create_pattern(identifier), rep, proc {}, snapshot_name: :last)
       @rules_collection.add_item_routing_rule(routing_rule)
     end
 
@@ -233,7 +233,7 @@ module Nanoc::Int
       filename = ["#{name}", "#{name}.rb", "./#{name}", "./#{name}.rb"].find { |f| File.file?(f) }
       raise Nanoc::Int::Errors::NoRulesFileFound.new if filename.nil?
 
-      Nanoc::Int::RulesLoader.new(@config, @rules_collection).parse(filename)
+      Nanoc::RuleDSL::RulesLoader.new(@config, @rules_collection).parse(filename)
     end
 
     # Creates a postprocessor block that will be executed after all data is