blz 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.1, released 2012-11-18
+
+* Fixes a bug with `nil` values (kudos to @max-power)
+* Refactoring code, and it's just better to 
+  read now (again, thanks to @max-power)
+
 # 0.1.0, released 2012-09-27
 
 * Initial version released on GitHub

data/README.md

@@ -52,6 +52,10 @@ from the German Bundesbank
 [here](http://www.bundesbank.de/Redaktion/DE/Standardartikel/Kerngeschaeftsfelder/Unbarer_Zahlungsverkehr/bankleitzahlen_download.html).
 Now go and build your own BLZ gem ;-)
 
+## Contributors
+
+* [max-power](https://github.com/max-power)
+
 ## License
 
 Released under the MIT License. See the LICENSE file for further

data/blz.gemspec

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

data/lib/blz/bank.rb

@@ -1,85 +1,60 @@
 # encoding: utf-8
+require 'csv'
 
 module BLZ
-  #  Represents a bank with a BLZ, a BIC, a name etc.
   class Bank
-    # BLZ = a bank idenfier code widely used in DE and AT
-    attr_reader :blz
-    # Name of the bank
-    attr_reader :name
-    # Postal code
-    attr_reader :zip
-    # City
-    attr_reader :city
-    # Short name = short description of the bank
-    attr_reader :short_name
-    # BIC = bank identifier code (ISO 9362)
-    attr_reader :bic
-
-    # Initializes a single Bank record.
-    def initialize(blz, name, zip, city, short_name, bic)
-      @blz = blz
-      @name = name 
-      @zip = zip
-      @city = city
-      @short_name = short_name
-      @bic = bic
-    end
-
-    # Returns an array of all Banks specified by +code+.
-    # The following options apply:
-    #
-    #    exact:: Only return exact matches (false by default)
-    #
-    def self.find_by_blz(code, options = nil)
-      options ||= {}
-      exact = options.fetch(:exact, false)
+    #  Represents a bank with a BLZ, a BIC, a name etc.
+    class << self
+      # Returns an array of all Banks specified by +code+.
+      # The following options apply:
+      #    exact:: Only return exact matches (false by default)
+      #
+      def find_by_blz(code, options = {})
+        exact = options.fetch(:exact, false)
+        all.select do |bank|
+          bank.blz == code || (!exact && bank.blz.start_with?(code))
+        end
+      end
 
-      self.all.inject([]) do |results, bank|
-        if bank.blz == code || (!exact && bank.blz.start_with?(code))
-          results << bank
+      # Returns an array of all Banks with a substring of +city+.
+      def find_by_city(substring)
+        all.select do |bank|
+          bank.city.index(substring)
         end
-        results
       end
-    end
 
-    # Returns an array of all Banks with a substring of +city+.
-    def self.find_by_city(substring)
-      self.all.inject([]) do |results, bank|
-        results << bank if bank.city.index(substring)
-        results
+      # Returns an array of all banks.
+      def all
+        @banks ||= read_banks
+      end
+      
+      private
+
+      def read_banks
+        banks = []
+        filename = File.expand_path('data/blz.tsv')
+        CSV.foreach(filename, col_sep: "\t") do |r|
+          banks << new(r[0], r[2], r[3], r[4], r[5], r[7])
+        end
+        banks
       end
     end
+    
+    attr_reader :blz, :name, :zip, :city, :short_name, :bic
 
-    # Returns an array of all banks.
-    def self.all
-      # TODO is this the right way to do it?
-      Thread.current[:'BLZ::Bank.all'] ||= read_banks
+    # Initializes a single Bank record.
+    def initialize(blz, name, zip, city, short_name, bic)
+      @blz  = blz
+      @name = name 
+      @zip  = zip
+      @city = city
+      @bic  = bic
+      @short_name = short_name
     end
 
     # Returns a nice representation of the bank.
     def to_s
-      [blz, name, "#{zip} #{city}", bic].reject { |s| s.empty? }.join ", "
+      [blz, name, "#{zip} #{city}", bic].compact.reject(&:empty?).join(', ')
     end
-
-  private
-
-    def self.read_banks
-      banks = []
-      filename = File.join(File.dirname(__FILE__), '..', '..', 'data', 'blz.tsv')
-      File.foreach(filename) do |line|
-        columns = line.split /\t/
-        blz = columns[0].strip
-        name = columns[2].strip
-        zip = columns[3].strip
-        city = columns[4].strip
-        short_name = columns[5].strip
-        bic = columns[7].strip
-        banks << Bank.new(blz, name, zip, city, short_name, bic)
-      end
-      banks
-    end
-
   end
-end
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler