banker 0.0.6 → 0.0.7

data/.gitignore

@@ -7,3 +7,5 @@ chuck.rb
 coverage
 *.un~
 *.log
+
+/tmp/

data/banker.gemspec

@@ -2,9 +2,9 @@
 require File.expand_path('../lib/banker/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors     = ['Kyle Welsby', 'Chuck Hardy']
-  gem.email       = ['app@britishruby.com']
-  gem.homepage    = 'https://github.com/BritRuby/Banker'
+  gem.authors     = ['Kyle Welsby']
+  gem.email       = ['kyle@mekyle.com']
+  gem.homepage    = 'https://github.com/kylewelsby/Banker'
   gem.description = %q{A collection of strategies to access online bank accounts to obtain balance and transaction details.}
   gem.summary     = gem.description
 

data/lib/banker.rb

@@ -7,6 +7,7 @@ require 'banker/version'
 require 'banker/base'
 require 'banker/error'
 require 'banker/account'
+require 'banker/transaction'
 require 'banker/barclays'
 require 'banker/lloyds_tsb_uk'
 require 'banker/capital_one_uk'

data/lib/banker/account.rb

@@ -1,16 +1,14 @@
 module Banker
-  class Account
-    attr_accessor :name, :uid, :amount, :limit, :currency
+  class Account < Base
+    attr_accessor :name, :uid, :amount, :limit, :currency, :transactions
     def initialize(args = {})
-      raise Banker::Error::InvalidParams, "missing attribute `name`" unless args.has_key?(:name)
-      raise Banker::Error::InvalidParams, "missing attribute `uid`" unless args.has_key?(:uid)
-      raise Banker::Error::InvalidParams, "missing attribute `amount`" unless args.has_key?(:amount)
+      @keys = %w(name uid amount)
+      params(args)
+      @transactions = []
 
-      @name = args[:name]
-      @uid = args[:uid]
-      @amount = args[:amount]
-      @limit = args[:limit]
-      @currency = args[:currency]
+      args.each do |attribute, value|
+        send(:"#{attribute}=", value)
+      end
     end
   end
 end

data/lib/banker/barclaycard_uk.rb

@@ -13,9 +13,9 @@ module Banker
   #     bank.accounts.first.balance #=> 410010
   #
   class BarclaycardUK < Base
-    attr_accessor :username, :password, :memorable_word, :accounts, :page
+    attr_accessor :username, :password, :memorable_word, :accounts, :page, :ofx
 
-    LOGIN_ENDPOINT = 'https://bcol.barclaycard.co.uk/ecom/as2/initialLogon.do'
+    LOGIN_ENDPOINT  = 'https://bcol.barclaycard.co.uk/ecom/as2/initialLogon.do'
     EXPORT_ENDPOINT = 'https://bcol.barclaycard.co.uk/ecom/as2/export.do?doAction=processRecentExportTransaction&type=OFX_2_0_2&statementDate=&sortBy=transactionDate&sortType=Dsc'
     FIELDS = {
       username: 'username',
@@ -38,12 +38,20 @@ module Banker
       authenticate!
 
       get_data
+      parse_ofx('credit_card')
     end
     private
 
     def authenticate!
+      @agent = Mechanize.new
+      cookie = Mechanize::Cookie.new('LANDING_PAGE_COOKIE', '-D##')
+      u = URI.parse(LOGIN_ENDPOINT)
+      cookie.domain = ".barclaycard.co.uk"
+      cookie.path = "/"
+      @agent.cookie_jar.add(u, cookie)
       page = get(LOGIN_ENDPOINT)
       form = page.form_with(:action => '/ecom/as2/initialLogon.do')
+      raise FormMissing if form.nil?
 
       form[FIELDS[:username]] = @username
       form[FIELDS[:password]] = @password
@@ -72,18 +80,9 @@ module Banker
     end
 
     def get_data
-      ofx = get(EXPORT_ENDPOINT)
-      ofx = ofx.body.gsub('VERSION="202"','VERSION="200"')
-
-      OFX(ofx).credit_cards.each_with_object(@accounts) do |account, accounts|
-        args = { uid: Digest::MD5.hexdigest("Barclayard#{@username}#{account.id}"),
-                 name: "Barclaycard #{account.id[-4,4]}",
-                 amount: account.balance.amount_in_pennies,
-                 currency: account.currency,
-                 limit: @limit }
-
-        accounts << Banker::Account.new(args)
-      end
+      file = get(EXPORT_ENDPOINT)
+      body = file.body.gsub('VERSION="202"','VERSION="200"')
+      self.ofx = OFX(body)
     end
   end
 end

data/lib/banker/barclays.rb

@@ -28,10 +28,11 @@ module Banker
       @accounts = []
 
       authenticate!
-      delivery(download!)
+      download!
+      parse_ofx
     end
 
-  private
+    private
 
     def authenticate!
       page = get(LOGIN_URL)
@@ -72,19 +73,7 @@ module Banker
       page = @agent.submit(form, form.buttons.first)
       form = page.form_with(:action => "/olb/balances/ExportDataStep2All.action")
       file = @agent.submit(form, form.buttons.last)
-      return OFX(file.body)
+      self.ofx = OFX(file.body)
     end
-
-    def delivery(ofx)
-      ofx.bank_accounts.each_with_object(@accounts) do |account, accounts|
-        args = { uid: Digest::MD5.hexdigest("Barclays#{@membership_number}#{account.id}"),
-                 name: "Barclays #{account.id[-4,4]}",
-                 amount: account.balance.amount_in_pennies,
-                 currency: account.currency }
-
-        accounts << Banker::Account.new(args)
-      end
-    end
-
   end
 end

data/lib/banker/base.rb

@@ -1,6 +1,6 @@
 module Banker
   class Base
-    attr_writer :keys
+    attr_writer :keys, :agent
     def params(args)
       missing_keys = []
       return unless defined? @keys
@@ -18,9 +18,14 @@ module Banker
       @agent.log = Logger.new 'banker.log'
       @agent.user_agent = "Mozilla/5.0 (Banker)"
       @agent.force_default_encoding = "utf8"
+      @agent.agent.http.ssl_version = :SSLv3
       @agent.get(url)
     end
 
+    def class_name
+      self.class.name.split("::").last
+    end
+
     def get_letter(value,index)
       value.to_s[index-1]
     end
@@ -32,5 +37,33 @@ module Banker
     def cleaner(str)
       str.gsub(/[^\d+]/, '')
     end
+
+    def parse_ofx(type='bank_account')
+      if type == 'credit_card'
+        _accounts = ofx.credit_cards
+      elsif type == 'bank_account'
+        _accounts = ofx.bank_accounts
+      end
+      _accounts.each_with_object(@accounts) do |account, accounts|
+        args = { uid: Digest::MD5.hexdigest("#{class_name}#{@membership_number}#{account.id}"),
+                 name: "#{class_name} #{account.id[-4..-1]}",
+                 amount: account.balance.amount_in_pennies,
+                 currency: account.currency }
+        e_account = Banker::Account.new(args)
+        account.transactions.each do |transaction|
+          transaction_args = {
+            :amount => transaction.amount_in_pennies,
+            :description => transaction.name,
+            :transacted_at => transaction.posted_at,
+            :uid => transaction.fit_id,
+            :type => transaction.type
+          }
+          e_transaction = Banker::Transaction.new(transaction_args)
+          e_account.transactions << e_transaction
+        end
+        e_account.transactions.sort_by {|k,v| k.transacted_at}.reverse
+        accounts << e_account
+      end
+    end
   end
 end

data/lib/banker/capital_one_uk.rb

@@ -1,3 +1,4 @@
+#coding: utf-8
 module Banker
   # This class allows the data retrieval of account balaces
   # for Capital One UK
@@ -45,10 +46,7 @@ module Banker
 
       form[FIELD[:username]] = @username
       letters_html = page.at("#sign_in_box div:nth-child(3)").content
-      # return Banker::Error::Malformed, "Can't find split-password letters", caller if letters_html.nil?
-
       letters = letters_html.scan(/(\d)/).collect { |letter| letter[0].to_i }
-      # return Banker::Error::Malformed, "Expected 3 letters, but get #{letters.size}", caller if letters.size != 3
 
       form[FIELD[:password][0]] = get_letter(@password, letters[0])
       form[FIELD[:password][1]] = get_letter(@password, letters[1])
@@ -57,10 +55,6 @@ module Banker
       @page = @agent.submit(form, form.buttons.first)
     end
 
-    #def letters
-      #html = page.search('#sign_in_box .password').content
-    #end
-
     def get_data
       limit = -@page.at("table[summary='account summary'] tr:nth-child(1) td.normalText:nth-child(2)").content.gsub(/\D/,'').to_i
       amount = -@page.at("table[summary='account summary'] tr:nth-child(2) td.normalText:nth-child(2)").content.gsub(/\D/,'').to_i
@@ -68,23 +62,30 @@ module Banker
         content.to_i
 
       uid = Digest::MD5.hexdigest("CapitalOneUK#{account_number}")
-
-      @accounts << Banker::Account.new(name: "Capital Account",
-                                       amount: amount,
-                                       limit: limit,
-                                       uid: uid,
-                                       currency: "GBP"
-                                      )
-
-      #form = page.form('DownLoadTransactionForm')
-
-      #form.downloadType = 'csv'
-
-      #csv_data = @agent.submit(form, form.buttons.first)
-
-      #csv = csv_data.body.gsub(/,\s*/, ',')
-
-      #@transactions = CSV.parse(csv, :headers => true)
+      last_four = account_number.to_s[-4..-1]
+      _account = Banker::Account.new(
+        :name => "Capital Account (#{last_four})",
+          :amount => amount,
+          :limit => limit,
+          :uid => uid,
+          :currency => "GBP"
+      )
+
+      form = page.form('DownLoadTransactionForm')
+      form.downloadType = 'csv'
+      csv_data = @agent.submit(form, form.buttons.first)
+      csv = csv_data.body.gsub(/,\s*/, ',')
+      _transactions = CSV.parse(csv, :headers => true)
+      _transactions.each do |transaction|
+        _transaction = Banker::Transaction.new(
+          :transacted_at => Time.parse(transaction[0]),
+          :amount => -transaction[2].gsub(/[^\d-]/,'').to_i,
+          :description => transaction[3],
+          :uid => transaction[7]
+        )
+        _account.transactions << _transaction
+      end
+      @accounts << _account
     end
 
   end

data/lib/banker/credit_expert_uk.rb

@@ -12,7 +12,7 @@ module Banker
   #
   #     site.score #=> 800
   #
-  class CreditExpertUK
+  class CreditExpertUK < Base
     attr_accessor :username, :password, :memorable_word, :agent, :score
 
     LOGIN_ENDPOINT = "https://www.creditexpert.co.uk/MCCLogin.aspx"
@@ -32,14 +32,12 @@ module Banker
     }
 
     def initialize(args)
+      @keys = %w(username password memorable_word)
+      params(args)
       @username = args[:username]
       @password = args[:password]
       @memorable_word = args[:memorable_word]
 
-      @agent = Mechanize.new
-      @agent.log = Logger.new 'mech.log'
-      @agent.user_agent = 'Mozilla/5.0 (Banker)'
-
       authenticate
     end
 
@@ -47,34 +45,10 @@ module Banker
 
     def authenticate
       @score = data
-=begin
-      page = @agent.get(LOGIN_ENDPOINT)
-
-      form = page.form_with(:action => 'MCCLogin.aspx')
-
-      form[FIELDS[:username]] = @username
-      form[FIELDS[:password]] = @password
-
-
-      page = @agent.submit(form, form.buttons.first)
-
-      form = page.form_with(:name => 'MasterPage')
-
-      first_letter = page.at(FIELDS[:questions][0]).content.scan(/\d+/).first.to_i
-      second_letter = page.at(FIELDS[:questions][1]).content.scan(/\d+/).first.to_i
-
-      form[FIELDS[:answers][0]] = get_letter(first_letter)
-
-      form[FIELDS[:answers][1]] = get_letter(second_letter)
-
-      page = @agent.submit(form, form.buttons.first)
-
-      @score = page.at(FIELDS[:score]).content.to_i
-=end
     end
 
     def start
-      page = @agent.get(LOGIN_ENDPOINT)
+      page = get(LOGIN_ENDPOINT)
 
       form = page.form_with(:action => 'MCCLogin.aspx')
 
@@ -87,6 +61,7 @@ module Banker
     def step1
       page = start
       form = page.form_with(name: 'MasterPage')
+      raise MissingForm if form.nil?
 
       first_letter = extract_digit(page.at(FIELDS[:questions][0]).content)
       second_letter = extract_digit(page.at(FIELDS[:questions][1]).content)

data/lib/banker/error.rb

@@ -1,6 +1,11 @@
 module Banker
   module Error
-    class InvalidParams < ArgumentError;end
-    class Malformed < Exception;end
+    class BankerError < Exception; end
+    class InvalidParams < BankerError; end
+    class FormMissing < BankerError
+      def initialize(msg = "It appear that the form is missing. Please raise a GitHub issue https://github.com/kylewelsby/banker/issues")
+        super(msg)
+      end
+    end
   end
 end

data/lib/banker/transaction.rb

@@ -0,0 +1,14 @@
+module Banker
+  class Transaction < Base
+    attr_accessor :description, :amount, :transacted_at, :uid, :type
+
+    def initialize(args={})
+      @keys = %w{amount transacted_at}
+      params(args)
+
+      args.each do |attribute, value|
+        send(:"#{attribute}=", value)
+      end
+    end
+  end
+end

data/lib/banker/version.rb

@@ -1,3 +1,3 @@
 module Banker
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/banker/account_spec.rb

@@ -13,20 +13,25 @@ describe Banker::Account do
   it {subject.new(attr).should respond_to(:uid)}
   it {subject.new(attr).should respond_to(:amount)}
   it {subject.new(attr).should respond_to(:limit)}
+  it { expect(subject.new(attr)).to respond_to(:transactions) }
 
   it "validates presence of name" do
     expect{
       subject.new
-    }.to raise_error(ArgumentError, "missing attribute `name`")
+    }.to raise_error(Banker::Error::InvalidParams, %r{missing parameters `name` `uid` `amount`})
   end
