Reduce json size (2factorauth#3133)

* Reduce json size as of build, ~800k to ~200k * Add json verification * Cleanup for readability also saves ~1K of extra space by removing more spaces * Fix tabs and spaces * tabbing cleanup
sildur · Aug 29, 2018 · 941ef98 · 941ef98
1 parent 349afec
commit 941ef98
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,7 @@ gem 'github-pages', group: :jekyll_plugins
 group :test do
   gem 'fastimage'
   gem 'html-proofer'
+  gem 'jsonlint'
   gem 'kwalify'
   gem 'rake'
   gem 'rubocop'

diff --git a/Rakefile b/Rakefile
@@ -1,8 +1,9 @@
 require 'html-proofer'
 require 'rubocop/rake_task'
 require 'jekyll'
+require 'jsonlint/rake_task'
 
-task default: %w[proof verify rubocop]
+task default: %w[proof verify jsonlint rubocop]
 
 task :build do
   config = Jekyll.configuration(
@@ -32,6 +33,10 @@ task proof_external: 'build' do
   ).run
 end
 
+JsonLint::RakeTask.new do |t|
+  t.paths = %w[_site/data.json]
+end
+
 task :verify do
   ruby './verify.rb'
 end

diff --git a/data.json b/data.json
@@ -1,19 +1,22 @@
 ---
 ---
-{
-    {% for section in site.data.sections %}
-    {% assign section_file = site.data[section.id] %}
-    "{{ section.title }}": {
-                        {% for website in section_file.websites %}
-                                "{{ website.name }}": {
-                                    {%for tag in website %}
-                                    {%if tag[0] != "exceptions"%}"{{ tag[0] }}": {% if tag[1] == true or tag[1] == false %}{{tag[1]}}{%else%}"{{ tag[1] }}"{%endif%}{%else%}"{{ tag[0] }}": {
-                                    {% for exception in tag[1] %}
-                                     "{{ exception[0] }}": "{{ exception[1] }}"{%if forloop.last != true%},{%endif%}
-                                {%endfor%}}{%endif%}{%if forloop.last != true%},{%endif%}
-                                    {%endfor%}
-                               }{% if forloop.last != true %},{% endif %}
-                        {% endfor %}
-                        }{% if forloop.last != true %},{% endif %}
-    {% endfor %}
-}
+{% raw %}{{% endraw %}{%
+for section in site.data.sections %}{%
+    assign section_file = site.data[section.id] %}"{{ section.title }}":{% raw %}{{% endraw %}{%
+    for website in section_file.websites %}"{{ website.name }}":{% raw %}{{% endraw %}{%
+        for tag in website %}{%
+            if tag[0] != "exceptions" %}"{{ tag[0] }}":{%
+                if tag[1] == true or tag[1] == false %}{{tag[1]}}{%
+                else %}"{{ tag[1] }}"{%
+                endif %}{%
+            else %}"{{ tag[0] }}":{% raw %}{{% endraw %}{%
+                for exception in tag[1] %}"{{ exception[0] }}":"{{ exception[1] }}"{%
+                    if forloop.last != true %},{% endif %}{%
+                endfor %}}{%
+            endif %}{%
+        if forloop.last != true %},{% endif %}{%
+        endfor %}}{%
+    if forloop.last != true %},{% endif %}{%
+    endfor %}}{%
+if forloop.last != true %},{% endif %}{%
+endfor %}}