jekyll-data 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef504f55a2b8067637d9c39a015d1931bc46cf49
-  data.tar.gz: cc1515e3a63bfc0722308ffb08fa9594f2435279
+  metadata.gz: 7c383a01aa3bb9fe5690b81d7cd54125be7ac8b3
+  data.tar.gz: 0f98f59af2bee263e7af7e10304e23318b632cd0
 SHA512:
-  metadata.gz: 0eb3122d58976537b4e4a50ce4b51e96b413a148d95d0e3dfa2f5cf210a0f155affe92d44d312615522fbe432e823211de28f69dff740dff1f2a8dea444b98bf
-  data.tar.gz: '05840a5d7b27acb2fffb63b93cf8067a3855e8d947f01c2f7b034e03f3fa3eb5d3d63edd5df97627f2dc4399db31cf312389ba9ca060ee2c9fc21b88d4a37883'
+  metadata.gz: 3bc5a33b09beb3c7cb19c474c723928eb0e8f79f93beac5568f0714440a196ae5e8bfbba58bd54e550082688576c3d696b6cbdd8b3112078006aff8081a8cbc4
+  data.tar.gz: 72e1317d7b637897ac35a0ccecc711772145bc45baf1b6a016b5e4a879d32136816e5f6bac9f0d9e6395e24f0950d8d72b1aa8fb677da4adc1f454c26183a51e

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://img.shields.io/gem/v/jekyll-data.svg)](https://rubygems.org/gems/jekyll-data)
 
-Introducing a plugin that reads data files within **jekyll theme gems** and adds it to the site's internal data hash.
+Introducing a plugin that reads data files within **jekyll theme gems** and adds the resulting hash to the site's internal data hash.
 
 ## Installation
 

data/lib/jekyll-data.rb

@@ -1,16 +1,16 @@
-require "jekyll"
-require "jekyll-data/version"
-
-# Plugin inclusions
-require_relative "jekyll/theme_reader"
-require_relative "jekyll/readers/theme_data_reader"
-require_relative "jekyll/drops/themed_site_drop"
-
-# Monkey-patches
-require_relative "jekyll/theme"
-require_relative "jekyll/drops/unified_payload_drop"
-
-# replace Jekyll::Reader with a subclass Jekyll::ThemeReader
-Jekyll::Hooks.register :site, :after_init do |site|
-  site.reader = Jekyll::ThemeReader.new(site)
-end
+require "jekyll"
+require "jekyll-data/version"
+
+# Plugin inclusions
+require_relative "jekyll/theme_reader"
+require_relative "jekyll/readers/theme_data_reader"
+require_relative "jekyll/drops/themed_site_drop"
+
+# Monkey-patches
+require_relative "jekyll/theme"
+require_relative "jekyll/drops/unified_payload_drop"
+
+# replace Jekyll::Reader with a subclass Jekyll::ThemeReader
+Jekyll::Hooks.register :site, :after_init do |site|
+  site.reader = Jekyll::ThemeReader.new(site)
+end

data/lib/jekyll-data/version.rb

@@ -1,3 +1,3 @@
-module JekyllData
-  VERSION = "0.2.0".freeze
-end
+module JekyllData
+  VERSION = "0.2.1".freeze
+end

data/lib/jekyll/theme.rb

@@ -1,66 +1,66 @@
-module Jekyll
-  class Theme
-    extend Forwardable
-    attr_reader :name
-    def_delegator :gemspec, :version, :version
-
-    def initialize(name)
-      @name = name.downcase.strip
-      configure_sass
-    end
-
-    def root
-      # Must use File.realpath to resolve symlinks created by rbenv
-      # Otherwise, Jekyll.sanitized path with prepend the unresolved root
-      @root ||= File.realpath(gemspec.full_gem_path)
-    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
-      nil
-    end
-
-    def includes_path
-      path_for "_includes".freeze
-    end
-
-    def layouts_path
-      path_for "_layouts".freeze
-    end
-
-    def sass_path
-      path_for "_sass".freeze
-    end
-
-    def data_path
-      path_for "_data".freeze
-    end
-
-    def assets_path
-      path_for "assets".freeze
-    end
-
-    def configure_sass
-      return unless sass_path
-      require "sass"
-      Sass.load_paths << sass_path
-    end
-
-    private
-
-    def path_for(folder)
-      path = realpath_for(folder)
-      path if path && File.directory?(path)
-    end
-
-    def realpath_for(folder)
-      File.realpath(Jekyll.sanitized_path(root, folder.to_s))
-    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
-      nil
-    end
-
-    def gemspec
-      @gemspec ||= Gem::Specification.find_by_name(name)
-    rescue Gem::LoadError
-      raise Jekyll::Errors::MissingDependencyException,
-        "The #{name} theme could not be found."
-    end
-  end
-end
+module Jekyll
+  class Theme
+    extend Forwardable
+    attr_reader :name
+    def_delegator :gemspec, :version, :version
+
+    def initialize(name)
+      @name = name.downcase.strip
+      configure_sass
+    end
+
+    def root
+      # Must use File.realpath to resolve symlinks created by rbenv
+      # Otherwise, Jekyll.sanitized path with prepend the unresolved root
+      @root ||= File.realpath(gemspec.full_gem_path)
+    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
+      nil
+    end
+
+    def includes_path
+      path_for "_includes".freeze
+    end
+
+    def layouts_path
+      path_for "_layouts".freeze
+    end
+
+    def sass_path
+      path_for "_sass".freeze
+    end
+
+    def data_path
+      path_for "_data".freeze
+    end
+
+    def assets_path
+      path_for "assets".freeze
+    end
+
+    def configure_sass
+      return unless sass_path
+      require "sass"
+      Sass.load_paths << sass_path
+    end
+
+    private
+
+    def path_for(folder)
+      path = realpath_for(folder)
+      path if path && File.directory?(path)
+    end
+
+    def realpath_for(folder)
+      File.realpath(Jekyll.sanitized_path(root, folder.to_s))
+    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
+      nil
+    end
+
+    def gemspec
+      @gemspec ||= Gem::Specification.find_by_name(name)
+    rescue Gem::LoadError
+      raise Jekyll::Errors::MissingDependencyException,
+        "The #{name} theme could not be found."
+    end
+  end
+end

data/lib/jekyll/theme_reader.rb

@@ -38,7 +38,6 @@ module Jekyll
       end
     end
 
-
     private
 
     def debug_theme_reader
@@ -52,29 +51,45 @@ module Jekyll
     end
 
     def debug_theme_data_reader
-      print_clear_line
-      print "Site Data:"
-      process_hash @site.data
+      print "Inspecting:", "Site Data >>"
+      inspect_hash @site.data
       print_clear_line
     end
 
-    def process_hash(hash)
+    def inspect_hash(hash)
       hash.each do |key, value|
         print_key key
+        if key == @site.theme.name
+          inspect_theme_override value
+        end
         if value.class == Hash
-          process_inner_hash value
+          inspect_inner_hash value
+        elsif value.class == Array
+          print_label key
+          extract_hashes_and_print value
         else
           print_value "'#{value}'"
         end
       end
     end
 
-    def process_inner_hash(hash)
+    def inspect_theme_override(value)
+      if value == false
+        abort_with_msg "Cannot define or override Theme Configuration " \
+                       "with an empty file!"
+      end
+      unless value.class == Hash
+        abort_with_msg "Theme Config or its override should be a Hash of " \
+            "key:value pairs or mappings. But got #{value.class} instead."
+      end
+    end
+
+    def inspect_inner_hash(hash)
       hash.each do |key, value|
         if value.class == Array
           print_label key
           extract_hashes_and_print value
-          print_dashes
+          print_clear_line
         elsif value.class == Hash
           print_subkey_and_value key, value
         else
@@ -84,14 +99,17 @@ module Jekyll
     end
 
     def extract_hashes_and_print(array)
-      array.each do |h|
-        process_inner_hash h
+      array.each do |entry|
+        if entry.class == String
+          print "-", entry
+        else
+          inspect_inner_hash entry
+        end
       end
     end
 
     def print_hash(key, value)
-      key = key.to_s + ":"
-      print key, value
+      print "#{key}:", value
     end
 
     def print_key(key)
@@ -103,7 +121,6 @@ module Jekyll
 
     def print_subkey_and_value(key, value)
       print_label key
-      print_dashes
       value.each do |subkey, val|
         print_hash subkey, val
       end
@@ -119,7 +136,7 @@ module Jekyll
     end
 
     def print_label(key)
-      print "#{key.to_s}:"
+      print "#{key}:"
     end
 
     def print_dashes
@@ -133,5 +150,9 @@ module Jekyll
     def print(arg1, arg2 = "")
       Jekyll.logger.debug arg1, arg2
     end
+
+    def abort_with_msg(msg)
+      Jekyll.logger.abort_with "JekyllData:", msg
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-data
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ashwin Maroli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll