jekyll-data 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd5090a5a9fecc23edb990f2af43701cdf018fc2
-  data.tar.gz: 5d9c0af30ca3738e65114eb9ac29514b8c7c2fc9
+  metadata.gz: b58db9039555a41b84b5c3d663b9bc689267f10a
+  data.tar.gz: 24db34fd2650c035b8a07a11ecf30cd47b152675
 SHA512:
-  metadata.gz: 89371b0891b485f65b138a30b13af973b4397a058eeaf3130eaaf7a75ac4db733864d79bcf12a1637813be2b4872fe6d74395956225f9a2d7e72bd7d80f931e9
-  data.tar.gz: 43d1d7e23a4ed9d40d6154f5100bf192865104259ebb52dc33ecd64c46151e83ad974df6837d5fce6066b72dfd252fd7efe2d7b8e2497e9507d37e084731859f
+  metadata.gz: 7eaf71e652e9ed84805277cc8135c428f90c2239c3dd9563a4504b42db949ef2e8520cb637b26715380b8118203e39088d16b4690398cbb8437e64fac784d1d1
+  data.tar.gz: cf41dc8dfc5ae0e63176d862c59b6316232a224ce29fe29c7e14094ac0eb5f9fd4137ac98168cdcabb1ca793ae4b4bc1d68667af45b8f9aff7792ee3c6f0901b

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Ashwin Maroli
+Copyright (c) 2016-2017 Ashwin Maroli & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -5,11 +5,13 @@
 
 [travis]: https://travis-ci.org/ashmaroli/jekyll-data
 
-Introducing a plugin that reads data files within **jekyll theme-gems** and adds the resulting hash to the site's internal data hash. If a **`_config.yml`** is present at the root of the theme-gem, it will be read as well.
+Introducing a plugin that reads data files within **jekyll theme-gems** and adds the resulting hash to the site's internal data hash. If a **`_config.yml`** is present at the root of the theme-gem, it will be evaluated and the extracted hash data will be incorporated into the site's existing config hash.
+
 
 ## Installation
 
-Simply add the plugin to your site's Gemfile and config file like every other jekyll plugin gems..
+Simply add the plugin to your site's Gemfile and config file like every other jekyll plugin gem:
+
 ```ruby
 # Gemfile
 
@@ -17,118 +19,102 @@ group :jekyll_plugins do
   gem "jekyll-data"
 end
 ```
-```yaml
-# _config.yml
+..and run
 
-gems:
-  - jekyll-data
+    bundle install
+
+
+> **Note: If the plugin has been marked as a `runtime_dependency` by the theme-gem's author it will be installed automatically with the theme-gem. Yet, it is recommended that the plugin be added to `:jekyll_plugins` group in the Gemfile rather than the `gems:` array in the config file while building or serving the site to avoid 'overriding' the `gems:` array data that may have been read-in from the theme-gem.**
 
-```
-..and run 
-```
-bundle install
-```
 
 ## Usage
 
 **Note:** *This plugin will only run in conjunction with a gem-based Jekyll-theme.*
 
-As long as the plugin gem has been installed properly, and is included in both the Gemfile & the config file, data-files supported by Jekyll and present in the `_data` directory at the root of your theme gem will be read. Their contents will be added to the site's internal data hash, provided, an identical data hash doesn't already exist at the site-source.
+As long as the plugin-gem has been installed properly, and is included in the Gemfile's `:jekyll_plugins` group, data files supported by Jekyll and present in the `_data` directory at the root of your theme-gem will be read. Their contents will be added to the site's internal data hash, provided, an identical data hash doesn't already exist at the site-source.
+
+If the theme-gem also includes a `_config.yml` at its root, then it will be read as well. The resulting config hash will be mixed into the site's existing config hash, filling in where the *keys* are not already defined. In other words, the config file at `source` will override corresponding identical keys in a `_config.yml` within the theme-gem which would in turn override corresponding `DEFAULTS` from Jekyll:
+
+  **DEFAULTS** < **_config.yml in theme-gem** < **_config.yml at source** < **Override configs via command-line**.
 
-If the theme-gem also includes a `_config.yml` at its root, then it will be read as well. The resulting config hash will be mixed into the site's existing config hash, filling in where the *keys* are not already defined. In other words, the site's config hash without this plugin, will override the conflicting config hash generated by this plugin from reading the included `_config.yml`
 
 ### Theme Configuration
 
-Jekyll themes (built prior to Jekyll 3.2) usually ship with configuration settings defined in the config file, which are then used within the theme's template files directly under the `site` namespace (e.g. `{{ site.myvariable }}`). This is not possible with theme gems as a config file and data-files within gems are not natively read (as of Jekyll 3.3), and hence require end-users to inspect a *demo* or *example* directory to source those files.
+Jekyll themes (built prior to `Jekyll 3.2`) usually ship with configuration settings defined in the config file, which are then used within the theme's template files directly under the `site` namespace (e.g. `{{ site.myvariable }}`). This is not possible with theme-gems as a config file and data files within gems are not natively read (as of Jekyll 3.3), and hence require end-users to inspect a *demo* or *example* directory to source those files.
 
-This plugin provides a couple of solutions to that hurdle:  
+This plugin provides a solution to that hurdle:
 
-  - settings via `_config.yml`  
-  ----------------------------  
-  This plugin reads the config file (at present only `_config.yml`) and uses the data to modify the site's config hash. This allows the gem to continue using `{{ site.myvariable }}` within its templates.
-  - settings via `_data/[theme-name].*`  
-  --------------------------------------  
-  An alternate route is to have theme-specific settings defined as a hash, in a valid data file named the same as the theme-gem.
-  The defined settings will be accessible via `{{ theme.myvariable }}`.  
-  e.g. if *minima* were to ship a YAML file with *minima*-specific settings (say, `post_excerpt: enabled`), then the gem would've a **_data/minima.yml** and this particular setting can be accessed in its templates via `{{ theme.post_excerpt }}` which is functionally equivalent to `{{ site.data.minima.post_excerpt }}`  
-  *Note: The `{{ theme.variable }}` is only available if the data-file is named the same as the theme-gem.*
+JekyllData now reads the config file (at present only `_config.yml`) present within the theme-gem and uses the data to modify the site's config hash. This allows the theme-gem to continue using `{{ site.myvariable }}` within its templates and work out-of-the-box as intended, with minimal user intervention.
 
-### Regular Data-files
+**Note: the plugins required by the theme may be listed under the `gems:` array and will be automatically `required` by Jekyll while building/serving, provided that the user doesn't have a different `gems:` array in the config file at source. Hence it is recommended to add all other plugins ( including `jekyll-data` ) via the Gemfile's `:jekyll_plugins` group.**
 
-Regular data files that may be used to supplement theme templates (e.g. locales and translated UI text) can be named as desired. Either use a sub-directory to house related data-files or declare all of them as a mapped data block within a single file.
+#### The `theme` namespace
+
+From `v1.0`, JekyllData no longer supports reading theme configuration provided as a `[theme-name].***` file within the `_data` directory and instead the `theme` namespace points to a certain key in the bundled `_config.yml`.
+
+For `{{ theme.variable }}` to work, the config file should nest all such key-value pairs under the `[theme-name]` key, as outlined in the example below for a theme-gem called `solitude`:
 
 ```yaml
-# <theme-gem>/_data/apparel.yml
-
-shirts:
-  - color: white
-    size: large
-    image: s_w_lg.jpg
-  - color: black
-    size: large
-    image: s_b_lg.jpg
-
-jeans:
-  - color: khaki
-    waist: 34
-    image: j_kh_34.jpg
-  - color: blue
-    waist: 32
-    image: j_bu_32.jpg
-```
-is the same as:
-```yaml
-# <theme-gem>/_data/apparel/shirts.yml
-
-- color: white
-  size: large
-  image: s_w_lg.jpg
-- color: black
-  size: large
-  image: s_b_lg.jpg
-```
-```yaml
-# <theme-gem>/_data/apparel/jeans.yml
-
-- color: khaki
-  waist: 34
-  image: j_kh_34.jpg
-- color: blue
-  waist: 32
-  image: j_bu_32.jpg
+# <solitude-0.1.0>/_config.yml
+
+# the settings below have been used in this theme's templates via the `theme`
+# namespace. e.g. `{{ theme.recent_posts.style }}` instead of using the more
+# verbose `{{ site.solitude.recent_posts.style }}` though both are functionally
+# the same.
+#
+solitude:
+  sidebar       : true      # enter 'false' to enable horizontal navbar instead.
+  theme_variant : Charcoal  # choose from 'Ocean', 'Grass', 'Charcoal'
+  recent_posts  :
+    style       : list      # choose from 'list' and 'grid'.
+    quantity    : '4'       # either '4' or '6'
+
 ```
 
