algoliasearch-jekyll 0.5.3 → 0.6.0

data/spec/spec_helper.rb

@@ -4,40 +4,61 @@ if ENV['TRAVIS']
 end
 
 require 'awesome_print'
-require_relative './spec_helper_jekyll.rb'
+require 'jekyll'
 require_relative './spec_helper_simplecov.rb'
 require './lib/push.rb'
 
 RSpec.configure do |config|
   config.filter_run(focus: true)
   config.run_all_when_everything_filtered = true
+end
 
-  # Create a Jekyll::Site instance, patched with a `file_by_name` method
-  def get_site(config = {}, options = {})
-    default_options = {
-      mock_write_method: true,
-      process: true
-    }
-    options = default_options.merge(options)
-
-    config = config.merge(
-      source: File.expand_path('./spec/fixtures')
-    )
-    config = Jekyll.configuration(config)
-
-    site = AlgoliaSearchJekyllPush.init_options({}, options, config)
-                           .jekyll_new(config)
-
-    def site.file_by_name(file_name)
-      each_site_file do |file|
-        return file if file.path =~ /#{file_name}$/
-      end
-      nil
-    end
+# Disabling the logs
+Jekyll.logger.log_level = :error
+
+# Create a Jekyll::Site instance, patched with a `file_by_name` method
+def get_site(config = {}, options = {})
+  default_options = {
+    mock_write_method: true,
+    process: true
+  }
+  options = default_options.merge(options)
 
-    allow(site).to receive(:write) if options[:mock_write_method]
+  config = config.merge(
+    source: fixture_path
+  )
+  config = Jekyll.configuration(config)
 
-    site.process if options[:process]
-    site
+  site = AlgoliaSearchJekyllPush.init_options({}, options, config)
+  .jekyll_new(config)
+
+  def site.file_by_name(file_name)
+    each_site_file do |file|
+      return file if file.path =~ /#{file_name}$/
+    end
+    nil
   end
+
+  allow(site).to receive(:write) if options[:mock_write_method]
+
+  site.process if options[:process]
+  site
+end
+
+# Return the fixture path, according to the current Jekyll version being tested
+def fixture_path
+  jekyll_version = Jekyll::VERSION[0]
+  fixture_path = "./spec/fixtures/jekyll_version_#{jekyll_version}"
+  File.expand_path(fixture_path)
+end
+
+# Check the current Jekyll version
+def restrict_jekyll_version(more_than: nil, less_than: nil)
+  jekyll_version = Gem::Version.new(Jekyll::VERSION)
+  minimum_version = Gem::Version.new(more_than)
+  maximum_version = Gem::Version.new(less_than)
+
+  return false if !more_than.nil? && jekyll_version < minimum_version
+  return false if !less_than.nil? && jekyll_version > maximum_version
+  true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Tim Carry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algoliasearch
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
-- !ruby/object:Gem::Dependency
-  name: jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -213,6 +214,8 @@ files:
 - Rakefile
 - algoliasearch-jekyll.gemspec
 - docs/travis-settings.png
+- gemfiles/jekyll_v2.gemfile
+- gemfiles/jekyll_v3.gemfile
 - lib/algoliasearch-jekyll.rb
 - lib/credential_checker.rb
 - lib/push.rb
@@ -224,37 +227,47 @@ files:
 - scripts/git_hooks/pre-commit
 - scripts/git_hooks/pre-push
 - scripts/release
+- scripts/test
+- scripts/test_ci
+- scripts/test_v2
+- scripts/test_v3
+- scripts/watch
+- scripts/watch_v2
+- scripts/watch_v3
 - spec/credential_checker_spec.rb
