nanoc 3.7.3 → 3.7.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (182) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +71 -46
  3. data/NEWS.md +14 -0
  4. data/lib/nanoc.rb +1 -1
  5. data/lib/nanoc/base/checksummer.rb +1 -1
  6. data/lib/nanoc/base/compilation/checksum_store.rb +1 -1
  7. data/lib/nanoc/base/compilation/compiled_content_cache.rb +1 -1
  8. data/lib/nanoc/base/compilation/compiler.rb +11 -10
  9. data/lib/nanoc/base/compilation/compiler_dsl.rb +4 -4
  10. data/lib/nanoc/base/compilation/dependency_tracker.rb +7 -7
  11. data/lib/nanoc/base/compilation/filter.rb +1 -1
  12. data/lib/nanoc/base/compilation/item_rep_proxy.rb +6 -5
  13. data/lib/nanoc/base/compilation/item_rep_recorder_proxy.rb +8 -7
  14. data/lib/nanoc/base/compilation/outdatedness_checker.rb +6 -6
  15. data/lib/nanoc/base/compilation/rule.rb +1 -1
  16. data/lib/nanoc/base/compilation/rule_memory_store.rb +1 -1
  17. data/lib/nanoc/base/compilation/rules_collection.rb +5 -5
  18. data/lib/nanoc/base/context.rb +1 -1
  19. data/lib/nanoc/base/core_ext/array.rb +1 -1
  20. data/lib/nanoc/base/core_ext/date.rb +1 -1
  21. data/lib/nanoc/base/core_ext/hash.rb +1 -1
  22. data/lib/nanoc/base/directed_graph.rb +3 -3
  23. data/lib/nanoc/base/memoization.rb +1 -1
  24. data/lib/nanoc/base/notification_center.rb +1 -1
  25. data/lib/nanoc/base/ordered_hash.rb +1 -1
  26. data/lib/nanoc/base/plugin_registry.rb +3 -3
  27. data/lib/nanoc/base/result_data/item_rep.rb +13 -11
  28. data/lib/nanoc/base/source_data/code_snippet.rb +2 -2
  29. data/lib/nanoc/base/source_data/data_source.rb +3 -3
  30. data/lib/nanoc/base/source_data/item.rb +8 -8
  31. data/lib/nanoc/base/source_data/item_array.rb +1 -1
  32. data/lib/nanoc/base/source_data/layout.rb +1 -1
  33. data/lib/nanoc/base/source_data/site.rb +27 -18
  34. data/lib/nanoc/base/store.rb +3 -3
  35. data/lib/nanoc/base/temp_filename_factory.rb +2 -2
  36. data/lib/nanoc/cli.rb +6 -6
  37. data/lib/nanoc/cli/cleaning_stream.rb +1 -1
  38. data/lib/nanoc/cli/command_runner.rb +4 -3
  39. data/lib/nanoc/cli/commands/autocompile.rb +3 -3
  40. data/lib/nanoc/cli/commands/check.rb +3 -3
  41. data/lib/nanoc/cli/commands/compile.rb +23 -23
  42. data/lib/nanoc/cli/commands/create-item.rb +5 -5
  43. data/lib/nanoc/cli/commands/create-layout.rb +14 -14
  44. data/lib/nanoc/cli/commands/create-site.rb +6 -6
  45. data/lib/nanoc/cli/commands/deploy.rb +8 -8
  46. data/lib/nanoc/cli/commands/nanoc.rb +3 -3
  47. data/lib/nanoc/cli/commands/prune.rb +3 -3
  48. data/lib/nanoc/cli/commands/shell.rb +4 -4
  49. data/lib/nanoc/cli/commands/show-data.rb +5 -5
  50. data/lib/nanoc/cli/commands/show-plugins.rb +5 -5
  51. data/lib/nanoc/cli/commands/show-rules.rb +4 -4
  52. data/lib/nanoc/cli/commands/sync.rb +1 -1
  53. data/lib/nanoc/cli/commands/update.rb +13 -13
  54. data/lib/nanoc/cli/commands/validate-css.rb +3 -3
  55. data/lib/nanoc/cli/commands/validate-html.rb +3 -3
  56. data/lib/nanoc/cli/commands/validate-links.rb +6 -6
  57. data/lib/nanoc/cli/commands/view.rb +4 -4
  58. data/lib/nanoc/cli/commands/watch.rb +11 -11
  59. data/lib/nanoc/cli/error_handler.rb +10 -10
  60. data/lib/nanoc/cli/logger.rb +1 -1
  61. data/lib/nanoc/cli/stream_cleaners/abstract.rb +1 -1
  62. data/lib/nanoc/data_sources/deprecated/last_fm.rb +5 -5
  63. data/lib/nanoc/data_sources/deprecated/twitter.rb +1 -1
  64. data/lib/nanoc/data_sources/filesystem.rb +16 -16
  65. data/lib/nanoc/data_sources/filesystem_unified.rb +1 -1
  66. data/lib/nanoc/data_sources/filesystem_verbose.rb +1 -1
  67. data/lib/nanoc/data_sources/static.rb +1 -1
  68. data/lib/nanoc/extra/auto_compiler.rb +2 -2
  69. data/lib/nanoc/extra/checking/check.rb +11 -1
  70. data/lib/nanoc/extra/checking/checks/external_links.rb +15 -7
  71. data/lib/nanoc/extra/checking/checks/internal_links.rb +3 -3
  72. data/lib/nanoc/extra/checking/checks/stale.rb +6 -6
  73. data/lib/nanoc/extra/checking/runner.rb +10 -9
  74. data/lib/nanoc/extra/chick.rb +2 -2
  75. data/lib/nanoc/extra/core_ext/enumerable.rb +1 -1
  76. data/lib/nanoc/extra/deployers/fog.rb +2 -2
  77. data/lib/nanoc/extra/deployers/rsync.rb +3 -3
  78. data/lib/nanoc/extra/file_proxy.rb +3 -3
  79. data/lib/nanoc/extra/jruby_nokogiri_warner.rb +1 -1
  80. data/lib/nanoc/extra/link_collector.rb +3 -3
  81. data/lib/nanoc/extra/piper.rb +2 -2
  82. data/lib/nanoc/extra/pruner.rb +4 -3
  83. data/lib/nanoc/extra/validators/links.rb +2 -2
  84. data/lib/nanoc/extra/validators/w3c.rb +1 -1
  85. data/lib/nanoc/extra/vcs.rb +5 -5
  86. data/lib/nanoc/extra/vcses/dummy.rb +1 -1
  87. data/lib/nanoc/filters/asciidoc.rb +1 -1
  88. data/lib/nanoc/filters/bluecloth.rb +1 -1
  89. data/lib/nanoc/filters/coffeescript.rb +1 -1
  90. data/lib/nanoc/filters/colorize_syntax.rb +19 -21
  91. data/lib/nanoc/filters/erubis.rb +1 -1
  92. data/lib/nanoc/filters/handlebars.rb +1 -1
  93. data/lib/nanoc/filters/less.rb +2 -2
  94. data/lib/nanoc/filters/markaby.rb +1 -1
  95. data/lib/nanoc/filters/mustache.rb +1 -1
  96. data/lib/nanoc/filters/rdoc.rb +1 -1
  97. data/lib/nanoc/filters/relativize_paths.rb +5 -5
  98. data/lib/nanoc/filters/rubypants.rb +1 -1
  99. data/lib/nanoc/filters/sass/sass_filesystem_importer.rb +1 -1
  100. data/lib/nanoc/filters/typogruby.rb +1 -1
  101. data/lib/nanoc/filters/xsl.rb +1 -1
  102. data/lib/nanoc/helpers/blogging.rb +12 -12
  103. data/lib/nanoc/helpers/capturing.rb +3 -3
  104. data/lib/nanoc/helpers/html_escape.rb +6 -6
  105. data/lib/nanoc/helpers/tagging.rb +1 -1
  106. data/lib/nanoc/helpers/xml_sitemap.rb +4 -4
  107. data/lib/nanoc/tasks/clean.rake +1 -1
  108. data/lib/nanoc/tasks/clean.rb +1 -1
  109. data/lib/nanoc/tasks/deploy/rsync.rake +2 -2
  110. data/lib/nanoc/version.rb +1 -1
  111. data/tasks/rubocop.rake +1 -0
  112. data/test/base/core_ext/array_spec.rb +7 -7
  113. data/test/base/core_ext/hash_spec.rb +1 -1
  114. data/test/base/test_checksum_store.rb +1 -1
  115. data/test/base/test_compiler.rb +14 -14
  116. data/test/base/test_compiler_dsl.rb +13 -13
  117. data/test/base/test_context.rb +2 -2
  118. data/test/base/test_dependency_tracker.rb +42 -42
  119. data/test/base/test_directed_graph.rb +102 -102
  120. data/test/base/test_item.rb +21 -21
  121. data/test/base/test_item_array.rb +19 -19
  122. data/test/base/test_item_rep.rb +50 -50
  123. data/test/base/test_layout.rb +6 -6
  124. data/test/base/test_outdatedness_checker.rb +2 -2
  125. data/test/base/test_rule_context.rb +2 -2
  126. data/test/base/test_site.rb +5 -5
  127. data/test/cli/commands/test_compile.rb +7 -7
  128. data/test/cli/commands/test_create_site.rb +2 -2
  129. data/test/cli/commands/test_deploy.rb +10 -10
  130. data/test/cli/commands/test_prune.rb +2 -2
  131. data/test/cli/commands/test_sync.rb +1 -1
  132. data/test/cli/commands/test_watch.rb +7 -7
  133. data/test/cli/test_cleaning_stream.rb +4 -4
  134. data/test/cli/test_cli.rb +3 -3
  135. data/test/cli/test_error_handler.rb +3 -3
  136. data/test/data_sources/test_filesystem.rb +19 -19
  137. data/test/data_sources/test_filesystem_unified.rb +30 -30
  138. data/test/data_sources/test_filesystem_verbose.rb +3 -3
  139. data/test/data_sources/test_static.rb +9 -9
  140. data/test/extra/checking/checks/test_stale.rb +8 -8
  141. data/test/extra/checking/test_check.rb +11 -1
  142. data/test/extra/checking/test_dsl.rb +1 -1
  143. data/test/extra/core_ext/test_enumerable.rb +2 -2
  144. data/test/extra/deployers/test_fog.rb +10 -10
  145. data/test/extra/deployers/test_rsync.rb +2 -2
  146. data/test/extra/test_auto_compiler.rb +28 -28
  147. data/test/extra/test_filesystem_tools.rb +3 -3
  148. data/test/extra/test_link_collector.rb +39 -20
  149. data/test/extra/validators/test_w3c.rb +5 -5
  150. data/test/filters/test_asciidoc.rb +2 -2
  151. data/test/filters/test_bluecloth.rb +1 -1
  152. data/test/filters/test_coffeescript.rb +1 -1
  153. data/test/filters/test_colorize_syntax.rb +20 -13
  154. data/test/filters/test_erb.rb +1 -1
  155. data/test/filters/test_kramdown.rb +1 -1
  156. data/test/filters/test_less.rb +10 -10
  157. data/test/filters/test_markaby.rb +2 -2
  158. data/test/filters/test_maruku.rb +2 -2
  159. data/test/filters/test_pandoc.rb +3 -3
  160. data/test/filters/test_rainpress.rb +4 -4
  161. data/test/filters/test_rdiscount.rb +2 -2
  162. data/test/filters/test_rdoc.rb +1 -1
  163. data/test/filters/test_redcarpet.rb +5 -5
  164. data/test/filters/test_redcloth.rb +5 -5
  165. data/test/filters/test_relativize_paths.rb +33 -31
  166. data/test/filters/test_rubypants.rb +2 -2
  167. data/test/filters/test_sass.rb +8 -8
  168. data/test/filters/test_slim.rb +3 -3
  169. data/test/filters/test_uglify_js.rb +1 -1
  170. data/test/filters/test_yui_compressor.rb +3 -3
  171. data/test/gem_loader.rb +1 -1
  172. data/test/helper.rb +14 -16
  173. data/test/helpers/test_blogging.rb +28 -28
  174. data/test/helpers/test_breadcrumbs.rb +12 -12
  175. data/test/helpers/test_capturing.rb +7 -7
  176. data/test/helpers/test_filtering.rb +16 -16
  177. data/test/helpers/test_link_to.rb +3 -3
  178. data/test/helpers/test_rendering.rb +1 -1
  179. data/test/helpers/test_tagging.rb +11 -11
  180. data/test/helpers/test_xml_sitemap.rb +18 -18
  181. data/test/tasks/test_clean.rb +8 -8
  182. metadata +2 -2