-### User-overrides
 
-To override directives shipped with a theme gem, simply have an identical hash at the site-source.  
-e.g.
+### Data files
+
+Data files may be used to supplement theme templates (e.g. locales and translated UI text) and can be named as desired.
+  - Organize related small data files in sub-directories. (or)
+  - Declare all related data as mapped data blocks within a single file.
+
+To illustrate with an example, consider a `locales.yml` that has mappings for `en:`, `fr:`, `it:`.
+
 ```yaml
-# <site_source_dir>/_data/navigation.yml
-
-mainmenu:
-  - title: Home
-    url: /
-  - title: Kitchen Diaries
-    url: /kitchen-diaries/
-  - title: Tips & Tricks
-    url: /tips-n-tricks/
-  - title: Health Facts
-    url: /health/
-  - title: About Me
-    url: /about/ 
- ```
- would have overridden the following:
- ```yaml
-# <theme-gem>/_data/navigation/mainmenu.yml
-
-- title: Link Item 1
-  url: /link-one/
-- title: Link Item 2
-  url: /link-two/
-- title: Link Item 3
-  url: /link-three/
+# <theme-gem>/_data/locales.yml
+
+en:
+  previous : previous
+  next     : next
+
+fr:
+  previous : précédent
+  next     : prochain
+
+it:
+  previous : precedente
+  next     : seguente
 ```
 
