i18n-complements 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16d692a49edce3b47b6a8ada497b8146cd1205ec
-  data.tar.gz: 8cf691d258e71da95029badf9114c5d9b9f5d969
+  metadata.gz: 7dda6ac868f33ce669414e1ccd72b713018a1540
+  data.tar.gz: 5dfb9a290c3b542c2d633b9e41f97e63a90a25ca
 SHA512:
-  metadata.gz: 253e77f53716e54ca9bb917c2d7a2900fd3242c82768b13c0025dafdc9934aab9d448141d349d6419878287812dec382c425f4d3e4eead2067259c1ced36b282
-  data.tar.gz: 9d5867df77df878ae0bece031e7adff3872e3c10f05f3e570ea80b13ebb18b26dd2e9577883ce9204b39bb30cd0dc875e4f8ed380407fae211fec6124623d318
+  metadata.gz: 02421e944a7a2d5c1720b1f444b5fe42bd85befc811b2f089248e460bb9e9b08f2e3b83df9479a95651efb593d120ae22222c9e6deec58b3997e05802c2cb097
+  data.tar.gz: 3855cdc267a8cdfe9a6763b103e8f26cfdd733ab93e54f4df759e6bedfc29f143154ac23d15c8b793f7c3b57db9a2e204ab75d07fb2dd97b220bb1b032f68bb0

data/lib/i18n/complements/localize_extension.rb

@@ -7,7 +7,7 @@ module I18n
           return localize_without_complements(locale, object, format, options)
         elsif object.respond_to?(:abs)
           if currency = options[:currency]
-            raise I18n::InvalidCurrency.new("Currency #{currency} does not exist.") unless I18n::Complements::Numisma[currency.to_s]
+            raise I18n::InvalidCurrency, "Currency #{currency} does not exist." unless I18n::Complements::Numisma[currency.to_s]
             return I18n::Complements::Numisma[currency.to_s].localize(object, locale: locale)
           else
             formatter = I18n.translate('number.format'.to_sym, locale: locale, default: {})

data/lib/i18n/complements/numisma.rb

@@ -22,7 +22,7 @@ module I18n
         # Returns a hash with active currencies only
         def active_currencies
           x = {}
-          for code, currency in @@currencies
+          @@currencies.each do |code, currency|
             x[code] = currency if currency.active
           end
           x
@@ -33,10 +33,21 @@ module I18n
           @@currencies[currency_code]
         end
 
+        def fixed_currency_rate(from, to)
+          rates = @@fixed_currency_rates[from]
+          return nil unless rates
+          rates[to]
+        end
+
         def currency_rate(from, to)
-          raise InvalidCurrency.new(":from currency is unknown (#{from.class}:#{from.inspect})") if Numisma[from].nil?
-          raise InvalidCurrency.new(":to currency is unknown (#{to.class}:#{to.inspect})") if Numisma[to].nil?
-          rate = nil
+          if Numisma[from].nil?
+            raise InvalidCurrency, ":from currency is unknown (#{from.class}:#{from.inspect})"
+          end
+          if Numisma[to].nil?
+            raise InvalidCurrency, ":to currency is unknown (#{to.class}:#{to.inspect})"
+          end
+          rate = fixed_currency_rate(from, to)
+          return rate if rate
           begin
             uri = URI('http://www.webservicex.net/CurrencyConvertor.asmx/ConversionRate')
             response = Net::HTTP.post_form(uri, 'FromCurrency' => from, 'ToCurrency' => to)
@@ -53,15 +64,31 @@ module I18n
         # Load currencies
         def load_currencies
           @@currencies = {}
-          for code, details in YAML.load_file(currencies_file)
-            currency = Currency.new(code, details.inject({}) { |h, p| h[p[0].to_sym] = p[1]; h })
+          yaml = YAML.load_file(currencies_file)
+          yaml.each do |code, attributes|
+            currency = Currency.new(code, attributes.inject({}) { |h, p| h[p[0].to_sym] = p[1]; h })
             @@currencies[currency.code] = currency
           end
         end
+
+        # Load fixed currency rates with reverse rates too.
+        def load_fixed_currency_rates
+          @@fixed_currency_rates = {}
+          yaml = YAML.load_file(File.join(File.dirname(__FILE__), 'numisma', 'fixed_currency_rates.yml'))
+          yaml.each do |from, rates|
+            @@fixed_currency_rates[from] ||= {}
+            rates.each do |to, rate|
+              @@fixed_currency_rates[from][to] = rate
+              @@fixed_currency_rates[to] ||= {}
+              @@fixed_currency_rates[to][from] = 1 / rate
+            end
+          end
+        end
       end
 
       # Finally load all currencies
       load_currencies
+      load_fixed_currency_rates
     end
   end
 

data/lib/i18n/complements/numisma/fixed_currency_rates.yml

@@ -0,0 +1,20 @@
+EUR:
+  EEK: 15.6466
+  SKK: 30.126
+  GRD: 340.75
+  PTE: 200.482
+  NLG: 2.20371
+  BEF: 40.3399
+  FRF: 6.55957
+  LUF: 40.3399
+  LVL: 0.702804
+  ITL: 1936.27
+  MTL: 0.4293
+  LTL: 3.4528
+  CYP: 0.585274
+  IEP: 0.787564
+  DEM: 1.95583
+  FIM: 5.94573
+  ESP: 166.386
+  ATS: 13.7603
+  SIT: 239.64

data/lib/i18n/complements/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Complements
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/test/test_currencies.rb

@@ -44,12 +44,12 @@ class TestCurrencies < I18n::Complements::TestCase
 
   def test_number_formatting_with_currency
     number = 413_500
-    assert_equal "¥413,500", ::I18n.localize(number, locale: :eng, currency: 'JPY')
+    assert_equal '¥413,500', ::I18n.localize(number, locale: :eng, currency: 'JPY')
     assert_equal "413\u{00A0}500\u{00A0}¥", ::I18n.localize(number, locale: :fra, currency: 'JPY')
-    assert_equal "413,500円", ::I18n.localize(number, locale: :jpn, currency: 'JPY')
-    assert_equal "€0.325,1", ::I18n.localize(0.3251, locale: :eng, currency: 'EUR')
+    assert_equal '413,500円', ::I18n.localize(number, locale: :jpn, currency: 'JPY')
+    assert_equal '€0.325,1', ::I18n.localize(0.3251, locale: :eng, currency: 'EUR')
     assert_equal "0,325\u{00A0}1\u{00A0}F", ::I18n.localize(0.3251, locale: :fra, currency: 'FRF')
-    assert_equal "€123,852.325,1", ::I18n.localize(123_852.3251, locale: :eng, currency: 'EUR')
+    assert_equal '€123,852.325,1', ::I18n.localize(123_852.3251, locale: :eng, currency: 'EUR')
   end
 
   def test_number_formatting_with_currency_with_core_extensions

data/test/test_currency_rates.rb

@@ -3,6 +3,11 @@ require 'helper'
 
 class TestCurrencies < I18n::Complements::TestCase
   def test_conversion_rate
+    rate = I18n::Complements::Numisma.currency_rate('EUR', 'FRF')
+    assert !rate.zero?, 'Rate should not be zero'
+
+    assert rate == 6.55957
+
     assert_raise I18n::InvalidCurrency do
       I18n::Complements::Numisma.currency_rate(:EUR, 'JPY')
     end
@@ -17,7 +22,8 @@ class TestCurrencies < I18n::Complements::TestCase
 
     r1 = I18n::Complements::Numisma.currency_rate('EUR', 'JPY')
     r2 = I18n::Complements::Numisma.currency_rate('JPY', 'EUR')
-    assert 0.01 >= 1 - (r1 * r2).round(2), "EUR -> JPY: #{r1}, JPY -> EUR: #{r2}, #{r1 * r2}, #{(r1 * r2).round(2)}"
+    rounded_one = (r1 * r2).round(2)
+    assert rounded_one >= 0.99, "EUR -> JPY: #{r1}, JPY -> EUR: #{r2}, #{r1 * r2}, #{rounded_one}"
 
     rate = I18n::Complements::Numisma.currency_rate('EUR', 'JPY')
     assert !rate.nil?, 'Rate cannot be nil'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-complements
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -97,6 +97,7 @@ files:
 - lib/i18n/complements/numisma.rb
 - lib/i18n/complements/numisma/currencies.yml
 - lib/i18n/complements/numisma/currency.rb
+- lib/i18n/complements/numisma/fixed_currency_rates.yml
 - lib/i18n/complements/version.rb
 - test/helper.rb
 - test/locales/eng.yml