banktools-de 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f644a79480002d1cd803cd2eae18a277cd12ea8
-  data.tar.gz: 7bb872deab831e3669c911c4540910a1a02ecf70
+  metadata.gz: f345d2155801661ec0ff314f20becde6475fd980
+  data.tar.gz: bc5c1b608d90a7d945ef8f7ec3327b39a74f4a16
 SHA512:
-  metadata.gz: 3e5fa5cec11896056bb53e7046f636bd978e75c443e4fe9b1a39937f27fd7a870f041d0413b2179b70ec404527b530241267628edb3855328c9c7abc171cbdc5
-  data.tar.gz: 8f93fb72571d481d5aee6eeb4b50e0cabd08cbb1b7c1486be9d8d15e18f845df2115131d69c1fe69cd928c1d31b5e551e533e62ad6212671969d9618030543b9
+  metadata.gz: 95edc5332504a760fa042731c15291d89e17c0573f8fa79b626a9996037c24faad2000aa1bfc6810acc79af4ee19d03f5ac61a5da4686e34d9ea1dc204539fa1
+  data.tar.gz: 5564d54c3a56a31fc52eb0b472e0a1824eebc2a1a9f5fa467f65e6a4c8d5f610a0aeabdef7b4a9d023222efbcd045623c34088bfab7f6f39b33907514dd732fa

data/banktools-de.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "attr_extras", ">= 4"
-  spec.add_dependency "ibanomat"  # Convert BLZ to IBAN/BIC
+  spec.add_dependency "memoit"
+  spec.add_dependency "ibanizator"  # Convert BLZ to IBAN and lookup BIC from IBAN
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/banktools-de/iban_bic.rb

@@ -1,12 +1,12 @@
-require "ibanomat"
+require "memoit"
+require "ibanizator"
 require "attr_extras/explicit"
 
 class BankTools::DE::IbanBicConverter
   extend AttrExtras.mixin
 
-  class CouldNotConvertError < StandardError; end
-  class ServiceUnavailable < StandardError; end
-  class UnknownError < StandardError; end
+  class CouldNotConvertIbanError < StandardError; end
+  class CouldNotFindBicError < StandardError; end
 
   class IbanBic
     extend AttrExtras.mixin
@@ -16,27 +16,30 @@ class BankTools::DE::IbanBicConverter
   method_object [ :blz!, :account! ]
 
   def call
-    account_data = get_account_data
-    build_result(account_data)
+    IbanBic.new(iban, bic)
   end
 
   private
 
-  def get_account_data
-    Ibanomat.find(bank_code: blz, bank_account_number: account)
-  rescue RestClient::RequestTimeout
-    raise ServiceUnavailable
-  rescue
-    raise UnknownError
+  def iban
+    iban_object.iban_string
+  end
+
+  def bic
+    iban_object.extended_data.bic
+  rescue Ibanizator::BankDb::BankNotFoundError => e
+    raise CouldNotFindBicError.new(e.message)
   end
 
-  def build_result(account_data)
-    # Non-"00" values represent an Ibanomat warning or error.
-    return_code = account_data.fetch(:return_code)
-    raise CouldNotConvertError unless return_code == "00"
+  memoize \
+  def iban_object
+    iban_string = Ibanizator.new.calculate_iban(country_code: :de, bank_code: blz, account_number: account)
+    iban = Ibanizator.iban_from_string(iban_string)
 
-    iban = account_data.fetch(:iban)
-    bic  = account_data.fetch(:bic)
-    IbanBic.new(iban, bic)
+    if Ibanizator.iban_from_string(iban).valid?
+      iban
+    else
+      raise CouldNotConvertIbanError.new("Invalid IBAN: #{iban.iban_string}")
+    end
   end
 end

data/lib/banktools-de/version.rb

@@ -1,5 +1,5 @@
 module BankTools
   module DE
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/spec/account_spec.rb

@@ -28,11 +28,11 @@ end
 
 describe BankTools::DE::Account, "#valid?" do
   it "is true with no errors" do
-    expect(BankTools::DE::Account.new("12").valid?).to be_true
+    expect(BankTools::DE::Account.new("12").valid?).to be_truthy
   end
 
   it "is false with errors" do
-    expect(BankTools::DE::Account.new("1").valid?).to be_false
+    expect(BankTools::DE::Account.new("1").valid?).to be_falsy
   end
 end
 

data/spec/blz_spec.rb

@@ -19,11 +19,11 @@ end
 
 describe BankTools::DE::BLZ, "#valid?" do
   it "is true with no errors" do
-    expect(BankTools::DE::BLZ.new("123 456 78").valid?).to be_true
+    expect(BankTools::DE::BLZ.new("123 456 78").valid?).to be_truthy
   end
 
   it "is false with errors" do
-    expect(BankTools::DE::BLZ.new("1").valid?).to be_false
+    expect(BankTools::DE::BLZ.new("1").valid?).to be_falsy
   end
 end
 

data/spec/iban_bic_spec.rb

@@ -2,39 +2,31 @@ require "spec_helper"
 require "banktools-de/iban_bic"
 
 describe BankTools::DE::IbanBicConverter, ".call" do
-  let(:blz) { "abc" }
-  let(:account) { "def" }
-
   it "returns the BIC and IBAN" do
-    allow(Ibanomat).to receive(:find).and_return(iban: "some iban", bic: "some bic", return_code: "00")
+    blz = "25050180"
+    account = "39370089"
 
     actual = BankTools::DE::IbanBicConverter.call(blz: blz, account: account)
 
-    expect(actual.iban).to eq("some iban")
-    expect(actual.bic).to eq("some bic")
-  end
-
-  it "raises CouldNotConvertError on conversion errors" do
-    allow(Ibanomat).to receive(:find).and_return(return_code: "1")
-
-    expect {
-      BankTools::DE::IbanBicConverter.call(blz: blz, account: account)
-    }.to raise_error(BankTools::DE::IbanBicConverter::CouldNotConvertError)
+    expect(actual.iban).to eq("DE53250501800039370089")
+    expect(actual.bic).to eq("SPKHDE2HXXX")
   end
 
-  it "raises ServiceUnavailable when the service is down" do
-    allow(Ibanomat).to receive(:find).and_raise(RestClient::RequestTimeout)
+  it "raises CouldNotConvertIbanError on IBAN conversion errors" do
+    blz = "abc"
+    account = "def"
 
     expect {
       BankTools::DE::IbanBicConverter.call(blz: blz, account: account)
-    }.to raise_error(BankTools::DE::IbanBicConverter::ServiceUnavailable)
+    }.to raise_error(BankTools::DE::IbanBicConverter::CouldNotConvertIbanError)
   end
 
-  it "raises UnknownError on other errors" do
-    allow(Ibanomat).to receive(:find).and_raise("unknown error")
+  it "raises CouldNotFindBicError on find BIC errors" do
+    blz = "21050171"
+    account = "12345678"
 
     expect {
       BankTools::DE::IbanBicConverter.call(blz: blz, account: account)
-    }.to raise_error(BankTools::DE::IbanBicConverter::UnknownError)
+    }.to raise_error(BankTools::DE::IbanBicConverter::CouldNotFindBicError)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: banktools-de
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: ibanomat
+  name: memoit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ibanizator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Validate and normalize German Bankleitzahl (BLZ) and bank account numbers.