nanoc 4.4.5 → 4.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863abf7fed2e1998046a921fe61e76d21bc0d4d3
-  data.tar.gz: 03a50e4fc4e75f74e0505c0664c352e5b2821d09
+  metadata.gz: '0186a136e28013d7133ebf66fa6d1e7065992a40'
+  data.tar.gz: 9198ef4aa5d624328b6bc3a5dc20238c4d4a4e53
 SHA512:
-  metadata.gz: 5efd6d09aef769a17e8a1d66ee9557ca8b70dbdca303b36e2142e331d133904caf4b902b246d65d9b22ead0cb152746684bf0ae52436ce7c7bfa6de670a537af
-  data.tar.gz: 62b27f158e7d10f8faf730df0ce02bb931fc15d665e5ad4960ca006c2f917333dcc74ff8cd49532245b47f65648313095819c4bda84e4657e515585ea20a6686
+  metadata.gz: b4f5f734e8a28c0cb7f01fa35119bbd7b2ffe7cae4a1d832fd70d3fa1fb7657a7f000ed9557213c8f849117033d4222bb7681fe4bc3bc3977dc9f441a59658af
+  data.tar.gz: b193bcfdf436fa88af0ae448019037bba79a5ab75a643280a3b5ce031e92e3e7ebbeab8e135f0d77111244d15fcff0bbf112662f027a60cb5544ed048a809f30

data/Gemfile

@@ -8,14 +8,17 @@ group :devel do
   gem 'fuubar'
   gem 'guard-rake'
   gem 'json', '~> 2.0'
+  gem 'm', '~> 1.5'
   gem 'minitest', '~> 5.0'
   gem 'mocha'
   gem 'pry'
+  gem 'rainbow', '~> 2.1'
   gem 'rake'
   gem 'rdoc', '~> 5.0'
-  gem 'rspec-mocks'
   gem 'rspec'
-  gem 'rubocop'
+  gem 'rspec-its', '~> 1.2'
+  gem 'rspec-mocks'
+  gem 'rubocop', github: 'bbatsov/rubocop'
   gem 'simplecov', require: false
   gem 'timecop'
   gem 'vcr'
@@ -55,6 +58,7 @@ group :plugins do
   gem 'rubypants'
   gem 'sass'
   gem 'slim'
+  gem 'therubyracer', github: 'cowboyd/therubyracer'
   gem 'typogruby'
   gem 'uglifier'
   gem 'w3c_validators'

data/Gemfile.lock

@@ -1,3 +1,22 @@
+GIT
+  remote: git://github.com/bbatsov/rubocop.git
+  revision: 186b16e10514eaf304990d614184b980abc0ad2b
+  specs:
+    rubocop (0.46.0)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+
+GIT
+  remote: git://github.com/cowboyd/therubyracer.git
+  revision: 2f1127bed45f03b91f3c92469be26399d3c1bcd8
+  specs:
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.15)
+      ref
+
 GIT
   remote: git://github.com/tmm1/pygments.rb.git
   revision: a988d127d3270d21685d2ac2e586060bf43709f3
@@ -8,10 +27,9 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.4.5)
+    nanoc (4.4.6)
       cri (~> 2.3)
       hamster (~> 3.0)
-      parallel (~> 1.9)
       ref (~> 2.0)
 
 GEM
@@ -50,7 +68,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.3)
+    concurrent-ruby (1.0.4)
     contracts (0.14.0)
     coveralls (0.8.17)
       json (>= 1.8, < 3)
@@ -219,7 +237,7 @@ GEM
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
     handlebars-source (4.0.6)
-    hashdiff (0.3.1)
+    hashdiff (0.3.2)
     inflecto (0.0.2)
     ipaddress (0.8.3)
     json (2.0.2)
@@ -232,6 +250,9 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.10)
+    m (1.5.0)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
     markaby (0.8.0)
       builder
     maruku (0.7.2)
