nanoc 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3215906d4c407f3712161bcf4464b5b5358e50c8
-  data.tar.gz: 1e3877875fd5f931ab99fce68ff6c1130acd2936
+  metadata.gz: cb5ae7fdab33a2274afd361558045fdac7c5c2f9
+  data.tar.gz: 636a45cd39ba85dc37c2fc6abbb43af2e6e98e16
 SHA512:
-  metadata.gz: 34b4e72944f26ee705b66ab40367528a78733ee623bd580656d385e9a71f0b4d125dd334c356699723390c82e214064fc85a627865e52414737a4141705af294
-  data.tar.gz: f1772e11403f7ffc7b62e1421a63c59c87c2024f448d61ddc4eb7c5c838dd6a576d40580eb4a8fcf502603bdbd54906a33981d28af30e9e761bac3b8dbfdac67
+  metadata.gz: 98f9a4d6fb54b47bdee2a1c4bef5f7fc141daa1d63d28048076596ce5b88959b5522d1000898873256e46b06b4693f9049bad09809e198110b0ec755c43bfd54
+  data.tar.gz: bec451e9af2fa9782c224df87f53629e6e4a3d9dc715d7cc145ce467c813bf33d221adf6a540b063e8ad7a0febf13dcee0a4f619ac096305e2ce60edb038e693

data/Appraisals

@@ -8,4 +8,4 @@ appraise 'rouge-2' do
   group :plugins do
     gem 'rouge', '~> 2.0'
   end
-end
+end

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
-  remote: git://github.com/bbatsov/rubocop.git
-  revision: 1c0cf571afc608229c3116fa6f66dd480e395772
+  remote: https://github.com/bbatsov/rubocop.git
+  revision: c52c7ea94d1d99f2d384f562b36dbed0f546f628
   specs:
     rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
@@ -10,7 +10,7 @@ GIT
       unicode-display_width (~> 1.0, >= 1.0.1)
 
 GIT
-  remote: git://github.com/cowboyd/therubyracer.git
+  remote: https://github.com/cowboyd/therubyracer.git
   revision: 466a1f0d4f696acfe971899272359623ec0a7a97
   specs:
     therubyracer (0.12.3)
@@ -18,7 +18,7 @@ GIT
       ref
 
 GIT
-  remote: git://github.com/tmm1/pygments.rb.git
+  remote: https://github.com/tmm1/pygments.rb.git
   revision: cf50cbeda48e8a242ef9cba9467e092935730f66
   specs:
     pygments.rb (1.1.1)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.6.1)
+    nanoc (4.6.2)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -69,8 +69,8 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.4)
-    contracts (0.14.0)
+    concurrent-ruby (1.0.5)
+    contracts (0.15.0)
     coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -81,13 +81,13 @@ GEM
       safe_yaml (~> 1.0.0)
     cri (2.7.1)
       colored (~> 1.2)
-    ddplugin (1.0.0)
+    ddplugin (1.0.1)
     diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.54.0)
+    excon (0.55.0)
     execjs (2.7.0)
-    ffi (1.9.17)
+    ffi (1.9.18)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.38.0)
@@ -127,7 +127,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (1.2.0)
+    fog-aws (1.2.1)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -161,7 +161,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.19)
+    fog-openstack (0.1.20)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -206,10 +206,10 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.7.0)
+    fog-vsphere (1.7.1)
       fog-core
       rbvmomi (~> 1.9)
-    fog-xenserver (0.2.3)
+    fog-xenserver (0.3.0)
       fog-core
       fog-xml
     fog-xml (0.1.2)
@@ -276,7 +276,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
-    parser (2.3.3.1)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -286,18 +286,18 @@ GEM
     public_suffix (2.0.5)
     rack (2.0.1)
     rainbow (2.2.1)
-    rainpress (1.0)
+    rainpress (1.0.1)
     rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rbvmomi (1.9.4)
-      builder (~> 3.2)
+    rbvmomi (1.9.5)
+      builder (~> 3.0)
       json (>= 1.8)
       nokogiri (~> 1.5)
       trollop (~> 2.1)
     rdiscount (2.2.0.1)
-    rdoc (5.0.0)
+    rdoc (5.1.0)
     redcarpet (3.4.0)
     ref (2.0.0)
     rouge (2.0.7)
@@ -338,11 +338,11 @@ GEM
     thor (0.19.4)
     tilt (2.0.6)
     timecop (0.8.1)
-    tins (1.13.0)
+    tins (1.13.2)
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.0.4)
+    uglifier (3.1.3)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.3)
     vcr (3.0.3)