data/test/helpers/test_xml_sitemap.rb CHANGED
@@ -19,8 +19,8 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
19
19
 
20
20
  # Create item 1
21
21
  @items << Nanoc::Item.new('some content 1', {}, '/item-one/')
22
- self.create_item_rep(@items.last, :one_a, '/item-one/a/')
23
- self.create_item_rep(@items.last, :one_b, '/item-one/b/')
22
+ create_item_rep(@items.last, :one_a, '/item-one/a/')
23
+ create_item_rep(@items.last, :one_b, '/item-one/b/')
24
24
 
25
25
  # Create item 2
26
26
  @items << Nanoc::Item.new('some content 2', { :is_hidden => true }, '/item-two/')
@@ -28,12 +28,12 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
28
28
  # Create item 3
29
29
  attrs = { :mtime => Time.parse('2004-07-12'), :changefreq => 'daily', :priority => 0.5 }
30
30
  @items << Nanoc::Item.new('some content 3', attrs, '/item-three/')
31
- self.create_item_rep(@items.last, :three_a, '/item-three/a/')
32
- self.create_item_rep(@items.last, :three_b, '/item-three/b/')
31
+ create_item_rep(@items.last, :three_a, '/item-three/a/')
32
+ create_item_rep(@items.last, :three_b, '/item-three/b/')
33
33
 