@@ -247,7 +268,7 @@ GEM
     multi_json (1.12.1)
     mustache (1.0.3)
     nenv (0.3.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -263,7 +284,7 @@ GEM
       slop (~> 3.4)
     public_suffix (2.0.4)
     rack (2.0.1)
-    rainbow (2.1.0)
+    rainbow (2.2.0)
     rainpress (1.0)
     rake (12.0.0)
     rb-fsevent (0.9.8)
@@ -276,7 +297,7 @@ GEM
       trollop (~> 2.1)
     rdiscount (2.2.0.1)
     rdoc (5.0.0)
-    redcarpet (3.3.4)
+    redcarpet (3.4.0)
     ref (2.0.0)
     rouge (2.0.7)
     rspec (3.5.0)
@@ -288,16 +309,13 @@ GEM
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     rubypants (0.6.0)
@@ -316,9 +334,6 @@ GEM
     temple (0.7.7)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
     thor (0.19.4)
     tilt (2.0.5)
     timecop (0.8.1)
@@ -369,6 +384,7 @@ DEPENDENCIES
   kramdown
   less (~> 2.0)
   listen
+  m (~> 1.5)
   markaby
   maruku
   mime-types
@@ -382,6 +398,7 @@ DEPENDENCIES
   pry
   pygments.rb!
   rack
+  rainbow (~> 2.1)
   rainpress
   rake
   rdiscount (~> 2.2)
@@ -389,12 +406,14 @@ DEPENDENCIES
   redcarpet
   rouge
   rspec
+  rspec-its (~> 1.2)
   rspec-mocks
-  rubocop
+  rubocop!
   rubypants
   sass
   simplecov
   slim
+  therubyracer!
   timecop
   typogruby
   uglifier
@@ -406,4 +425,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.4.6 (2016-12-28)
+
+Fixes:
+
+* Fixed issue where `#compiled_content` would not return the correct content (#1040, #1041)
+
 ## 4.4.5 (2016-12-24)
 
 Fixes:

data/Rakefile

@@ -3,30 +3,18 @@ require 'rspec/core/rake_task'
 require 'rake/testtask'
 require 'coveralls/rake/task'
 
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.options  = %w(--display-cop-names --format simple)
-  task.patterns = ['bin/nanoc', 'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb']
-end
+RuboCop::RakeTask.new(:rubocop)
 
 Coveralls::RakeTask.new
 
-SUBDIRS = %w(* base checking cli data_sources deploying extra filters helpers).freeze
-
-namespace :test do
-  SUBDIRS.each do |dir|
-    Rake::TestTask.new(dir == '*' ? 'all' : dir) do |t|
-      t.test_files = Dir["test/#{dir}/**/*_spec.rb"] + Dir["test/#{dir}/**/test_*.rb"]
-      t.libs = ['./lib', '.']
-      t.ruby_opts = ['-r./test/helper']
-    end
-  end
+Rake::TestTask.new(:test_all) do |t|
+  t.test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
+  t.libs << 'test'
 end
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.verbose = false
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run all tests and specs'
-task test: [:spec, :'test:all', :'coveralls:push']
+task test: [:spec, :test_all, :rubocop]
+task test_ci: [:test, :'coveralls:push']
 
-task default: [:test, :rubocop]
+task default: :test

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

@@ -32,9 +32,7 @@ module Nanoc::Int
     #
     # @return [void]
     def load
-      # rubocop:disable Lint/Eval
       eval(@data, TOPLEVEL_BINDING, @filename)
-      # rubocop:enable Lint/Eval
       nil
     end
 

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

@@ -66,24 +66,16 @@ module Nanoc::Int
     def compiled_content(snapshot: nil)
       # Get name of last pre-layout snapshot
       snapshot_name = snapshot || (@snapshot_contents[:pre] ? :pre : :last)
-      is_movable = [:pre, :post, :last].include?(snapshot_name)
 
       # Check existance of snapshot
       snapshot_def = snapshot_defs.reverse.find { |sd| sd.name == snapshot_name }
-      is_final = snapshot_def && snapshot_def.final?
-      if !is_movable && !is_final
+      unless snapshot_def
         raise Nanoc::Int::Errors::NoSuchSnapshot.new(self, snapshot_name)
       end
 
       # Verify snapshot is usable
-      is_still_moving =
-        case snapshot_name
-        when :post, :last
-          true
-        when :pre
-          !is_final
-        end
-      is_usable_snapshot = @snapshot_contents[snapshot_name] && (compiled? || !is_still_moving)
+      stopped_moving = snapshot_name != :last || compiled?
+      is_usable_snapshot = @snapshot_contents[snapshot_name] && stopped_moving
       unless is_usable_snapshot
         Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(self))
         return compiled_content(snapshot: snapshot)
@@ -98,16 +90,6 @@ module Nanoc::Int
       snapshot_content.string
     end
 
-    contract Symbol => C::Bool
-    # Checks whether content exists at a given snapshot.
-    #
-    # @return [Boolean] True if content exists for the snapshot with the
-    #   given name, false otherwise
-    def snapshot?(snapshot_name)
-      !@snapshot_contents[snapshot_name].nil?
-    end
-    alias has_snapshot? snapshot?
-
     contract C::KeywordArgs[snapshot: C::Optional[Symbol]] => C::Maybe[String]
     # Returns the item rep’s raw path. It includes the path to the output
     # directory and the full filename.
@@ -144,7 +126,7 @@ module Nanoc::Int
     end
 
     def inspect
-      "<#{self.class} name=\"#{name}\" binary=#{binary?} raw_path=\"#{raw_path}\" item.identifier=\"#{item.identifier}\">"
+      "<#{self.class} name=\"#{name}\" raw_path=\"#{raw_path}\" item.identifier=\"#{item.identifier}\">"
     end
   end
 end

data/lib/nanoc/base/entities/processing_actions/snapshot.rb

@@ -1,26 +1,28 @@
 module Nanoc::Int::ProcessingActions
   class Snapshot < Nanoc::Int::ProcessingAction
     # snapshot :before_layout
-    # snapshot :before_layout, final: true
     # snapshot :before_layout, path: '/about.md'
 
     attr_reader :snapshot_name
-    attr_reader :final
     attr_reader :path
-    alias final? final
 
-    def initialize(snapshot_name, final, path)
+    def initialize(snapshot_name, path)
       @snapshot_name = snapshot_name
-      @final = final
       @path = path
     end
 
     def serialize
-      [:snapshot, @snapshot_name, @final, @path]
+      [:snapshot, @snapshot_name, true, @path]
+    end
+
+    NONE = Object.new
+
+    def copy(path: NONE)
+      self.class.new(@snapshot_name, path.equal?(NONE) ? @path : path)
     end
 
     def to_s
-      "snapshot #{@snapshot_name.inspect}, final: #{@final.inspect}, path: #{@path.inspect}"
+      "snapshot #{@snapshot_name.inspect}, path: #{@path.inspect}"
     end
   end
 end

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

@@ -3,9 +3,9 @@ module Nanoc::Int
     include Nanoc::Int::ContractsSupport
     include Enumerable
 
-    def initialize(item_rep)
+    def initialize(item_rep, actions: [])
       @item_rep = item_rep
-      @actions = []
+      @actions = actions
     end
 
     contract C::None => Numeric
@@ -30,10 +30,10 @@ module Nanoc::Int
       self
     end
 
-    contract Symbol, C::Bool, C::Maybe[String] => self
-    def add_snapshot(snapshot_name, final, path)
-      will_add_snapshot(snapshot_name) if final
-      @actions << Nanoc::Int::ProcessingActions::Snapshot.new(snapshot_name, final, path)
+    contract Symbol, C::Maybe[String] => self
+    def add_snapshot(snapshot_name, path)
+      will_add_snapshot(snapshot_name)
+      @actions << Nanoc::Int::ProcessingActions::Snapshot.new(snapshot_name, path)
       self
     end
 
@@ -56,7 +56,7 @@ module Nanoc::Int
 
     # TODO: Add contract
     def serialize
-      map(&:serialize)
+      to_a.map(&:serialize)
     end
 
     contract C::Func[Nanoc::Int::ProcessingAction => C::Any] => self
@@ -65,6 +65,14 @@ module Nanoc::Int
       self
     end
 
+    contract C::Func[Nanoc::Int::ProcessingAction => C::Any] => self
+    def map
+      self.class.new(
+        @item_rep,
+        actions: @actions.map { |a| yield(a) },
+      )
+    end
+
     private
 
     def will_add_snapshot(name)

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

@@ -5,15 +5,9 @@ module Nanoc
 
       attr_reader :name
 
-      contract Symbol, C::Bool => C::Any
-      def initialize(name, is_final)
+      contract Symbol => C::Any
+      def initialize(name)
         @name = name
-        @is_final = is_final
-      end
-
-      contract C::None => C::Bool
-      def final?
-        @is_final
       end
     end
   end

data/lib/nanoc/base/repos/store.rb

@@ -66,21 +66,11 @@ module Nanoc::Int
     #
     # @return [void]
     def load
-      # Check file existance
-      unless File.file?(filename)
-        no_data_found
-        return
-      end
+      return unless File.file?(filename)
 
       begin
         pstore.transaction do
-          # Check version
-          if pstore[:version] != version
-            version_mismatch_detected
-            return
-          end
-
-          # Load
+          return if pstore[:version] != version
           self.data = pstore[:data]
         end
       rescue
@@ -102,22 +92,6 @@ module Nanoc::Int
       end
     end
 
-    # @group Callback methods
-
-    # Callback method that is called when no data file was found. By default,
-    # this implementation does nothing, but it should probably be overridden
-    # by the subclass.
-    #
-    # @return [void]
-    def no_data_found; end
-
-    # Callback method that is called when a version mismatch is detected. By
-    # default, this implementation does nothing, but it should probably be
-    # overridden by the subclass.
-    #
-    # @return [void]
-    def version_mismatch_detected; end
-
     private
 
     def pstore

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

@@ -104,7 +104,13 @@ module Nanoc::Int
       end
     end
 
-    class RuleContextUpdateBehavior
+    class UpdateBehavior
+      def self.update(_obj, _digest)
+        raise NotImpementedError
+      end
+    end
+
+    class RuleContextUpdateBehavior < UpdateBehavior
       def self.update(obj, digest)
         digest.update('item=')
         yield(obj.item)
@@ -119,7 +125,7 @@ module Nanoc::Int
       end
     end
 
-    class ContextUpdateBehavior
+    class ContextUpdateBehavior < UpdateBehavior
       def self.update(obj, digest)
         obj.instance_variables.each do |var|
           digest.update(var.to_s)
@@ -130,12 +136,6 @@ module Nanoc::Int
       end
     end
 
-    class UpdateBehavior
-      def self.update(_obj, _digest)
-        raise NotImpementedError
-      end
-    end
-
     class RawUpdateBehavior < UpdateBehavior
       def self.update(obj, digest)
         digest.update(obj.to_s)
@@ -167,8 +167,7 @@ module Nanoc::Int
     end
 
     class NoUpdateBehavior < UpdateBehavior
-      def self.update(_obj, _digest)
-      end
+      def self.update(_obj, _digest); end
     end
 
     class UnwrapUpdateBehavior < UpdateBehavior

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

@@ -75,7 +75,7 @@ module Nanoc::Int
 
     # Provides functionality for (re)calculating the content of an item rep, without caching or
     # outdatedness checking.
-    class RecalculatingItemRepCompiler
+    class RecalculatePhase
       include Nanoc::Int::ContractsSupport
 
       def initialize(action_provider:, dependency_store:, compilation_context:)
@@ -98,7 +98,7 @@ module Nanoc::Int
           when Nanoc::Int::ProcessingActions::Layout
             executor.layout(action.layout_identifier, action.params)
           when Nanoc::Int::ProcessingActions::Snapshot
-            executor.snapshot(action.snapshot_name, final: action.final?, path: action.path)
+            executor.snapshot(action.snapshot_name)
           else
             raise Nanoc::Int::Errors::InternalInconsistency, "unknown action #{action.inspect}"
           end
@@ -109,8 +109,8 @@ module Nanoc::Int
     end
 
     # Provides functionality for (re)calculating the content of an item rep, with caching or
-    # outdatedness checking. Delegates to RecalculatingItemRepCompiler if outdated or no cache available.
-    class CachingItemRepCompiler
+    # outdatedness checking. Delegates to RecalculatePhase if outdated or no cache available.
+    class CachePhase
       include Nanoc::Int::ContractsSupport
 
       def initialize(compiled_content_cache:, wrapped:)
@@ -138,7 +138,7 @@ module Nanoc::Int
     end
 
     # Provides functionality for suspending and resuming item rep compilation (using fibers).
-    class ResumableItemRepCompiler
+    class ResumePhase
       include Nanoc::Int::ContractsSupport
 
       def initialize(wrapped:)
@@ -182,7 +182,7 @@ module Nanoc::Int
       end
     end
 
-    class WritingItemRepCompiler
+    class WritePhase
       include Nanoc::Int::ContractsSupport
 
       def initialize(wrapped:)
@@ -194,9 +194,7 @@ module Nanoc::Int
         @wrapped.run(rep, is_outdated: is_outdated)
 
         rep.snapshot_defs.each do |sdef|
-          if sdef.final?
-            ItemRepWriter.new.write(rep, sdef.name)
-          end
+          ItemRepWriter.new.write(rep, sdef.name)
         end
       end
     end
@@ -344,23 +342,23 @@ module Nanoc::Int
 
     def item_rep_compiler
       @_item_rep_compiler ||= begin
-        recalculating_item_rep_compiler = RecalculatingItemRepCompiler.new(
+        recalculate_phase = RecalculatePhase.new(
           action_provider: action_provider,
           dependency_store: @dependency_store,
           compilation_context: compilation_context,
         )
 
-        caching_item_rep_compiler = CachingItemRepCompiler.new(
+        cache_phase = CachePhase.new(
           compiled_content_cache: compiled_content_cache,
-          wrapped: recalculating_item_rep_compiler,
+          wrapped: recalculate_phase,
         )
 
-        resumable_item_rep_compiler = ResumableItemRepCompiler.new(
-          wrapped: caching_item_rep_compiler,
+        resume_phase = ResumePhase.new(
+          wrapped: cache_phase,
         )
 
-        WritingItemRepCompiler.new(
-          wrapped: resumable_item_rep_compiler,
+        WritePhase.new(
+          wrapped: resume_phase,
         )
       end
     end

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

@@ -35,9 +35,6 @@ module Nanoc
           if filter.class.to_binary? && !File.file?(filter.output_filename)
             raise OutputNotWrittenError.new(filter_name, filter.output_filename)
           end
-
-          # Create snapshot
-          snapshot(@rep.snapshot_contents[:post] ? :post : :pre, final: false) unless @rep.binary?
         ensure
           Nanoc::Int::NotificationCenter.post(:filtering_ended, @rep, filter_name)
         end
@@ -55,17 +52,12 @@ module Nanoc
         # Check whether item can be laid out
         raise Nanoc::Int::Errors::CannotLayoutBinaryItem.new(@rep) if @rep.binary?
 
-        # Create "pre" snapshot
-        if @rep.snapshot_contents[:post].nil?
-          snapshot(:pre, final: true)
-        end
-
         # Create filter
         klass = Nanoc::Filter.named(filter_name)
         raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if klass.nil?
         view_context = @compilation_context.create_view_context(@dependency_tracker)
         layout_view = Nanoc::LayoutView.new(layout, view_context)
-        filter = klass.new(assigns_for(@rep).merge({ layout: layout_view }))
+        filter = klass.new(assigns_for(@rep).merge(layout: layout_view))
 
         # Visit
         @dependency_tracker.bounce(layout, raw_content: true)
@@ -78,15 +70,12 @@ module Nanoc
           arg = content.binary? ? content.filename : content.string
           res = filter.setup_and_run(arg, filter_args)
           @rep.snapshot_contents[:last] = Nanoc::Int::TextualContent.new(res).tap(&:freeze)
-
-          # Create "post" snapshot
-          snapshot(:post, final: false)
         ensure
           Nanoc::Int::NotificationCenter.post(:filtering_ended, @rep, filter_name)
         end
       end
 
-      def snapshot(snapshot_name, final: true, path: nil) # rubocop:disable Lint/UnusedMethodArgument
+      def snapshot(snapshot_name)
         @rep.snapshot_contents[snapshot_name] = @rep.snapshot_contents[:last]
       end
 

data/lib/nanoc/base/views/mixins/with_reps_view_mixin.rb

@@ -12,7 +12,7 @@ module Nanoc
     #   any).
     #
     # @return [String] The content of the given rep at the given snapshot.
-    def compiled_content(rep: :default, snapshot: :pre)
+    def compiled_content(rep: :default, snapshot: nil)
       reps.fetch(rep).compiled_content(snapshot: snapshot)
     end
 

data/lib/nanoc/checking/checks/external_links.rb

@@ -43,7 +43,8 @@ module ::Nanoc::Checking::Checks
     end
 
     def select_invalid(hrefs)
-      Parallel.map(hrefs, in_threads: 10) { |href| validate(href) }.compact
+      col = Nanoc::Extra::ParallelCollection.new(hrefs, parallelism: 10)
+      col.map { |href| validate(href) }.compact
     end
 
     def validate(href)