-- spec/fixtures/_config.yml
-- spec/fixtures/_layouts/default.html
-- spec/fixtures/_my-collection/collection-item.html
-- spec/fixtures/_my-collection/collection-item.md
-- spec/fixtures/_posts/2015-07-02-test-post.md
-- spec/fixtures/_posts/2015-07-03-test-post-again.md
-- spec/fixtures/_site/2015/07/02/test-post.html
-- spec/fixtures/_site/2015/07/03/test-post-again.html
-- spec/fixtures/_site/about.html
-- spec/fixtures/_site/assets/ring.png
-- spec/fixtures/_site/authors.html
-- spec/fixtures/_site/excluded.html
-- spec/fixtures/_site/hierarchy.html
-- spec/fixtures/_site/index.html
-- spec/fixtures/_site/my-collection/collection-item.html
-- spec/fixtures/_site/page2/index.html
-- spec/fixtures/_site/weight.html
-- spec/fixtures/about.md
-- spec/fixtures/api_key_dir/_algolia_api_key
-- spec/fixtures/assets/ring.png
-- spec/fixtures/authors.html
-- spec/fixtures/excluded.html
-- spec/fixtures/hierarchy.md
-- spec/fixtures/index.html
-- spec/fixtures/page2/index.html
-- spec/fixtures/weight.md
+- spec/fixtures/jekyll_version_2/_config.yml
+- spec/fixtures/jekyll_version_2/_layouts/default.html
+- spec/fixtures/jekyll_version_2/_my-collection/collection-item.html
+- spec/fixtures/jekyll_version_2/_my-collection/collection-item.md
+- spec/fixtures/jekyll_version_2/_posts/2015-07-02-test-post.md
+- spec/fixtures/jekyll_version_2/_posts/2015-07-03-test-post-again.md
+- spec/fixtures/jekyll_version_2/about.md
+- spec/fixtures/jekyll_version_2/api_key_dir/_algolia_api_key
+- spec/fixtures/jekyll_version_2/assets/ring.png
+- spec/fixtures/jekyll_version_2/authors.html
+- spec/fixtures/jekyll_version_2/excluded.html
+- spec/fixtures/jekyll_version_2/hierarchy.md
+- spec/fixtures/jekyll_version_2/index.html
+- spec/fixtures/jekyll_version_2/page2/index.html
+- spec/fixtures/jekyll_version_2/weight.md
+- spec/fixtures/jekyll_version_3/_config.yml
+- spec/fixtures/jekyll_version_3/_layouts/default.html
+- spec/fixtures/jekyll_version_3/_my-collection/collection-item.html
+- spec/fixtures/jekyll_version_3/_my-collection/collection-item.md
+- spec/fixtures/jekyll_version_3/_posts/2015-07-02-test-post.md
+- spec/fixtures/jekyll_version_3/_posts/2015-07-03-test-post-again.md
+- spec/fixtures/jekyll_version_3/about.md
+- spec/fixtures/jekyll_version_3/api_key_dir/_algolia_api_key
+- spec/fixtures/jekyll_version_3/assets/ring.png
+- spec/fixtures/jekyll_version_3/authors.html
+- spec/fixtures/jekyll_version_3/excluded.html
+- spec/fixtures/jekyll_version_3/hierarchy.md
+- spec/fixtures/jekyll_version_3/index.html
+- spec/fixtures/jekyll_version_3/page2/index.html
+- spec/fixtures/jekyll_version_3/weight.md
 - spec/push_spec.rb
 - spec/record_extractor_spec.rb
 - spec/spec_helper.rb
-- spec/spec_helper_jekyll.rb
 - spec/spec_helper_simplecov.rb
 - txt/api_key_missing
 - txt/application_id_missing

data/spec/fixtures/_site/2015/07/02/test-post.html

@@ -1,26 +0,0 @@
-<p>Introduction text that also includes <a href="https://www.algolia.com">some link</a>. To
-add a bit of fancy, we will also <strong>bold</strong> and <em>italicize</em> some text.</p>
-
-<h1 id="main-title">Main title</h1>
-
-<p>We like writing stuff and then indexing it in a very fast engine. Here is why
-a fast engine is good for you:</p>
-
-<ul>
-  <li>fast</li>
-  <li>fast</li>
-  <li>fast</li>
-  <li>and fast</li>
-</ul>
-
-<h2 id="built-with-hands">Built with hands</h2>
-
-<p>All this text was typed with my own hands, on my own keyboard. I also did use
-a Chair© and a Table™.</p>
-
-<h2 id="features">Features</h2>
-
-<p>The whole plugin is composed of parts of <code>code</code>, and sometime even
-<code>&lt;code&gt;</code>.</p>
-
-<p>Code is <strong>✔ checked</strong> and errors are <strong>✘ deleted</strong>.</p>

data/spec/fixtures/_site/2015/07/03/test-post-again.html

@@ -1,3 +0,0 @@
-<p>The goal of this post is simply to trigger pagination, and see that we do not
-index the pagination results.</p>
-

data/spec/fixtures/_site/about.html

@@ -1,31 +0,0 @@
-<h1 id="heading-1">Heading 1</h1>
-
-<p>Text 1</p>
-
-<h2 id="heading-2">Heading 2</h2>
-
-<p>Text 2</p>
-
-<h3 id="heading-3">Heading 3</h3>
-
-<p>Text 3</p>
-
-<ul>
-  <li>item 1</li>
-  <li>item 2</li>
-  <li>item 3</li>
-</ul>
-
-<h3 id="another-heading-3">Another Heading 3</h3>
-
-<p id="text4">Another text 4</p>
-
-<h2 id="heading2b">Another Heading 2</h2>
-
-<p>Another <code>&lt;text&gt;</code> 5</p>
-
-<h3 id="last-heading-3">Last Heading 3</h3>
-
-<div>Just a div</div>
-
-<div><p>Last text 6 </p></div>

data/spec/fixtures/_site/hierarchy.html

@@ -1,31 +0,0 @@
-<h1 id="h1">H1</h1>
-
-<p>TEXT1-H1</p>
-
-<h2 id="h2a">H2A</h2>
-
-<p>TEXT2-H2A-H1</p>
-
-<p>TEXT3-H2A-H1</p>
-
-<h2 id="h2b">H2B</h2>
-
-<p>TEXT4-H2B-H1</p>
-
-<h3 id="h3a">H3A</h3>
-
-<p>TEXT5-H3-H2B-H1</p>
-
-<div>
-  <h4>H4</h4>
-  <p>TEXT7-H4-H3-H2B-H1</p>
-</div>
-
-<h2 id="h2c">H2C</h2>
-
-<p>TEXT8-H2C-H1</p>
-
-<h3 id="h3b-code">H3B <code>&lt;code&gt;</code></h3>
-
-<p>TEXT9-H3B-H2C-H1</p>
-

data/spec/fixtures/_site/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-us">
-  <body>
-    This default index page is used to display the paginated posts
-
-
-  <a href="/2015/07/03/test-post-again.html">
-    Test post again
-  </a>
-  <p>The goal of this post is simply to trigger pagination, and see that we do not
-index the pagination results.</p>
-
-
-
-
-  </body>
-</html>

data/spec/fixtures/_site/page2/index.html

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-us">
-  <body>
-    This default index page is used to display the paginated posts
-
-
-  <a href="/2015/07/02/test-post.html">
-    Test post
-  </a>
-  <p>Introduction text that also includes <a href="https://www.algolia.com">some link</a>. To
-add a bit of fancy, we will also <strong>bold</strong> and <em>italicize</em> some text.</p>
-
-<h1 id="main-title">Main title</h1>
-
-<p>We like writing stuff and then indexing it in a very fast engine. Here is why
-a fast engine is good for you:</p>
-
-<ul>
-  <li>fast</li>
-  <li>fast</li>
-  <li>fast</li>
-  <li>and fast</li>
-</ul>
-
-<h2 id="built-with-hands">Built with hands</h2>
-
-<p>All this text was typed with my own hands, on my own keyboard. I also did use
-a Chair© and a Table™.</p>
-
-<h2 id="features">Features</h2>
-
-<p>The whole plugin is composed of parts of <code>code</code>, and sometime even
-<code>&lt;code&gt;</code>.</p>
-
-<p>Code is <strong>✔ checked</strong> and errors are <strong>✘ deleted</strong>.</p>
-
-
-
-  </body>
-</html>

data/spec/fixtures/_site/weight.html

@@ -1,15 +0,0 @@
-<h1 id="aaa-bbb-ccc-ddd">AAA BBB CCC DDD</h1>
-
-<p>aaa xxx aaa xxx aaa</p>
-
-<h2 id="aaa-bbb">AAA BBB</h2>
-
-<p>aaa bbb</p>
-
-<h2 id="ccc-ddd">CCC DDD</h2>
-
-<p>ccc ddd</p>
-
-<h3 id="ddd">DDD</h3>
-
-<p>aaa bbb ccc dddd</p>

data/spec/spec_helper_jekyll.rb

@@ -1,4 +0,0 @@
-require 'jekyll'
-
-# Prevent Jekyll from displaying the "Configuration file:..." on every test
-Jekyll.logger.log_level = :error