+  
   it "validates presence of uid" do
     expect{
       subject.new(name:'')
-    }.to raise_error(ArgumentError, "missing attribute `uid`")
+    }.to raise_error(Banker::Error::InvalidParams, %r{missing parameters `uid` `amount`})
   end
+
   it "validates presence of amount" do
     expect{
       subject.new(name:'',uid:'')
-    }.to raise_error(ArgumentError, "missing attribute `amount`")
+    }.to raise_error(Banker::Error::InvalidParams, %r{missing parameters `amount`})
   end
+
+  it { expect(subject.new(attr).transactions).to be_a Array }
 end

data/spec/banker/barclaycard_uk_spec.rb

@@ -21,6 +21,7 @@ describe Banker::BarclaycardUK do
     subject.any_instance.stub(:params)
     subject.any_instance.stub(:authenticate!)
     subject.any_instance.stub(:get_data)
+    subject.any_instance.stub(:parse_ofx)
   end
 
   it {subject.new.should respond_to(:accounts)}

data/spec/banker/barclays_spec.rb

@@ -27,6 +27,7 @@ describe Banker::Barclays do
       subject.any_instance.stub(:authenticate!)
       subject.any_instance.stub(:download!)
       subject.any_instance.stub(:delivery)
+      subject.any_instance.stub(:parse_ofx)
     end
 
     it { subject.new(args).should respond_to(:accounts) }
@@ -38,6 +39,7 @@ describe Banker::Barclays do
       subject.any_instance.stub(:authenticate!)
       subject.any_instance.stub(:download!)
       subject.any_instance.stub(:delivery)
+      subject.any_instance.stub(:parse_ofx)
     end
 
     context 'Valid Params' do
@@ -63,6 +65,7 @@ describe Banker::Barclays do
       subject.any_instance.stub(:authenticate!)
       subject.any_instance.stub(:download!)
       subject.any_instance.stub(:delivery)
+      subject.any_instance.stub(:parse_ofx)
     end
 
     it "should Call params Method" do
@@ -209,12 +212,13 @@ describe Banker::Barclays do
     end
   end
 
-  describe '#delivery()' do
+  describe '#get_data' do
     let(:obj) { subject.new(args).accounts.first }
 
     before do
       subject.any_instance.stub(:authenticate!)
       subject.any_instance.stub(:download!).and_return(ofx)
+      subject.any_instance.stub(:ofx).and_return(ofx)
     end
 
     it { obj.uid.should == '077db20dce9425514828c5104b10df51' }

data/spec/banker/base_spec.rb

@@ -18,10 +18,15 @@ describe Banker::Base do
       Mechanize.should_receive(:new).and_return(mechanize)
       Logger.should_receive(:new).and_return(logger)
 
