jekyll-algolia 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf886389ae5ad938db693d1bc2ed35e2b89015d3
-  data.tar.gz: 252509afafa7dd89faea1ed3dc7aa9590da1a9be
+  metadata.gz: 7d43c87fe0b5fbfc8fc82a37856b91b4d5afc302
+  data.tar.gz: bed79ab03a0debd6d942d32c6c0aa7b50736ecde
 SHA512:
-  metadata.gz: 3a4472b586bbd24f67ee82c4e1bdb8505789d50296b5604b4be388fa25df123545c5e949b8e7caada3276e28a4f1a9f0270a0ae5013f08d1c47d17df0238fc27
-  data.tar.gz: 78946a3ec46e391260479c1e2a24b131c3627d86f4b643f8e884b8cb183376317e95827600036b402c703ad2f796023d7f939777961ed809e70f40581b5f3221
+  metadata.gz: b4957ab0730f5955bdab4cf148021e5162973a844eb0f0c58fe0c1c7ac9dae5c89859995755f500ed7ccb10858b3c31020661c82c945e47f919135168811a6ef
+  data.tar.gz: 8f4d12ee5472aef456a02d5cfd84f85d8eb8466817880fbf644ad78f16621a85651e3acfefff951aa8b6ad1597830df5eb7975e64d7b4b98bde28a91aeae4df4

data/lib/errors/settings_manually_edited.txt

@@ -13,5 +13,5 @@ W:algolia:
 W:  settings:
 {settings}
 I:
-I:If you'd like to revert your index to its default settings, the best way is to delete the index and run `jekyll algolia` again.
+I:If you'd like to revert to the default settings, the easiest way delete the indices and run `jekyll algolia` again.
 I:

data/lib/jekyll-algolia.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require 'jekyll/commands/algolia'
-require 'jekyll/algolia/overwrites/jekyll-algolia-site'
-require 'jekyll/algolia/overwrites/jekyll-document'
-require 'jekyll/algolia/overwrites/jekyll-tags-link'
 require 'date'
 
 module Jekyll
@@ -29,6 +26,9 @@ module Jekyll
     # The gist of the plugin works by instanciating a Jekyll site,
     # monkey-patching its `write` method and building it.
     def self.init(config = {})
+      # Monkey patch Jekyll and external plugins
+      load_overwrites
+
       config = Configurator.init(config).config
       @site = Jekyll::Algolia::Site.new(config)
 
@@ -36,9 +36,6 @@ module Jekyll
 
       Configurator.warn_of_deprecated_options
 
-      # Register our own tags to overwrite the default tags
-      Liquid::Template.register_tag('link', JekyllAlgoliaLink)
-
       if Configurator.dry_run?
         Logger.log('W:==== THIS IS A DRY RUN ====')
         Logger.log('W:  - No records will be pushed to your index')
@@ -48,6 +45,21 @@ module Jekyll
       self
     end
 
+    # Public: Monkey patch Jekyll and external plugins so they don't interfere
+    # with our plugin
+    #
+    # Note: This is only loaded when running `jekyll algolia` so should not have
+    # any impact on regular builds
+    def self.load_overwrites
+      require 'jekyll/algolia/overwrites/githubpages-configuration'
+      require 'jekyll/algolia/overwrites/jekyll-algolia-site'
+      require 'jekyll/algolia/overwrites/jekyll-document'
+      require 'jekyll/algolia/overwrites/jekyll-tags-link'
+
+      # Register our own tags to overwrite the default tags
+      Liquid::Template.register_tag('link', JekyllAlgoliaLink)
+    end
+
     # Public: Run the main Algolia module
     #
     # Actually "process" the site, which will acts just like a regular `jekyll

data/lib/jekyll/algolia/overwrites/githubpages-configuration.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module GitHubPages
+  # The github-pages gem will automatically disable every plugin that is not in
+  # the whitelist of plugins allowed by GitHub. This includes any plugin defined
+  # in the `_plugins` folder as well.
+  #
+  # Users of the jekyll-algolia plugin will use custom plugins in _plugins to
+  # define custom hooks to modify the indexing. If they happen to have the
+  # github-pages gem installed at the same time, those hooks will never be
+  # executed.
+  #
+  # Here, we overwrite the call to GitHubPages::Configuration.set that init the
+  # whole plugin to actually do nothing, hence disabling the plugin completely.
+  # https://github.com/github/pages-gem/blob/master/lib/github-pages.rb#L19
+  #
+  # This file will only be loaded when running `jekyll algolia`, so it won't
+  # interfere with the regular usage of `jekyll build`
+  class Configuration
+    class << self
+      def set(site); end
+    end
+  end
+end

data/lib/jekyll/algolia/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Algolia
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-algolia
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Tim Carry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algolia_html_extractor
@@ -303,6 +303,7 @@ files:
 - lib/jekyll/algolia/hooks.rb
 - lib/jekyll/algolia/indexer.rb
 - lib/jekyll/algolia/logger.rb
+- lib/jekyll/algolia/overwrites/githubpages-configuration.rb
 - lib/jekyll/algolia/overwrites/jekyll-algolia-site.rb
 - lib/jekyll/algolia/overwrites/jekyll-document.rb
 - lib/jekyll/algolia/overwrites/jekyll-tags-link.rb