flutterby 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98bf6013901069664a2281251125dbc4f2b82bf1
-  data.tar.gz: 677647c5e11088fbf5091fe7aa3e5a121a48c37a
+  metadata.gz: 999c3198c2142accdf16e2ceb75e3bed0d2c1465
+  data.tar.gz: d2b5a2573131d8275baf6b64ed0def712befc72f
 SHA512:
-  metadata.gz: cd149d0e3efa73a1692fc9b940f09dbaef6379864721c396b6f7103d624973477da40fcdab67e600051b7d5c53b5cc9445a871b4f37136a60506c5c2929410a1
-  data.tar.gz: 94648d86b9e989b8dc523a345aa4b655e54c13e1faf6fa58766a2174faffde2eeefb9458968e3496cc69207f462ea8328256fefaa38f1f4d9946b50594088dd4
+  metadata.gz: 9dbfa0722dab9e0bc5b50bc0f436cf7e5ae55c2c51732d44baaff615e667f61d86248d7f3075f3c0fd5e2bab3e483d3182386caadd90aaaba0dfccc1bfbd00f0
+  data.tar.gz: 1410e3505211430225a98f0093a9dc1045e841b8b50a0820c2142cf38a8784206de90f1e72d7361f365a0a3f21e1330d129872e40709ea43fd48803a1161fbc3

data/lib/flutterby/node.rb

@@ -3,7 +3,7 @@ require 'benchmark'
 module Flutterby
   class Node
     attr_accessor :parent, :ext, :source, :body
-    attr_reader :name, :filters, :fs_path, :data, :children, :paths
+    attr_reader :name, :filters, :fs_path, :children, :paths
 
     def initialize(name, parent: nil, fs_path: nil, source: nil)
       @fs_path = fs_path ? ::File.expand_path(fs_path) : nil
@@ -139,7 +139,7 @@ module Flutterby
 
     def reload!
       @body     = nil
-      @data     = {}
+      @data     = nil
       @children = []
       @paths    = {}
 
@@ -159,7 +159,6 @@ module Flutterby
       #
       walk_tree do |node|
         node.render_body! if node.should_prerender?
-        node.extract_data!
         node.register! if node.should_publish?
       end
     end
@@ -183,9 +182,11 @@ module Flutterby
     end
 
     def extract_data!
+      @data ||= {}
+
       # Extract date from name
       if name =~ %r{^(\d\d\d\d\-\d\d?\-\d\d?)\-}
-        data['date'] = Time.parse($1)
+        @data['date'] = Time.parse($1)
       end
 
       # Read remaining data from frontmatter. Data in frontmatter
@@ -222,10 +223,19 @@ module Flutterby
     end
 
     def body
-      render_body! if @body.nil?
+      if @body.nil?
+        data   # make sure data is lazy-loaded
+        render_body!
+      end
+
       @body
     end
 
+    def data
+      extract_data! if @data.nil?
+      @data
+    end
+
     def render(layout: true)
       (layout && apply_layout?) ? apply_layout(body) : body
     end
@@ -253,25 +263,27 @@ module Flutterby
     #
 
     def parse_frontmatter!
+      @data || {}
+
       if @source
         # YAML Front Matter
         if @source.sub!(/\A\-\-\-\n(.+)\n\-\-\-\n/m, "")
-          data.merge! YAML.load($1)
+          @data.merge! YAML.load($1)
         end
 
         # TOML Front Matter
         if @source.sub!(/\A\+\+\+\n(.+)\n\+\+\+\n/m, "")
-          data.merge! TOML.parse($1)
+          @data.merge! TOML.parse($1)
         end
       end
     end
 
     def read_json!
-      data.merge!(JSON.parse(body))
+      @data.merge!(JSON.parse(body))
     end
 
     def read_yaml!
-      data.merge!(YAML.load(body))
+      @data.merge!(YAML.load(body))
     end
 
 

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Hendrik Mans