ziffern 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/ziffern.rb +2 -2
  3. data/ziffern_spec.rb +14 -11
  4. metadata +12 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7ef4b4fb9aacb8ca20eda2ea0ed7e86a6f48a063
4
- data.tar.gz: 000019bbfaf9ea01efd88092de78f0427e39cf25
3
+ metadata.gz: 9000941bc614a91060998666f08dbbe42ae52bb1
4
+ data.tar.gz: f80336c1b765bfabf7f0d5783279987a2b7fe613
5
5
  SHA512:
6
- metadata.gz: f4c203da22e15ef702ca13df05570d395278894f0ff3b771c7897d47068585f8343f41d196d3a82e792ae8572390c660cff421854d6f28d30339d63a076af8aa
7
- data.tar.gz: cac329cd35ebad1a128d32edbefef413773ebd864140644f5b4f88a355dd920432b70f5673a211effd5868cc71d2b231e897334236f23456be60a83deb7d038d
6
+ metadata.gz: cc5382b7fe59040f44c9909389c631a983fd3d88e7442a1f0e846017ab8fad2f5680c5a14082e0a031baf000e52ce8f3c8b827fe2cc25e0dc4a87ad42e5dc275
7
+ data.tar.gz: ecae6124a4a1068345fa12758db7483e05643e67a1618b026f8c0275718feb9390ca96f690352a0491cdb687c49855f22b9f3c48a27e5a31124d04d0aedb09c9
data/ziffern.rb CHANGED
@@ -65,7 +65,7 @@ class Ziffern
65
65
  amount, remainder = number.divmod(factor)
66
66
 
67
67
  text = convert(amount) + quantifier
68
- text << convert(remainder) unless remainder.zero?
68
+ text << convert(remainder, 'eins') unless remainder.zero?
69
69
 
70
70
  text
71
71
  end
@@ -85,7 +85,7 @@ class Ziffern
85
85
 
86
86
  pairs
87
87
  .reject { |amount,| amount.zero? }
88
- .map { |amount, name| quantify_big_name(amount, name) }
88
+ .map { |amount, name| quantify_big_name(amount, name) }
89
89
  .join(' ')
90
90
  end
91
91
 
data/ziffern_spec.rb CHANGED
@@ -35,6 +35,7 @@ describe Ziffern do
35
35
  context 'numbers up to 1000' do
36
36
  test_german_numbers({
37
37
  100 => "einhundert",
38
+ 101 => "einhunderteins",
38
39
  234 => "zweihundertvierunddreißig",
39
40
  999 => "neunhundertneunundneunzig",
40
41
  })
@@ -43,6 +44,7 @@ describe Ziffern do
43
44
  context 'numbers up to one million' do
44
45
  test_german_numbers({
45
46
  1000 => "eintausend",
47
+ 1001 => "eintausendeins",
46
48
  1234 => "eintausendzweihundertvierunddreißig",
47
49
  10_000 => "zehntausend",
48
50
  999_999 => "neunhundertneunundneunzigtausendneunhundertneunundneunzig",
@@ -51,9 +53,9 @@ describe Ziffern do
51
53
 
52
54
  context 'really big numbers' do
53
55
  test_german_numbers({
54
- 1_000_000 => "eine Million",
55
- 1_000_001 => "eine Million eins",
56
- 2_204_510 => "zwei Millionen zweihundertviertausendfünfhundertzehn",
56
+ 1_000_000 => "eine Million",
57
+ 1_000_001 => "eine Million eins",
58
+ 2_204_510 => "zwei Millionen zweihundertviertausendfünfhundertzehn",
57
59
  1_203_400_021 => "eine Milliarde zweihundertdrei Millionen vierhunderttausendeinundzwanzig",
58
60
  3_000_000_000_000_099 => "drei Billiarden neunundneunzig",
59
61
  10 ** 123 => "eine Vigintilliarde"
@@ -62,7 +64,7 @@ describe Ziffern do
62
64
 
63
65
  context 'negative numbers' do
64
66
  test_german_numbers({
65
- -1 => "minus eins",
67
+ -1 => "minus eins",
66
68
  -20 => "minus zwanzig",
67
69
  -21 => "minus einundzwanzig",
68
70
  -63 => "minus dreiundsechzig",
@@ -72,20 +74,21 @@ describe Ziffern do
72
74
 
73
75
  context 'decimals' do
74
76
  test_german_numbers({
75
- 0.1234 => "null Komma eins zwei drei vier",
76
- 5.6789 => "fünf Komma sechs sieben acht neun",
77
- 5.0 => "fünf Komma null",
78
- -5.6 => "minus fünf Komma sechs",
77
+ 0.1234 => "null Komma eins zwei drei vier",
78
+ 5.6789 => "fünf Komma sechs sieben acht neun",
79
+ 5.0 => "fünf Komma null",
80
+ -5.6 => "minus fünf Komma sechs",
79
81
  -567.89 => "minus fünfhundertsiebenundsechzig Komma acht neun",
80
- -0.001 => "minus null Komma null null eins"
82
+ -0.001 => "minus null Komma null null eins"
81
83
  })
82
84
  end
83
85
 
84
86
  context 'strings' do
85
87
  test_german_numbers({
86
- '-123' => "minus einhundertdreiundzwanzig",
88
+ '-0' => "null",
89
+ '-123' => "minus einhundertdreiundzwanzig",
87
90
  '-123.1' => "minus einhundertdreiundzwanzig Komma eins",
88
- '5.00' => "fünf Komma null null",
91
+ '5.00' => "fünf Komma null null",
89
92
  })
90
93
  end
91
94
 
metadata CHANGED
@@ -1,55 +1,55 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ziffern
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jimmy Börjesson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-09 00:00:00.000000000 Z
11
+ date: 2015-03-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.6'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.6'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '10.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '3.0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '3.0'
55
55
  description:
@@ -68,20 +68,20 @@ metadata: {}
68
68
  post_install_message:
69
69
  rdoc_options: []
70
70
  require_paths:
71
- - .
71
+ - "."
72
72
  required_ruby_version: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - '>='
74
+ - - ">="
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
77
  required_rubygems_version: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - '>='
79
+ - - ">="
80
80
  - !ruby/object:Gem::Version
81
81
  version: '0'
82
82
  requirements: []
83
83
  rubyforge_project:
84
- rubygems_version: 2.0.14
84
+ rubygems_version: 2.4.5
85
85
  signing_key:
86
86
  specification_version: 4
87
87
  summary: Converts numbers to text, in German.