cloudcannon-jekyll 2.3.0 → 2.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3a8badc065e548c467c7c794747e3f7147eeb8b200f19fe73aef583a026ab657
4
- data.tar.gz: e6fa47b31b8801e4f6b106574cf15584a56299be5dff80128a2c12b325d6d77e
3
+ metadata.gz: 00114b22694d4a9d0f1de2f1e44a8e893c0184d5d0a9ec2e644d8115d30c3a83
4
+ data.tar.gz: 58acfeb5af57f993c0d8340722b9b45fe650062c7189c7b82f7b11841070b07b
5
5
  SHA512:
6
- metadata.gz: 60a58b7deaeaff3265a13ad0b14b1fe68229b53f1b413a08d7859167c3acc3da2ecef016372b08f630705edd14040167be6e9b15323344948e6856f4666c3bf6
7
- data.tar.gz: 5c3d1b8402f2178eea44a03743d9d3985a19984795ff320dc9e34e106c3d19e0d34782e34f8d6905d039b36917a87bfe57dfe88f4288b4bf2575fe3fddc13acf
6
+ metadata.gz: 6fb1598701caa1dd4b0fc667ec2c5c5bfb6674806126a78b4905b1c680bdad689e11ce5e82880dc06246d50e73037a5d0de125d5e70bfba2d0d0bbde0d4536df
7
+ data.tar.gz: 63efb6ab686f4b62f9eae28d5fb2c146228dd6a147ad00030975407e7500de38af808fdeef79dccab4cbfbe823c5261fc5c472d1a543a09f15376dc7d5efd848
data/HISTORY.md CHANGED
@@ -1,3 +1,8 @@
1
+ # 2.3.1
2
+
3
+ * Fix issue where pages config overwrites default
4
+ * Fix issue when a site has no pages
5
+
1
6
  # 2.3.0
2
7
 
3
8
  * Fix output for drafts collection config
@@ -44,6 +44,7 @@ module CloudCannonJekyll
44
44
  end
45
45
  # rubocop:enable Metrics/MethodLength
46
46
 
47
+ # rubocop:disable Metrics/CyclomaticComplexity
47
48
  def generate_collections_config(pages)
48
49
  collections = @site.config["collections"]&.dup || {}
49
50
  collections_config = @site.config.dig("cloudcannon", "collections")&.dup || {}
@@ -54,18 +55,20 @@ module CloudCannonJekyll
54
55
  collections_config[key] = (collections_config[key] || {}).merge(defaults)
55
56
  end
56
57
 
57
- unless pages.empty?
58
- collections_config["pages"] ||= {
58
+ unless pages.empty? || collections.key?("pages")
59
+ pages_defaults = {
59
60
  "output" => true,
60
61
  "filter" => "strict",
61
62
  "path" => "",
62
63
  }
64
+
65
+ collections_config["pages"] = pages_defaults.merge(collections_config["pages"] || {})
63
66
  end
64
67
 
65
68
  collections_config
66
69
  end
67
70
 
68
- # rubocop:disable Metrics/CyclomaticComplexity
71
+ # rubocop:disable Metrics/PerceivedComplexity
69
72
  def generate_collections(collections_config, pages, drafts)
70
73
  split_posts = group_by_category_folder(all_posts, "posts")
71
74
  split_drafts = group_by_category_folder(drafts, "drafts")
@@ -83,9 +86,11 @@ module CloudCannonJekyll
83
86
  collections[key] ||= []
84
87
  end
85
88
 
86
- collections["pages"] = pages if collections["pages"].empty? && !pages.empty?
89
+ has_collection_pages = collections.key?("pages") && !collections["pages"].empty?
90
+ collections["pages"] = pages unless pages.empty? || has_collection_pages
87
91
  collections
88
92
  end
93
+ # rubocop:enable Metrics/PerceivedComplexity
89
94
  # rubocop:enable Metrics/CyclomaticComplexity
90
95
 
91
96
  def generate_data
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module CloudCannonJekyll
4
- VERSION = "2.3.0"
4
+ VERSION = "2.3.1"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cloudcannon-jekyll
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - CloudCannon
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-07 00:00:00.000000000 Z
11
+ date: 2021-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll