jekyll-kw-shorten 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b301717cf83ddd281a7cc992c4e6e0bfbf219422eb1af0c2c31f0b6637b7387e
-  data.tar.gz: 9ca3cce9db681a39b39bd4bc6b661657920d9c09d20ed3f21a19575437d1ea13
+  metadata.gz: 68f63c1abffd9e7cadb9ce48e2b926f612b4e6ec7a40d964a9a7660631cff5fb
+  data.tar.gz: 319d0ba44d6f0ae50589ad2df7db45ca9798bab80db52a225bc29ba32318d967
 SHA512:
-  metadata.gz: 30ed8a3a94fed605f15732e0dd447ea86dcadbc8c019d15ac9beeebdfd21d1febfc028623e70ea0648d87a9b336d3165e901eef3d6ff505ec7041bda8ffcc449
-  data.tar.gz: 7bc9b7d533e0bcb706a9e19e979dfbb2a72248ebac4c3ab0e879cccf10348c5a53eb7f9105107262029f0884f4802957a71affc55fcb62631343e6c9e020fde9
+  metadata.gz: a5bd7d988b75d828a50c5733e2e843e662c58c18a3dd009c61955926c53f62fe5216fbdded3642b12d2f9648dea238392665b773e5b32e6e1002b0e86d6ee91e
+  data.tar.gz: 38b05260c97dda5f6e1c531cf87e815c8890d880b1a83f3edfc36d9842121a981add98eb36ac7f57863b427a1b0f975dfba4bdca9db49cbccc0fbbc7334af69f

data/lib/jekyll-kw-shorten.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'jekyll/KargWare/Shorten/parser'
+require 'jekyll/KargWare/Shorten/version'
 
 module Jekyll
   module KargWare
@@ -10,28 +11,55 @@ module Jekyll
 
       # shorten tag {% shorten input %} for Jekyll
       class ShortenTag < Liquid::Tag
+
+        class << self
+          def tag_name
+            name.split("::").last.downcase
+          end
+        end
+
         def initialize(tag_name, input, tokens)
           super
-          @input = input
+          @input = input.to_s.strip
+
+          # raise ArgumentError, <<~MSG
+          #   Could not use '#{input}' in tag '#{self.class.tag_name}'.
+          #   Make sure it is a string or a number.
+          # MSG
         end
 
         def render(context)
-          filter = Jekyll::KargWare::Shorten::ShortenFilter.new
-          filter.shorten(@input)
+          parser = Jekyll::KargWare::Shorten::Parser.new(get_plugin_config(context))
+          # parser = Jekyll::KargWare::Shorten::Parser.new({})
+          parser.parse(@input)
+        end
+
+        private
+
+        def get_plugin_config(context)
+          if defined? context.registers[:site].config
+            context.registers[:site].config[Jekyll::KargWare::Shorten::RUBYGEM_NAME] || {}
+          else
+            {}
+          end
         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)
+          parser = Jekyll::KargWare::Shorten::Parser.new(get_plugin_config)
+          parser.parse(number)
         end
 
         private
 
-        def get_site_config
-          @context.registers[:site].config['jekyll-kw-shorten'] || {}
+        def get_plugin_config
+          if defined? @context.registers[:site].config
+            @context.registers[:site].config[Jekyll::KargWare::Shorten::RUBYGEM_NAME] || {}
+          else
+            {}
+          end
         end
       end
 

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

@@ -13,25 +13,35 @@ 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
+        def parse(text)
+          if Parser.is_number?(text) then
+            num = text.to_f
             if num >= 1000000000000 then
               return "∞ 🚀"
             elsif num >= 1000000000 then
-              return (num / 1000000000.0).truncate(1).to_s + @configuration.shorten_gt9_digit
+              return format(num / 1000000000.0) + @configuration.shorten_gt9_digit
             elsif num >= 1000000 then
-              return (num / 1000000.0).truncate(1).to_s + @configuration.shorten_gt6_digit
+              return format(num / 1000000.0) + @configuration.shorten_gt6_digit
             elsif num >= 1000 then
-              return (num / 1000.0).truncate(1).to_s + @configuration.shorten_gt3_digit
+              return format(num / 1000.0) + @configuration.shorten_gt3_digit
             else
-              return (num).truncate(1).to_s
+              return num.round(0).truncate(0).to_s.rjust(5)
             end
+          else
+            return text
           end
         end
 
+        # private
+
+        def format(num)
+          num.round(1).truncate(1).to_s
+        end
+
+        def self.is_number? string
+          true if Float(string) rescue 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.5'
+      VERSION = '0.0.10'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-kw-shorten
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 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: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll