jekyll-kw-shorten 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb27dde8ac5b0e129bea77504f4d60f5056362c057cc1d3ac60b79641eca3199
-  data.tar.gz: 72952c2ef3477374858a7069be47100f687bc8cc67ea0a02c7ca8ccbdeeb1e8c
+  metadata.gz: 012dee8b1fc72f257b2e457836d2b8f56cc3faac819e57fb0f29336cf3ff2436
+  data.tar.gz: b3203689baedeeef368523c60a6bc272c74642f4348bf7dfc332665836085188
 SHA512:
-  metadata.gz: 7db034eb7c07fdc09713dc54279048e78663d22e15a98daca06821cc177329d3eb33c0115972100a7c6025a134eea3377ca11db66eba3feb84fb165cb41a1636
-  data.tar.gz: 6a544ec6995693777fbf6d607510163ee09520aaeaed34c0484396b0a174bae1ee82e5d8eec24eda781e59c0955977a3af8c4bd500594dccd84c310291ab8843
+  metadata.gz: 443768121201fcbb3a56405c1d25ca797278b4178070445b5ff745113a6efc1f694aff1156f9ea6e073b553c690348eb423db86ae0154e7d4e8847792d015a04
+  data.tar.gz: ed61ccbf42f6b92577d68f8efbc4258f884185b69866a93c93b1484dc2e10c7937177b3bc9303e6b2cdaf6993e89637270fc1e5cc89be8120fd735a5ca6442af

data/lib/jekyll-kw-shorten.rb

@@ -1,44 +1,50 @@
 # frozen_string_literal: true
 
 require 'jekyll/KargWare/Shorten/parser'
+require 'jekyll/KargWare/Shorten/version'
 
 module Jekyll
   module KargWare
+    # jekyll-kw-shorten jekyll (tag and filter) class
     module Shorten
       class Error < StandardError; end
       class Exception < Gem::Exception; end
 
+      module_function def get_plugin_config(context)
+        if defined? context.registers[:site].config
+          context.registers[:site].config[Jekyll::KargWare::Shorten::RUBYGEM_NAME] || {}
+        else
+          {}
+        end
+      end
+
       # shorten tag {% shorten input %} for Jekyll
       class ShortenTag < Liquid::Tag
-        include Jekyll::KargWare::Shorten::ShortenFilter
-
         def initialize(tag_name, input, tokens)
           super
-          @input = input
+          @input = input.to_s.strip
         end
 
         def render(context)
-          shorten(@input)
+          parser = Jekyll::KargWare::Shorten::Parser.new(
+            Jekyll::KargWare::Shorten.get_plugin_config(context)
+          )
+          parser.parse(@input)
         end
       end
 
       # shorten filter {{ number | shorten }} for Jekyll
       module ShortenFilter
-        def shorten(number)
-          parser = Jekyll::KargWare::Shorten::Parser.new(get_site_config)
-          parser.shorten(number)
-        end
-
-        private
-
-        def get_site_config
-          @context.registers[:site].config['jekyll-kw-shorten'] || {}
+        def shorten(input)
+          parser = Jekyll::KargWare::Shorten::Parser.new(
+            Jekyll::KargWare::Shorten.get_plugin_config(@context)
+          )
+          parser.parse(input)
         end
       end
-
     end
   end
 end
 
 Liquid::Template.register_tag('shorten', Jekyll::KargWare::Shorten::ShortenTag)
-Liquid::Template.register_filter(Jekyll::KargWare::Shorten::ShortenFilter)
+Liquid::Template.register_filter(Jekyll::KargWare::Shorten::ShortenFilter)

data/lib/jekyll/KargWare/Shorten/configuration.rb

@@ -21,9 +21,7 @@ module Jekyll
           @shorten_gt9_digit = options['shorten_gt9_digit']
         end
 
-        private
-
-        def generate_option_hash(options)
+        private def generate_option_hash(options)
           DEFAULT_CONFIG.merge(options)
         rescue TypeError
           DEFAULT_CONFIG

data/lib/jekyll/KargWare/Shorten/parser.rb

@@ -7,31 +7,56 @@ module Jekyll
     module Shorten
       # jekyll-kw-shorten parser class
       class Parser
+        # https://stackoverflow.com/questions/33952093/how-to-allow-only-one-dot-in-regex
+        DIGITS_AND_SINGLE_DOT_ESCAPE_REGEXP = /(-?\s?[0-9]+(\.[0-9]+)?)/.freeze
+
         attr_reader :configuration
 
         def initialize(options = {})
           @configuration = Jekyll::KargWare::Shorten::Configuration.new(options)
         end
 
-        def shorten(text)
-          if text.is_a? String then
-            return text
-          else
-            num = text.to_i
-            if num >= 1000000000000 then
-              return "∞ 🚀"
-            elsif num >= 1000000000 then
-              return (num / 1000000000.0).truncate(1).to_s + @configuration.shorten_gt9_digit
-            elsif num >= 1000000 then
-              return (num / 1000000.0).truncate(1).to_s + @configuration.shorten_gt6_digit
-            elsif num >= 1000 then
-              return (num / 1000.0).truncate(1).to_s + @configuration.shorten_gt3_digit
+        def parse(text)
+          num = Parser.only_float_numbers(text)
+
+          return text unless Parser.number?(num)
+
+          begin
+            if num >= 1000000000000
+              '∞ 🚀'
+            elsif num >= 1000000000
+              format(num / 1000000000.0) + @configuration.shorten_gt9_digit
+            elsif num >= 1000000
+              format(num / 1000000.0) + @configuration.shorten_gt6_digit
+            elsif num >= 1000
+              format(num / 1000.0) + @configuration.shorten_gt3_digit
             else
-              return (num).truncate(1).to_s
+              num.round(0).truncate(0).to_s.rjust(5)
             end
+          rescue StandardError => e
+            puts e.message
+            text
           end
         end
 
+        # private
+
+        def format(num)
+          num.round(1).truncate(1).to_s
+        end
+
+        def self.number?(string)
+          true if Float(string)
+          # true if Float(Parser.only_float_numbers(string))
+        rescue StandardError
+          false
+        end
+
+        def self.only_float_numbers(input)
+          input.to_s.scan(DIGITS_AND_SINGLE_DOT_ESCAPE_REGEXP).first.first.to_f
+        rescue StandardError
+          input
+        end
       end
     end
   end

data/lib/jekyll/KargWare/Shorten/version.rb

@@ -4,7 +4,7 @@ module Jekyll
   module KargWare
     module Shorten
       RUBYGEM_NAME = 'jekyll-kw-shorten'
-      VERSION = '0.0.7'
+      VERSION = '0.0.12'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-kw-shorten
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors:
 - Nicolas Karg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll