diff --git a/lib/cloudcannon-jekyll/_cloudcannon/config-2.x.json b/lib/cloudcannon-jekyll/_cloudcannon/config-2.x.json index 09ea9bf..4faddbc 100644 --- a/lib/cloudcannon-jekyll/_cloudcannon/config-2.x.json +++ b/lib/cloudcannon-jekyll/_cloudcannon/config-2.x.json @@ -1,5 +1,5 @@ { - "time": {{ site.time | cc_jsonify }}, + "time": {{ site.time | date_to_xmlschema | cc_jsonify }}, "cloudcannon": { "name": "cloudcannon-jekyll", "version": {{ gem_version | cc_jsonify }} @@ -8,7 +8,7 @@ "include": {{ config.include | cc_jsonify }}, "exclude": {{ config.exclude | cc_jsonify }}, {% if config.baseurl %}"base-url": {{ config.baseurl | cc_jsonify }},{% endif %} - {% if config.collections %}"comments": {{ config.collections | cc_jsonify: 'collections' }},{% endif %} + {% if config.collections %}"collections": {{ config.collections | cc_jsonify: 'collections' }},{% endif %} {% if config._comments %}"comments": {{ config._comments | cc_jsonify }},{% endif %} {% if config._options %}"input-options": {{ config._options | cc_jsonify }},{% endif %} {% if config.defaults %}"defaults": {{ config.defaults | cc_jsonify }},{% endif %} diff --git a/lib/cloudcannon-jekyll/_cloudcannon/config-3.0-4.x.json b/lib/cloudcannon-jekyll/_cloudcannon/config-3.0-4.x.json index 09ea9bf..4faddbc 100644 --- a/lib/cloudcannon-jekyll/_cloudcannon/config-3.0-4.x.json +++ b/lib/cloudcannon-jekyll/_cloudcannon/config-3.0-4.x.json @@ -1,5 +1,5 @@ { - "time": {{ site.time | cc_jsonify }}, + "time": {{ site.time | date_to_xmlschema | cc_jsonify }}, "cloudcannon": { "name": "cloudcannon-jekyll", "version": {{ gem_version | cc_jsonify }} @@ -8,7 +8,7 @@ "include": {{ config.include | cc_jsonify }}, "exclude": {{ config.exclude | cc_jsonify }}, {% if config.baseurl %}"base-url": {{ config.baseurl | cc_jsonify }},{% endif %} - {% if config.collections %}"comments": {{ config.collections | cc_jsonify: 'collections' }},{% endif %} + {% if config.collections %}"collections": {{ config.collections | cc_jsonify: 'collections' }},{% endif %} {% if config._comments %}"comments": {{ config._comments | cc_jsonify }},{% endif %} {% if config._options %}"input-options": {{ config._options | cc_jsonify }},{% endif %} {% if config.defaults %}"defaults": {{ config.defaults | cc_jsonify }},{% endif %} diff --git a/lib/cloudcannon-jekyll/_cloudcannon/config.json b/lib/cloudcannon-jekyll/_cloudcannon/config.json index 96eecd4..cc2a049 100644 --- a/lib/cloudcannon-jekyll/_cloudcannon/config.json +++ b/lib/cloudcannon-jekyll/_cloudcannon/config.json @@ -1,5 +1,5 @@ { - "time": {{ site.time | cc_jsonify }}, + "time": {{ site.time | date_to_xmlschema | cc_jsonify }}, "cloudcannon": { "name": "cloudcannon-jekyll", "version": {{ gem_version | cc_jsonify }} diff --git a/lib/cloudcannon-jekyll/_cloudcannon/details-2.x.json b/lib/cloudcannon-jekyll/_cloudcannon/details-2.x.json index 6f7511c..8d9d25e 100644 --- a/lib/cloudcannon-jekyll/_cloudcannon/details-2.x.json +++ b/lib/cloudcannon-jekyll/_cloudcannon/details-2.x.json @@ -1,5 +1,5 @@ { - "time": {{ site.time | cc_jsonify }}, + "time": {{ site.time | date_to_xmlschema | cc_jsonify }}, "cloudcannon": { "name": "cloudcannon-jekyll", "version": {{ gem_version | cc_jsonify }} diff --git a/lib/cloudcannon-jekyll/_cloudcannon/details-3.0-4.x.json b/lib/cloudcannon-jekyll/_cloudcannon/details-3.0-4.x.json index 54c7dc7..3cba0fe 100644 --- a/lib/cloudcannon-jekyll/_cloudcannon/details-3.0-4.x.json +++ b/lib/cloudcannon-jekyll/_cloudcannon/details-3.0-4.x.json @@ -1,5 +1,5 @@ { - "time": {{ site.time | cc_jsonify }}, + "time": {{ site.time | date_to_xmlschema | cc_jsonify }}, "cloudcannon": { "name": "cloudcannon-jekyll", "version": {{ gem_version | cc_jsonify }} diff --git a/lib/cloudcannon-jekyll/_cloudcannon/details.json b/lib/cloudcannon-jekyll/_cloudcannon/details.json index bc55fac..d018ad0 100644 --- a/lib/cloudcannon-jekyll/_cloudcannon/details.json +++ b/lib/cloudcannon-jekyll/_cloudcannon/details.json @@ -1,5 +1,5 @@ { - "time": {{ site.time | cc_jsonify }}, + "time": {{ site.time | date_to_xmlschema | cc_jsonify }}, "cloudcannon": { "name": "cloudcannon-jekyll", "version": {{ gem_version | cc_jsonify }} diff --git a/spec/build-configuration-schema.json b/spec/build-configuration-schema.json index 3b73468..2942405 100644 --- a/spec/build-configuration-schema.json +++ b/spec/build-configuration-schema.json @@ -1,3 +1,3 @@ { - "$ref": "https://raw.githubusercontent.com/CloudCannon/build-configuration-schema/v0.0.2/schema.json" + "$ref": "https://raw.githubusercontent.com/CloudCannon/build-configuration-schema/v0.0.3/schema.json" } \ No newline at end of file diff --git a/spec/generator_spec.rb b/spec/generator_spec.rb index 268e754..762d603 100644 --- a/spec/generator_spec.rb +++ b/spec/generator_spec.rb @@ -43,7 +43,7 @@ let(:site_data) { { :cloudcannon => { "data" => true } } } it "contains valid time" do - expect(details["time"]).to match(%r!\d{4}\-\d\d\-\d\d \d\d:\d\d:\d\d [+-]\d{4}!) + expect(details["time"]).to match(%r!\d{4}\-\d\d\-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d!) end it "contains gem information" do @@ -134,7 +134,7 @@ def log_schema_error(error) end it "contains valid time" do - expect(details["time"]).to match(%r!\d{4}\-\d\d\-\d\d \d\d:\d\d:\d\d [+-]\d{4}!) + expect(details["time"]).to match(%r!\d{4}\-\d\d\-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d!) end it "contains gem information" do @@ -315,8 +315,8 @@ def log_schema_error(error) end end - it "has no non-default collections", focus: true do - if Jekyll::VERSION.start_with?("2") || Jekyll::VERSION.match?(%r!3\.[0-4]\.!) + it "has no non-default collections" do + if Jekyll::VERSION.start_with?("2") expect(config["collections"]).to be_nil else expect(config["collections"].length).to eq(1)