nanoc 4.8.7 → 4.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '07984b4aff20053d01dc8bea393474155c3fedfb'
-  data.tar.gz: 5acf842fc584f0b0f06bd8e55debfde99f2cc8ca
+  metadata.gz: bb4c5c05f6a0346d3c7b123114fc03b5031b3f4a
+  data.tar.gz: b9e21682769d53cc3682de776779d634775ac5d3
 SHA512:
-  metadata.gz: a65e2fe0959a685600f6ce8892b51c0adf81ae8de63ac4eb5fa77f6c5d12f2192d6c6198dd9512444ff279cd74ee1d5f79ee697a3f1d12c7f4ca51141eb32e9a
-  data.tar.gz: 75189ba5e175f556a4164925e009c54150e39c82f3b4c21e37e78a9658fe997f899eadea3ddad7d9befcc6618c371c46a9527ab8ea1e4973be4a730c163f2246
+  metadata.gz: f4c2d65be0f13377c87e0a7ceaaac3e47d61ba1473d107a8945b8746483af258b8515d7eeaecc8ef644c749967c13c8299088b4017b9bd3f73d32815e039fb95
+  data.tar.gz: b43daf3c7a9593d9fec24e9444d061b7ab1e8a33d1d4b0c717635db074c877ca2207fb9a1473973ac9ee60399b358a50612c8024157a024b85067c41184bd4ed

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.8.8 (2017-09-22)
+
+Enhancements:
+
+* Added `#dig` to configuration (#1221) [Gregory Pakosz]
+
 ## 4.8.7 (2017-09-18)
 
 Fixes:

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

@@ -96,6 +96,11 @@ module Nanoc::Int
       @wrapped[key]
     end
 
+    contract C::Args[C::Any] => C::Any
+    def dig(*keys)
+      @wrapped.dig(*keys)
+    end
+
     contract C::Any, C::Maybe[C::Any], C::Maybe[C::Func[C::None => C::Any]] => C::Any
     def fetch(key, fallback = NONE, &_block)
       @wrapped.fetch(key) do

data/lib/nanoc/base/views/config_view.rb

@@ -47,5 +47,11 @@ module Nanoc
       @context.dependency_tracker.bounce(unwrap, attributes: true)
       @config.each(&block)
     end
+
+    # @see Hash#dig
+    def dig(*keys)
+      @context.dependency_tracker.bounce(unwrap, attributes: keys.take(1))
+      @config.dig(*keys)
+    end
   end
 end

data/lib/nanoc/version.rb

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

data/spec/nanoc/base/views/config_view_spec.rb

@@ -5,7 +5,7 @@ describe Nanoc::ConfigView do
     Nanoc::Int::Configuration.new(hash: hash)
   end
 
-  let(:hash) { { amount: 9000, animal: 'donkey' } }
+  let(:hash) { { amount: 9000, animal: 'donkey', foo: { bar: :baz } } }
 
   let(:view) { described_class.new(config, view_context) }
 
@@ -41,12 +41,12 @@ describe Nanoc::ConfigView do
       expect(dependency_tracker).to receive(:bounce).with(config, attributes: [key])
     end
 
-    context 'with existant key' do
+    context 'with existing key' do
       let(:key) { :animal }
       it { is_expected.to eql('donkey') }
     end
 
-    context 'with non-existant key' do
+    context 'with non-existing key' do
       let(:key) { :weapon }
       it { is_expected.to eql(nil) }
     end
@@ -57,7 +57,7 @@ describe Nanoc::ConfigView do
       expect(dependency_tracker).to receive(:bounce).with(config, attributes: [key])
     end
 
-    context 'with existant key' do
+    context 'with existing key' do
       let(:key) { :animal }
 
       subject { view.fetch(key) }
@@ -65,7 +65,7 @@ describe Nanoc::ConfigView do
       it { is_expected.to eql('donkey') }
     end
 
-    context 'with non-existant key' do
+    context 'with non-existing key' do
       let(:key) { :weapon }
 
       context 'with fallback' do
@@ -95,12 +95,12 @@ describe Nanoc::ConfigView do
       expect(dependency_tracker).to receive(:bounce).with(config, attributes: [key])
     end
 
-    context 'with existant key' do
+    context 'with existing key' do
       let(:key) { :animal }
       it { is_expected.to eql(true) }
     end
 
-    context 'with non-existant key' do
+    context 'with non-existing key' do
       let(:key) { :weapon }
       it { is_expected.to eql(false) }
     end
@@ -115,7 +115,25 @@ describe Nanoc::ConfigView do
       res = []
       view.each { |k, v| res << [k, v] }
 
-      expect(res).to eql([[:amount, 9000], [:animal, 'donkey']])
+      expect(res).to eql([[:amount, 9000], [:animal, 'donkey'], [:foo, { bar: :baz }]])
+    end
+  end
+
+  describe '#dig' do
+    subject { view.dig(*keys) }
+
+    before do
+      expect(dependency_tracker).to receive(:bounce).with(config, attributes: [:foo])
+    end
+
+    context 'with existing keys' do
+      let(:keys) { %i[foo bar] }
+      it { is_expected.to eql(:baz) }
+    end
+
+    context 'with non-existing keys' do
+      let(:keys) { %i[foo baz bar] }
+      it { is_expected.to be_nil }
     end
   end
 

data/spec/nanoc/regressions/gh_1216_spec.rb

@@ -5,7 +5,7 @@ describe 'GH-1216', site: true, stdio: true do
     FileUtils.mkdir_p('content/talks')
     File.write('content/talks/aaa.html', 'A')
     File.write('content/talks/bbb.html', 'B')
-    File.write('content/talks.html', '<%= @items.find_all("/talks/*").map { |i| i.raw_content + "=" + i[:status].to_s }.join(" ") %>')
+    File.write('content/talks.html', '<%= @items.find_all("/talks/*").map { |i| i.raw_content + "=" + i[:status].to_s }.sort.join(" ") %>')
 
     File.write('Rules', <<~EOS)
       compile '/**/*' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.7
+  version: 4.8.8
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri