cloudcannon-jekyll 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fed35269d24b4a1fd24b64ff5d89264e69e31b4d2b1451923824ae994ed43df
-  data.tar.gz: 3f0338deb85d35b56f577f90408ad11660479a05d203ce4b5a17588b44439e0c
+  metadata.gz: dd3e4826b181fb4ef65a89bb32d863c0aa61918b00ec81a49c02450f3bb141e2
+  data.tar.gz: 8031b3e4c93bfa7ab139691b5dad29f93de7d1457fb3e140f27abdd4f7c8df96
 SHA512:
-  metadata.gz: 20e086e703f86bf8221b88cc9e419b7f1715976a42fa736a0e0d08df2a1e062b583f0bfdb201f2ee5bfde4cbd1e8a2a8bb0f23436eaba8e5b3275467fec9e08e
-  data.tar.gz: 728c3feb864fcc8eed871fd188d4304870733e66074657af3a5ceeef4760d4f38478b59dacfa606c454adde6ff8ba15e45f0da82082535858316cc666d76b027
+  metadata.gz: c9d4070e718c37c728f60c8a6ed256b4d8dd7a1ab4a64943d27d505644a8718aad0379c5ba657124d4a10b85dd646eb86daa50d8f37c032f2f0a646333f436b4
+  data.tar.gz: 5163fbb5f10c2bf0a920da5f440d6bf4ecbae933c45a3a117d5cad9713352ac92116ccb69d3d8919e49fcdad0ad9cd17f29865aafded895e947104514deed198

data/HISTORY.md

@@ -1,3 +1,11 @@
+# 3.2.1
+
+* Pass through any keys in the global configuration file
+
+# 3.2.0
+
+* Add dam_uploads and dam_static to paths
+
 # 3.1.0
 
 * Add options for ignoring and preventing parsing collections

data/lib/cloudcannon-jekyll/generators/info.rb

@@ -22,36 +22,25 @@ module CloudCannonJekyll
       collections = collections_generator.generate_collections(collections_config)
       collections_generator.remove_empty_collection_config(collections_config, collections)
 
-      {
+      base = @config || {}
+
+      generated = {
         time: site.time.iso8601,
         version: '0.0.3',
         cloudcannon: generate_cloudcannon,
         generator: generate_generator,
         paths: generate_paths,
         collections_config: collections_config,
-        collection_groups: @config['collection_groups'],
         collections: collections,
         data: generate_data,
         source: @config['source'] || '',
-        timezone: @config['timezone'],
         base_url: @config['base_url'] || '',
-        editor: @config['editor'],
-        source_editor: @config['source_editor'],
-        _inputs: @config['_inputs'],
-        _editables: @config['_editables'],
-        _select_data: @config['_select_data'],
-        _structures: @config['_structures'],
-
-        # Deprecated
-        _array_structures: @config['_array_structures'],
-        _comments: @config['_comments'],
-        _enabled_editors: @config['_enabled_editors'],
-        _instance_values: @config['_instance_values'],
-        _options: @config['_options'],
 
         # Jekyll-only
         defaults: @site_config['defaults']
-      }.compact
+      }
+
+      base.merge(generated).compact
     end
 
     def generate_data
@@ -70,6 +59,8 @@ module CloudCannonJekyll
       {
         static: '',
         uploads: @config.dig('paths', 'uploads') || 'uploads',
+        dam_uploads: @config.dig('paths', 'dam_uploads') || '',
+        dam_static: @config.dig('paths', 'dam_static') || '',
         data: @data_dir,
         collections: @collections_dir,
         layouts: @site_config['layouts_dir'] || '_layouts'

data/lib/cloudcannon-jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = '3.1.0'
+  VERSION = '3.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll