jekyll-kw-shorten 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f63c1abffd9e7cadb9ce48e2b926f612b4e6ec7a40d964a9a7660631cff5fb
-  data.tar.gz: 319d0ba44d6f0ae50589ad2df7db45ca9798bab80db52a225bc29ba32318d967
+  metadata.gz: 3e593496e1b6a803fc2ccad35c0e477fefe1fb7fa1f9d5ae4431a84a9c99395f
+  data.tar.gz: 27ad67e6058c04547fc482d58e9b12bf9f06685ce01ff966b5e7fd7302348801
 SHA512:
-  metadata.gz: a5bd7d988b75d828a50c5733e2e843e662c58c18a3dd009c61955926c53f62fe5216fbdded3642b12d2f9648dea238392665b773e5b32e6e1002b0e86d6ee91e
-  data.tar.gz: 38b05260c97dda5f6e1c531cf87e815c8890d880b1a83f3edfc36d9842121a981add98eb36ac7f57863b427a1b0f975dfba4bdca9db49cbccc0fbbc7334af69f
+  metadata.gz: cf3e5f9f35fad937a511661d3a6ab694046dc8fe178e84a234c195e46766d3291d2438c0990cba4b534d129d87d951865d4cb8903fe9009b9263cf664a217bf0
+  data.tar.gz: ece39f6384277d0f5f32fc6c32a79c3903099343cf4d0cea6682fae432814240dffdfe3817852e0339dc4d17db2019a8f400306e2582c415d8de4b63691bc933

data/lib/jekyll-kw-shorten.rb

@@ -5,67 +5,46 @@ 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
 
-      # shorten tag {% shorten input %} for Jekyll
-      class ShortenTag < Liquid::Tag
-
-        class << self
-          def tag_name
-            name.split("::").last.downcase
-          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.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)
-          parser = Jekyll::KargWare::Shorten::Parser.new(get_plugin_config(context))
-          # parser = Jekyll::KargWare::Shorten::Parser.new({})
+          parser = Jekyll::KargWare::Shorten::Parser.new(
+            Jekyll::KargWare::Shorten.get_plugin_config(context)
+          )
           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_plugin_config)
+          parser = Jekyll::KargWare::Shorten::Parser.new(
+            Jekyll::KargWare::Shorten.get_plugin_config(@context)
+          )
           parser.parse(number)
         end
-
-        private
-
-        def get_plugin_config
-          if defined? @context.registers[:site].config
-            @context.registers[:site].config[Jekyll::KargWare::Shorten::RUBYGEM_NAME] || {}
-          else
-            {}
-          end
-        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

@@ -14,21 +14,24 @@ module Jekyll
         end
 
         def parse(text)
-          if Parser.is_number?(text) then
+          return text unless Parser.number?(text)
+
+          begin
             num = text.to_f
-            if num >= 1000000000000 then
-              return "∞ 🚀"
-            elsif num >= 1000000000 then
-              return format(num / 1000000000.0) + @configuration.shorten_gt9_digit
-            elsif num >= 1000000 then
-              return format(num / 1000000.0) + @configuration.shorten_gt6_digit
-            elsif num >= 1000 then
-              return format(num / 1000.0) + @configuration.shorten_gt3_digit
+            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.round(0).truncate(0).to_s.rjust(5)
+              num.round(0).truncate(0).to_s.rjust(5)
             end
-          else
-            return text
+          rescue StandardError => e
+            puts e.message
+            text
           end
         end
 
@@ -38,10 +41,11 @@ module Jekyll
           num.round(1).truncate(1).to_s
         end
 
-        def self.is_number? string
-          true if Float(string) rescue false
+        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.10'
+      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.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nicolas Karg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll