cldr-plurals-runtime-rb 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b7267b1d49bef215926ebf45036af6dbe0d861a0
-  data.tar.gz: 1fa59c03acec1e1bde8d94b59b6eb2158928a998
+SHA256:
+  metadata.gz: 6541eea401e167602c7129ea578f7f8f74bbd469001a5d1908a68379aec40282
+  data.tar.gz: 0f33eea5ee8731118f19cc057fe0e02702f4c494d7455b75d453bef9e3d71e3b
 SHA512:
-  metadata.gz: ffc828dcec27c0ed94fe5a31c000cb637f87dbe57b0f3c18da8de9017868f337ee5c4965885f36b05ec0f9e9eb9af2c03ff1f5c8cec4ac6fcc1c83451d742d8f
-  data.tar.gz: e441da7d0fcb9152defd4dc76988bfd12150dd5bf4b60b300377cd40edef86696ee03d8870948a78490448ed54094484c103dc1359ad67f889c27cc007a89f91
+  metadata.gz: e9018fc7fa6f67dfb5675d66381e0536dab8b4a8685068ef051148fa53ef0b24654b17bf9ff23be47b3fe340ead020d94e96e9e3eb1b4e696048c76f63e5efd3
+  data.tar.gz: f72d23ad45b5a7cda6756c69ec61242feeb58e6eeafc3e825b54a3cf5fe41a7db277dd24ca184b6dd0a759ef7fdd7cdd72f17cc52df76c0153167d339184b564

data/Gemfile

@@ -3,11 +3,10 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'pry-nav'
+  gem 'pry-byebug'
   gem 'rake'
 end
 
 group :test do
   gem 'rspec'
-  gem 'rr'
 end

data/README.md

@@ -27,6 +27,7 @@ The CLDR data set contains [plural information](http://unicode.org/cldr/trac/bro
 | w      | number of visible fraction digits in n, without trailing zeros.|
 | f      | visible fractional digits in n, with trailing zeros.           |
 | t      | visible fractional digits in n, without trailing zeros.        |
+| c/e    | compact decimal exponent value                                 |
 
 cldr-plurals-runtime-rb is an implementation of these calculations in Ruby. You can use them via the `CldrPlurals::RubyRuntime` module. Note that all methods take a stringified number as input:
 

data/cldr-plurals-runtime-rb.gemspec

@@ -7,11 +7,10 @@ Gem::Specification.new do |s|
   s.authors  = ["Cameron Dutro"]
   s.email    = ["camertron@gmail.com"]
   s.homepage = "http://github.com/camertron"
+  s.license  = "MIT"
 
   s.description = s.summary = 'Ruby runtime methods for CLDR plural rules (see camertron/cldr-plurals).'
-
   s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
 
   s.require_path = 'lib'
   s.files = Dir["{lib,spec}/**/*", "Gemfile", "History.txt", "LICENSE.txt", "README.md", "Rakefile", "cldr-plurals-runtime-rb.gemspec"]

data/lib/cldr-plurals/ruby-runtime/str_num.rb

@@ -0,0 +1,100 @@
+module CldrPlurals
+  module RubyRuntime
+
+    class StrNum
+      def self.from_string(str)
+        sign, int, frac, exp = str.scan(/([+-])?(\d+)\.?(\d+)?[eEcC]?(-?\d+)?/).flatten
+        new(sign || '', int, frac || '', exp.to_i)
+      end
+
+      attr_reader :sign, :int, :frac, :exp
+
+      def initialize(sign, int, frac, exp)
+        @sign = sign
+        @int = int
+        @frac = frac
+        @exp = exp
+      end
+
+      def int_val
+        int.to_i
+      end
+
+      def frac_val
+        # remove leading zeroes
+        frac.sub(/\A0*/, '')
+      end
+
+      def apply_exp
+        new_int, new_frac = if exp > 0
+          shift_right(exp)
+        else
+          shift_left(exp.abs)
+        end
+
+        self.class.new(sign, new_int || '', new_frac || '', 0)
+      end
+
+      def abs
+        self.class.new('', int, frac, exp)
+      end
+
+      def to_s
+        ''.tap do |result|
+          result << "#{sign}#{int}"
+          result << ".#{frac}" unless frac.empty?
+          result << "e#{exp}" if exp != 0
+        end
+      end
+
+      def strip
+        self.class.new(sign, int, frac.sub(/0+\z/, ''), exp)
+      end
+
+      def to_val
+        str = to_s
+
+        if str.include?('.')
+          str.to_f
+        else
+          str.to_i * (10 ** exp)
+        end
+      end
+
+      private
+
+      def shift_right(n)
+        return [int, frac] if exp == 0
+
+        new_int = "#{int}#{frac[0...n]}"
+
+        if n - frac.length > 0
+          new_int << '0' * (n - frac.length)
+        end
+
+        new_frac = frac[n..-1]
+        new_frac = (!new_frac || new_frac.empty?) && !frac.empty? ? '0' : new_frac
+
+        [new_int, new_frac]
+      end
+
+      def shift_left(n)
+        return [int, frac] if exp == 0
+
+        new_frac = ''
+
+        if n - int.length > 0
+          new_frac << '0' * (n - int.length)
+        end
+
+        new_frac << int[0...n]
+        new_frac << frac
+        new_int = int[n..-1]
+        new_int = !new_int || new_int.empty? ? '0' : new_int
+
+        [new_int, new_frac]
+      end
+    end
+
+  end
+end

data/lib/cldr-plurals/ruby-runtime/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module CldrPlurals
-  RUBY_RUNTIME_VERSION = '1.0.1'
+  RUBY_RUNTIME_VERSION = '1.1.0'
 end

data/lib/cldr-plurals/ruby_runtime.rb

@@ -1,80 +1,60 @@
 # encoding: UTF-8
 
+require 'cldr-plurals/ruby-runtime/str_num'
+
 module CldrPlurals
   module RubyRuntime
     class << self
 
       def build_args_for(num_str)
+        num = StrNum.from_string(num_str)
+
         [
-          n(num_str), i(num_str), f(num_str),
-          t(num_str), v(num_str), w(num_str)
+          n(num), i(num), f(num),
+          t(num), v(num), w(num),
+          e(num)
         ]
       end
 
-      def n(str)
-        to_num(
-          if str.include?('.')
-            _n(str).gsub(/([0]+\z)/, '').chomp('.')
-          else
-            _n(str)
-          end
-        )
-      end
-
-      def i(str)
-        to_num(_i(str))
-      end
-
-      def f(str)
-        to_num(_f(str))
-      end
-
-      def t(str)
-        to_num(_t(str))
-      end
-
-      def v(str)
-        to_num(_v(str))
-      end
-
-      def w(str)
-        to_num(_w(str))
-      end
-
-      private
-
-      def to_num(str)
-        str.include?('.') ? str.to_f : str.to_i
-      end
-
       # absolute value of the source number (integer and decimals).
-      def _n(str)
-        str.gsub(/(-)(.*)/, '\2')
+      def n(num)
+        wrap(num).abs.strip.to_val
       end
 
       # integer digits of n.
-      def _i(str)
-        _n(str).gsub(/([\d]+)(\..*)/, '\1')
+      def i(num)
+        wrap(num).apply_exp.int_val
       end
 
       # visible fractional digits in n, with trailing zeros.
-      def _f(str)
-        _n(str).gsub(/([\d]+\.?)(.*)/, '\2')
+      def f(num)
+        wrap(num).apply_exp.frac_val.to_i
       end
 
       # visible fractional digits in n, without trailing zeros.
-      def _t(str)
-        _f(str).gsub(/([0]+\z)/, '')
+      def t(num)
+        wrap(num).apply_exp.strip.frac_val.to_i
       end
 
       # number of visible fraction digits in n, with trailing zeros.
-      def _v(str)
-        _f(str).length.to_s
+      def v(num)
+        wrap(num).apply_exp.frac.length
       end
 
       # number of visible fraction digits in n, without trailing zeros.
-      def _w(str)
-        _t(str).length.to_s
+      def w(num)
+        wrap(num).apply_exp.strip.frac_val.length
+      end
+
+      def e(num)
+        wrap(num).exp
+      end
+
+      private
+
+      def wrap(str_or_num)
+        return str_or_num if str_or_num.is_a?(StrNum)
+        StrNum.from_string(str_or_num)
       end
 
     end

data/spec/ruby_runtime_spec.rb

@@ -34,6 +34,34 @@ describe CldrPlurals::RubyRuntime do
     end
   end
 
+  context 'with an exponent' do
+    let(:num) { '1.203e1' }
+
+    it '#n returns n without trailing zeroes' do
+      expect(rt.n(num)).to eq(12.03)
+    end
+
+    it '#i returns the int value multiplied by the power' do
+      expect(rt.i(num)).to eq(12)
+    end
+
+    it '#v returns num of visible fraction digits (with zeroes)' do
+      expect(rt.v(num)).to eq(2)
+    end
+
+    it '#w returns num of visible fraction digits (without zeroes)' do
+      expect(rt.w(num)).to eq(1)
+    end
+
+    it '#f returns visible fractional digits (with zeroes)' do
+      expect(rt.f(num)).to eq(3)
+    end
+
+    it '#t returns visible fractional digits (without zeroes)' do
+      expect(rt.t(num)).to eq(3)
+    end
+  end
+
   context 'with a zero decimal' do
     let(:num) { '1.0' }
 
@@ -162,7 +190,7 @@ describe CldrPlurals::RubyRuntime do
     end
 
     it '#w returns num of visible fraction digits (without zeroes)' do
-      expect(rt.w(num)).to eq(2)
+      expect(rt.w(num)).to eq(1)
     end
 
     it '#f returns visible fractional digits (with zeroes)' do

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require 'rspec'
-require 'pry-nav'
+require 'pry-byebug'
 require 'cldr-plurals/ruby_runtime'
 
 RSpec.configure do |config|
-  config.mock_with :rr
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cldr-plurals-runtime-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies: []
 description: Ruby runtime methods for CLDR plural rules (see camertron/cldr-plurals).
 email:
@@ -18,19 +18,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
 - cldr-plurals-runtime-rb.gemspec
+- lib/cldr-plurals/ruby-runtime/str_num.rb
 - lib/cldr-plurals/ruby-runtime/version.rb
 - lib/cldr-plurals/ruby_runtime.rb
 - spec/ruby_runtime_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/camertron
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -45,9 +46,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby runtime methods for CLDR plural rules (see camertron/cldr-plurals).
 test_files: []

data/History.txt

@@ -1,3 +0,0 @@
-== 1.0.0
-
-* Birthday!