jekyll-kw-shorten 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97496aede7c98b125cb9e846af73359d5fbc9bf7a1d2bf64209cd1b029e2a8c8
-  data.tar.gz: f10ea06d240481bbf7dc057ea48bd30a915d23a1df0c20a4faedd276d9879475
+  metadata.gz: e0b8e21ea523c1e4ff5487f6e50750e609ab59ff0f7d0a6932c01ffe45246362
+  data.tar.gz: 88c23330b3c708e2633ce84df8785f910e9fe85fd1dafae7db5e5a8033c839b2
 SHA512:
-  metadata.gz: dbe3c662114d8a867b4e1ed5718215a62826eb35e3e08934fdf460a967757ec00f2b35283a2411e551796b69c2aae0b093cd38e5aa081e8235fbd284acda348a
-  data.tar.gz: 0112cb09a60e5dc1bf4d7a9f9de3a035ed178dcbac030fe2d8f5e5924fc79205d8284907ace1a0175f954acad24e56a2a7e42651a3b3bc3aa53a71983085eba9
+  metadata.gz: bcbd4a45c256e3d496bba8e7db42f00570f6d99bf510961406d9edcac1278a593d5486bf6882401e70f55336fd66f142dc41192703eb5be65a67c8148b7a3543
+  data.tar.gz: 655a299563860560d9893c454f82064a273856721c41a195fd303adf4fbcd23a5d5e1624d2d4645dfaa9ffe1916bb07327f2c7c1368aa524f121544095cf7394

data/README.md

@@ -1,27 +1,115 @@
 
-The project `jekyll-kw-shorten` is a **[filter](https://jekyllrb.com/docs/plugins/filters/)** plug-in for a [jekyll](https://jekyllrb.com/) static page blog.
+The project `jekyll-kw-shorten` is a plug-in for a [jekyll](https://jekyllrb.com/) static page blog.
+
+It can be used as **[filter](https://jekyllrb.com/docs/plugins/filters/)** and as **[tag](https://jekyllrb.com/docs/plugins/tag/)**.
 
 It is published on [rubygems.org](https://rubygems.org/gems/jekyll-kw-shorten), the source code is hosted on [GitHub](https://github.com/n13org/jekyll-kw-shorten).
 
 ## Usage
 
-* {{ "txt" | shorten }}
-* {{ "text with spaces" | shorten }}
-* {{ 500 | shorten }}
-* {{ 777 | shorten }}
-* {{ 1000 | shorten }}
-* {{ 1200 | shorten }}
-* {{ 1450 | shorten }}
-* {{ 1777 | shorten }}
-* {{ 12345 | shorten }}
-* {{ 1000000 | shorten }}
-* {{ 1110000 | shorten }}
-* {{ 1000000000 | shorten }}
+Use the filter `{{ 1234 | shorten }}` or the tag `{% shorten 1234 %}` inside your markdown blog post file to get `1.2 K`.
+
+The plug-in supports
+
+* positiv numbers
+* negativ numbers with leading `-` or `- `.
+* float numbers (when multiple dots are in the text only the part to the first will be taken)
+* Text with no numbers inside will simply echoed
+* Text with numbers, will be reduced to just the digits 
+* Show a rocket `∞ 🚀` for very huge values (>= 1000000000000)
+* Float numbers will be rounded
+
+### Examples as Jekyll Tag
+
+| Syntax                        | OK | Result   |
+|-------------------------------|:--:|----------|
+| {% shorten "MyText" %}        | ✔️  | "MyText" |
+| {% shorten MyText %}          | ✔️  | MyText   |
+| {% shorten "My43Text" %}      | ✔️  | 43       |
+| {% shorten "My43.56Text" %}   | ✔️  | 44       |
+| {% shorten "My43.56.7Text" %} | ✔️  | 44       |
+| {% shorten "1234" %}          | ✔️  | 1.2 K    |
+| {% shorten 1 %}               | ✔️  | 1        |
+| {% shorten -22 %}             | ✔️  | -22      |
+| {% shorten - 44 %}            | ✔️  | -44      |
+| {% shorten 1000 %}            | ✔️  | 1.0 K    |
+| {% shorten 1000000 %}         | ✔️  | 1.0 M    |
+| {% shorten 1000000000 %}      | ✔️  | 1.0 B    |
+| {% shorten 1000000000000 %}   | ✔️  | ∞ 🚀     |
+
+### Examples as Jekyll Filter
+
+| Syntax                           | OK | Result   |
+|----------------------------------|:--:|----------|
+| {{ "MyText" \| shorten }}        | ✔️ | "MyText" |
+| {{ MyText \| shorten }}          | ❌ |          |
+| {{ "My43Text" \| shorten }}      | ✔️ | 43       |
+| {{ "My43.56Text" \| shorten }}   | ✔️ | 44       |
+| {{ "My43.56.7Text" \| shorten }} | ✔️ | 44       |
+| {{ "1234" \| shorten }}          | ✔️ | 1.2 K    |
+| {{ 1 \| shorten }}               | ✔️ | 1        |
+| {{ -22 \| shorten }}             | ✔️ | -22      |
+| {{ - 44 \| shorten }}            | ❌ |          |
+| {{ 1000 \| shorten }}            | ✔️ | 1.0 K    |
+| {{ 1000000 \| shorten }}         | ✔️ | 1.0 M    |
+| {{ 1000000000 \| shorten }}      | ✔️ | 1.0 B    |
+| {{ 1000000000000 \| shorten }}   | ✔️ | ∞ 🚀     |
+
+**HINTS**:  
+
+* The filter `{{ MyText | shorten }}` will show nothing (empty string). The filter "thinks" the MyText is a variable (with the value nil). Numbers can be used with and without quotes. Text must be wrapped in quotes.
+* The filter `{{ - 44 | shorten }}` will show nothing (empty string). The filter tries to parse the `-` as first part, not the number behind.
 
 ## Installation
 
+Add `jekyll-kw-shorten` plugin in your Gemfile inside the `jekyll_plugins` group.
+
+```ruby
+group :jekyll_plugins do
+  ...
+  gem "jekyll-kw-shorten"
+  ...
+end
+```
+
+Run `bundle install` to install the gem and update the Gemfile.lock.
+
+Add `jekyll-kw-shorten` to the plugins section in your site's `_config.yml`. Then [configure](#configuration) your plug-in.
+
+```yaml
+plugins:
+  - jekyll-kw-shorten
+```
+
 ## Configuration
 
-## Contribution
+Add the setting to your `_config.yml` file. Details you can find in the [documentation](https://jekyllrb.com/docs/configuration/). The name of the group is `jekyll-kw-shorten`.
+
+* **shorten_gt3_digit** will be used for numbers between 1000 and 999999. Default is `' K'`.
+* **shorten_gt6_digit** will be used for numbers between 1000000 and 999999999. Default is `' M'`.
+* **shorten_gt9_digit** will be used for numbers between 1000000000 and 999999999999. Default is `' B'`.
+
+```yaml
+...
+jekyll-kw-shorten:
+  shorten_gt3_digit: ' K'
+  shorten_gt6_digit: ' M'
+  shorten_gt9_digit: ' B'
+...
+```
+
+When the config values are omit then the default values are used. 
 
 ## Test locally
+
+Run linting
+
+```shell
+bundle exec rubocop
+```
+
+Run tests
+
+```shell
+bundle exec rake test
+```

data/lib/jekyll-kw-shorten.rb

@@ -5,66 +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
-
-          # raise ArgumentError, <<~MSG
-          #   Could not use '#{input}' in tag '#{self.class.tag_name}'.
-          #   Make sure it is a string or a number.
-          # MSG
+          @input = input.to_s.strip
         end
 
         def render(context)
-          parser = Jekyll::KargWare::Shorten::Parser.new(get_plugin_config(context))
+          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.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
+        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,6 +7,9 @@ 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 = {})
@@ -14,24 +17,46 @@ module Jekyll
         end
 
         def parse(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
+          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.9'
+      VERSION = '0.1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-kw-shorten
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 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
@@ -25,7 +25,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
-description: "    A template project for jekyll plugins with some additional content\n"
+description: |2
+      A jekyll plugin which can shorten long numbers, e.g. 1000 == 1K or 1000000 == 1M.
+
+      It can be used as filter `{{ 1234 | shorten }}` and as tag `{% shorten 1234 %}`, the result will be **1.2 K**
 email:
 - rubygems.org@n13.org
 executables: []
@@ -37,12 +40,12 @@ files:
 - lib/jekyll/KargWare/Shorten/configuration.rb
 - lib/jekyll/KargWare/Shorten/parser.rb
 - lib/jekyll/KargWare/Shorten/version.rb
-homepage: https://notes.n13.org/rubygems
+homepage: https://n13.org/rubygems
 licenses: []
 metadata:
-  homepage_uri: https://notes.n13.org/rubygems
-  bug_tracker_uri: https://github.com/n13org/jekyll-plugin-template/issues
-  source_code_uri: https://github.com/n13org/jekyll-plugin-template
+  homepage_uri: https://n13.org/rubygems
+  bug_tracker_uri: https://github.com/n13org/jekyll-kw-shorten/issues
+  source_code_uri: https://github.com/n13org/jekyll-kw-shorten
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -61,5 +64,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: A template project for jekyll plugins.
+summary: A jekyll plugin to shorten long numbers
 test_files: []