vizbuilder 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc925f85d53e2dc765eca9ffae446e0197d471a5680a8b77c3f60aa9d48f6bb
-  data.tar.gz: 7167536f3e903ac3c446f9be2773582065c22e126004f2330623bac87b2b6ce5
+  metadata.gz: 71af917f2f1a1a80a6bd1d2e56bac7574e7e2a3a7b076fcbf203d461eb1924cc
+  data.tar.gz: 6bef1bb5f64ec5565068b1627db81a5469dcc993c26be08329f294e808546a64
 SHA512:
-  metadata.gz: 84a2a641318f6060ec8432e0aba51e4ca090b42651ca46fe74bbc57ec24338fc72495dcb88936be091e7f86c5dfa5e458cbdd1a2e2ed02a7f89ea1e7da9afc66
-  data.tar.gz: 01c7df8fd30bce6dfa1d6cf67580f6698a889c7272ea00bff8775f4159ec0e9cce16c61e509712b96f15ea9841cfe3bfc08a99fdab0e615783ab74c9228d81aa
+  metadata.gz: 90e932c5a6184a02a6b9741d91bebca2dc79f7cdce4afdd4b283862ed8669b5d0ff72da055093c468401ca9578bc1d0fcf9105ed589c8d0f4865024eeedd7cd8
+  data.tar.gz: 44710ff243b226bb202c4c32bdd6391a34c3deec1f99dacfcf7b9b450526ba08492e60a949c23c831497fc3b1c1339d7a05ccabc5838141c03db5174db41bf80

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/vizbuilder.rb

@@ -37,10 +37,10 @@ class VizBuilder
     index_prebuilt!
     # First we build prebuilt pages that need digests calculated by build_page
     digested = sitemap.select { |_path, page| page[:digest] == true }
-    digested.each { |path, _page| build_page(path, TemplateContext.new(@config), silent: silent) }
+    digested.each { |path, _page| build_page(path, silent: silent) }
     # Then we build all other pages
     undigested = sitemap.reject { |_path, page| page[:digest] == true }
-    undigested.each { |path, _page| build_page(path, TemplateContext.new(@config), silent: silent) }
+    undigested.each { |path, _page| build_page(path, silent: silent) }
   end
 
   # Run this builder as a server
@@ -112,8 +112,7 @@ class VizBuilder
       # Check our sitemap then our prebuilt folder for content to serve
       if sitemap[path].present?
         content_type = MimeMagic.by_path(path).to_s
-        ctx = TemplateContext.new(@config)
-        content = build_page(path, ctx)
+        content = build_page(path)
         status = 200
       elsif File.exist?(build_filename)
         content_type = MimeMagic.by_path(path).to_s
@@ -155,7 +154,7 @@ class VizBuilder
     # data was called.
     run_hook!(:after_load_data)
     # Add helpers to the TemplateContext class
-    TemplateContext.include(*helper_modules) unless helper_modules.empty?
+    TemplateContext.include(*helper_modules.reverse) unless helper_modules.empty?
     # Mark app configured
     @_configured = true
     # Chainable
@@ -260,7 +259,7 @@ class VizBuilder
       if new_helpers.present?
         # extend the current Config instance with the helpers, making them available
         # to the rest of the configuration block
-        extend(*new_helpers) if type.nil? || type.to_sym == :config
+        extend(*new_helpers.reverse) if type.nil? || type.to_sym == :config
         # add our new helpers to our array of all helpers
         @helper_modules += new_helpers if type.nil? || type.to_sym == :template
       end
@@ -406,13 +405,15 @@ class VizBuilder
   private
 
   # Generate one page from the sitemap and save to `build/`
-  def build_page(path, ctx, silent: false)
-    ctx.page = sitemap[path]
+  def build_page(path, silent: false)
+    page = sitemap[path]
     out_fname = File.join(BUILD_DIR, path)
     puts "Rendering #{out_fname}..." unless silent
 
     # Check page data for info on how to build this path
-    if ctx.page['template'].present?
+    if page['template'].present?
+      ctx = TemplateContext.new(@config)
+      ctx.page = page
       # Check if we have a layout defined, use it
       layout = ctx.page.key?('layout') ? ctx.page['layout'] : config['layout']
 
@@ -424,10 +425,10 @@ class VizBuilder
         else
           ctx.render(ctx.page['template'])
         end
-    elsif ctx.page['json'].present?
-      content = ctx.page['json'].to_json
-    elsif ctx.page['file'].present?
-      content = File.read(ctx.page['file'])
+    elsif page['json'].present?
+      content = page['json'].to_json
+    elsif page['file'].present?
+      content = File.read(page['file'])
     else
       raise(
         ArgumentError,
@@ -436,13 +437,13 @@ class VizBuilder
     end
 
     # If page data includes a digest flag, add sha1 digest to output filename
-    if ctx.page['digest'] == true
+    if page['digest'] == true
       ext = VizBuilder.fullextname(path)
       fname = File.basename(path, ext)
       dir = File.dirname(path)
       digest = Digest::SHA1.hexdigest(content)
       digest_fname = "#{fname}-#{digest}#{ext}"
-      ctx.page['digest_path'] = "#{dir}/#{digest_fname}"
+      page['digest_path'] = "#{dir}/#{digest_fname}"
       out_fname = File.join(BUILD_DIR, dir, digest_fname)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vizbuilder
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ryan Mark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport