Fix ruby 1.8.7, ree. Add another ruby implementations on travis.

kslazarev · Mar 25, 2013 · 7b13e52 · 7b13e52
1 parent a033424
commit 7b13e52
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,10 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
-  - jruby
-  - rbx
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - ree
-
diff --git a/lib/numbers_and_words/strategies/figures_converter/decorators/en/fractional.rb b/lib/numbers_and_words/strategies/figures_converter/decorators/en/fractional.rb
@@ -16,7 +16,7 @@ def fraction_significance
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
             end
 
             def figures

diff --git a/lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb b/lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb
@@ -16,7 +16,7 @@ def fraction_significance
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
             end
 
             def figures

diff --git a/lib/numbers_and_words/strategies/figures_converter/decorators/ru/fractional.rb b/lib/numbers_and_words/strategies/figures_converter/decorators/ru/fractional.rb
@@ -17,7 +17,7 @@ def fraction_significance
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
             end
 
             def figures

diff --git a/lib/numbers_and_words/strategies/figures_converter/decorators/ua/fractional.rb b/lib/numbers_and_words/strategies/figures_converter/decorators/ua/fractional.rb
@@ -17,7 +17,7 @@ def fraction_significance
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
             end
 
             def figures

diff --git a/lib/numbers_and_words/strategies/figures_converter/languages/families/helpers.rb b/lib/numbers_and_words/strategies/figures_converter/languages/families/helpers.rb
@@ -5,19 +5,22 @@ module Languages
         module Families
           module Helpers
             [:zero].each do |method_name|
-              define_method(method_name) { |options = {}|
+              define_method(method_name) { |*args|
+                options = args.first || {}
                 translate method_name, options
               }
             end
 
             [:ones, :teens, :tens, :tens_with_ones, :hundreds].each do |method_name|
-              define_method(method_name) { |options = {}|
+              define_method(method_name) { |*args|
+                options = args.first || {}
                 translate method_name, @figures.send(method_name), options
               }
             end
 
             [:megs].each do |method_name|
-              define_method(method_name) { |options = {}|
+              define_method(method_name) { |*args|
+                options = args.first || {}
                 translate method_name, @current_capacity, options
               }
             end