banktools-se 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae26d83c75f488a904bc1dcaffada866c129f7f923a4083ef4c2886c58c4d605
-  data.tar.gz: 1a52ea7948ea5d90c0df16501455015ff8c870f22f00b64ca7ccf64f050aba83
+  metadata.gz: 2171141853a873652da69aa7ccd2c49212b060c34b8438798019178f86717a9e
+  data.tar.gz: 53ddab54a570de046d7149e26805670068be40b37549a21c121a62295e4dd15b
 SHA512:
-  metadata.gz: 4ea749b95887d14fce1fa99b3f34537f497706ea1670050014cf94064830b6e23a1db8c3a71caeaab0282a559879562ea4305d9507608f1ad01f04c0ffa859fc
-  data.tar.gz: 3aef88169d2c7be49fcfa7d88148db48db4a2ff2d9f8822cc9898ee03f9fad0cc0b4e7f9197ce0410f1021c3459172b8159d99d49269f20a0f06c98b882f8eb7
+  metadata.gz: 8bfd4a36644ed06f78b43b22484b8fa9a3c337c5731fb213f9c744138ad3ff5aaed4718765e6c35586feb38535111b6286c0651b9cf39e5a1d7f9e1e0712fb0f
+  data.tar.gz: 823a913eb6e0a644028679331af9bbff728adf86a4f81a3febd122979408a791ea46e244ebbee403ba649dc1f2157ccef6abee5709ce717551ab0ab0f90e8f30

data/.github/workflows/ci.yml

