russian_central_bank 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f458d677cf82c7a11d3c4a88cffbfda4904bf0
-  data.tar.gz: fab07fb36ba2531fab496ec9bb37f070a3c76f41
+  metadata.gz: 876e31a704b78e07f98a29a05e17e83ef17de6aa
+  data.tar.gz: 05819489bd309ee2f0ce1e3c4b66bd2fadd505ef
 SHA512:
-  metadata.gz: 4cfbaccf01fc6f1da5c6edb7ef320aff5f8b4eb3dde5ef02d3db8488117d632b44f9a462142754561e50e75d4495ccde6d367a80d8817f29755e61cf96ff3e55
-  data.tar.gz: ef2ac1c0a4f56649e9c1f83327811b136923271ec730c408b7b19e41a21aca08b6890f50474f719c692fff32865a248f37dce644458a903a3e762b4496a257b4
+  metadata.gz: da4e31eb6d86580b64a6272fbf299e82aa38ad7f885f0db2d145830b7b94b82df1c53c0f2b517fb639b0a248dda02a9bb00bf7de1cc8315c1ec2755dc6654f36
+  data.tar.gz: 87547efb549d977dfec661fa8a23c2b5b1de1355ce8032417a6fbcf060634a7df2f8f33c4f336bd161986461dcc2d189216d97fbcb227014557ed3fd168bc315

data/README.md

@@ -1,6 +1,9 @@
+[![Build Status](https://circleci.com/gh/rmustafin/russian_central_bank.svg?style=shield)](https://circleci.com/gh/rmustafin/russian_central_bank)
+[![License](https://img.shields.io/github/license/rmustafin/russian_central_bank.svg)](http://opensource.org/licenses/MIT)
+
 # RussianCentralBank
 
-This gem extends Money::Bank::VariableExchange with Money::Bank::RussianCentralBank and gives acceess to the Central Bank of Russia currency exchange.
+This gem extends [Money](https://github.com/RubyMoney/money)::Bank::VariableExchange with [Money](https://github.com/RubyMoney/money)::Bank::RussianCentralBank and gives access to the Central Bank of Russia currency exchange.
 
 ## Installation
 
@@ -16,25 +19,34 @@ Or install it yourself as:
 
     $ gem install russian_central_bank
 
+NOTE: use 0.x version of `russian_central_bank` for > 6.0 `money` versions
+
 ##Dependencies
 
-* savon
-* money
+* [savon](http://savonrb.com/)
+* [money](https://github.com/RubyMoney/money)
 
 ## Usage
 
+Regular usage
+
+    require 'russian_central_bank'
+
     bank = Money::Bank::RussianCentralBank.new
 
+    Money.default_bank = bank
+
     # Load today's rates
     bank.update_rates
 
-    # Or you can specify the date
-    bank.update_rates(3.days.ago)
+    # Exchange 100 USD to RUB
+    Money.new(1000, "USD").exchange_to('RUB')
 
-    Money.default_bank = bank
+Specific date rates
 
-    # Exchange 100 USD to RUB
-    100.to_money('USD').exchange_to('RUB')
+    # Specify rates date
+    bank.update_rates(Date.today - 3000)
+    Money.new(1000, "USD").exchange_to('RUB')  # makes you feel better
 
     # Check last rates update
     bank.rates_updated_at
@@ -42,8 +54,11 @@ Or install it yourself as:
     # Check on which date rates were updated
     bank.rates_updated_on
 
+Autoupdate
+
     # Use ttl attribute to enable rates autoupdate
     bank.ttl = 1.day
+
     # Check expiration date
     bank.rates_expired_at
 

data/lib/russian_central_bank.rb

@@ -10,29 +10,27 @@ class Money
       attr_reader :rates_updated_at, :rates_updated_on, :ttl, :rates_expired_at
 
       def flush_rates
-        @mutex.synchronize{
-          @rates = {}
-        }
+        @store = Money::RatesStore::Memory.new
       end
 
       def update_rates(date = Date.today)
-        @mutex.synchronize{
-          update_parsed_rates exchange_rates(date)
+        store.transaction do
+          update_parsed_rates(exchange_rates(date))
           @rates_updated_at = Time.now
           @rates_updated_on = date
           update_expired_at
-          @rates
-        }
+          store.send(:index)
+        end
       end
 
-      def set_rate(from, to, rate)
-        @rates[rate_key_for(from, to)] = rate
-        @rates[rate_key_for(to, from)] = 1.0 / rate
+      def add_rate(from, to, rate)
+        super(from, to, rate)
+        super(to, from, 1.0 / rate)
       end
 
-      def get_rate from, to
+      def get_rate(from, to)
         update_rates if rates_expired?
-        @rates[rate_key_for(from, to)] || indirect_rate(from, to)
+        super || indirect_rate(from, to)
       end
 
       def ttl=(value)
@@ -55,19 +53,19 @@ class Money
         end
       end
 
-      def indirect_rate from, to
-        from_base_rate = @rates[rate_key_for('RUB', from)]
-        to_base_rate = @rates[rate_key_for('RUB', to)]
+      def indirect_rate(from, to)
+        from_base_rate = get_rate('RUB', from)
+        to_base_rate = get_rate('RUB', to)
         to_base_rate / from_base_rate
       end
 
-      def exchange_rates(date)
+      def exchange_rates(date = Date.today)
         client = Savon::Client.new(wsdl: CBR_SERVICE_URL, log: false, log_level: :error)
         response = client.call(:get_curs_on_date, message: { 'On_date' => date.strftime('%Y-%m-%dT%H:%M:%S') })
         response.body[:get_curs_on_date_response][:get_curs_on_date_result][:diffgram][:valute_data][:valute_curs_on_date]
       end
 
-      def update_parsed_rates rates
+      def update_parsed_rates(rates)
         local_currencies = Money::Currency.table.map { |currency| currency.last[:iso_code] }
         add_rate('RUB', 'RUB', 1)
         rates.each do |rate|

data/russian_central_bank.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'russian_central_bank'
-  spec.version       = '0.3.0'
+  spec.version       = '1.0.0'
   spec.authors       = ['Ramil Mustafin']
   spec.email         = ['rommel.rmm@gmail.com']
   spec.description   = 'RussianCentralBank extends Money::Bank::VariableExchange and gives you access to the Central Bank of Russia currency exchange rates.'
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~>1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>=2.0.0'
+  spec.add_development_dependency 'rspec', '~>3'
 
-  spec.add_dependency 'money', '>=5.0'
+  spec.add_dependency 'money', '~>6.0'
   spec.add_dependency 'savon', '~>2.0'
 end

data/spec/russian_central_bank_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe 'RussianCentralBank' do
   before do
     rates_hash = symbolize_keys YAML::load(File.open('spec/support/daily_rates.yml'))
-    Savon::Client.any_instance.stub_chain(:call, :body).and_return rates_hash
+    allow_any_instance_of(Savon::Client).to receive_message_chain(:call, :body) { rates_hash }
   end
 
   before :each do
@@ -16,9 +16,9 @@ describe 'RussianCentralBank' do
     end
 
     it 'should update rates from daily rates service' do
-      @bank.rates['RUB_TO_USD'].should == 0.03083678705348332
-      @bank.rates['RUB_TO_EUR'].should == 0.023478587528174305
-      @bank.rates['RUB_TO_JPY'].should == 3.086143524190736
+      expect(@bank.rates['RUB_TO_USD']).to eq(0.03083678705348332)
+      expect(@bank.rates['RUB_TO_EUR']).to eq(0.023478587528174305)
+      expect(@bank.rates['RUB_TO_JPY']).to eq(3.086143524190736)
     end
   end
 
@@ -30,7 +30,7 @@ describe 'RussianCentralBank' do
     it 'should delete all rates' do
       @bank.get_rate('RUB', 'USD')
       @bank.flush_rates
-      @bank.rates.should == {}
+      expect(@bank.store.send(:index)).to be_empty
     end
   end
 
@@ -43,11 +43,11 @@ describe 'RussianCentralBank' do
       end
 
       it 'should get rate from @rates' do
-        @bank.get_rate('RUB', 'USD').should == 0.03
+        expect(@bank.get_rate('RUB', 'USD')).to eq(0.03)
       end
 
       it 'should calculate indirect rates' do
-        @bank.get_rate('USD', 'GBP').should == 0.6666666666666667
+        expect(@bank.get_rate('USD', 'GBP')).to eq(0.6666666666666667)
       end
     end
 
@@ -72,7 +72,7 @@ describe 'RussianCentralBank' do
       end
 
       it "should not update rates" do
-        @bank.should_not_receive(:update_rates)
+        expect(@bank).to_not receive(:update_rates)
         @bank.get_rate('RUB', 'USD')
       end
     end
@@ -87,7 +87,7 @@ describe 'RussianCentralBank' do
         end
 
         it "should update rates" do
-          @bank.should_receive(:update_rates)
+          expect(@bank).to receive(:update_rates)
           @bank.get_rate('RUB', 'USD')
         end
       end
@@ -99,7 +99,7 @@ describe 'RussianCentralBank' do
         end
 
         it "should not update rates" do
-          @bank.should_not_receive(:update_rates)
+          expect(@bank).to_not receive(:update_rates)
           @bank.get_rate('RUB', 'USD')
         end
       end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'support/helpers'
 
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.tty = true
 
   config.order = :random

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: russian_central_bank
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ramil Mustafin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: RussianCentralBank extends Money::Bank::VariableExchange and gives you
@@ -88,7 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Access to Central Bank of Russia currency exchange rates.