jekyll-data-revised 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e564d57f1221d0dc6a960069f91669fba9febf32945eb74420defd09ffe5955e
-  data.tar.gz: 9b4cbd5d076f6b713cf3343ae54cb0d130b3bc481fb96e79f7d48da9b47e24d2
+  metadata.gz: 8235a1de5929de3afae76827b3d20547fd0ff9837b8aa7d4d3a553a007efc8dd
+  data.tar.gz: 5eae835b1f3023ce3e242a8d3e1cadac9a9e2a56d0b335aba3ed3b0587f627bd
 SHA512:
-  metadata.gz: 2bfff099d709386204254508622bb5cc49046ad622882e588408192e931012eef956abb55d1e1c741595d385429246130f0ae9682d021bde9351340c1b97993a
-  data.tar.gz: cc426bbdd5db09e73cc1b258475c9bbe96416a40d70b603653525872261fa85f4c4fff908ce81cb03c93b6e6d9a98f53cbbbb4acd5e44b6fde112068ae381603
+  metadata.gz: 0d000fd359099279f80bf071947e8dab18d4d450109c3848fe76186b5f3f180ed4c39bda9d43103378cd8332b901a1b667b8a3bb71fedd9f8f7dbb0b6ac9182a
+  data.tar.gz: 5758af8fe853e8948ce9fb0a620c9dabcbe6b8c596199c8505ea0cd583dfa38adf8a18e89026e296de0a9f2034ed1f52865fdc4f861bf9e56f2dfc288c7c01f7

data/README.md

@@ -29,6 +29,8 @@ end
 
 ## 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 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:

data/lib/jekyll-data.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "jekyll"
 require "jekyll-data/version"
 
@@ -16,7 +14,8 @@ require_relative "jekyll/data_path"
 require_relative "jekyll/theme_drop"
 
 # ----------------------------------------------------------------------------
-# Modify the current site instance only if it uses a gem-based theme.
+# Modify the current site instance if it uses a gem-based theme else have this
+# plugin disabled.
 #
 # 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.
@@ -25,6 +24,12 @@ Jekyll::Hooks.register :site, :after_reset do |site|
   if site.theme
     file = site.in_theme_dir("_config.yml")
     JekyllData::ThemeConfiguration.reconfigure(site) if File.exist?(file)
+  else
+    Jekyll.logger.abort_with(
+      "JekyllData:",
+      "Error! This plugin only works with gem-based jekyll-themes. " \
+      "Please disable this plugin to proceed."
+    )
   end
 end
 
@@ -38,7 +43,7 @@ end
 Jekyll::Hooks.register :site, :after_init do |site|
   if site.theme
     file = site.in_theme_dir("_config.yml")
-    Jekyll.logger.debug "Theme Config file:", file if File.exist?(file)
+    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

@@ -1,5 +1,4 @@
-# frozen_string_literal: true
-
+# encoding: UTF-8
 require "csv"
 
 module JekyllData

data/lib/jekyll-data/theme_configuration.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# encoding: UTF-8
 
 module JekyllData
   class ThemeConfiguration < Jekyll::Configuration

data/lib/jekyll-data/theme_data_reader.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module JekyllData
   class ThemeDataReader < Jekyll::DataReader
     attr_reader :site, :content

data/lib/jekyll-data/themed_site_drop.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# encoding: UTF-8
 
 module JekyllData
   class ThemedSiteDrop < Jekyll::Drops::SiteDrop
@@ -9,6 +9,7 @@ module JekyllData
     def_delegator  :@obj, :site_data, :data
     def_delegators :@obj, :theme
 
-    private def_delegator :@obj, :config, :fallback_data
+    private
+    def_delegator :@obj, :config, :fallback_data
   end
 end

data/lib/jekyll-data/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module JekyllData
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/jekyll/build_options.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Jekyll
   class Command
     class << self

data/lib/jekyll/data_path.rb

@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 module Jekyll
   class Theme
     def data_path
-      @data_path ||= path_for "_data"
+      path_for "_data".freeze
     end
   end
 end

data/lib/jekyll/theme_drop.rb

@@ -1,18 +1,19 @@
-# frozen_string_literal: true
+# 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 ||= begin
-          config = site.send(:fallback_data)
-          config[config["theme"]]
-        end
+        @theme_drop ||= site[site.theme.name]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-data-revised
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ashwin Maroli
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.47.1
 description: 
 email:
 - ashmaroli@gmail.com