jekyll-kw-shorten 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6125e8c3d524a504d635ef8d54be52fd1921e1a438bedf395e2648ebeab5df37
-  data.tar.gz: 52b469038d47775197f2516c8ebd7c5e364ea6c5e5fd53438abbbf504dc519b4
+  metadata.gz: 3e593496e1b6a803fc2ccad35c0e477fefe1fb7fa1f9d5ae4431a84a9c99395f
+  data.tar.gz: 27ad67e6058c04547fc482d58e9b12bf9f06685ce01ff966b5e7fd7302348801
 SHA512:
-  metadata.gz: 44c016593f8df9f70db887461e88d04eec172f2db398a641543d74b010607c4490da7e56576e2076a2a7bf85fda5db8b75fc580be6a8c34bac6f2c4b7bbbcb41
-  data.tar.gz: 6181b606cbdae7b187a85ce6910298860d845b265b88b8323f6649393a9b4f153f34d17b3a88341791d9edc3e8fa9c8ea91b8e1f02fbb7505777cbc24688ad40
+  metadata.gz: cf3e5f9f35fad937a511661d3a6ab694046dc8fe178e84a234c195e46766d3291d2438c0990cba4b534d129d87d951865d4cb8903fe9009b9263cf664a217bf0
+  data.tar.gz: ece39f6384277d0f5f32fc6c32a79c3903099343cf4d0cea6682fae432814240dffdfe3817852e0339dc4d17db2019a8f400306e2582c415d8de4b63691bc933

data/lib/jekyll-kw-shorten.rb

@@ -1,42 +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
         def initialize(tag_name, input, tokens)
           super
-          @input = input
+          @input = input.to_s.strip
         end
 
         def render(context)
-          ShortenFilter.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'] || {}
+          parser = Jekyll::KargWare::Shorten::Parser.new(
+            Jekyll::KargWare::Shorten.get_plugin_config(@context)
+          )
+          parser.parse(number)
         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

@@ -13,25 +13,39 @@ module Jekyll
           @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)
+          return text unless Parser.number?(text)
+
+          begin
+            num = text.to_f
+            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)
+        rescue StandardError
+          false
+        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.6'
+      VERSION = '0.0.11'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-kw-shorten
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 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-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll