jekyll-algolia 1.1.5 → 1.2.0

data/lib/jekyll/algolia/logger.rb

@@ -29,18 +29,19 @@ module Jekyll
       #   "X:Your content"
       # Where X is either I, W or E for marking respectively an info, warning or
       # error display
-      def self.log(line)
-        type, content = /^(I|W|E):(.*)/.match(line).captures
+      def self.log(input)
+        type, content = /^(I|W|E):(.*)/m.match(input).captures
         logger_mapping = {
           'E' => :error,
           'I' => :info,
           'W' => :warn
         }
 
-        # Jekyll logger tries to center log lines, so we force a consistent
-        # width of 80 chars
-        content = content.ljust(80, ' ')
-        Jekyll.logger.send(logger_mapping[type], content)
+        # Display by chunk of 80-characters lines
+        lines = Utils.split_lines(content, 80)
+        lines.each do |line|
+          Jekyll.logger.send(logger_mapping[type], line)
+        end
       end
 
       # Public: Only display a log line if verbose mode is enabled
@@ -78,7 +79,7 @@ module Jekyll
         # Convert all variables
         content = File.open(file).read
         metadata.each do |key, value|
-          content = content.gsub("{#{key}}", value)
+          content = content.gsub("{#{key}}", value.to_s)
         end
 
         # Display each line differently

data/lib/jekyll/algolia/overwrites.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Jekyll
+  # Overwriting the Jekyll::Document class
+  class Document
+    # By default, Jekyll will set the current date (time of build) to any
+    # collection item. This will break our diff algorithm, so we monkey patch
+    # this call to return nil if no date is defined instead.
+    def date
+      data['date'] || nil
+    end
+  end
+end

data/lib/jekyll/algolia/progress_bar.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'progressbar'
+require 'ostruct'
+
+module Jekyll
+  module Algolia
+    # Module to push records to Algolia and configure the index
+    module ProgressBar
+      include Jekyll::Algolia
+
+      def self.should_be_silenced?
+        Configurator.verbose?
+      end
+
+      def self.create(options)
+        if should_be_silenced?
+          fake_bar = OpenStruct.new
+          fake_bar.increment = nil
+          return fake_bar
+        end
+
+        ::ProgressBar.create(options)
+      end
+    end
+  end
+end

data/lib/jekyll/algolia/utils.rb

@@ -31,10 +31,10 @@ module Jekyll
       # input - the variable to test
       # classname - the string representation of the class
       def self.instance_of?(input, classname)
-        return input.instance_of? Object.const_get(classname)
+        input.instance_of? Object.const_get(classname)
       rescue StandardError
         # The class might not even exist
-        return false
+        false
       end
 
       # Public: Convert an HTML string to its content only
@@ -46,14 +46,14 @@ module Jekyll
         text.tr("\n", ' ').squeeze(' ').strip
       end
 
-      # Public: Remove all keys with a nil value or an empty array from a hash
+      # Public: Remove all keys with a nil value or an empty string from a hash
       #
       # hash - The input hash
       def self.compact_empty(hash)
         new_hash = {}
         hash.each do |key, value|
           next if value.nil?
-          next if value.respond_to?(:empty?) && value.empty?
+          next if value.is_a?(String) && value.empty?
           new_hash[key] = value
         end
         new_hash
@@ -127,6 +127,54 @@ module Jekyll
 
         stringified
       end
+
+      # Public: Get a hash representing the difference between two hashes
+      #
+      # It only checks that all keys of alpha are also in beta, with the same
+      # value. If not, it remember what was the value of beta and return it in
+      # the output
+      def self.diff_keys(alpha, beta)
+        diff = {}
+        alpha.each do |key, value|
+          diff[key] = beta[key] if beta[key] != value
+        end
+
+        return nil if diff.empty?
+        diff
+      end
+
+      # Public: Split a long text into lines of specific length
+      #
+      # It takes care to not cut words
+      def self.split_lines(input, max_length)
+        # Force splitting on actual new lines first
+        if input.include?("\n")
+          output = []
+          input.split("\n").each do |line|
+            output += split_lines(line, max_length)
+          end
+          return output
+        end
+
+        output = []
+        words = input.split(' ')
+        current_line = words.shift || ''
+        test_line = '' # must be defined outside of the loop
+
+        words.each do |word|
+          test_line = "#{current_line} #{word}"
+          if test_line.length > max_length
+            output << current_line
+            current_line = word
+            next
+          end
+          current_line = test_line
+        end
+        output << current_line
+
+        # Making sure all lines are the same length
+        output.map { |line| line.ljust(max_length, ' ') }
+      end
     end
   end
 end

data/lib/jekyll/algolia/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Algolia
-    VERSION = '1.1.5'
+    VERSION = '1.2.0'
   end
 end

data/lib/jekyll/commands/algolia.rb

@@ -14,20 +14,6 @@ module Jekyll
                            '--config CONFIG_FILE[,CONFIG_FILE2,...]',
                            Array,
                            'Custom configuration file'
-            command.option 'future',
-                           '--future',
-                           'Index posts with a future date'
-            command.option 'limit_posts',
-                           '--limit_posts MAX_POSTS',
-                           Integer,
-                           'Limits the number of posts to parse and index'
-            command.option 'show_drafts',
-                           '-D',
-                           '--drafts',
-                           'Index posts in the _drafts folder'
-            command.option 'unpublished',
-                           '--unpublished',
-                           'Index posts that were marked as unpublished'
             command.option 'dry_run',
                            '--dry-run',
                            '-n',
@@ -35,6 +21,9 @@ module Jekyll
             command.option 'verbose',
                            '--verbose',
                            'Display more information on what is indexed'
+            command.option 'force_settings',
+                           '--force-settings',
+                           'Force updating of the index settings'
 
             command.action do |_, options|
               configuration = configuration_from_options(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-algolia
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Carry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algolia_html_extractor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: algoliasearch
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: verbal_expressions
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +291,7 @@ files:
 - lib/errors/missing_index_name.txt
 - lib/errors/no_records_found.txt
 - lib/errors/record_too_big.txt
+- lib/errors/settings_manually_edited.txt
 - lib/errors/unknown_application_id.txt
 - lib/errors/unknown_settings.txt
 - lib/jekyll-algolia.rb
@@ -287,6 +302,8 @@ files:
 - lib/jekyll/algolia/hooks.rb
 - lib/jekyll/algolia/indexer.rb
 - lib/jekyll/algolia/logger.rb
+- lib/jekyll/algolia/overwrites.rb
+- lib/jekyll/algolia/progress_bar.rb
 - lib/jekyll/algolia/utils.rb
 - lib/jekyll/algolia/version.rb
 - lib/jekyll/commands/algolia.rb