@@ -13,12 +13,15 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["3.0", "2.7", "2.6", "2.5"]
+        ruby-version:
+          - 3.1
+          - "3.0"
+          - 2.7
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@ae9cb3b565e36682a2c6045e4f664388da4c73aa
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.2.0
+
+- Add Account#normalize keyword arguments `digits_only`, `clearing_checksum`. [#11](https://github.com/barsoom/banktools-se/pull/11)
+
+## 3.1.1
+
+- Require MFA for privileged Rubygems actions.
+
 ## 3.1.0
 
 - Add more banks to the range in `BankTools::SE::Account::ClearingNumber`. See [#7]. Thanks, Milen Dimitrov!

data/Gemfile

@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in bank-tools-se.gemspec
 gemspec
 
-group :development do
-  gem "barsoom_utils", github: "barsoom/barsoom_utils"
+group :development, :test do
+  gem "barsoom_utils"
+  gem "guard"
+  gem "guard-rspec"
+  gem "rake"
+  gem "rspec"
   gem "rubocop"
 end

data/banktools-se.gemspec

@@ -14,9 +14,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = [ "lib" ]
   s.metadata      = { "rubygems_mfa_required" => "true" }
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "guard"
-  s.add_development_dependency "guard-rspec"
 end

data/lib/banktools-se/account.rb

@@ -36,9 +36,16 @@ module BankTools
         errors
       end
 
-      def normalize
+      def normalize(digits_only: false, clearing_checksum: true)
         if valid?
-          [ clearing_number, serial_number ].join("-")
+          clearing_number_part =
+            if clearing_checksum
+              clearing_number
+            else
+              digits[0, 4]
+            end
+          result = [ clearing_number_part, serial_number ].join("-")
+          digits_only ? result.gsub(/\D/, "") : result
         else
           number
         end

data/lib/banktools-se/version.rb

@@ -1,5 +1,5 @@
 module BankTools
   module SE
-    VERSION = "3.1.1"
+    VERSION = "3.2.0"
   end
 end

data/spec/account_spec.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
-require "spec_helper"
 require "banktools-se"
 
-describe BankTools::SE::Account do
+RSpec.describe BankTools::SE::Account do
   it "should initialize" do
     expect(BankTools::SE::Account.new("foo")).to be_a(BankTools::SE::Account)
   end
@@ -147,7 +146,7 @@ describe BankTools::SE::Account do
 
   describe "#normalize" do
     it "should normalize to clearing number dash serial number" do
-      account = expect(BankTools::SE::Account.new("11000000007").normalize).to eq("1100-0000007")
+      expect(BankTools::SE::Account.new("11000000007").normalize).to eq("1100-0000007")
     end
 
     it "should keep any Swedbank/Sparbanker clearing checksum" do
@@ -155,12 +154,50 @@ describe BankTools::SE::Account do
     end
 
     it "should not attempt to normalize invalid numbers" do
-      account = expect(BankTools::SE::Account.new(" 1-2-3 ").normalize).to eq(" 1-2-3 ")
+      expect(BankTools::SE::Account.new(" 1-2-3 ").normalize).to eq(" 1-2-3 ")
     end
 
     it "should prepend zeroes to the serial number if necessary" do
       expect(BankTools::SE::Account.new("8000-2-80000003").normalize).to   eq("8000-2-0080000003")
       expect(BankTools::SE::Account.new("8000-2-8000000003").normalize).to eq("8000-2-8000000003")
     end
+
+    context "using digits_only: true" do
+      it "normalizes to clearing number then serial number" do
+        expect(BankTools::SE::Account.new("11000000007").normalize(digits_only: true)).to eq("11000000007")
+      end
+
+      it "keeps any Swedbank/Sparbanker clearing checksum" do
+        expect(BankTools::SE::Account.new("8000-2-0000000000").normalize(digits_only: true)).to eq("800020000000000")
+      end
+
+      it "does not attempt to normalize invalid numbers" do
+        expect(BankTools::SE::Account.new(" 1-2-3 ").normalize(digits_only: true)).to eq(" 1-2-3 ")
+      end
+
+      it "prepends zeroes to the serial number if necessary" do
+        expect(BankTools::SE::Account.new("8000-2-80000003").normalize(digits_only: true)).to   eq("800020080000003")
+        expect(BankTools::SE::Account.new("8000-2-8000000003").normalize(digits_only: true)).to eq("800028000000003")
+      end
+    end
+
+    context "using clearing_checksum: false" do
+      it "normalizes to clearing number then serial number" do
+        expect(BankTools::SE::Account.new("1100 0000007").normalize(clearing_checksum: false)).to eq("1100-0000007")
+      end
+
+      it "drops any Swedbank/Sparbanker clearing checksum" do
+        expect(BankTools::SE::Account.new("8000-2-0000000000").normalize(clearing_checksum: false)).to eq("8000-0000000000")
+      end
+
+      it "keeps any invalid numbers" do
+        expect(BankTools::SE::Account.new(" 1-2-3 ").normalize(clearing_checksum: false)).to eq(" 1-2-3 ")
+      end
+
+      it "prepends zeroes to the serial number if necessary" do
+        expect(BankTools::SE::Account.new("8000-2-80000003").normalize(clearing_checksum: false)).to   eq("8000-0080000003")
+        expect(BankTools::SE::Account.new("8000-2-8000000003").normalize(clearing_checksum: false)).to eq("8000-8000000003")
+      end
+    end
   end
 end

data/spec/bankgiro_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
 require "banktools-se"
 
-describe BankTools::SE::Bankgiro do
+RSpec.describe BankTools::SE::Bankgiro do
   it "should initialize" do
     expect(BankTools::SE::Bankgiro.new("foo")).to be_a(BankTools::SE::Bankgiro)
   end

data/spec/ocr_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
 require "banktools-se"
 
-describe BankTools::SE::OCR do
+RSpec.describe BankTools::SE::OCR do
   # https://www.bankgirot.se/globalassets/dokument/anvandarmanualer/bankgiroinbetalningar_anvandarmanual_sv_31okt2016.pdf section 5.2
   describe ".from_number" do
     it "adds a mod-10 check digit" do

data/spec/plusgiro_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
 require "banktools-se"
 
-describe BankTools::SE::Plusgiro do
+RSpec.describe BankTools::SE::Plusgiro do
 
   it "should initialize" do
     expect(BankTools::SE::Plusgiro.new("foo")).to be_a(BankTools::SE::Plusgiro)

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
+  config.disable_monkey_patching!
 end

data/spec/utils_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
 require "banktools-se/utils"
 
-describe BankTools::SE::Utils, "valid_luhn?" do
+RSpec.describe BankTools::SE::Utils, "valid_luhn?" do
 
   [
     "00",

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: banktools-se
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
-dependencies:
-- !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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  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: guard-rspec
-  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'
+date: 2022-06-14 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - henrik@barsoom.se
@@ -75,6 +19,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
@@ -115,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: Validate and normalize Swedish bank account numbers, plusgiro and bankgiro.