blz 0.1.4.20170306 → 0.2.0.20170605

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b91975870ed8a957ec0b85731e5688934b48729
-  data.tar.gz: 181e78ea59318c93deeefdf3998a79a1ceb49f96
+  metadata.gz: 583b483d338385dc57d528a92908249de42bcb29
+  data.tar.gz: e3e9638f159ef7b87e083021ca86e40a0e5b3603
 SHA512:
-  metadata.gz: 6b1eeb84ce1631d0fd739795be6a3104de50864c2ef9195597c427bb08728ae708aa3f935f427fa687bcce0d3aab5ff4ac29dc98b99d0eb6abd6d60f7d32dff5
-  data.tar.gz: '0664556387efcb42313cd0ca50c641ad8408707ffd0dd59d6d3830521fbced644e9f42f227d845904c6683aa7ddc62f62eb567f2fe05526b966ab69ce68f4347'
+  metadata.gz: 75a886ea53fa801e1832b2564cfa0ecf1ba3a4308a40b19bac7c9c221b24c2b668a4d271976d4983b1e94292a5c4e92a3dbdeb32a52d41913d626e407d08959e
+  data.tar.gz: bc03dd1c2d3bd6dc73956c03d764730996e1f5b1fad95bb6ebbdb43be1985a740ca7d03e3767998b995e190041a87c0ab3325a5ee6ee42ca3a21140f19378970

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.0.20170605, released 2017-05-08
+
+* BLZ data file for cycle 2017-06-04 to 2017-09-03 added
+* BLZ data files for 2015 removed
+* revamped tests, so that manual editing becomes unnecessary
+
 # 0.1.4.20170306, released 2017-02-06
 
 * BLZ data file for cycle 2017-03-06 to 2017-06-04 added

data/README.md

@@ -78,10 +78,7 @@ files. Currently, this is a 3-monthly manual process of:
 3. Gzip'ing the `.tsv` file (i.e. `gzip -9 yyyy_mm_dd.tsv`, resulting
   in `data/yyyy_mm_dd.tsv.gz`).
 
-4. Modify the `test_current_data_file` method in `test/test_bank.rb` to
-  reflect the latest file.
-
-5. Run the tests (`rake`).
+4. Run the tests (`rake`).
 
 Obviously, this process tends to be error prone. A pull request with a
 Rake task completing these steps would be nice to have.

data/blz.gemspec

@@ -4,7 +4,7 @@ extra_rdoc_files = ['CHANGELOG.md', 'LICENSE', 'README.md']
 
 Gem::Specification.new do |s|
   s.name            = 'blz'
-  s.version         = '0.1.4.20170306'
+  s.version         = '0.2.0.20170605'
   s.platform        = Gem::Platform::RUBY
   s.summary         = "BLZ (Bankleitzahlen) for Ruby"
 

data/lib/blz.rb

@@ -10,23 +10,22 @@
 require "date"
 
 module BLZ
+  def self.convert_file_to_date(f)
+    match = f.match /(?<y>\d{4})_(?<m>\d\d)_(?<d>\d\d)\.tsv\.gz$/
+    Date.new match[:y].to_i, match[:m].to_i, match[:d].to_i
+  end
+
   def self.find_data_file(now=Date.today)
     glob = Dir[ File.join(File.dirname(__FILE__), '../data/*.tsv.gz') ].sort
-
-    file2time = proc do |f|
-      match = f.match /(?<y>\d{4})_(?<m>\d\d)_(?<d>\d\d)\.tsv\.gz$/
-      Date.new match[:y].to_i, match[:m].to_i, match[:d].to_i
-    end
-
-    filename = glob.find {|c| now <= file2time[c] } || glob.last
+    file = glob.find {|c| now <= convert_file_to_date(c) } || glob.last
 
     # sanity check
-    t = file2time[filename]
-    if t < Date.new(2013, 12, 9) || now > t + 90
+    if now < Date.new(2016, 3, 6) || now > (convert_file_to_date(file) + 90)
+      warn [now]
       warn '[BLZ] The data provided may not be accurate.'
     end
 
-    filename
+    file
   end
 
   DATA_FILE = find_data_file

data/test/test_bank.rb

@@ -2,26 +2,36 @@
 
 require 'blz'
 require 'test/unit'
+require 'stringio'
 
 class TestBank < Test::Unit::TestCase
+  DATA_FILES = Dir[File.join(File.dirname(__FILE__), '../data/*.tsv.gz')].sort
+
+  DATA_FILES.each do |filename|
+    define_method "test_find_file_for_#{File.basename(filename)[0..-8]}" do
+      assert_stderr_no_match "The data provided may not be accurate" do
+        date = BLZ.convert_file_to_date(filename)
+        file = BLZ.find_data_file(date)
+        assert_equal b(filename), b(file)
+      end
+    end
+  end
 
-  def test_data_file_finder
-    {
-      Date.new(2000,1,1)  => "2015_03_09.tsv.gz",
-      Date.new(2015,1,1)  => "2015_03_09.tsv.gz",
-      Date.new(2015,3,9)  => "2015_03_09.tsv.gz",
-
-      Date.new(2015,3,10) => "2015_12_06.tsv.gz",
-      Date.new(2015,6,25) => "2015_12_06.tsv.gz",
-      Date.new(2015,12,6) => "2015_12_06.tsv.gz",
-
-      Date.new(2015,12,7) => "2016_03_06.tsv.gz",
-      Date.new(2016,3,6)  => "2016_03_06.tsv.gz",
-      Date.new(2016,3,7)  => "2016_09_04.tsv.gz",
-      Date.new(2017,6,5)  => "2017_03_06.tsv.gz", # ! until next release cycle
-    }.each do |date, filename|
-      file = BLZ.find_data_file(date)
-      assert_equal filename, File.basename(file)
+  def test_find_file_for_past_date
+    assert_stderr_match "The data provided may not be accurate" do
+      file  = DATA_FILES.first
+      date  = BLZ.convert_file_to_date(file) - 1
+      found = BLZ.find_data_file(date)
+      assert_equal b(file), b(found)
+    end
+  end
+
+  def test_find_file_for_future_date
+    assert_stderr_match "The data provided may not be accurate" do
+      file  = DATA_FILES.last
+      date  = BLZ.convert_file_to_date(file) + 91
+      found = BLZ.find_data_file(date)
+      assert_equal b(file), b(found)
     end
   end
 
@@ -91,4 +101,29 @@ class TestBank < Test::Unit::TestCase
     assert_equal "70150000, Stadtsparkasse München, 80791 München, SSKMDEMMXXX", results[0].to_s
   end
 
+  # helper
+
+  def assert_stderr_match(msg, &block)
+    serr = redirect_stderr(&block)
+    assert_match msg, serr
+  end
+
+  def assert_stderr_no_match(msg, &block)
+    msg = Regexp.new(Regexp.escape(msg)) unless msg.is_a?(Regexp)
+    serr = redirect_stderr(&block)
+    assert_no_match msg, serr
+  end
+
+  def b(file)
+    File.basename file
+  end
+
+  def redirect_stderr
+    fake_stderr = StringIO.new
+    original_stderr, $stderr = $stderr, fake_stderr
+    yield
+    fake_stderr.string
+  ensure
+    $stderr = original_stderr
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blz
 version: !ruby/object:Gem::Version
-  version: 0.1.4.20170306
+  version: 0.2.0.20170605
 platform: ruby
 authors:
 - Oliver Eilhard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,11 +78,10 @@ files:
 - Rakefile
 - bin/blz
 - blz.gemspec
-- data/2015_03_09.tsv.gz
-- data/2015_12_06.tsv.gz
 - data/2016_03_06.tsv.gz
 - data/2016_09_04.tsv.gz
 - data/2017_03_06.tsv.gz
+- data/2017_06_05.tsv.gz
 - lib/blz.rb
 - lib/blz/bank.rb
 - test/test_bank.rb