@@ -425,4 +425,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.14.3
+   1.14.5

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.6.2 (2017-03-04)
+
+Fixes:
+
+* Fixed crash in `#binary?` (#1082, #1083, #1084)
+* Fixed issue which would cause the file referenced by `#raw_path` not to exist (#1097, #1099)
+
+Enhancements:
+
+* Allowed calling `#write` multiple times in the same rule (#1037, #1085)
+* Changed the `html` check to use validator.nu (#1104)
+
 ## 4.6.1 (2017-01-29)
 
 Fixes:

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

@@ -64,6 +64,13 @@ module Nanoc
         self
       end
 
+      contract String => self
+      def with_identifier_prefix(prefix)
+        other = dup
+        other.identifier = @identifier.prefix(prefix)
+        other
+      end
+
       contract C::None => String
       # @abstract
       #

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

@@ -8,14 +8,15 @@ module Nanoc::Int
 
     def_delegator :@objects, :each
     def_delegator :@objects, :size
-    def_delegator :@objects, :<<
-    def_delegator :@objects, :concat
 
-    contract C::Or[Hash, C::Named['Nanoc::Int::Configuration']] => C::Any
-    def initialize(config)
+    contract C::Or[Hash, C::Named['Nanoc::Int::Configuration']], C::IterOf[C::RespondTo[:identifier]] => C::Any
+    def initialize(config, objects = [])
       @config = config
+      @objects = objects
+    end
 
-      @objects = []
+    def self.from(enum, config)
+      new(config, enum)
     end
 
     contract C::None => self
@@ -50,10 +51,12 @@ module Nanoc::Int
       @objects.empty?
     end
 
-    contract C::Func[C::RespondTo[:identifier] => C::Bool] => self
-    def delete_if(&block)
-      @objects.delete_if(&block)
-      self
+    def add(obj)
+      self.class.new(@config, @objects + [obj])
+    end
+
+    def reject(&block)
+      self.class.new(@config, @objects.reject(&block))
     end
 
     protected

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

@@ -3,33 +3,30 @@ module Nanoc::Int
   class ItemRep
     include Nanoc::Int::ContractsSupport
 
-    # @return [Boolean]
+    contract C::None => C::Bool
     attr_accessor :compiled
     alias compiled? compiled
 
-    # @return [Hash<Symbol,String>]
-    attr_accessor :raw_paths
+    contract C::None => C::HashOf[Symbol => C::IterOf[String]]
+    attr_reader :raw_paths
 
-    # @return [Hash<Symbol,String>]
-    attr_accessor :paths
+    contract C::None => C::HashOf[Symbol => C::IterOf[String]]
+    attr_reader :paths
 
-    # @return [Nanoc::Int::Item]
+    contract C::None => Nanoc::Int::Item
     attr_reader :item
 
-    # @return [Symbol]
+    contract C::None => Symbol
     attr_reader :name
 
-    # @return [Enumerable<Nanoc::Int:SnapshotDef]
+    contract C::None => C::IterOf[C::Named['Nanoc::Int::SnapshotDef']]
     attr_accessor :snapshot_defs
 
-    # @return [Boolean]
+    contract C::None => C::Bool
     attr_accessor :modified
     alias modified? modified
 
     contract Nanoc::Int::Item, Symbol => C::Any
-    # @param [Nanoc::Int::Item] item
-    #
-    # @param [Symbol] name
     def initialize(item, name)
       # Set primary attributes
       @item   = item
@@ -42,6 +39,19 @@ module Nanoc::Int
 
       # Reset flags
       @compiled = false
+      @modified = false
+    end
+
+    contract C::HashOf[Symbol => C::IterOf[String]] => self
+    def raw_paths=(val)
+      @raw_paths = val
+      self
+    end
+
+    contract C::HashOf[Symbol => C::IterOf[String]] => self
+    def paths=(val)
+      @paths = val
+      self
     end
 
     contract Symbol => C::Bool
@@ -52,13 +62,8 @@ module Nanoc::Int
     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.
-    #
-    # @param [Symbol] snapshot The snapshot for which the path should be
-    #   returned
-    #
-    # @return [String] The item rep’s path
     def raw_path(snapshot: :last)
-      @raw_paths[snapshot]
+      @raw_paths.fetch(snapshot, []).first
     end
 
     contract C::KeywordArgs[snapshot: C::Optional[Symbol]] => C::Maybe[String]
@@ -66,20 +71,11 @@ module Nanoc::Int
     # with a slash and it is relative to the output directory. It does not
     # include the path to the output directory. It will not include the
     # filename if the filename is an index filename.
-    #
-    # @param [Symbol] snapshot The snapshot for which the path should be
-    #   returned
-    #
-    # @return [String] The item rep’s path
     def path(snapshot: :last)
-      @paths[snapshot]
+      @paths.fetch(snapshot, []).first
     end
 
     # Returns an object that can be used for uniquely identifying objects.
-    #
-    # @api private
-    #
-    # @return [Object] An unique reference to this object
     def reference
       [:item_rep, item.identifier, name]
     end

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

@@ -3,26 +3,30 @@ module Nanoc::Int::ProcessingActions
     # snapshot :before_layout
     # snapshot :before_layout, path: '/about.md'
 
-    attr_reader :snapshot_name
-    attr_reader :path
+    include Nanoc::Int::ContractsSupport
 
-    def initialize(snapshot_name, path)
-      @snapshot_name = snapshot_name
-      @path = path
+    attr_reader :snapshot_names
+    attr_reader :paths
+
+    contract C::IterOf[Symbol], C::IterOf[String] => C::Any
+    def initialize(snapshot_names, paths)
+      @snapshot_names = snapshot_names
+      @paths = paths
     end
 
+    contract C::None => Array
     def serialize
-      [:snapshot, @snapshot_name, true, @path]
+      [:snapshot, @snapshot_names, true, @paths]
     end
 
-    NONE = Object.new
-
-    def copy(path: NONE)
-      self.class.new(@snapshot_name, path.equal?(NONE) ? @path : path)
+    contract C::KeywordArgs[snapshot_names: C::Optional[C::IterOf[Symbol]], paths: C::Optional[C::IterOf[String]]] => self
+    def update(snapshot_names: [], paths: [])
+      self.class.new(@snapshot_names + snapshot_names, @paths + paths)
     end
 
+    contract C::None => String
     def to_s
-      "snapshot #{@snapshot_name.inspect}, path: #{@path.inspect}"
+      "snapshot #{@snapshot_names.inspect}, paths: #{@paths.inspect}"
     end
   end
 end

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

@@ -33,7 +33,7 @@ module Nanoc::Int
     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)
+      @actions << Nanoc::Int::ProcessingActions::Snapshot.new([snapshot_name], path ? [path] : [])
       self
     end
 
@@ -47,11 +47,9 @@ module Nanoc::Int
       @actions.any? { |a| a.is_a?(Nanoc::Int::ProcessingActions::Layout) }
     end
 
-    contract C::None => Hash
+    contract C::None => Array
     def paths
-      snapshot_actions.each_with_object({}) do |action, paths|
-        paths[action.snapshot_name] = action.path
-      end
+      snapshot_actions.map { |a| [a.snapshot_names, a.paths] }
     end
 
     # TODO: Add contract
@@ -73,6 +71,18 @@ module Nanoc::Int
       )
     end
 
+    def compact_snapshots
+      actions = []
+      @actions.each do |action|
+        if [actions.last, action].all? { |a| a.is_a?(Nanoc::Int::ProcessingActions::Snapshot) }
+          actions[-1] = actions.last.update(snapshot_names: action.snapshot_names, paths: action.paths)
+        else
+          actions << action
+        end
+      end
+      self.class.new(@item_rep, actions: actions)
+    end
+
     private
 
     def will_add_snapshot(name)

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

@@ -3,17 +3,19 @@ module Nanoc::Int
   class Site
     include Nanoc::Int::ContractsSupport
 
+    attr_reader :code_snippets
+    attr_reader :config
+    attr_accessor :data_source
     attr_accessor :compiler
 
-    contract C::KeywordArgs[config: Nanoc::Int::Configuration, code_snippets: C::IterOf[Nanoc::Int::CodeSnippet], items: C::IterOf[Nanoc::Int::Item], layouts: C::IterOf[Nanoc::Int::Layout]] => C::Any
-    def initialize(config:, code_snippets:, items:, layouts:)
+    contract C::KeywordArgs[config: Nanoc::Int::Configuration, code_snippets: C::IterOf[Nanoc::Int::CodeSnippet], data_source: C::Maybe[C::Named['Nanoc::DataSource']]] => C::Any
+    def initialize(config:, code_snippets:, data_source:)
       @config = config
       @code_snippets = code_snippets
-      @items = items
-      @layouts = layouts
+      @data_source = data_source
 
-      ensure_identifier_uniqueness(@items, 'item')
-      ensure_identifier_uniqueness(@layouts, 'layout')
+      ensure_identifier_uniqueness(@data_source.items, 'item')
+      ensure_identifier_uniqueness(@data_source.layouts, 'layout')
     end
 
     contract C::None => self
@@ -27,10 +29,13 @@ module Nanoc::Int
       @compiler ||= Nanoc::Int::CompilerLoader.new.load(self)
     end
 
-    attr_reader :code_snippets
-    attr_reader :config
-    attr_reader :items
-    attr_reader :layouts
+    def items
+      @data_source.items
+    end
+
+    def layouts
+      @data_source.layouts
+    end
 
     contract C::None => self
     def freeze