34
34
  # Create item 4
35
35
  @items << Nanoc::Item.new('some content 4', {}, '/item-four/')
36
- self.create_item_rep(@items.last, :four_a, nil)
36
+ create_item_rep(@items.last, :four_a, nil)
37
37
 
38
38
  # Create sitemap item
39
39
  @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
@@ -75,8 +75,8 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
75
75
  @items = []
76
76
  @items << nil
77
77
  @items << Nanoc::Item.new('some content 1', {}, '/item-one/')
78
- self.create_item_rep(@items.last, :one_a, '/item-one/a/')
79
- self.create_item_rep(@items.last, :one_b, '/item-one/b/')
78
+ create_item_rep(@items.last, :one_a, '/item-one/a/')
79
+ create_item_rep(@items.last, :one_b, '/item-one/b/')
80
80
  @items << nil
81
81
 
82
82
  # Create sitemap item
@@ -86,7 +86,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
86
86
  @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
87
87
 
88
88
  # Build sitemap
89
- res = xml_sitemap(:items => [ @items[1] ])
89
+ res = xml_sitemap(:items => [@items[1]])
90
90
 
91
91
  # Check
92
92
  doc = Nokogiri::XML(res)
@@ -108,9 +108,9 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
108
108
  def test_filter
109
109
  if_have 'builder', 'nokogiri' do
110
110
  # Create items
111
- @items = [ Nanoc::Item.new('some content 1', {}, '/item-one/') ]
112
- self.create_item_rep(@items.last, :one_a, '/item-one/a/')
113
- self.create_item_rep(@items.last, :one_b, '/item-one/b/')
111
+ @items = [Nanoc::Item.new('some content 1', {}, '/item-one/')]
112
+ create_item_rep(@items.last, :one_a, '/item-one/a/')
113
+ create_item_rep(@items.last, :one_b, '/item-one/b/')
114
114
 
115
115
  # Create sitemap item
116
116
  @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
@@ -139,14 +139,14 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
139
139
  # Create items
140
140
  @items = []
141
141
  @items << Nanoc::Item.new('some content 1', {}, '/george/')
142
- self.create_item_rep(@items.last, :a_alice, '/george/alice/')
143
- self.create_item_rep(@items.last, :b_zoey, '/george/zoey/')
142
+ create_item_rep(@items.last, :a_alice, '/george/alice/')
143
+ create_item_rep(@items.last, :b_zoey, '/george/zoey/')
144
144
  @items << Nanoc::Item.new('some content 1', {}, '/walton/')
145
- self.create_item_rep(@items.last, :a_eve, '/walton/eve/')
146
- self.create_item_rep(@items.last, :b_bob, '/walton/bob/')
145
+ create_item_rep(@items.last, :a_eve, '/walton/eve/')
146
+ create_item_rep(@items.last, :b_bob, '/walton/bob/')
147
147
  @items << Nanoc::Item.new('some content 1', {}, '/lucas/')
148
- self.create_item_rep(@items.last, :a_trudy, '/lucas/trudy/')
149
- self.create_item_rep(@items.last, :b_mallory, '/lucas/mallory/')
148
+ create_item_rep(@items.last, :a_trudy, '/lucas/trudy/')
149
+ create_item_rep(@items.last, :b_mallory, '/lucas/mallory/')
150
150
 
151
151
  # Create sitemap item
152
152
  @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
@@ -172,7 +172,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
172
172
  end
173
173
  end
174
174
 
175
- protected
175
+ protected
176
176
 
177
177
  def create_item_rep(item, name, path)
178
178
  rep = Nanoc::ItemRep.new(item, name)
data/test/tasks/test_clean.rb CHANGED
@@ -5,14 +5,14 @@ class Nanoc::Tasks::CleanTest < Nanoc::TestCase
5
5
  def test_simple
6
6
  if_have 'w3c_validators' do
7
7
  # Stub items
8
- items = [ mock, mock ]
9
- reps = [ [ mock, mock ], [ mock, mock ] ]
8
+ items = [mock, mock]
9
+ reps = [[mock, mock], [mock, mock]]
10
10
  items[0].expects(:reps).returns(reps[0])
11
11
  items[1].expects(:reps).returns(reps[1])
12
12
 
13
13
  # Create sample files
14
- [ 0, 1 ].each do |item_id|
15
- [ 0, 1 ].each do |rep_id|
14
+ [0, 1].each do |item_id|
15
+ [0, 1].each do |rep_id|
16
16
  filename = "item-#{item_id}-rep-#{rep_id}.txt"
17
17
  reps[item_id][rep_id].expects(:raw_path).returns(filename)
18
18
  File.open(filename, 'w') { |io| io.write('hello') }
@@ -31,8 +31,8 @@ class Nanoc::Tasks::CleanTest < Nanoc::TestCase
31
31
  clean.run
32
32
 
33
33
  # Check
34
- [ 0, 1 ].each do |item_id|
35
- [ 0, 1 ].each do |rep_id|
34
+ [0, 1].each do |item_id|
35
+ [0, 1].each do |rep_id|
36
36
  filename = "item-#{item_id}-rep-#{rep_id}.txt"
37
37
  assert !File.file?(filename)
38
38
  end
@@ -45,14 +45,14 @@ class Nanoc::Tasks::CleanTest < Nanoc::TestCase
45
45
  # Stub items
46
46
  item = mock
47
47
  rep = mock
48
- item.expects(:reps).returns([ rep ])
48
+ item.expects(:reps).returns([rep])
49
49
 
50
50
  # Create sample file
51
51
  rep.expects(:raw_path).returns(nil)
52
52
 
53
53
  # Stub site
54
54
  site = mock
55
- site.expects(:items).returns([ item ])
55
+ site.expects(:items).returns([item])
56
56
 
57
57
  # Create clean task
58
58
  clean = ::Nanoc::Tasks::Clean.new(site)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nanoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.7.3
4
+ version: 3.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Denis Defreyne
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-31 00:00:00.000000000 Z
11
+ date: 2014-11-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cri