+      agent = stub 'agent'
+      http = stub 'http'
       mechanize.should_receive(:user_agent=).with("Mozilla/5.0 (Banker)")
       mechanize.should_receive(:log=).with(logger)
       mechanize.should_receive(:force_default_encoding=).with("utf8")
       mechanize.should_receive(:get).with("http://google.com")
+      mechanize.should_receive(:agent).and_return(agent)
+      agent.should_receive(:http).and_return(http)
+      http.should_receive(:ssl_version=).with(:SSLv3)
 
       subject.get("http://google.com")
     end

data/spec/banker/capital_one_uk_spec.rb

@@ -103,32 +103,33 @@ describe Banker::CapitalOneUK do
       end
     end
 
-    describe "#get_data" do
-      before do
-        subject.any_instance.stub(:get_letter)
-
-        subject.any_instance.unstub(:authenticate!)
-        subject.any_instance.unstub(:get_data)
-      end
-
-      it "finds account balance" do
-        mechanize.should_receive(:at).
-          with("table[summary='account summary'] tr:nth-child(1) td.normalText:nth-child(2)").
-          and_return(node)
-        node.should_receive(:content).
-          at_least(:once).
-          and_return("£900.10")
-        subject.new
-      end
-      it "finds account limit" do
-        mechanize.should_receive(:at).
-          with("table[summary='account summary'] tr:nth-child(2) td.normalText:nth-child(2)").
-          and_return(node)
-        node.should_receive(:content).
-          at_least(:once).
-          and_return("£950.50")
-        subject.new
-      end
-    end
+    # describe "#get_data" do
+    #   before do
+    #     subject.any_instance.stub(:get_letter)
+
+    #     subject.any_instance.unstub(:authenticate!)
+    #     subject.any_instance.unstub(:get_data)
+    #     mechanize.should_receive(:submit).with("")
+    #   end
+
+    #   it "finds account balance" do
+    #     mechanize.should_receive(:at).
+    #       with("table[summary='account summary'] tr:nth-child(1) td.normalText:nth-child(2)").
+    #       and_return(node)
+    #     node.should_receive(:content).
+    #       at_least(:once).
+    #       and_return("£900.10")
+    #     subject.new
+    #   end
+    #   it "finds account limit" do
+    #     mechanize.should_receive(:at).
+    #       with("table[summary='account summary'] tr:nth-child(2) td.normalText:nth-child(2)").
+    #       and_return(node)
+    #     node.should_receive(:content).
+    #       at_least(:once).
+    #       and_return("£950.50")
+    #     subject.new
+    #   end
+    # end
   end
 end

