numbers_and_words 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7503257030adb52e2ff1704101a18dce89c3f20adbf07f259f7483452098d3b
-  data.tar.gz: ac2e88eb5d1d0fc1cd3aa2f7107dea6b83a8c96818280ff4e410f0e77055e656
+  metadata.gz: b5208a2d2ff914744a29fe15c5fd93c7a60b770e0aae261c279cb553f08bf777
+  data.tar.gz: 69b589aae5e3c2477ad9271ab4749e0f1d0b7c8b03c024ea595711226a6e51b8
 SHA512:
-  metadata.gz: b8f82e6d2cadd49ca7af046963f4db230d86511a0d09bf0b9404a8f1373df2a4076e418ec5645f14626082cc79ce64574d5c4a1beada1ac6412c24a633f873a5
-  data.tar.gz: 1920bfb10e576382d1cdfc439ad870baf3d1e6db53193b29a63a05403c32340fb0e32dd9a7cf579b14f5a8702ec6b5874e36f02f9b69eb9e46174ff8d570fea3
+  metadata.gz: 19dc40ac39ae76cb5f2f758a4eb0e91f581b56e50c4e5b9bfc574e46fdaca9150ad4aa7f7974bf83666cca17f64692eb35ff1a6ffd3aef9f426e197c8fb20188
+  data.tar.gz: a622bde5b625c9cd9f8cc04fc41a2ebc5d604db50041d58dab12b115a18646d0bc1b1f234199ab87f041a4ccd6032dc4516e3a3a619f6861f025796197ad3f4d

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 ### Features
   * Your contribution here.
 
+## 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

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.
 

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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NumbersAndWords
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 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.1
 platform: ruby
 authors:
 - Kirill Lazarev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2025-03-07 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
@@ -267,7 +280,6 @@ homepage: http://github.com/kslazarev/numbers_and_words
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -282,8 +294,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.5
 specification_version: 4
 summary: Spell out numbers in several languages
 test_files: []