nanoc 4.8.9 → 4.8.10

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

@@ -10,43 +10,37 @@ Prints the rules used for all items and layouts in the current site.
 module Nanoc::CLI::Commands
   class ShowRules < ::Nanoc::CLI::CommandRunner
     def run
-      @site = load_site
+      site = load_site
 
-      @c = Nanoc::CLI::ANSIStringColorizer
+      res = Nanoc::Int::Compiler.new_for(site).run_until_reps_built
+      reps = res.fetch(:reps)
 
-      compiler = @site.compiler
-      compiler.build_reps
-      @reps = compiler.reps
+      action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
+      rules = action_provider.rules_collection
 
-      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
+      items = site.items.sort_by(&:identifier)
+      layouts = site.layouts.sort_by(&:identifier)
 
-      @site.items.sort_by(&:identifier).each   { |e| explain_item(e) }
-      @site.layouts.sort_by(&:identifier).each { |e| explain_layout(e) }
+      items.each   { |e| explain_item(e, rules: rules, reps: reps) }
+      layouts.each { |e| explain_layout(e, rules: rules) }
     end
 
-    def explain_item(item)
-      puts "#{@c.c('Item ' + item.identifier, :bold, :yellow)}:"
+    def explain_item(item, rules:, reps:)
+      puts(fmt_heading("Item #{item.identifier}") + ':')
 
-      @reps[item].each do |rep|
-        rule = @rules.compilation_rule_for(rep)
+      reps[item].each do |rep|
+        rule = rules.compilation_rule_for(rep)
         puts "  Rep #{rep.name}: #{rule ? rule.pattern : '(none)'}"
       end
 
       puts
     end
 
-    def explain_layout(layout)
-      puts "#{@c.c('Layout ' + layout.identifier, :bold, :yellow)}:"
+    def explain_layout(layout, rules:)
+      puts(fmt_heading("Layout #{layout.identifier}") + ':')
 
       found = false
-      @rules.layout_filter_mapping.each_key do |pattern|
+      rules.layout_filter_mapping.each_key do |pattern|
         if pattern.match?(layout.identifier)
           puts "  #{pattern}"
           found = true
@@ -59,6 +53,10 @@ module Nanoc::CLI::Commands
 
       puts
     end
+
+    def fmt_heading(s)
+      Nanoc::CLI::ANSIStringColorizer.c(s, :bold, :yellow)
+    end
   end
 end
 

data/lib/nanoc/cli/error_handler.rb

@@ -146,23 +146,6 @@ module Nanoc::CLI
 
     protected
 
-    # @return [Boolean] true if debug output is enabled, false if not
-    #
-    # @see Nanoc::CLI.debug?
-    def debug?
-      Nanoc::CLI.debug?
-    end
-
-    # @return [Nanoc::Int::Site] The site that is currently being processed
-    def site
-      @command&.site
-    end
-
-    # @return [Nanoc::Int::Compiler] The compiler for the current site
-    def compiler
-      site&.compiler
-    end
-
     # @return [Hash<String, Array>] A hash containing the gem names as keys and gem versions as value
     def gems_and_versions
       gems = {}

data/lib/nanoc/data_sources/filesystem.rb

@@ -371,15 +371,17 @@ module Nanoc::DataSources
       ParseResult.new(content: content, attributes: meta, attributes_data: meta_raw)
     end
 
+    SEPARATOR = /(-{5}|-{3})/.source
+
     # @return [ParseResult]
     def parse_with_frontmatter(content_filename)
       data = read(content_filename)
 
-      if data !~ /\A-{3,5}\s*$/
+      if data !~ /\A#{SEPARATOR}\s*$/
         return ParseResult.new(content: data, attributes: {}, attributes_data: '')
       end
 
-      pieces = data.split(/^(-{5}|-{3})[ \t]*\r?\n?/, 3)
+      pieces = data.split(/^#{SEPARATOR}[ \t]*\r?\n?/, 3)
       if pieces.size < 4
         raise Errors::InvalidFormat.new(content_filename)
       end

data/lib/nanoc/deploying/deployers/fog.rb

@@ -82,7 +82,7 @@ module Nanoc::Deploying::Deployers
 
     # @see Nanoc::Deploying::Deployer#run
     def run
-      require 'fog'
+      require 'fog/core'
 
       src      = File.expand_path(source_path)
       bucket   = config[:bucket] || config[:bucket_name]
@@ -126,6 +126,9 @@ module Nanoc::Deploying::Deployers
 
     def connect
       ::Fog::Storage.new(config_for_fog)
+    rescue ArgumentError
+      require "fog/#{config[:provider]}"
+      ::Fog::Storage.new(config_for_fog)
     end
 
     def get_or_create_bucket(connection, bucket, path)

data/lib/nanoc/helpers/link_to.rb

@@ -17,7 +17,7 @@ module Nanoc::Helpers
         case target
         when String
           target
-        when Nanoc::ItemWithRepsView, Nanoc::ItemWithoutRepsView, Nanoc::ItemRepView
+        when Nanoc::CompilationItemView, Nanoc::BasicItemView, Nanoc::BasicItemRepView
           raise "Cannot create a link to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if target.path.nil?
           target.path
         else

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -53,14 +53,18 @@ module Nanoc::RuleDSL
         Nanoc::Int::InMemDataSource.new(ctx.items.unwrap, ctx.layouts.unwrap)
     end
 
-    def postprocess(site, reps)
+    def postprocess(site, compiler, reps)
       dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
+
+      res = compiler.run_until_reps_built
+      reps = res.fetch(:reps)
+
       view_context =
-        Nanoc::ViewContext.new(
+        Nanoc::ViewContextForCompilation.new(
           reps: reps,
           items: site.items,
           dependency_tracker: dependency_tracker,
-          compilation_context: site.compiler.compilation_context,
+          compilation_context: compiler.compilation_context(reps: reps),
           snapshot_repo: nil,
         )
       ctx = new_postprocessor_context(site, view_context)
@@ -72,15 +76,8 @@ module Nanoc::RuleDSL
 
     # @api private
     def new_preprocessor_context(site)
-      dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
       view_context =
-        Nanoc::ViewContext.new(
-          reps: nil,
-          items: nil,
-          dependency_tracker: dependency_tracker,
-          compilation_context: nil,
-          snapshot_repo: nil,
-        )
+        Nanoc::ViewContextForPreCompilation.new(items: site.items)
 
       Nanoc::Int::Context.new(
         config: Nanoc::MutableConfigView.new(site.config, view_context),

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -57,8 +57,8 @@ module Nanoc::RuleDSL
     end
 
     def new_action_sequence_for_rep(rep)
-      dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
-      view_context = @site.compiler.compilation_context.create_view_context(dependency_tracker)
+      view_context =
+        Nanoc::ViewContextForPreCompilation.new(items: @site.items)
 
       executor = Nanoc::RuleDSL::RecordingExecutor.new(rep)
       rule = @rules_collection.compilation_rule_for(rep)
@@ -132,12 +132,21 @@ module Nanoc::RuleDSL
       routing_rule = routing_rules[snapshot_name]
       return nil if routing_rule.nil?
 
-      dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
-      view_context = Nanoc::ViewContext.new(reps: nil, items: nil, dependency_tracker: dependency_tracker, compilation_context: nil, snapshot_repo: nil)
-      basic_path = routing_rule.apply_to(rep, executor: nil, site: @site, view_context: view_context)
+      view_context =
+        Nanoc::ViewContextForPreCompilation.new(items: @site.items)
+
+      basic_path =
+        routing_rule.apply_to(
+          rep,
+          executor: nil,
+          site: @site,
+          view_context: view_context,
+        )
+
       if basic_path && !basic_path.start_with?('/')
         raise PathWithoutInitialSlashError.new(rep, basic_path)
       end
+
       basic_path
     end
   end

data/lib/nanoc/rule_dsl/recording_executor.rb

@@ -14,6 +14,10 @@ module Nanoc
         @pre_snapshot = false
       end
 
+      def inspect
+        "<#{self.class}>"
+      end
+
       def filter(filter_name, filter_args = {})
         @action_sequence_builder.add_filter(filter_name, filter_args)
       end

data/lib/nanoc/rule_dsl/rule.rb

@@ -5,6 +5,8 @@ module Nanoc::RuleDSL
   #
   # @api private
   class Rule
+    include Nanoc::Int::ContractsSupport
+
     # @return [Symbol] The name of the representation that will be compiled
     #   using this rule
     attr_reader :rep_name
@@ -44,18 +46,21 @@ module Nanoc::RuleDSL
       @pattern.match?(item.identifier)
     end
 
-    # Applies this rule to the given item rep.
-    #
-    # @param [Nanoc::Int::ItemRep] rep
-    # @param [Nanoc::Int::Site] site
-    # @param [Nanoc::Int::Executor, Nanoc::RuleDSL::RecordingExecutor] executor
-    # @param [Nanoc::ViewContext] view_context
-    #
-    # @return [void]
+    contract Nanoc::Int::ItemRep, C::KeywordArgs[
+      site: Nanoc::Int::Site,
+      executor: C::Or[nil, Nanoc::Int::Executor, Nanoc::RuleDSL::RecordingExecutor],
+      view_context: Nanoc::ViewContextForPreCompilation,
+    ] => C::Any
     def apply_to(rep, site:, executor:, view_context:)
+      # FIXME: allowing executor to be nil is ugly
+
       context = Nanoc::RuleDSL::RuleContext.new(
-        rep: rep, executor: executor, site: site, view_context: view_context,
+        rep: rep,
+        executor: executor,
+        site: site,
+        view_context: view_context,
       )
+
       context.instance_exec(matches(rep.item.identifier), &@block)
     end
 

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -10,14 +10,14 @@ module Nanoc::RuleDSL
     # @param [Nanoc::Int::ItemRep] rep
     # @param [Nanoc::Int::Site] site
     # @param [Nanoc::Int::Executor, Nanoc::RuleDSL::RecordingExecutor] executor
-    # @param [Nanoc::ViewContext] view_context
+    # @param [Nanoc::ViewContextForCompilation] view_context
     def initialize(rep:, site:, executor:, view_context:)
       @_executor = executor
 
       super({
-        item: Nanoc::ItemWithoutRepsView.new(rep.item, view_context),
-        rep: Nanoc::ItemRepView.new(rep, view_context),
-        item_rep: Nanoc::ItemRepView.new(rep, view_context),
+        item: Nanoc::BasicItemView.new(rep.item, view_context),
+        rep: Nanoc::BasicItemRepView.new(rep, view_context),
+        item_rep: Nanoc::BasicItemRepView.new(rep, view_context),
         items: Nanoc::ItemCollectionWithoutRepsView.new(site.items, view_context),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
         config: Nanoc::ConfigView.new(site.config, view_context),

data/lib/nanoc/spec.rb

@@ -30,6 +30,8 @@ module Nanoc
         @items = Nanoc::Int::ItemCollection.new(@config)
         @layouts = Nanoc::Int::LayoutCollection.new(@config)
         @dependency_tracker = Nanoc::Int::DependencyTracker.new(Object.new)
+        @snapshot_repo = Nanoc::Int::SnapshotRepo.new
+        @action_provider = new_action_provider
       end
 
       # Creates a new item and adds it to the site’s collection of items.
@@ -40,7 +42,7 @@ module Nanoc
       #
       # @param [Nanoc::Identifier, String] identifier This item's identifier
       #
-      # @return [Nanoc::ItemWithRepsView] A view for the newly created item
+      # @return [Nanoc::CompilationItemView] A view for the newly created item
       def create_item(content, attributes, identifier)
         item = Nanoc::Int::Item.new(content, attributes, identifier)
         @items = @items.add(item)
@@ -55,7 +57,7 @@ module Nanoc
       #
       # @param [Nanoc::Identifier, String] identifier This layout's identifier
       #
-      # @return [Nanoc::ItemWithRepsView] A view for the newly created layout
+      # @return [Nanoc::CompilationItemView] A view for the newly created layout
       def create_layout(content, attributes, identifier)
         layout = Nanoc::Int::Layout.new(content, attributes, identifier)
         @layouts = @layouts.add(layout)
@@ -64,7 +66,7 @@ module Nanoc
 
       # Creates a new representation for the given item.
       #
-      # @param [Nanoc::ItemWithRepsView] item The item to create a represetation for
+      # @param [Nanoc::CompilationItemView] item The item to create a represetation for
       #
       # @param [String] path The path of the `:last` snapshot of this item representation
       # @param [Symbol] rep The rep name to create
@@ -95,12 +97,12 @@ module Nanoc
         assigns[:config]
       end
 
-      # @return [Nanoc::ItemWithRepsView, nil]
+      # @return [Nanoc::CompilationItemView, nil]
       def item
         assigns[:item]
       end
 
-      # @return [Nanoc::ItemRepView, nil]
+      # @return [Nanoc::BasicItemRepView, nil]
       def item_rep
         assigns[:item_rep]
       end
@@ -130,12 +132,21 @@ module Nanoc
       private
 
       def view_context
-        Nanoc::ViewContext.new(
-          reps: @reps,
-          items: @items,
-          dependency_tracker: @dependency_tracker,
-          compilation_context: site.compiler.compilation_context,
-          snapshot_repo: site.compiler.compilation_context.snapshot_repo,
+        compilation_context =
+          Nanoc::Int::CompilationContext.new(
+            action_provider:        @action_provider,
+            reps:                   @reps,
+            site:                   @site,
+            compiled_content_cache: :__compiled_content_cache,
+            snapshot_repo:          @snapshot_repo,
+          )
+
+        Nanoc::ViewContextForCompilation.new(
+          reps:                @reps,
+          items:               @items,
+          dependency_tracker:  @dependency_tracker,
+          compilation_context: compilation_context,
+          snapshot_repo:       @snapshot_repo,
         )
       end
 
@@ -164,26 +175,23 @@ module Nanoc
       end
 
       def new_compiler_for(site)
-        Nanoc::Int::CompilerLoader.new.load(site, action_provider: new_action_provider)
+        Nanoc::Int::CompilerLoader.new.load(site, action_provider: @action_provider)
       end
 
       def site
-        @_site ||= begin
-          site = Nanoc::Int::Site.new(
+        @_site ||=
+          Nanoc::Int::Site.new(
             config: @config,
             code_snippets: [],
             data_source: Nanoc::Int::InMemDataSource.new(@items, @layouts),
           )
-          site.compiler = new_compiler_for(site)
-          site
-        end
       end
 
       def assigns
         {
           config: Nanoc::MutableConfigView.new(@config, view_context),
-          item_rep: @item_rep ? Nanoc::ItemRepView.new(@item_rep, view_context) : nil,
-          item: @item ? Nanoc::ItemWithRepsView.new(@item, view_context) : nil,
+          item_rep: @item_rep ? Nanoc::CompilationItemRepView.new(@item_rep, view_context) : nil,
+          item: @item ? Nanoc::CompilationItemView.new(@item, view_context) : nil,
           items: Nanoc::ItemCollectionWithRepsView.new(@items, view_context),
           layouts: Nanoc::LayoutCollectionView.new(@layouts, view_context),
           _erbout: @erbout,

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.8.9'
+  VERSION = '4.8.10'
 end

data/spec/nanoc/base/checksummer_spec.rb

@@ -252,11 +252,11 @@ describe Nanoc::Int::Checksummer do
     end
   end
 
-  context 'Nanoc::ItemWithRepsView' do
-    let(:obj) { Nanoc::ItemWithRepsView.new(item, nil) }
+  context 'Nanoc::CompilationItemView' do
+    let(:obj) { Nanoc::CompilationItemView.new(item, nil) }
     let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
 
-    it { is_expected.to eql('Nanoc::ItemWithRepsView<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>>') }
+    it { is_expected.to eql('Nanoc::CompilationItemView<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>>') }
   end
 
   context 'Nanoc::Int::ItemRep' do
@@ -266,19 +266,27 @@ describe Nanoc::Int::Checksummer do
     it { is_expected.to eql('Nanoc::Int::ItemRep<item=Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,name=Symbol<pdf>>') }
   end
 
-  context 'Nanoc::ItemRepView' do
-    let(:obj) { Nanoc::ItemRepView.new(rep, :_unused_context) }
+  context 'Nanoc::BasicItemRepView' do
+    let(:obj) { Nanoc::BasicItemRepView.new(rep, :_unused_context) }
     let(:rep) { Nanoc::Int::ItemRep.new(item, :pdf) }
     let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
 
-    it { is_expected.to eql('Nanoc::ItemRepView<Nanoc::Int::ItemRep<item=Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,name=Symbol<pdf>>>') }
+    it { is_expected.to eql('Nanoc::BasicItemRepView<Nanoc::Int::ItemRep<item=Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,name=Symbol<pdf>>>') }
   end
 
-  context 'Nanoc::ItemWithoutRepsView' do
-    let(:obj) { Nanoc::ItemWithoutRepsView.new(item, nil) }
+  context 'Nanoc::CompilationItemRepView' do
+    let(:obj) { Nanoc::CompilationItemRepView.new(rep, :_unused_context) }
+    let(:rep) { Nanoc::Int::ItemRep.new(item, :pdf) }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
+
+    it { is_expected.to eql('Nanoc::CompilationItemRepView<Nanoc::Int::ItemRep<item=Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,name=Symbol<pdf>>>') }
+  end
+
+  context 'Nanoc::BasicItemView' do
+    let(:obj) { Nanoc::BasicItemView.new(item, nil) }
     let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
 
-    it { is_expected.to eql('Nanoc::ItemWithoutRepsView<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>>') }
+    it { is_expected.to eql('Nanoc::BasicItemView<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<asdf>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>>') }
   end
 
   context 'Nanoc::LayoutView' do
@@ -362,9 +370,9 @@ describe Nanoc::Int::Checksummer do
       [
         'Nanoc::RuleDSL::RuleContext<',
         'item=',
-        'Nanoc::ItemWithoutRepsView<' + expected_item_checksum + '>',
+        'Nanoc::BasicItemView<' + expected_item_checksum + '>',
         ',rep=',
-        'Nanoc::ItemRepView<' + expected_item_rep_checksum + '>',
+        'Nanoc::BasicItemRepView<' + expected_item_rep_checksum + '>',
         ',items=',
         'Nanoc::ItemCollectionWithoutRepsView<Array<' + expected_item_checksum + ',>>',
         ',layouts=',