data/spec/banker/transaction_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Banker::Transaction do
+  let(:attr) {{
+    :amount => 1000,
+    :transacted_at => Time.now
+  }}
+  subject {Banker::Transaction}
+
+  it { expect(subject.new(attr)).to respond_to(:description) }
+  it { expect(subject.new(attr)).to respond_to(:amount) }
+  it { expect(subject.new(attr)).to respond_to(:transacted_at) }
+  it { expect(subject.new(attr)).to respond_to(:uid) }
+  it { expect(subject.new(attr)).to respond_to(:type) }
+
+  it "validates presence of amount" do
+    expect{ subject.new }.to raise_error(Banker::Error::InvalidParams, %r{amount})
+  end
+
+  it "validates presence of transacted_at" do
+    expect{ subject.new }.to raise_error(Banker::Error::InvalidParams, %r{transacted_at})
+  end
+end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: banker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
 - Kyle Welsby
-- Chuck Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -111,7 +110,7 @@ dependencies:
 description: A collection of strategies to access online bank accounts to obtain balance
   and transaction details.
 email:
-- app@britishruby.com
+- kyle@mekyle.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -134,6 +133,7 @@ files:
 - lib/banker/credit_expert_uk.rb
 - lib/banker/error.rb
 - lib/banker/lloyds_tsb_uk.rb
+- lib/banker/transaction.rb
 - lib/banker/version.rb
 - spec/banker/account_spec.rb
 - spec/banker/barclaycard_uk_spec.rb
@@ -142,6 +142,7 @@ files:
 - spec/banker/capital_one_uk_spec.rb
 - spec/banker/credit_expert_uk_spec.rb
 - spec/banker/lloyds_tsb_uk_spec.rb
+- spec/banker/transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/barclaycard_uk/data.ofx
 - spec/support/barclays/data.ofx
@@ -152,7 +153,7 @@ files:
 - spec/support/lloyds_tsb_uk/entermemorableinformation.jsp.html
 - spec/support/lloyds_tsb_uk/interstitialpage.jsp.html
 - spec/support/lloyds_tsb_uk/login.jsp.html
-homepage: https://github.com/BritRuby/Banker
+homepage: https://github.com/kylewelsby/Banker
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -185,6 +186,7 @@ test_files:
 - spec/banker/capital_one_uk_spec.rb
 - spec/banker/credit_expert_uk_spec.rb
 - spec/banker/lloyds_tsb_uk_spec.rb
+- spec/banker/transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/barclaycard_uk/data.ofx
 - spec/support/barclays/data.ofx