ibandit 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1df2cf95c45aa65c6c465e6e84acf90bdbe129c
-  data.tar.gz: eb5ec39059d88313840d5d3f97fbe60a65d9612a
+  metadata.gz: b6b28e164036f1f3d80a9e52b12af42cc8452a37
+  data.tar.gz: 4e9aa3c2e839cbc7ba9e133c8f4151fe90f19dfb
 SHA512:
-  metadata.gz: d8a8c4d383522ed5295cf35495d321bd5518f3e9d487033dd3a81e4eedf49d2df3f93a2f7be89d32bc93495b01cd620cf0c7fbabab70dee71c97f82fe30679ed
-  data.tar.gz: 1b2c6c34acbdf70762aaa588a6e7660895e318c76d2cf0b78ce6ac24276b9836c77924560507b05d54231e9e022cab0b517b2a6adbcccf70d407dc4178152b20
+  metadata.gz: 7dd754b8daf06d399f2332c2ad55bfb57a1630708567ba3e08d96f68c33040faf46feb2ce0732e569cde3ec3e92f8c9b0137246ba79ae3978165bf7f85405340
+  data.tar.gz: ce8aa651ef4e7d42c92f9a5f75863cd8f0141064ca79ec4a450a0a1207f12e5e169fac46cf8cf4bc1c4d71fbf2df3ee7d0df6199506fcd122ce5c0f8913d7368

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.1 - July 21, 2015
+
+- Add Norway to LocalDetailsCleaner and IBANAssembler
+
 ## 0.6.0 - July 20, 2015
 
 - Add support for Sweden

data/README.md

@@ -301,6 +301,21 @@ iban = Ibandit::IBAN.new(
 )
 iban.iban                     # => "NL91ABNA0417164300"
 
+# Norway
+iban = Ibandit::IBAN.new(
+  country_code: 'NO',
+  account_number: '1117947',
+  bank_code: '8601'
+)
+iban.iban                     # => "NO9386011117947"
+
+# Norway with 11 digit account number
+iban = Ibandit::IBAN.new(
+  country_code: 'NO',
+  account_number: '8601.1117947',
+)
+iban.iban                     # => "NO9386011117947"
+
 # Portugal
 iban = Ibandit::IBAN.new(
   country_code: 'PT',

data/data/raw/structure_additions.yml

@@ -58,6 +58,9 @@ MU:
 NL:
   :local_check_digit_position: 18
   :local_check_digit_length: 1
+'NO':
+  :local_check_digit_position: 15
+  :local_check_digit_length: 1
 PT:
   :branch_code_format: \d{4}
   :account_number_format: \d{11}\d{2}

data/data/structures.yml

@@ -633,6 +633,8 @@ NL:
   :bban_format: \d{4}\d{6}\d{1}
   :bank_code_format: \d{4}
   :account_number_format: \d{6}\d{1}
+  :local_check_digit_position: 15
+  :local_check_digit_length: 1
 PK:
   :bank_code_position: 5
   :bank_code_length: 4

data/lib/ibandit/check_digit.rb

@@ -134,6 +134,28 @@ module Ibandit
       result < 10 ? result.to_s : (11 - result).to_s
     end
 
+    # Currently unused in this gem. This method calculates the last digit
+    # of a Norwegian account number when given the initial digits.
+    def self.norwegian(string)
+      weights = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2]
+
+      scaled_values = string.chars.map.with_index do |char, index|
+        unless char.to_i.to_s == char
+          raise InvalidCharacterError,
+                "Unexpected non-numeric character '#{char}'"
+        end
+
+        char.to_i * weights[index % weights.size]
+      end
+
+      if scaled_values[4] == 0 && scaled_values[5] == 0
+        scaled_values = scaled_values[6..-1]
+      end
+
+      result = 11 - scaled_values.inject(:+) % 11
+      result < 10 ? result.to_s : '0'
+    end
+
     # Currently unused in this gem. This method calculates the last digit
     # of a Finnish account number when given the initial digits (in electronic
     # format).

data/lib/ibandit/iban_assembler.rb

@@ -1,7 +1,7 @@
 module Ibandit
   module IBANAssembler
     SUPPORTED_COUNTRY_CODES = %w(AT BE CY DE EE ES FI FR GB GR IE IT LT LU LV MC
-                                 MT NL PT SE SI SK SM).freeze
+                                 MT NL NO PT SE SI SK SM).freeze
 
     EXCEPTION_COUNTRY_CODES = %w(IT SM BE).freeze
 
@@ -84,7 +84,7 @@ module Ibandit
 
     def self.required_fields(country_code)
       case country_code
-      when *%w(AT CY DE EE FI LT LU LV NL SE SI SK)
+      when *%w(AT CY DE EE FI LT LU LV NL NO SE SI SK)
         %i(bank_code account_number)
       when 'BE'
         %i(account_number)

data/lib/ibandit/local_details_cleaner.rb

@@ -1,7 +1,7 @@
 module Ibandit
   module LocalDetailsCleaner
     SUPPORTED_COUNTRY_CODES = %w(AT BE CY DE EE ES FI FR GB GR IE IT LT LU LV MC
-                                 MT NL PT SE SI SK SM).freeze
+                                 MT NL NO PT SE SI SK SM).freeze
 
     def self.clean(local_details)
       country_code = local_details[:country_code]
@@ -29,7 +29,7 @@ module Ibandit
       case country_code
       when 'AT', 'CY', 'DE', 'FI', 'LT', 'LU', 'LV', 'NL', 'SI', 'SK'
         %i(bank_code account_number)
-      when 'BE', 'EE', 'ES', 'SE'
+      when 'BE', 'EE', 'ES', 'SE', 'NO'
         %i(account_number)
       when 'GB', 'IE', 'MT'
         if Ibandit.bic_finder.nil? then %i(bank_code branch_code account_number)
@@ -290,6 +290,25 @@ module Ibandit
       }
     end
 
+    def self.clean_no_details(local_details)
+      # This method supports being passed the component IBAN parts, as defined
+      # by SWIFT, or a single 11 digit string.
+      if local_details[:bank_code]
+        bank_code      = local_details[:bank_code]
+        account_number = local_details[:account_number]
+      else
+        cleaned_acct_number = local_details[:account_number].gsub(/[-.\s]/, '')
+
+        bank_code      = cleaned_acct_number.slice(0, 4)
+        account_number = cleaned_acct_number[4..-1]
+      end
+
+      {
+        bank_code:      bank_code,
+        account_number: account_number
+      }
+    end
+
     def self.clean_pt_details(local_details)
       local_details
     end

data/lib/ibandit/version.rb

@@ -1,3 +1,3 @@
 module Ibandit
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/spec/ibandit/check_digit_spec.rb

@@ -104,6 +104,28 @@ describe Ibandit::CheckDigit do
     end
   end
 
+  describe '.norwegian' do
+    subject { described_class.norwegian(account_number) }
+
+    let(:account_number) { '8601111794' }
+    it { is_expected.to eq('7') }
+
+    context 'with another account number (double checking!)' do
+      let(:account_number) { '8601549472' }
+      it { is_expected.to eq('9') }
+    end
+
+    context 'with a third account number (triple checking!)' do
+      let(:account_number) { '3000501790' }
+      it { is_expected.to eq('0') }
+    end
+
+    context 'with a non-numeric character' do
+      let(:account_number) { '1BAD2014' }
+      specify { expect { subject }.to raise_error(/non-numeric character/) }
+    end
+  end
+
   describe '.slovakian_prefix' do
     subject { described_class.slovakian_prefix(account_number) }
 

data/spec/ibandit/iban_assembler_spec.rb

@@ -524,6 +524,32 @@ describe Ibandit::IBANAssembler do
       end
     end
 
+    context 'with NO as the country_code' do
+      let(:args) do
+        {
+          country_code: 'NO',
+          bank_code: '8601',
+          account_number: '1117947'
+        }
+      end
+
+      it { is_expected.to eq('NO9386011117947') }
+
+      it_behaves_like 'allows round trips', 'NO93 8601 1117 947'
+
+      context 'without a bank_code' do
+        before { args.delete(:bank_code) }
+        before { args[:account_number] = '86011117947' }
+
+        it { is_expected.to be_nil }
+      end
+
+      context 'without an account_number' do
+        before { args.delete(:account_number) }
+        it { is_expected.to be_nil }
+      end
+    end
+
     context 'with PT as the country_code' do
       let(:args) do
         {

data/spec/ibandit/local_details_cleaner_spec.rb

@@ -658,6 +658,28 @@ describe Ibandit::LocalDetailsCleaner do
     end
   end
 
+  context 'Norway' do
+    let(:country_code) { 'NO' }
+    let(:bank_code) { '8601' }
+    let(:account_number) { '1117947' }
+
+    it { is_expected.to eq(local_details) }
+
+    context 'with bank and branch codes in the account number' do
+      let(:bank_code) { nil }
+      let(:branch_code) { nil }
+      let(:account_number) { '8601.1117947' }
+
+      its([:bank_code]) { is_expected.to eq('8601') }
+      its([:account_number]) { is_expected.to eq('1117947') }
+    end
+
+    context 'without an account number' do
+      let(:account_number) { nil }
+      it { is_expected.to eq(local_details) }
+    end
+  end
+
   context 'Portugal' do
     let(:country_code) { 'PT' }
     let(:bank_code) { '0002' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibandit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Grey Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec