si 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: e3d6c6cb24a8ed364c310019d4ad39af6f6bdc0c9ffeba7915854ef72a3de125
+  data.tar.gz: e67d999cd37a2f6d2cfb0c05994bb43d447e18bbc0e3aa9f0ee953f026772007
+SHA512:
+  metadata.gz: c379c44a26d41a4d9e80448f6e9ced1b24723b9bb7b9300b2a71ec244c97c7fe98ea428e607c395d5940ea7b5a70f6b96a81cc0e0f770aa743c46b7c78fbe94a
+  data.tar.gz: d447b4d285805e5947d2f03caec9764f6547aebaa1b7feeacbe2f416a954e32f30559a9d8a55867a9aa3559c6f0ff318561ec742ff6d24e60f6054d5d483f177

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+name: Ruby
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Update the RubyGems system software
+        run: gem update --system
+
+      - name: Update Bundler
+        run: bundle update --bundler
+
+      - name: Install dependencies
+        run: bundle install

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in si.gemspec
 gemspec
+
+gem 'test-unit', '~> 3.6', '>= 3.6.1'
+gem 'rake', '~> 13.0', '>= 13.0.6'

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    si (0.1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    power_assert (2.0.3)
+    rake (13.0.6)
+    test-unit (3.6.1)
+      power_assert
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (~> 13.0, >= 13.0.6)
+  si!
+  test-unit (~> 3.6, >= 3.6.1)
+
+BUNDLED WITH
+   2.4.10

data/README.md

@@ -45,10 +45,12 @@ require 'si'
 
 #### Options
 
-- `:length` Number of digits. (default: 3)
-- `:base` For [binary prefix](http://en.wikipedia.org/wiki/Binary_prefix), set this to 1024 instead of default 1000.
-- `:min_exp` Default: -8, down to <strong>y</strong>octo
-- `:max_exp` Default:  8, up to <strong>Y</strong>otta
+| Option     | Default | Description                                                                                               |
+|------------|---------|-----------------------------------------------------------------------------------------------------------|
+| `:length`  |       3 | Number of digits                                                                                          |
+| `:base`    |    1000 | For [binary prefix](http://en.wikipedia.org/wiki/Binary_prefix), set this to 1024 instead of default 1000 |
+| `:min_exp` |      -8 | Down to <strong>y</strong>octo                                                                            |
+| `:max_exp` |       8 | Up to <strong>Y</strong>otta                                                                              |
 
 ```ruby
 9876543210000.si(:length => 5)  # '9.8765T'

data/lib/si/constants.rb

@@ -1,7 +1,25 @@
 # encoding: utf-8
 
 module SI
-  PREFIXES = Hash[ -8.upto(8).zip(%[yzafpnμm kMGTPEZY].chars.map(&:strip)) ]
+  PREFIXES = {
+    -8 => 'y',
+    -7 => 'z',
+    -6 => 'a',
+    -5 => 'f',
+    -4 => 'p',
+    -3 => 'n',
+    -2 => 'μ',
+    -1 => 'm',
+     0 => '',
+     1 => 'k',
+     2 => 'M',
+     3 => 'G',
+     4 => 'T',
+     5 => 'P',
+     6 => 'E',
+     7 => 'Z',
+     8 => 'Y'
+  }
 
   DEFAULT = {
     :length  =>    3,

data/lib/si/module.rb

@@ -1,13 +1,13 @@
 module SI
   class << self
     def convert num, options = {}
-      options = { :length => options } if options.is_a?(Fixnum)
+      options = { :length => options } if options.is_a?(Numeric)
       options = DEFAULT.merge(options)
       length,
       min_exp,
       max_exp = options.values_at(:length, :min_exp, :max_exp)
       raise ArgumentError.new("Invalid length") if length < 2
-      return num.is_a?(Fixnum) ? '0' : "0.#{'0' * (length - 1)}" if num == 0
+      return num.is_a?(Float) ? "0.#{'0' * (length - 1)}" : '0' if num == 0
 
       base    = options[:base].to_f
       minus   = num < 0 ? '-' : ''
@@ -17,8 +17,8 @@ module SI
         denom = base ** exp
         if nump >= denom || exp == min_exp
           val = nump / denom
-          val = val.round [length - val.to_i.to_s.length, 0].max
-          val = val.to_i if exp == 0 && num.is_a?(Fixnum)
+          val = SI.round val, [length - val.to_i.to_s.length, 0].max
+          val = val.to_i if exp == 0 && !num.is_a?(Float)
           val = val.to_s.ljust(length + 1, '0') if val.is_a?(Float)
 
           return "#{minus}#{val}#{PREFIXES[exp]}"
@@ -29,8 +29,8 @@ module SI
     end
 
     def revert str, options = {}
-      options = DEFAULT.select { |k, v| k == :base }.merge(options)
-      pair    = PREFIXES.to_a.find { |k, v| v == str[-1] }
+      options = Hash[ DEFAULT.select { |k, v| k == :base } ].merge(options)
+      pair    = PREFIXES.to_a.find { |k, v| !v.empty? && str =~ /[0-9]#{v}$/ }
 
       if pair
         str[0...-1].to_f * (options[:base] ** pair.first)
@@ -38,6 +38,18 @@ module SI
         str.to_f
       end
     end
+
+    if (RUBY_VERSION.split('.')[0, 2].map(&:to_i) <=> [1, 8]) == 1
+      def round val, ndigits
+        val.round ndigits
+      end
+    else
+      def round val, ndigits
+        exp = (10 ** ndigits).to_f
+        val = ((val * exp).round / exp)
+        ndigits == 0 ? val.to_i : val
+      end
+    end
   end
 
   def si options = {}

data/lib/si/patch.rb

@@ -1,15 +1,13 @@
-class Float
-  include SI
-end
+original_verbosity = $VERBOSE
 
-class Fixnum
-  include SI
-end
+$VERBOSE = nil
 
-class Bignum
-  include SI
-end
+['Float', 'Fixnum', 'Bignum', 'Rational', 'Integer'].each do |const|
+  next unless Object.const_defined?(const)
 
-class Rational
-  include SI
+  Object.const_get(const).class_eval do
+    include SI
+  end
 end
+
+$VERBOSE = original_verbosity

data/lib/si/version.rb

@@ -1,3 +1,3 @@
 module SI
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/test_si.rb

@@ -187,9 +187,10 @@ class TestSI < Test::Unit::TestCase
     assert_equal 9876500000,         SI.revert('9.8765G')
     assert_equal 9876500,            SI.revert('9.8765M')
     assert_equal 9.8765 * 1024 ** 2, SI.revert('9.8765M', :base => 1024)
-    assert_equal 0.0098765,          SI.revert('9.8765m')
+    assert_equal 0.0000098765,       SI.revert('9.8765μ')
     assert_equal 0.0098765,          SI.revert('9.8765m')
     assert_equal 9.8765,             SI.revert('9.8765')
+    assert_equal 9.8765,             SI.revert('9.8765xxxyyyzzz')
     assert_equal 0.0,                SI.revert('hello') # FIXME
   end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: si
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Junegunn Choi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies: []
 description: Formats a number with SI prefix
 email:
@@ -18,8 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".github/workflows/ruby.yml"
+- ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -33,27 +34,25 @@ files:
 - test/test_si.rb
 homepage: https://github.com/junegunn/si
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.4.6
+signing_key:
+specification_version: 4
 summary: Formats a number with SI prefix (metric prefix)
 test_files:
 - test/test_si.rb