+the Hash from above would be identical to one had the gem been shipped with a `_data/locales` directory containing individual files for each language data.
+
+
+### Overriding Data Files
+
+To override data shipped with a theme-gem, simply have an identical hash at the site-source.
+
+Irrespective of whether the theme-gem ships with consolidated data files of related entities, or sub-directories containing individual files, the data can be overridden with a single file or with multiple files.
+
+For example, if a theme-gem contains the above sample `locales.yml`, then to override the `fr:` key-data simply have either of the following:
+  - a **`_data/locales/fr.yml`** with identical subkey(s).
+  - a **`_data/locales.yml`** with **`fr:`** with identical subkey(s).
+
+--
+> **Note**
+  - having an **empty** `_data/locales.yml` at `source` directory will override the **entire `["data"]["locales"]` payload** from the theme-gem as **`false`**.
+  - having an **empty** `_data/locales/fr.yml` at `source` directory will override the **enire `["data"]["locales"]["fr"]` payload** from the theme-gem as **`false`**
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome at the [GitHub Repo](https://github.com/ashmaroli/jekyll-data). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/jekyll-data.rb

@@ -1,26 +1,29 @@
 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"
+module JekyllData
+  autoload :Reader,             "jekyll-data/reader"
+  autoload :ThemedSiteDrop,     "jekyll-data/themed_site_drop"
+  autoload :ThemeDataReader,    "jekyll-data/theme_data_reader"
+  autoload :ThemeConfiguration, "jekyll-data/theme_configuration"
+end
 
 # Monkey-patches
-require_relative "jekyll/theme"
-require_relative "jekyll/drops/unified_payload_drop"
+require_relative "jekyll/build_options"
+require_relative "jekyll/data_path"
+require_relative "jekyll/theme_drop"
 
-# replace Jekyll::Reader with a subclass Jekyll::ThemeReader only if the site
-# uses a gem-based theme else have this plugin disabled.
+# ----------------------------------------------------------------------------
+# Modify the current site instance if it uses a gem-based theme else have this
+# plugin disabled.
 #
-# Additionally, append to site's config hash with optional config hash from the
-# theme gem by filling in keys not already defined.
-Jekyll::Hooks.register :site, :after_init do |site|
+# if a '_config.yml' is present at the root of theme-gem, it is evaluated and
+# the extracted hash data is incorprated into the site's config hash.
+# ----------------------------------------------------------------------------
+Jekyll::Hooks.register :site, :after_reset do |site|
   if site.theme
-    site.config = Jekyll::Utils.deep_merge_hashes(
-      Jekyll::ThemeReader.new(site).read_theme_config, site.config
-    )
-    site.reader = Jekyll::ThemeReader.new(site)
+    file = site.in_theme_dir("_config.yml")
+    JekyllData::ThemeConfiguration.reconfigure(site) if File.exist?(file)
   else
     Jekyll.logger.abort_with(
       "JekyllData:",
@@ -29,3 +32,18 @@ Jekyll::Hooks.register :site, :after_init do |site|
     )
   end
 end
+
+# ---------------------------------------------------------------------------
+# Replace Jekyll::Reader with a subclass JekyllData::Reader only if the
+# site uses a gem-based theme.
+#
+# If a _config.yml exists at the root of the theme-gem, output its path.
+# Placed here inorder to avoid outputting the path after every regeneration.
+# ---------------------------------------------------------------------------
+Jekyll::Hooks.register :site, :after_init do |site|
+  if site.theme
+    file = site.in_theme_dir("_config.yml")
+    Jekyll.logger.info "Theme Config file:", file if File.exist?(file)
+    site.reader = JekyllData::Reader.new(site)
+  end
+end

data/lib/jekyll-data/reader.rb

@@ -0,0 +1,223 @@
+# encoding: UTF-8
+require "csv"
+
+module JekyllData
+  class Reader < Jekyll::Reader
+    def initialize(site)
+      @site = site
+      @theme = site.theme
+      @theme_data_files = Dir[File.join(site.theme.root,
+        site.config["data_dir"], "**", "*.{yaml,yml,json,csv}")]
+    end
+
+    # Read data files within theme-gem.
+    #
+    # Returns nothing.
+    def read
+      super
+      read_theme_data
+    end
+
+    # Read data files within a theme gem and add them to internal data
+    #
+    # Returns a hash appended with new data
+    def read_theme_data
+      if @theme.data_path
+        #
+        # show contents of "<theme>/_data/" dir being read while degugging.
+        inspect_theme_data
+        theme_data = ThemeDataReader.new(site).read(site.config["data_dir"])
+        @site.data = Jekyll::Utils.deep_merge_hashes(theme_data, @site.data)
+        #
+        # show contents of merged site.data hash while debugging with
+        # additional --show-data switch.
+        inspect_merged_hash if site.config["show-data"] && site.config["verbose"]
+      end
+    end
+
+    private
+
+    # Private:
+    # (only while debugging)
+    #
+    # Print a list of data file(s) within the theme-gem
+    def inspect_theme_data
+      print_clear_line
+      Jekyll.logger.debug "Reading:", "Theme Data Files..."
+      @theme_data_files.each { |file| Jekyll.logger.debug "", file }
+      print_clear_line
+      Jekyll.logger.debug "Merging:", "Theme Data Hash..."
+
+      unless site.config["show-data"] && site.config["verbose"]
+        Jekyll.logger.debug "", "use --show-data with --verbose to output " \
+                                "merged Data Hash.".cyan
+        print_clear_line
+      end
+    end
+
+    # Private:
+    # (only while debugging)
+    #
+    # Print contents of the merged data hash
+    def inspect_merged_hash
+      Jekyll.logger.debug "Inspecting:", "Site Data >>"
+
+      # the width of generated logger[message]
+      @width = 50
+      @dashes = "-" * @width
+
+      inspect_hash @site.data
+      print_clear_line
+    end
+
+    # --------------------------------------------------------------------
+    # Private helper methods to inspect data hash and output contents
+    # to logger at level debugging.
+    # --------------------------------------------------------------------
+
+    # Dissect the (merged) site.data hash and print its contents
+    #
+    # - Print the key string(s)
+    # - Individually analyse the hash[key] values and extract contents
+    #   to output.
+    def inspect_hash(hash)
+      hash.each do |key, value|
+        print_key key
+        if value.is_a? Hash
+          inspect_inner_hash value
+        elsif value.is_a? Array
+          extract_hashes_and_print value
+        else
+          print_string value.to_s
+        end
+      end
+    end
+
+    # Analyse deeper hashes and extract contents to output
+    def inspect_inner_hash(hash)
+      hash.each do |key, value|
+        if value.is_a? Array
+          print_label key
+          extract_hashes_and_print value
+        elsif value.is_a? Hash
+          print_subkey_and_value key, value
+        else
+          print_hash key, value
+        end
+      end
+    end
+
+    # If an array of strings, print. Otherwise assume as an
+    # array of hashes (sequences) that needs further analysis.
+    def extract_hashes_and_print(array)
+      array.each do |entry|
+        if entry.is_a? String
+          print_list entry
+        else
+          inspect_inner_hash entry
+        end
+      end
+    end
+
+    #
+
+    # --------------------------------------------------------------------
+    # Private methods for formatting log messages while debugging
+    # --------------------------------------------------------------------
+
+    # Splits a string longer than the value of '@width' into smaller
+    # strings and prints each line as a logger[message]
+    #
+    # string - the long string
+    #
+    # label - optional text to designate the printed lines.
+    def print_long_string(string, label = "")
+      strings = string.scan(%r!(.{1,#{@width}})(\s+|\W|\Z)!).map { |s| s.join.strip }
+      first_line = strings.first.cyan
+
+      label.empty? ? print_value(first_line) : print(label, first_line)
+      strings[1..-1].each { |s| print_value s.cyan }
+    end
+
+    # Prints key as logger[topic] and value as [message]
+    def print_hash(key, value)
+      if value.length > @width
+        print_long_string value, "#{key}:"
+      else
+        print "#{key}:", value.cyan
+      end
+    end
+
+    def print_list(item)
+      if item.length > @width
+        print_long_string item, "-"
+      else
+        print "-", item.cyan
+      end
+    end
+
+    def print_string(str)
+      if str.length > @width
+        print_long_string str
+      else
+        print_value str.inspect
+      end
+    end
+
+    # Prints the site.data[key] in color
+    def print_key(key)
+      print_clear_line
+      print "Data Key:", " #{key} ".center(@width, "=")
+      print_clear_line
+    end
+
+    # Prints label, keys and values of mappings
+    def print_subkey_and_value(key, value)
+      print_label key
+      value.each do |subkey, val|
+        if val.is_a? Hash
+          print_inner_subkey subkey
+          inspect_inner_hash val
+        elsif val.is_a? Array
+          print_inner_subkey subkey
+          extract_hashes_and_print val
+        elsif val.is_a? String
+          print_hash subkey, val
+        end
+      end
+    end
+
+    # Print only logger[message], [topic] = nil
+    def print_value(value)
+      if value.is_a? Array
+        extract_hashes_and_print value
+      else
+        print "", value
+      end
+    end
+
+    # Print only logger[topic] appended with a colon
+    def print_label(key)
+      print_value " #{key} ".center(@width, "-")
+    end
+
+    def print_inner_subkey(key)
+      print "#{key}:", @dashes
+    end
+
+    def print_dashes
+      print "", @dashes
+    end
+
+    def print_clear_line
+      print ""
+    end
+
+    # Redefine Jekyll Loggers to have the [topic] indented by 30.
+    # (rjust by just 29 to accomodate the additional whitespace added
+    # by Jekyll)
+    def print(topic, message = "")
+      Jekyll.logger.debug topic.rjust(29), message
+    end
+  end
+end

data/lib/jekyll-data/theme_configuration.rb

@@ -0,0 +1,64 @@
+# encoding: UTF-8
+
+module JekyllData
+  class ThemeConfiguration < Jekyll::Configuration
+    class << self
+      # Public: Establish a new site.config hash by reading an optional config
+      #         file within the theme-gem and appending the resulting hash to
+      #         existing site.config filling in keys not already defined.
+      #
+      # site: current Jekyll::Site instance.
+      #
+      # Returns a config Hash to be used by an 'after_reset' hook.
+      def reconfigure(site)
+        default_hash = Jekyll::Configuration::DEFAULTS
+        theme_config = ThemeConfiguration.new(site).read_theme_config
+
+        # Merge with existing site.config and strip any remaining defaults
+        config = Jekyll::Utils.deep_merge_hashes(
+          theme_config, site.config
+        ).reject { |key, value| value == default_hash[key] }
+
+        # Merge DEFAULTS < _config.yml in theme-gem < config file(s) from source
+        # and redefine site.config
+        site.config = Jekyll::Configuration.from(
+          Jekyll::Utils.deep_merge_hashes(theme_config, config)
+        )
+      end
+    end
+
+    #
+
+    def initialize(site)
+      @site = site
+    end
+
+    # Public: Read the '_config.yml' file within the theme-gem.
+    #         Additionally validates that the extracted config data and the
+    #         the 'value' of '<site.theme.name> key', when present, is a Hash.
+    #
+    # Returns a Configuration Hash
+    def read_theme_config
+      file = @site.in_theme_dir("_config.yml")
+      theme_name = @site.theme.name
+
+      config = safe_load_file(file)
+
+      check_config_is_hash!(config, file)
+      validate_config_hash config[theme_name] unless config[theme_name].nil?
+
+      config
+    end
+
+    private
+
+    # Validate the <site.theme.name> key's value to be accessed via the `theme`
+    # namespace.
+    def validate_config_hash(value)
+      unless value.is_a? Hash
+        Jekyll.logger.abort_with "JekyllData:", "Theme Configuration should be a " \
+            "Hash of key:value pairs or mappings. But got #{value.class} instead."
+      end
+    end
+  end
+end

data/lib/{jekyll/readers → jekyll-data}/theme_data_reader.rb

@@ -1,10 +1,10 @@
-module Jekyll
-  class ThemeDataReader < DataReader
+module JekyllData
+  class ThemeDataReader < Jekyll::DataReader
     attr_reader :site, :content
     def initialize(site)
       @site = site
       @content = {}
-      @entry_filter = EntryFilter.new(site)
+      @entry_filter = Jekyll::EntryFilter.new(site)
     end
 
     def read(dir)

data/lib/jekyll-data/themed_site_drop.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+module JekyllData
+  class ThemedSiteDrop < Jekyll::Drops::SiteDrop
+    extend Forwardable
+
+    mutable false
+
+    def_delegator  :@obj, :site_data, :data
+    def_delegators :@obj, :theme
+
+    private
+    def_delegator :@obj, :config, :fallback_data
+  end
+end

data/lib/jekyll-data/version.rb

@@ -1,3 +1,3 @@
 module JekyllData
-  VERSION = "0.4.0".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/jekyll/build_options.rb

@@ -0,0 +1,17 @@
+module Jekyll
+  class Command
+    class << self
+      #
+      # patch original method to inject a '--show-data' switch to display
+      # merged data hash
+      #
+      alias_method :original_build_options, :add_build_options
+
+      def add_build_options(c)
+        original_build_options(c)
+        c.option "show-data", "--show-data",
+          "Print merged site-data hash when used with --verbose."
+      end
+    end
+  end
+end

data/lib/jekyll/data_path.rb

@@ -0,0 +1,7 @@
+module Jekyll
+  class Theme
+    def data_path
+      path_for "_data".freeze
+    end
+  end
+end

data/lib/jekyll/theme_drop.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class UnifiedPayloadDrop < Drop
+      def site
+        @site_drop ||= JekyllData::ThemedSiteDrop.new(@obj)
+      end
+
+      # Register a namespace to easily call subkeys under <theme-name> key
+      # in the _config.yml within a theme-gem via its bundled templates.
+      #   e.g. with this drop, theme-specific variables usually called like
+      #        {{ site.minima.date_format }} can be shortened to simply
+      #        {{ theme.date_format }}.
+      def theme
+        @theme_drop ||= site[site.theme.name]
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-data
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ashwin Maroli
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,28 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.1
 description: 
 email:
 - ashmaroli@gmail.com
@@ -76,12 +110,14 @@ files:
 - LICENSE.txt
 - README.md
 - lib/jekyll-data.rb
+- lib/jekyll-data/reader.rb
+- lib/jekyll-data/theme_configuration.rb
+- lib/jekyll-data/theme_data_reader.rb
+- lib/jekyll-data/themed_site_drop.rb
 - lib/jekyll-data/version.rb
-- lib/jekyll/drops/themed_site_drop.rb
-- lib/jekyll/drops/unified_payload_drop.rb
-- lib/jekyll/readers/theme_data_reader.rb
-- lib/jekyll/theme.rb
-- lib/jekyll/theme_reader.rb
+- lib/jekyll/build_options.rb
+- lib/jekyll/data_path.rb
+- lib/jekyll/theme_drop.rb
 homepage: https://github.com/ashmaroli/jekyll-data
 licenses:
 - MIT
@@ -103,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: A plugin to read '_config.yml' and data files in Jekyll Theme Gems
+summary: A plugin to read '_config.yml' and data files within Jekyll theme-gems
 test_files: []

data/lib/jekyll/drops/themed_site_drop.rb

@@ -1,17 +0,0 @@
-# encoding: UTF-8
-
-module Jekyll
-  module Drops
-    class ThemedSiteDrop < SiteDrop
-      extend Forwardable
-
-      mutable false
-
-      def_delegator  :@obj, :site_data, :data
-      def_delegators :@obj, :theme
-
-      private
-      def_delegator :@obj, :config, :fallback_data
-    end
-  end
-end

data/lib/jekyll/drops/unified_payload_drop.rb

@@ -1,30 +0,0 @@
-# encoding: UTF-8
-
-module Jekyll
-  module Drops
-    class UnifiedPayloadDrop < Drop
-      mutable true
-
-      attr_accessor :page, :layout, :content, :paginator
-      attr_accessor :highlighter_prefix, :highlighter_suffix
-
-      def jekyll
-        JekyllDrop.global
-      end
-
-      def site
-        @site_drop ||= ThemedSiteDrop.new(@obj)
-      end
-
-      def theme
-        theme_name = site.theme.name
-        site.data[theme_name]
-      end
-
-      private
-      def fallback_data
-        @fallback_data ||= {}
-      end
-    end
-  end
-end

data/lib/jekyll/theme.rb

@@ -1,66 +0,0 @@
-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

@@ -1,209 +0,0 @@
-# encoding: UTF-8
-require "csv"
-
-module Jekyll
-  class ThemeReader < Reader
-    def initialize(site)
-      @site = site
-      @theme_data_files = Dir[File.join(@site.theme.root,
-        site.config["data_dir"], "**", "*.{yaml,yml,json,csv}")]
-    end
-
-    # Read data files within theme-gem.
-    #
-    # Returns nothing.
-    def read
-      super
-      read_theme_data
-    end
-
-    # Read data files within a theme gem and add them to internal data
-    #
-    # Returns a hash appended with new data
-    def read_theme_data
-      if site.theme.data_path
-        #
-        # show contents of "<theme>/_data/" dir being read while degugging.
-        # Additionally validate if a data file with the same name as the
-        # theme (= theme config or theme config-override) is a Hash.
-        inspect_theme_data
-        theme_data = ThemeDataReader.new(site).read(site.config["data_dir"])
-        @site.data = Utils.deep_merge_hashes(theme_data, @site.data)
-        #
-        # check if the merged hash is suitable for generating the site.
-        # Also show contents of merged site.data hash while debugging.
-        inspect_merged_hash
-      end
-    end
-
-    # Read the '_config.yml' file if present within the theme gem and
-    # return a data hash otherwise return a hash of Jekyll Defaults.
-    #
-    # Returns a hash
-    def read_theme_config
-      config = @site.in_theme_dir("_config.yml")
-      if File.exist?(config)
-        Configuration.new.read_config_file(config)
-      else
-        Configuration::DEFAULTS
-      end
-    end
-
-    private
-
-    # Private:
-    # Print messages only while debugging.
-    #
-    # Inspect the theme configuration file (data file with the same name
-    # as the theme) and print a success message, if valid.
-    def inspect_theme_data
-      print_clear_line
-      print "Reading:", "Theme Data Files..."
-      @theme_data_files.each do |file|
-        if File.basename(file, ".*") == @site.theme.name
-          inspect_theme_config file
-          print_value file.green
-        else
-          print_value file
-        end
-      end
-      print_clear_line
-      print "Merging:", "Theme Data Hash..."
-    end
-
-    # Private:
-    # Print contents of the merged data hash while debugging
-    def inspect_merged_hash
-      print "Inspecting:", "Site Data >>"
-      inspect_hash @site.data
-      print_clear_line
-    end
-
-    # Private helper methods to inspect data hash and output contents
-    # to logger at level debugging.
-
-    # Dissect the (merged) site.data hash and print its contents
-    #
-    # - Print the key string(s) and if matches theme name, validate its
-    #   value as well.
-    # - Individually analyse the hash[key] values and extract contents
-    #   to output.
-    def inspect_hash(hash)
-      hash.each do |key, value|
-        print_key key
-        if key == @site.theme.name
-          validate_config_hash value
-        end
-
-        if value.is_a? Hash
-          inspect_inner_hash value
-        elsif value.is_a? Array
-          print_label key
-          extract_hashes_and_print value
-        else
-          print_value "'#{value}'"
-        end
-      end
-    end
-
-    # Analyse deeper hashes and extract contents to output
-    def inspect_inner_hash(hash)
-      hash.each do |key, value|
-        if value.is_a? Array
-          print_label key
-          extract_hashes_and_print value
-          print_clear_line
-        elsif value.is_a? Hash
-          print_subkey_and_value key, value
-        else
-          print_hash key, value
-        end
-      end
-    end
-
-    # If an array of strings, print. Otherwise assume as an
-    # array of hashes (sequences) that needs further analysis.
-    def extract_hashes_and_print(array)
-      array.each do |entry|
-        if entry.is_a? String
-          print "-", entry
-        else
-          inspect_inner_hash entry
-        end
-      end
-    end
-
-    # analyse the theme config file and validate it as Hash
-    def inspect_theme_config(path)
-      config = ThemeDataReader.new(site).read_data_file(path)
-      validate_config_hash config
-    end
-
-    def validate_config_hash(value)
-      if value == false
-        abort_with_msg "Cannot define or override Theme Configuration " \
-                       "with an empty file!"
-      end
-      unless value.is_a? 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
-
-    # Private methods for formatting log messages while debugging and a
-    # method to issue conflict alert and abort site.process
-
-    # Prints key as logger[topic] and value as [message]
-    def print_hash(key, value)
-      print "#{key}:", value
-    end
-
-    # Prints the site.data[key] in color
-    def print_key(key)
-      @dashes = "------------------------"
-      print_value @dashes.to_s.cyan
-      print "Data Key:", key.to_s.cyan
-      print_value @dashes.to_s.cyan
-    end
-
-    # Prints label, keys and values of mappings
-    def print_subkey_and_value(key, value)
-      print_label key
-      value.each do |subkey, val|
-        print_hash subkey, val
-      end
-      print_dashes
-    end
-
-    # Print only logger[message], [topic] = nil
-    def print_value(value)
-      if value.is_a? Array
-        extract_hashes_and_print value
-      else
-        print "", value
-      end
-    end
-
-    # Print only logger[topic] appended with a colon
-    def print_label(key)
-      print "#{key}:"
-    end
-
-    def print_dashes
-      print "", @dashes
-    end
-
-    def print_clear_line
-      print ""
-    end
-
-    # Redefine Jekyll Loggers
-    def print(arg1, arg2 = "")
-      Jekyll.logger.debug arg1, arg2
-    end
-
-    def abort_with_msg(msg)
-      Jekyll.logger.abort_with "JekyllData:", msg
-    end
-  end
-end