vizbuilder 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb940b378df8d29c0b34ae8cafce1ffe6a2baf0997e9a5b8306bdf4c0a80208d
-  data.tar.gz: 2a213a778a2d961cad5e9349bdaed185b5fba2fbe90eb5868d24b31f7ddabf43
+  metadata.gz: d6197eeb10fd826f8e6947e1c6ba0b6df754e6274caca5985456c76e234989a8
+  data.tar.gz: fa6b2b0014b2486b7dbd7d9e04d2ad255d9762fc3a6115a83843844351b7e8d6
 SHA512:
-  metadata.gz: f42712411120f39a05c378e37de0cb38ab105a55aca8eab9956a9d3f99dd6433590b3559e2a26c255ae37a59045430f6a50870de8bc1866c79ecc376c63fcef3
-  data.tar.gz: a71e0b2f144fe3bc69aacafd948af954e9a989549c9441e00c0f3a1c1955439499daf7176f7577d00012b63699d6eba70627beb742b7dfc5aefcfcf8d68338af
+  metadata.gz: cbb4912215b85cdd543ddbf64ab75c0c4628d429635077dc692c820b979e84f220dc24f319316eb0ba4726aef09c895eeaadedf9294dc3aa18f901b7a7146e2d
+  data.tar.gz: 1ae34bc33bcf5547d8feab61b50fc6016fcb6740526347fad5026d618d34d9f8da5d1aab93295b1d39674835c1d289bd277a4bf200fbc9b7f316413adb59c6b4

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/vizbuilder.rb

@@ -411,34 +411,28 @@ class VizBuilder
     out_fname = File.join(BUILD_DIR, path)
     puts "Rendering #{out_fname}..." unless silent
 
-    # Check if we have a layout defined, use it
-    layout = ctx.page['layout'] || config['layout'] || nil
-
     # Check page data for info on how to build this path
     if ctx.page['template'].present?
+      # Check if we have a layout defined, use it
+      layout = ctx.page.key?('layout') ? ctx.page['layout'] : config['layout']
+
       # Make sure to render the template inside the layout render so code in the
       # erb layout and template are executed in a sensible order.
-      content = \
+      content =
         if layout.present?
           ctx.render(layout) { ctx.render(ctx.page['template']) }
         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'])
     else
-      # Everything else static data and not executable, so we don't have to load
-      # the content inside the layout execution.
-      if ctx.page['json'].present?
-        content = ctx.page['json'].to_json
-      elsif ctx.page['file'].present?
-        content = File.read(ctx.page['file'])
-      else
-        raise(
-          ArgumentError,
-          "Page '#{path}' missing one of required attributes: 'template', 'json', 'file'."
-        )
-      end
-
-      content = ctx.render(layout) { content } if layout.present?
+      raise(
+        ArgumentError,
+        "Page '#{path}' missing one of required attributes: 'template', 'json', 'file'."
+      )
     end
 
     # If page data includes a digest flag, add sha1 digest to output filename
@@ -466,7 +460,7 @@ class VizBuilder
       Dir.glob("#{DATA_DIR}/*#{ext}") do |fname|
         key = File.basename(fname, ext).to_sym
         puts "Loading data[:#{key}] from #{fname}..."
-        data[key] = \
+        data[key] =
           if ext == '.json'
             JSON.parse(File.read(fname))
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vizbuilder
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ryan Mark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport