jekyll-conrefifier 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efdff59b0efc358924f29d372fdde512b16c1280
-  data.tar.gz: 32e3178eb7720e9e7f8371251fc057495584f386
+  metadata.gz: 0c11ff53ee284f0cc454b6f40ec72b3e793d1a08
+  data.tar.gz: 9248f01dda24f82f1dc9018cfc98db17aba88fe7
 SHA512:
-  metadata.gz: ebf92a86304459d5004088293efdd19e1586a30ccc3c61680eaee9fdfc875895c84cb4d221eeba215391fa51f2b7b4c3ff14ba0235327d66d3df2308148a00e8
-  data.tar.gz: 459315d522117b7db0d552cd053727c01f3959da75e7cfc67d792918c682096ff9c36336505c1890ee8e7cedafffd9a3abcecb5442ecdd83acc5df96b2492dc0
+  metadata.gz: f558ba427001f4d4e5b0c10530c33ca50cea7268fb01cf2d7fcfa61b82bab0848ae91f0408287bee6b32e551840f8021f33d2d8e54dc3f1fcdde4d53fb0c81a2
+  data.tar.gz: 897d3ab3453c71eadc55198055d9276e954d0a04825e775b4a2088bea6578251910e0ed7608aa41a945a4cdc3719d6ce252fdf9b15b91874396935d3fdb2e2ba

data/lib/jekyll-conrefifier.rb

@@ -15,16 +15,14 @@ module Jekyll
     def self.setup_config(site, opts, path)
       data_vars = path.nil? ? {} : ConrefifierUtils.data_file_variables(site.config, opts[:actual_path] || path)
       config = { 'page' => data_vars }
-      config = { 'site' => { 'data' => site.data, 'config' => site.config } }.merge(config)
+      { 'site' => { 'data' => site.data, 'config' => site.config } }.merge(config)
     end
 
     def self.convert(content, data_vars)
       value = Liquid::Template.parse(content).render(data_vars)
       # protects against situations where [page.version] prevented a conversion
-      if value =~ /\{\{/
-        value = Liquid::Template.parse(value).render(data_vars)
-      end
-      value = value.gsub('"', '\"')
+      value = Liquid::Template.parse(value).render(data_vars) if value =~ /\{\{/
+      value.gsub('"', '\"')
     end
   end
 
@@ -41,9 +39,7 @@ module Jekyll
       else
         begin
           defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
-          unless defaults.empty?
-            @data = defaults
-          end
+          @data = defaults unless defaults.empty?
           @content = File.read(path, merged_file_read_opts(opts))
           if content =~ FRONT_REGEXP
             @content = $POSTMATCH
@@ -54,7 +50,7 @@ module Jekyll
               value = Jekyll::Renderer.new(@site, self).convert(value)
               value = value.gsub(/:/, ':')
               value = value.gsub(/\\"/, '"')
-              value.sub(/^<p>/, '').sub(/<\/p>$/, '').strip
+              value.sub(/^<p>/, '').sub(%r{</p>$}, '').strip
             end
 
             data_file = SafeYAML.load(prev_match)
@@ -70,12 +66,12 @@ module Jekyll
       end
 
       @data.each_pair do |key, value|
-        if value =~ /(\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/
-          data_vars = ConrefifierUtils.setup_config(@site, opts, path)
-          value = ConrefifierUtils.convert(value, data_vars)
-          value = Jekyll::Renderer.new(@site, self).convert(value)
-          @data[key] = value.sub(/^<p>/, '').sub(/<\/p>$/, '').strip
-        end
+        next unless value =~ /(\{% (?:if|unless).+? %\}.*?\{% end(?:if|unless) %\})/
+
+        data_vars = ConrefifierUtils.setup_config(@site, opts, path)
+        value = ConrefifierUtils.convert(value, data_vars)
+        value = Jekyll::Renderer.new(@site, self).convert(value)
+        @data[key] = value.sub(/^<p>/, '').sub(%r{</p>$}, '').strip
       end
     end
   end
@@ -122,7 +118,12 @@ module Jekyll
               end
             end
 
-            data[key] = SafeYAML.load(contents)
+            begin
+              data[key] = SafeYAML.load(contents)
+            rescue StandardError => e
+              puts "Load error in \n#{contents}: #{e}"
+              raise e
+            end
           end
         end
       end
@@ -161,11 +162,11 @@ module Jekyll
                       end
 
         parsed_content = begin
-                          parsed = Liquid::Template.parse(safe_match).render(config)
-                          parsed.gsub(/\[\[/, '{{\1') if preserve_all || preserve_non_vars
-                         rescue Exception => e
-                          puts "Parse error in #{matches}: #{e}"
-                          match
+                           parsed = Liquid::Template.parse(safe_match).render(config)
+                           parsed.gsub(/\[\[/, '{{\1') if preserve_all || preserve_non_vars
+                         rescue StandardError => e
+                           puts "Parse error in \n#{matches}: #{e}"
+                           match
                          end
         next if parsed_content.nil?
         contents = contents.sub(match, parsed_content)
@@ -206,7 +207,7 @@ module Jekyll
       data_file = context.registers[:site].data["data_render_#{@id}"]
       return data_file unless data_file.nil?
 
-      path = @id.gsub('.', '/')
+      path = @id.tr('.', '/')
       data_source = File.join(context.registers[:site].source, context.registers[:site].config['data_source'])
       data_file = File.read("#{data_source}/#{path}.yml")
       context.registers[:site].data["data_render_#{@id}"] = data_file
@@ -216,7 +217,7 @@ module Jekyll
       datafile = fetch_datafile(context, @keys)
 
       config = { 'page' => @hash_args }
-      config = { 'site' => { "data" => context.registers[:site].data } }.merge(config)
+      config = { 'site' => { 'data' => context.registers[:site].data } }.merge(config)
       versioned_yaml = SafeYAML.load(Liquid::Template.parse(datafile).render(config))
       context.registers[:site].data['data_render'] = versioned_yaml
       nil

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JekyllConrefifier
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-conrefifier
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Garen J. Torikian