cloudcannon-jekyll 3.2.0 → 3.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9baa033589ad0787d46384652694369f7c248193077e52f716247f3082e7495d
4
- data.tar.gz: 41c931e79f60de4b039009e9149f29df7e9eb77680ace64f393adc98a565feba
3
+ metadata.gz: 8827937e894ba56efca73b59add267f415a82b2c2b07070cbc0f3ccd71f354d3
4
+ data.tar.gz: 384fa1272fe5ecf282653377b97e40a6da9bd8dadb0eaa6eec350693be1eb6f6
5
5
  SHA512:
6
- metadata.gz: 850dc955f1fe35f6b2cce96ef442ca6cd85f4db8f6a7451970fed196f04872a130e152f702bec6401dea979e205009fb431d545fb4b275cc6de0e8004ae18234
7
- data.tar.gz: fec4d32d0a6e270839e1d8b8acd1e336e639f9040fd3340684fec906cf7ef1285e8e29d5e1d86daf20b9b37deedca409704e75bb882aebe8bcddc60eb9099b14
6
+ metadata.gz: 8180b1bd8e188367d0f60709a539f48c7b62aead0adb49d92a4e7205e7eb5517244424c209f037063eb72500b5ef932e079320247a7a0e6790494d3f2bcdcf65
7
+ data.tar.gz: 58678a43838afe626a2f207a4ebcb09ae5a37071943a22f7dbd29d27aa4d8bb8ae83900193dbf12b5d0ed8cb9f654f7b205d4d0c71ac282a8599dcb8a4d9ab48
data/HISTORY.md CHANGED
@@ -1,3 +1,11 @@
1
+ # 3.2.2
2
+
3
+ * Pass through any keys in the global configuration file
4
+
5
+ # 3.2.1
6
+
7
+ * No changes
8
+
1
9
  # 3.2.0
2
10
 
3
11
  * Add dam_uploads and dam_static to paths
data/README.md CHANGED
@@ -156,8 +156,9 @@ reads and processes the following from Jekyll if unset:
156
156
 
157
157
  1. Increase the version in `lib/cloudcannon-jekyll/version.rb`
158
158
  2. Update `HISTORY.md`
159
- 3. Run `./script/release`
160
- 3. [Create a release on GitHub](https://github.com/CloudCannon/cloudcannon-jekyll/releases/new)
159
+ 3. Commit and push those changes
160
+ 4. Run `./script/release`
161
+ 5. [Create a release on GitHub](https://github.com/CloudCannon/cloudcannon-jekyll/releases/new)
161
162
 
162
163
  ### Testing
163
164
 
@@ -22,36 +22,25 @@ module CloudCannonJekyll
22
22
  collections = collections_generator.generate_collections(collections_config)
23
23
  collections_generator.remove_empty_collection_config(collections_config, collections)
24
24
 
25
- {
25
+ base = @config || {}
26
+
27
+ generated = {
26
28
  time: site.time.iso8601,
27
29
  version: '0.0.3',
28
30
  cloudcannon: generate_cloudcannon,
29
31
  generator: generate_generator,
30
32
  paths: generate_paths,
31
33
  collections_config: collections_config,
32
- collection_groups: @config['collection_groups'],
33
34
  collections: collections,
34
35
  data: generate_data,
35
36
  source: @config['source'] || '',
36
- timezone: @config['timezone'],
37
37
  base_url: @config['base_url'] || '',
38
- editor: @config['editor'],
39
- source_editor: @config['source_editor'],
40
- _inputs: @config['_inputs'],
41
- _editables: @config['_editables'],
42
- _select_data: @config['_select_data'],
43
- _structures: @config['_structures'],
44
-
45
- # Deprecated
46
- _array_structures: @config['_array_structures'],
47
- _comments: @config['_comments'],
48
- _enabled_editors: @config['_enabled_editors'],
49
- _instance_values: @config['_instance_values'],
50
- _options: @config['_options'],
51
38
 
52
39
  # Jekyll-only
53
40
  defaults: @site_config['defaults']
54
- }.compact
41
+ }
42
+
43
+ base.merge(generated).compact
55
44
  end
56
45
 
57
46
  def generate_data
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module CloudCannonJekyll
4
- VERSION = '3.2.0'
4
+ VERSION = '3.2.2'
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: 3.2.0
4
+ version: 3.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - CloudCannon
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-30 00:00:00.000000000 Z
11
+ date: 2022-09-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll