Add common function

jbampton · jbampton · commit 9f969b3c49d5 · 2018-01-10T11:38:31.000+10:00
diff --git a/run.rb b/run.rb
@@ -10,6 +10,11 @@ def read_schema(schema)
   data
 end
 
+# function
+def ii(i)
+  i.positive? ? i : ''
+end
+
 repo = Rugged::Repository.new('.')
 branches = repo.branches.each_name(:local).sort
 
@@ -82,8 +87,8 @@ def draw_chart(which_chart, data, chart_string, chart_values,
 # build all the website pages
 def page_build(page_count)
   (0..page_count).map do |i|
-    instance_variable_set("@page#{i > 0 ? i : ''}",
-                          instance_variable_get("@page#{i > 0 ? i : ''}") + $page)
+    instance_variable_set("@page#{ii i}",
+                          instance_variable_get("@page#{ii i}") + $page)
   end
 end
 
@@ -92,7 +97,7 @@ def add_links(page_count)
   page = ''
   (0..page_count).map do |i|
     page += %(
-            <li><a href="index#{i > 0 ? i : ''}.html">Page #{i + 1}</a></li>)
+            <li><a href="index#{ii i}.html">Page #{i + 1}</a></li>)
   end
   page
 end
@@ -156,7 +161,7 @@ def clean_chart(chart)
 # try 50 chart sections per page
 page_count = structure.size / 50
 (0..page_count).map do |i|
-  instance_variable_set("@page#{i > 0 ? i : ''}", $page)
+  instance_variable_set("@page#{ii i}", $page)
 end
 # restart common page region
 $page = add_links(page_count)
@@ -177,17 +182,17 @@ def clean_chart(chart)
   k = i
   i /= 50
   # put each chart type in its own row
-  instance_variable_set("@page#{i > 0 ? i : ''}",
-                        instance_variable_get("@page#{i > 0 ? i : ''}") + "
+  instance_variable_set("@page#{ii i}",
+                        instance_variable_get("@page#{ii i}") + "
       <h2>#{k + 1}. Branch count of schema by #{token[0][0].delete '<'}</h2>
         <div class=\"row\">")
   token.map.with_index(1) do |chart, j|
     data0 = clean_chart(chart[0]) + j.to_s
-    instance_variable_set("@page#{i > 0 ? i : ''}",
-                          instance_variable_get("@page#{i > 0 ? i : ''}") + "\n          <div class=\"col-sm-6 col-md-4 col-lg-3\" id=\"chart_div_#{data0}\"></div>")
+    instance_variable_set("@page#{ii i}",
+                          instance_variable_get("@page#{ii i}") + "\n          <div class=\"col-sm-6 col-md-4 col-lg-3\" id=\"chart_div_#{data0}\"></div>")
   end
-  instance_variable_set("@page#{i > 0 ? i : ''}",
-                        instance_variable_get("@page#{i > 0 ? i : ''}") + '
+  instance_variable_set("@page#{ii i}",
+                        instance_variable_get("@page#{ii i}") + '
           <div class="navarrows">
             <a href="#head1">&#8593;</a>
             <a href="#theend">&#8595;</a>
@@ -283,8 +288,8 @@ def clean_chart(chart)
     colors = data1.map { |d| schema_colors[d[0]] }
     v = 'Values'
     i = ind / 50
-    instance_variable_set("@page#{i > 0 ? i : ''}",
-                          instance_variable_get("@page#{i > 0 ? i : ''}") + "        google.charts.setOnLoadCallback(drawChart#{data0});\n" + draw_chart(data0, data1, chart[0], v, chart_title(chart[0], ind * 3 + j, branches[j - 1]), data0, width, height, colors))
+    instance_variable_set("@page#{ii i}",
+                          instance_variable_get("@page#{ii i}") + "        google.charts.setOnLoadCallback(drawChart#{data0});\n" + draw_chart(data0, data1, chart[0], v, chart_title(chart[0], ind * 3 + j, branches[j - 1]), data0, width, height, colors))
   end
 end
 
@@ -312,7 +317,7 @@ def clean_chart(chart)
 page_build(page_count)
 # write all the HTML pages to files
 (0..page_count).map do |i|
-  file = File.open("index#{i > 0 ? i : ''}.html", 'w')
-  file.write(instance_variable_get("@page#{i > 0 ? i : ''}"))
+  file = File.open("index#{ii i}.html", 'w')
+  file.write(instance_variable_get("@page#{ii i}"))
   file.close
 end
