natwest 0.1.2 → 0.2.0

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_development_dependency "yard", ">= 0"
     gem.add_dependency "highline", ">= 0"
     gem.extra_rdoc_files = []
+    gem.rdoc_options = []
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -22,16 +23,9 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require 'rspec/core/rake_task'
+Rspec::Core::RakeTask.new do |spec|
+  spec.ruby_opts = '-r./spec/spec_helper'
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/nw

@@ -26,14 +26,18 @@ credentials = YAML.load(File.read(CONFIG)) rescue {}
   end
 end
 
-Natwest::Account.new.tap do |nw|
+Natwest::Customer.new.tap do |nw|
   nw.login credentials
-  puts "#{nw.account_number} (#{nw.sort_code}) " +
-       "balance: #{nw.balance}; available: #{nw.available}"
-  puts "\nRecent Transactions:"
-  nw.recent_transactions.each do |trans|
-    amount = trans[:credit] ? "+#{trans[:credit]}" : "-#{trans[:debit]}"
-    puts "#{trans[:date]}: #{amount}"
-    puts "\t" + trans[:details]
+  nw.accounts.each do |acc|
+    puts '###'
+    puts "#{acc.name} [#{acc.number}; #{acc.sort_code}] " +
+       "balance: #{acc.balance}; available: #{acc.available}"
+    puts "\nRecent Transactions:"
+    acc.transactions.each do |trans|
+      amount = trans[:credit] ? "+#{trans[:credit]}" : "-#{trans[:debit]}"
+      puts "#{trans[:date]}: #{amount}"
+      puts "\t" + trans[:details]
+    end
+    puts
   end
 end

data/lib/natwest.rb

@@ -64,49 +64,38 @@ module Natwest
     end
   end
 
-  class Account
+  class Customer
     include Login
     NO_DETAILS = 'No further transaction details held'
     attr_accessor :page
 
     def initialize
-      @ua = WWW::Mechanize.new {|ua| ua.user_agent_alias = 'Windows IE 7'}
+      @ua = Mechanize.new {|ua| ua.user_agent_alias = 'Windows IE 7'}
     end
 
-    def meta_row(field=nil)
-      assert(logged_in?, "Not logged in")
-      @meta_row ||= page.parser.
-                    css('table#ctl00_mainContent_Accounts > tbody > tr').
-                    first
-      return @meta_row unless field
-      @meta_row.css("td > span.#{field} > span").first.inner_text.tr(' ','')
-    end
-
-    def account_number
-      meta_row('AccountNumber').to_i
-    end
-
-    def sort_code
-      meta_row('SortCode')
-    end
-
-    def balance
-      meta_row.css('td')[3].inner_text
-    end
-
-    def available
-      meta_row.css('td')[4].inner_text
-    end
-
-    def recent_transactions
-      page.parser.css('table.InnerAccountTable > tbody > tr').map do |tr|
-        transaction = Hash[[:date, :details, :credit, :debit].
-          zip((cells = tr.css('td')).map(&:inner_text))]
-        unless (further = cells[1]['title']) == NO_DETAILS
-          transaction[:details] += " (#{further.squeeze(' ')})"
+    def accounts
+      page.parser.css('table.AccountTable > tbody > tr').each_slice(2).map do |meta, statement|
+        Account.new.tap do |acc|
+          acc.name = meta.at('td > span.AccountName').inner_text
+          acc.number = meta.at('td > span.AccountNumber').inner_text.gsub(/[^\d]/,'')
+          acc.sort_code = meta.at('td > span.SortCode').inner_text.gsub(/[^\d-]/,'')
+          acc.balance = meta.css('td')[-2].inner_text
+          acc.available = meta.css('td')[-1].inner_text
+          acc.transactions = 
+            statement.css('table.InnerAccountTable > tbody > tr').map do |tr|
+            transaction = Hash[[:date, :details, :credit, :debit].
+              zip((cells = tr.css('td')).map(&:inner_text))]
+            unless (further = cells[1]['title']) == NO_DETAILS
+              transaction[:details] += " (#{further.squeeze(' ')})"
+            end
+            Hash[transaction.map{|k,v| [k, v == ' - ' ? nil : v]}]
+          end
         end
-        Hash[transaction.map{|k,v| [k, v == ' - ' ? nil : v]}]
       end
     end
   end
+
+  class Account 
+    attr_accessor :name, :number, :sort_code, :balance, :available, :transactions
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: natwest
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Run Paint Run Run
@@ -9,39 +14,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 +00:00
+date: 2010-05-05 00:00:00 +01:00
 default_executable: nw
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: View balance and recent transactions of a Natwest account from the command line.
 email: runrun@runpaint.org
 executables: 
@@ -67,26 +80,28 @@ homepage: http://github.com/runpaint/natwest
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rudimentary API for Natwest Online Banking