numbers_and_words 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7503257030adb52e2ff1704101a18dce89c3f20adbf07f259f7483452098d3b
-  data.tar.gz: ac2e88eb5d1d0fc1cd3aa2f7107dea6b83a8c96818280ff4e410f0e77055e656
+  metadata.gz: d612787bffd49001ca0a53639182c25282a62d6bce6ed64102e404a01bb0a42a
+  data.tar.gz: 7f66649bed55c361ff6ea98ea230601e2304302a5a23cbca3003419fdadbb83a
 SHA512:
-  metadata.gz: b8f82e6d2cadd49ca7af046963f4db230d86511a0d09bf0b9404a8f1373df2a4076e418ec5645f14626082cc79ce64574d5c4a1beada1ac6412c24a633f873a5
-  data.tar.gz: 1920bfb10e576382d1cdfc439ad870baf3d1e6db53193b29a63a05403c32340fb0e32dd9a7cf579b14f5a8702ec6b5874e36f02f9b69eb9e46174ff8d570fea3
+  metadata.gz: 32e0e1aff9acaba88b7f073ef25850e4cec84f872ee28f420ad2370c3b0d90d12e2190a30c88cee81f697729f38d9c3ca18bdfe05ff1ce6a8844e96efa1c7cd5
+  data.tar.gz: 2fee47dcc8cf1e9863f3061c20fa4112dcff5782b397c161e9a76f7a46b55da5e669a2772206e4aaa2f0e2e7c936bb9201ea130261a364c5514718f826d304fc

data/CHANGELOG.md

@@ -1,8 +1,21 @@
-## 1.1.0 (Next)
+## 1.0.3 (Next)
 
 ### Features
   * Your contribution here.
 
+## 1.0.2 (Next)
+
+### Features
+  * Add support for Dutch floating-point numbers. \[[#207](https://github.com/kslazarev/numbers_and_words/pull/207)\]
+
+## 1.0.1 (March 7, 2025)
+
+### Features
+  * Add support for Ruby 3.4. \[[#204](https://github.com/kslazarev/numbers_and_words/pull/204)\]
+
+### Bugs
+  * Fix a few cases in French concerning plurals and union word (mainly 71 and 81). \[[#203](https://github.com/kslazarev/numbers_and_words/pull/203)\]
+
 ## 1.0.0 (October 17, 2024)
 
 ### Features
@@ -146,7 +159,7 @@
   * Add Lithuanian language. \[[#77](https://github.com/kslazarev/numbers_and_words/pull/77)\] \([@miks](https://github.com/miks)\) \(assignee: [@miks](https://github.com/miks)\)
 
 ### Bugs
-  * Fix latvian one hundread cases. \[[#81](https://github.com/kslazarev/numbers_and_words/pull/81)\] \([@miks](https://github.com/miks)\) \(assignee: [@miks](https://github.com/miks)\)
+  * Fix Latvian one hundred cases. \[[#81](https://github.com/kslazarev/numbers_and_words/pull/81)\] \([@miks](https://github.com/miks)\) \(assignee: [@miks](https://github.com/miks)\)
 
 ### Supports
   * Added @miks contacts to contributors list in README. \[[#79](https://github.com/kslazarev/numbers_and_words/issues/79)\] \([@kslazarev](https://github.com/kslazarev)\) \(assignee: [@miks](https://github.com/miks)\)
@@ -188,7 +201,7 @@
 ## 0.6.0 (March 25, 2013)
 
 ### Features
-  * Support fractional form for Ukranian. \[[#54](https://github.com/kslazarev/numbers_and_words/issues/54)\] \([@kslazarev](https://github.com/kslazarev)\) \(assignee: [@Shk-Serji](https://github.com/Shk-Serji)\)
+  * Support fractional form for Ukrainian. \[[#54](https://github.com/kslazarev/numbers_and_words/issues/54)\] \([@kslazarev](https://github.com/kslazarev)\) \(assignee: [@Shk-Serji](https://github.com/Shk-Serji)\)
   * Support fractional form for Russian. \[[#53](https://github.com/kslazarev/numbers_and_words/issues/53)\] \([@kslazarev](https://github.com/kslazarev)\) \(assignee: [@kslazarev](https://github.com/kslazarev)\)
   * Added functionality for spanish . \[[#51](https://github.com/kslazarev/numbers_and_words/pull/51)\] \([@jaambros](https://github.com/jaambros)\) \(assignee: [@jaambros](https://github.com/jaambros)\)
   * Support ordinal form for English and Hungarian. \[[#50](https://github.com/kslazarev/numbers_and_words/issues/50)\] \([@eLod](https://github.com/eLod)\) \(assignee: [@eLod](https://github.com/eLod)\)

data/README.rdoc

@@ -9,7 +9,7 @@ Spell out numbers in several languages using the I18n gem.
 
 Перевод чисел в слова при помощи библиотеки I18n.
 
-Converti les nombres en lettres en utilisant la librairie I18n.
+Convertit les nombres en lettres en utilisant la librairie I18n.
 
 Számok betűvel írva az I18n könyvtár segítségével.
 
@@ -285,7 +285,7 @@ Deletrea números en varios idiomas utilizando la gema I18n.
     I18n.with_locale(:ru) { 1001.to_words gender: :neuter }
     => "одна тысяча одно"
 
-* Ukranian
+* Ukrainian
 
   Change gender form: (gender: [:female || :male || :neuter])
 
@@ -373,6 +373,16 @@ Deletrea números en varios idiomas utilizando la gema I18n.
       I18n.with_locale(:da) { 1.to_words gender: :neuter }
       => "et"
 
+* Dutch
+
+    Remove 'zero' from integral part of float: (remove_zero: [true || false])
+
+      I18n.with_locale(:nl) { 0.7.to_words remove_zero: true }
+      => "zeven tienden"
+
+      I18n.with_locale(:nl) { 0.7.to_words remove_zero: false }
+      => "nul komma zeven tienden"
+
 == Other options / Другие опции
 
 * Precision

data/lib/numbers_and_words/i18n/locales/numbers.nl.yml

@@ -8,3 +8,48 @@ nl:
     mega: [_, duizend, miljoen, miljard, biljoen, biljard, triljoen, triljard, septiljoen, octillion, noniljoen, decillion]
     union: en
     union2or3: ën
+    micro: [_, tienden, honderdsten, duizendsten, miljoensten, miljardsten, biljoensten, biljardsten, triljoensten, triljardsten, septiljoensten, octillionsten, noniljoensten, decillionsten]
+    tienden:
+      one: tiende
+      other: tienden
+    honderdsten:
+      one: honderdste
+      other: honderdsten
+    duizendsten:
+      one: duizendste
+      other: duizendsten
+    miljoensten:
+      one: miljoenste
+      other: miljoensten
+    miljardsten:
+      one: miljardste
+      other: miljardsten
+    biljoensten:
+      one: biljoenste
+      other: biljoensten
+    biljardsten:
+      one: biljardste
+      other: biljardsten
+    triljoensten:
+      one: triljoenste
+      other: triljoensten
+    triljardsten:
+      one: triljardste
+      other: triljardsten
+    septiljoensten:
+      one: septiljoenste
+      other: septiljoensten
+    octillionsten:
+      one: octillionste
+      other: octillionsten
+    noniljoensten:
+      one: noniljoenste
+      other: noniljoensten
+    decillionsten:
+      one: decillionste
+      other: decillionsten
+    micro_separator: komma
+    micro_prefix:
+      tens: tien
+      hundreds: honderd
+      union: ''

data/lib/numbers_and_words/strategies/array_joiner/languages/nl.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module ArrayJoiner
+      module Languages
+        class Nl < Base
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/array_joiner/languages.rb

@@ -14,6 +14,7 @@ require 'numbers_and_words/strategies/array_joiner/languages/ua'
 require 'numbers_and_words/strategies/array_joiner/languages/pt-BR'
 require 'numbers_and_words/strategies/array_joiner/languages/cs'
 require 'numbers_and_words/strategies/array_joiner/languages/vi'
+require 'numbers_and_words/strategies/array_joiner/languages/nl'
 
 module NumbersAndWords
   module Strategies

data/lib/numbers_and_words/strategies/figures_converter/decorators/nl/base.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Nl
+          class Base < Decorators::Base
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/decorators/nl/fractional.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Nl
+          class Fractional < Base
+            def run
+              @strategy.options.options[:fractional_numeral] = true
+              "#{super} #{fraction_significance}"
+            end
+
+            private
+
+            def fraction_significance
+              @strategy.translations.micros full_fraction.fraction_capacity, figures.join.to_i
+            end
+
+            def full_fraction
+              (0..zero_length).inject(figures.clone) { |result, _el| result.unshift 0 }.to_figures
+            end
+
+            def figures
+              @strategy.figures.reverse
+            end
+
+            def zero_length
+              fraction_length - figures.length
+            end
+
+            def fraction_length
+              @options[:fractional][:length].to_i
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/decorators/nl/integral.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Nl
+          class Integral < Base
+            def run
+              return '' if @options[:remove_zero] && @strategy.figures.all?(&:zero?)
+
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/decorators/nl.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'numbers_and_words/strategies/figures_converter/decorators/nl/base'
+require 'numbers_and_words/strategies/figures_converter/decorators/nl/fractional'
+require 'numbers_and_words/strategies/figures_converter/decorators/nl/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators.rb

@@ -11,6 +11,7 @@ require 'numbers_and_words/strategies/figures_converter/decorators/hu'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua'
 require 'numbers_and_words/strategies/figures_converter/decorators/cs'
 require 'numbers_and_words/strategies/figures_converter/decorators/vi'
+require 'numbers_and_words/strategies/figures_converter/decorators/nl'
 
 module NumbersAndWords
   module Strategies

data/lib/numbers_and_words/strategies/figures_converter/languages/fr.rb

@@ -14,7 +14,11 @@ module NumbersAndWords
           end
 
           def hundreds
-            super({ pluralize: simple_number_to_words.empty? })
+            super({ pluralize: simple_number_to_words.empty? && (@parent_figures.nil? || @parent_figures.size == 3) })
+          end
+
+          def tens
+            super({ alone: @current_capacity&.positive? ? false : nil })
           end
 
           def megs

data/lib/numbers_and_words/strategies/figures_converter/languages/nl.rb

@@ -18,14 +18,34 @@ module NumbersAndWords
             capacity_words.empty? ? [] : [capacity_words, megs].join
           end
 
+          def ones(*args)
+            super({ fractional_numeral: @options.options[:fractional_numeral] }.merge(args.first || {}))
+          end
+
+          def tens_with_ones(*args)
+            super({ fractional_numeral: @options.options[:fractional_numeral] }.merge(args.first || {}))
+          end
+
           def simple_number_to_words
-            if @figures.only_ones && @figures.ones == 1
+            if @figures.only_ones && @figures.ones == 1 && !@options.options[:fractional_numeral]
               [@translations.t(:loose_one)]
             else
               super
             end
           end
 
+          def zero
+            return nil if maybe_remove_zero
+
+            super
+          end
+
+          private
+
+          def maybe_remove_zero
+            @options.remove_zero&.result
+          end
+
           def number_without_capacity_to_words
             return super unless apply_tens_of_hundreds?
 
@@ -36,8 +56,6 @@ module NumbersAndWords
             [([base, translate(:hundreds, 1)] + simple_number_to_words).join]
           end
 
-          private
-
           def apply_tens_of_hundreds?
             @options.tens_of_hundreds.result &&
               (1..9).cover?(figures.number_in_capacity(FiguresArray::THOUSAND_CAPACITY)) &&

data/lib/numbers_and_words/strategies/figures_converter/languages/vi.rb

@@ -7,19 +7,19 @@ module NumbersAndWords
         class Vi < Base
           def print_words
             value = super
-            remove_billion_noice(value)
+            remove_billion_noise(value)
           end
 
           def strings_logic
             if fractional?
               if fraction_number_zeros_leading.zero?
-                @options.options[:integeral] = true
-                integeral_string_logic
+                @options.options[:integral] = true
+                integral_string_logic
               else
                 fractional_with_zero_leading_string_logic
               end
             else
-              integeral_string_logic
+              integral_string_logic
             end
           end
 
@@ -28,7 +28,7 @@ module NumbersAndWords
             (@figures + leading_zeros).map(&:to_words)
           end
 
-          def integeral_string_logic
+          def integral_string_logic
             if @figures.capacity_count
               number_without_capacity_to_words + complex_number_to_words
             elsif hundreds?
@@ -66,7 +66,7 @@ module NumbersAndWords
           end
 
           def fractional?
-            !@options.options[:fractional].nil? && !@options.options[:integeral]
+            !@options.options[:fractional].nil? && !@options.options[:integral]
           end
 
           def fraction_length
@@ -79,7 +79,7 @@ module NumbersAndWords
             fraction_length - @figures.length
           end
 
-          def remove_billion_noice(value)
+          def remove_billion_noise(value)
             parts = value.split(billion_unit).map(&:strip)
             if value.end_with?(billion_unit)
               parts.insert(-1, billion_unit).join(' ')

data/lib/numbers_and_words/translations/fr.rb

@@ -14,11 +14,22 @@ module NumbersAndWords
         super
       end
 
-      def tens_with_ones(numbers, options = {})
-        return [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-') if [7, 9].include? numbers[1]
+      def tens_with_teens(numbers)
+        number_ones, number_tens = numbers.first(2)
+        separator = number_tens == 7 && number_ones == 1 ? "-#{union}-" : '-'
+        [tens(number_tens - 1, alone: false), teens(numbers)].join(separator)
+      end
 
-        separator = numbers[0] == 1 ? " #{union} " : '-'
-        super(numbers, options.merge(separator:))
+      def tens_with_ones(numbers, options = {})
+        number_ones, number_tens = numbers
+        return tens_with_teens(numbers) if [7, 9].include?(number_tens)
+
+        separator = number_ones == 1 && number_tens != 8 ? " #{union} " : '-'
+        if number_tens == 8
+          [tens(number_tens, alone: false), ones(number_ones, options)].join(separator)
+        else
+          super(numbers, options.merge(separator:))
+        end
       end
 
       def hundreds(number, options = {})

data/lib/numbers_and_words/translations/nl.rb

@@ -4,9 +4,19 @@ module NumbersAndWords
   module Translations
     class Nl < Base
       include NumbersAndWords::Translations::Families::Latin
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
 
-      def tens_with_ones(numbers, _options = {})
-        [ones(numbers[0]), tens(numbers[1])].join(union(numbers[0]))
+      def ones(number, options = {})
+        # In fractional context, use "een" instead of "één" for number 1
+        if number == 1 && options[:fractional_numeral]
+          t(:ones)[1] # "een" is at index 1 in the ones array
+        else
+          super
+        end
+      end
+
+      def tens_with_ones(numbers, options = {})
+        [ones(numbers[0], options), tens(numbers[1])].join(union(numbers[0]))
       end
 
       def hundreds(number, _options = {})

data/lib/numbers_and_words/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NumbersAndWords
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Kirill Lazarev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -38,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +129,7 @@ files:
 - lib/numbers_and_words/strategies/array_joiner/languages/families/base.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/fr.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/hu.rb
+- lib/numbers_and_words/strategies/array_joiner/languages/nl.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/pt-BR.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/ru.rb
 - lib/numbers_and_words/strategies/array_joiner/languages/ua.rb
@@ -147,6 +161,10 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/decorators/hu/base.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/hu/integral.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/nl.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/nl/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/nl/fractional.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/nl/integral.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/base.rb
 - lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/fractional.rb
@@ -267,7 +285,6 @@ homepage: http://github.com/kslazarev/numbers_and_words
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -282,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Spell out numbers in several languages
 test_files: []