Code refactoring

.cane

@@ -0,0 +1,5 @@
+--no-doc
+--no-style
+--style-measure 99
+--abc-max 18
+--style-exclude spec/**/*

.gitignore

@@ -1,6 +1,8 @@
 *.gem
 .bundle
 Gemfile.lock
+*.lock
 pkg/*
 doc/*
-coverage/*
+coverage/*
+.idea

.rspec

@@ -1 +1,3 @@
---colour
+--color
+--format documentation
+--require spec_helper

.rubocop.yml

@@ -0,0 +1,17 @@
+AllCops:
+  Include:
+    - '**/Rakefile'
+  Exclude:
+    - 'spec/**/*'
+Style/LineLength:
+  Max: 99
+Style/FileName:
+  Enabled: false
+Style/ModuleFunction:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Documentation:
+  Enabled: false
+Style/MethodLength:
+  Max: 15

.travis.yml

@@ -1,29 +1,18 @@
-script: "bundle exec rake spec"
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1.1
+  - 2.0.0
+  - 2.1
+  - ruby-head
   - jruby-19mode
-  - rbx
-notifications:
-  disable: true
+  - rbx-2
 gemfile:
-  - money-5.1.gemfile
-  - money-6.0.gemfile
-  - money-head.gemfile
+  - gemfiles/money_6.1.gemfile
+  - gemfiles/money_6.2.gemfile
+  - gemfiles/money_head.gemfile
 matrix:
   allow_failures:
-    - gemfile: gemfiles/money-head.gemfile
-  exclude:
-    - rvm: 1.9.3
-      gemfile: money-5.1.gemfile
-    - rvm: jruby-19mode
-      gemfile: money-5.1.gemfile
-    - rvm: rbx
-      gemfile: money-5.1.gemfile
-    - rvm: 1.9.3
-      gemfile: money-head.gemfile
-    - rvm: jruby-19mode
-      gemfile: money-head.gemfile
-    - rvm: rbx
-      gemfile: money-head.gemfile
+    - rvm: ruby-head
+bundler_args: --without local_development
+script:
+  - mkdir tmp
+  - bundle exec rake

Appraisals

@@ -0,0 +1,15 @@
+appraise "money-6.0" do
+  gem "money", "~> 6.0.0"
+end
+
+appraise "money-6.1" do
+  gem "money", "~> 6.1.0"
+end
+
+appraise "money-6.2" do
+  gem "money", "~> 6.2.0"
+end
+
+appraise "money-head" do
+  gem "money", github: "RubyMoney/money"
+end

CHANGELOG

@@ -1,3 +1,8 @@
+2014-11-17 - Alexander Simonov
+  * Version 2.1
+	* Code refactoring
+	* Add support for load rates from cache
+	* Remove support for Money 5.x
 2014-03-28 - Matias Korhonen
   * Version 2.0.2
   * Fixes the Nordea data URL

Gemfile

@@ -1,4 +1,20 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-# Specify your gem's dependencies in nordea.gemspec
 gemspec
+
+group :test do
+  gem 'simplecov', '>= 0.9.0', require: false
+  gem 'coveralls', require: false
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'terminal-notifier-guard', require: false if RUBY_PLATFORM.downcase.include?('darwin')
+  gem 'guard', '>= 2.0.0'
+  gem 'guard-rspec', '>= 4.3.1', require: false
+  gem 'guard-bundler', require: false
+  gem 'guard-preek', require: false
+  gem 'guard-rubocop', require: false
+  gem 'guard-reek', github: 'pericles/guard-reek', require: false
+  gem 'pry'
+end

Guardfile

@@ -0,0 +1,19 @@
+guard 'rspec', cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch('nordea.gemspec')
+end
+
+guard :rubocop do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard :preek, run_all_dir: 'lib' do
+  watch(/^lib\/(.*).rb/)
+end

README.md

@@ -23,6 +23,9 @@ The Money gem integration works in a similar way to the [eu\_central\_bank](http
     nordea_bank = Nordea::Bank.new
     Money.default_bank =  nordea_bank
 
+    # Load rates
+    nordea_bank.update_rates
+
     # Exchange 100 EUR to USD
     nordea_bank.exchange(100, "EUR", "USD")
 
@@ -32,9 +35,16 @@ The Money gem integration works in a similar way to the [eu\_central\_bank](http
     # Exchange 100 Canadian dollars to US dollars
     nordea_bank.exchange_with(Money.new(100, "CAD"), "USD")
 
-    # Update the forex rates
+    # Update the rates to latest
     nordea_bank.update_rates
 
+    # Save rates to cache file
+    cache = '/tmp/nordea_cache.yml'
+    nordea_bank.save_rates(cache)
+
+    # Load rates from cache file
+    nordea_bank.update_rates(cache)
+
 ### Without the Money gem
 
     exchange_rates = Nordea::ExchangeRates.new
@@ -51,12 +61,6 @@ The Money gem integration works in a similar way to the [eu\_central\_bank](http
 For more information, read the [documentation](http://rubydoc.info/gems/nordea).
 
 
-Ruby compatibility
-------------------
-
-The gem should work with Ruby 1.9.3, Ruby 2.0.0, jRuby, and Rubinius (only Ruby 1.9 is actively targetted).
-
-
 About the data and data source
 ------------------------------
 

Rakefile

@@ -1,12 +1,12 @@
 # encoding: UTF-8
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-require "rake"
-require "rake/task"
+require 'rake'
+require 'rake/task'
 
-require "rspec/core"
-require "rspec/core/rake_task"
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

defaults.reek

@@ -0,0 +1,11 @@
+---
+NestedIterators:
+  max_allowed_nesting: 2
+UtilityFunction:
+  enabled: false
+IrresponsibleModule:
+  enabled: false
+DuplicateMethodCall:
+  max_calls: 5
+FeatureEnvy:
+  enabled: false

gemfiles/money_6.1.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "money", "~> 6.1.0"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "appraisal"
+  gem "terminal-notifier-guard", :require => false
+  gem "guard", ">= 2.0.0"
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+end
+
+gemspec :path => "../"

gemfiles/money_6.2.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "money", "~> 6.2.0"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "appraisal"
+  gem "terminal-notifier-guard", :require => false
+  gem "guard", ">= 2.0.0"
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+end
+
+gemspec :path => "../"

gemfiles/money_head.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "money", :github => "RubyMoney/money"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "appraisal"
+  gem "terminal-notifier-guard", :require => false
+  gem "guard", ">= 2.0.0"
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+end
+
+gemspec :path => "../"

lib/nordea.rb

@@ -1,43 +1,46 @@
-require "nordea/bank"
-require "nordea/exchange_rates"
-require "nordea/version"
-require "tzinfo"
+require 'nordea/bank'
+require 'nordea/exchange_rates'
+require 'nordea/version'
+require 'tzinfo'
 
 # Ruby interface to the Nordea Bank exchange rate data.
 module Nordea
   # The default timezone, Europe/Helsinki
-  TZ = TZInfo::Timezone.get("Europe/Helsinki")
+  TZ = ::TZInfo::Timezone.get('Europe/Helsinki')
+  extend self
 
-  # Parses the datetime format used in the Nordea data.
-  #
-  # @example
-  #   Nordea.parse_time("20150101120056") #=> 2015-01-01 10:00:05 UTC
-  #
-  # @param [String] the datetime string (YYYYMMDDHHmmSS)
-  # @return [Time] the string converted into a Time object
-  def self.parse_time(datetime)
-    time = Time.utc( datetime[0..3].to_i,
-                     datetime[4..5].to_i,
-                     datetime[6..7].to_i,
-                     datetime[8..9].to_i,
-                     datetime[10..11].to_i,
-                     datetime[11..12].to_i )
+  class << self
+    # Parses the datetime format used in the Nordea data.
+    #
+    # @example
+    #   Nordea.parse_time("20150101120056") #=> 2015-01-01 10:00:05 UTC
+    #
+    # @param [String] the datetime string (YYYYMMDDHHmmSS)
+    # @return [Time] the string converted into a Time object
+    def parse_time(datetime)
+      time = Time.utc(datetime[0..3].to_i,
+                      datetime[4..5].to_i,
+                      datetime[6..7].to_i,
+                      datetime[8..9].to_i,
+                      datetime[10..11].to_i,
+                      datetime[11..12].to_i)
 
-    # Convert the local time to UTC time.
-    TZ.local_to_utc(time)
+      # Convert the local time to UTC time.
+      TZ.local_to_utc(time)
     rescue
       nil
-  end
+    end
 
-  # Parses the date format used in the Nordea data.
-  #
-  # @param [String] the date string (YYYYMMDD)
-  # @return [Date] the string converted into a Date object
-  def self.parse_date(date)
-    Date.new(date[0..3].to_i,
-             date[4..5].to_i,
-             date[6..7].to_i)
+    # Parses the date format used in the Nordea data.
+    #
+    # @param [String] the date string (YYYYMMDD)
+    # @return [Date] the string converted into a Date object
+    def parse_date(date)
+      ::Date.new(date[0..3].to_i,
+                 date[4..5].to_i,
+                 date[6..7].to_i)
     rescue
       nil
+    end
   end
-end
+end