banking_data 0.3.0 → 0.4.0

data/lib/banking_data.rb

@@ -1,6 +1,7 @@
 require 'active_model'
 require 'smarter_csv'
 require 'banking_data/version'
+require 'banking_data/query'
 require 'banking_data/bank'
 require 'banking_data/german_bank'
 require 'banking_data/austrian_bank'

data/lib/banking_data/austrian_bank.rb

@@ -2,33 +2,47 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 
 class BankingData::AustrianBank < BankingData::Bank
-  include ActiveModel::Model
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+  include ActiveModel::AttributeMethods
 
-  attr_accessor :bic
+  LOCALE = :at
 
-  def self.all
-    @@all ||= get_all
-  end
+  attr_accessor :bic, :blz
+
+  class << self
 
-  def self.get_all
-    banks = []
-    SmarterCSV.process(file, opts).each do |line|
-      bic = line[:'swift-code'].try(:gsub, /"/, '')
-      banks << new(bic: bic)
+    delegate :where, :only, to: :query
+
+    def all
+      @@all ||= get_all
     end
-    banks
-  end
 
-  def self.file
-    File.dirname(__FILE__) +
-      '/../../data/kiverzeichnis_gesamt_de_1381499802577.csv'
-  end
+    def get_all
+      banks = []
+      SmarterCSV.process(file, opts).each do |line|
+        if line[:kennzeichen] == 'Hauptanstalt'
+          blz = line[:bankleitzahl].try(:gsub, /"/, '')
+          bic = line[:'swift-code'].try(:gsub, /"/, '')
+          banks << new(bic: bic, blz: blz)
+        end
+      end
+      banks
+    end
+
+    private
+
+      def file
+        File.dirname(__FILE__) +
+          '/../../data/kiverzeichnis_gesamt_de_1381499802577.csv'
+      end
 
-  def self.opts
-    {
-      col_sep: ';',
-      file_encoding: 'iso-8859-1',
-      force_simple_split: true
-    }
+      def opts
+        {
+          col_sep: ';',
+          file_encoding: 'iso-8859-1',
+          force_simple_split: true
+        }
+      end
   end
 end

data/lib/banking_data/bank.rb

@@ -1,37 +1,21 @@
 module BankingData
   class Bank
 
-    @@options = {}
-
-    # goal: do something like:
-    # BankingData::Bank.where(locale: :de).only(:bic)
-    def self.where(options = {})
-      locale = options.delete(:locale)
-      if locale == 'DE' || locale == :de
-        GermanBank.where(options)
-      elsif locale == 'AT' || locale == :at
-        AustrianBank.where(options)
-      elsif locale == 'CH' || locale == :ch
-        SwissBank.where(options)
-      elsif options.empty?
-        self
-      else
-        @@options = @@options.merge(options)
-        self
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        send("#{name}=", value)
       end
     end
 
-    def self.only(*attributes)
-      options = @@options
-      @@options = {}
-      all.select { |bank| options.map { |k, v| bank.send(k) == v }.all? }
-        .map { |bank| attributes.map { |attr| bank.send(attr) } }
-    end
+    class << self
 
-    def self.to_a
-      options = @@options
-      @@options = {}
-      all.select { |bank| options.map { |k, v| bank.send(k) == v }.all? }
+      def where(options)
+        Query.new(options)
+      end
+
+      def query
+        Query.new(locale: self::LOCALE)
+      end
     end
   end
 end

data/lib/banking_data/german_bank.rb

@@ -1,25 +1,36 @@
 require 'active_support/core_ext/object/blank'
 
 class BankingData::GermanBank < BankingData::Bank
-  include ActiveModel::Model
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+  include ActiveModel::AttributeMethods
+
+  LOCALE = :de
 
   attr_accessor :bic, :blz
 
-  def self.all
-    @@all ||= get_all
-  end
+  class << self
+
+    delegate :where, :only, to: :query
 
-  def self.get_all
-    banks = []
-    File.open(file).each_line do |line|
-      blz = line[0..7]
-      bic = line[139..149]
-      banks << new(bic: bic, blz: blz)
+    def all
+      @@all ||= get_all
     end
-    banks
-  end
 
-  def self.file
-    File.dirname(__FILE__) + '/../../data/BLZ_20130909.txt'
+    private
+
+      def get_all
+        banks = []
+        File.open(file).each_line do |line|
+          blz = line[0..7]
+          bic = line[139..149]
+          banks << new(bic: bic, blz: blz)
+        end
+        banks
+      end
+
+      def file
+        File.dirname(__FILE__) + '/../../data/BLZ_20130909.txt'
+      end
   end
 end

data/lib/banking_data/query.rb

@@ -0,0 +1,42 @@
+require 'active_support/core_ext/class/subclasses'
+
+module BankingData
+  class Query
+
+    delegate :each, :flatten, :map, :first, :last, to: :to_a
+    attr_accessor :options, :attributes, :locale
+
+    def initialize(options, only = nil)
+      @locale = options.delete(:locale)
+      @options = options
+      @attributes = only
+    end
+
+    def where(opts = {})
+      clone.tap do |query|
+        query.locale = opts.delete(:locale)
+        query.options = @options.merge(opts)
+      end
+    end
+
+    def only(*attrs)
+      clone.tap do |query|
+        query.attributes = attrs
+      end
+    end
+
+    def to_a
+      data = bank.all
+        .select { |bank| @options.map { |k, v| bank.send(k) == v }.all? }
+      if @attributes
+        data.map { |bank| @attributes.map { |attr| bank.send(attr) } }
+      else
+        data
+      end
+    end
+
+    def bank
+      Bank.subclasses.find { |bank_class| bank_class::LOCALE == locale }
+    end
+  end
+end

data/lib/banking_data/swiss_bank.rb

@@ -1,27 +1,37 @@
 require 'active_support/core_ext/object/blank'
 
 class BankingData::SwissBank < BankingData::Bank
-  include ActiveModel::Model
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+  include ActiveModel::AttributeMethods
 
-  attr_accessor :bic
+  LOCALE = :ch
 
-  def self.all
-    @@all ||= get_all
-  end
+  attr_accessor :bic, :blz
+
+  class << self
 
-  def self.get_all
-    banks = []
-    File.read(file, encoding: 'iso-8859-1').lines.each do |line|
-      kennzeichen = line[7..10]
-      if kennzeichen == '0000'
-        bic = line[284..294]
-        banks << new(bic: bic)
+    delegate :where, :only, to: :query
+
+    def all
+      @@all ||= get_all
+    end
+
+    def get_all
+      banks = []
+      File.read(file, encoding: 'iso-8859-1').lines.each do |line|
+        kennzeichen = line[7..10]
+        if kennzeichen == '0000'
+          blz = line[2..6].strip
+          bic = line[284..294]
+          banks << new(bic: bic, blz: blz)
+        end
       end
+      banks
     end
-    banks
-  end
 
-  def self.file
-    File.dirname(__FILE__) + '/../../data/bcbankenstamm.txt'
+    def file
+      File.dirname(__FILE__) + '/../../data/bcbankenstamm.txt'
+    end
   end
 end

data/lib/banking_data/version.rb

@@ -1,4 +1,4 @@
 module BankingData
   # banking_data version
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/banking_data/german_bank_spec.rb

@@ -13,7 +13,11 @@ module BankingData
       ['76350000', '37040044'].each do |blz|
         it "includes #{blz}" do
           expect(GermanBank.only(:blz).map(&:first)).to include(blz)
-          expect(Bank.where(locale: :de, blz: blz).only(:blz).first).to eq([blz])
+          expect(GermanBank.only(:blz).flatten).to include(blz)
+          expect(Bank.where(locale: :de, blz: blz).only(:blz).first)
+            .to eq([blz])
+          expect(Bank.where(blz: blz, locale: :de).only(:blz).last)
+            .to eq([blz])
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banking_data
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,6 +162,7 @@ files:
 - lib/banking_data/austrian_bank.rb
 - lib/banking_data/bank.rb
 - lib/banking_data/german_bank.rb
+- lib/banking_data/query.rb
 - lib/banking_data/swiss_bank.rb
 - lib/banking_data/version.rb
 - rubocop-todo.yml