Changeset 1064 for easyweb

Timestamp:

09/08/08 23:58:29 (18 months ago)

Author:

vasi

Message:

seems to really work

Location:

easyweb/trunk

Files:

• TODO (deleted)
• lib/easyweb.rb (modified) (1 diff)
• lib/easyweb/account.rb (modified) (2 diffs)
• lib/easyweb/delegate.rb (modified) (2 diffs)
• lib/easyweb/delegate/debug-dir.rb (modified) (1 diff)
• script/all-activity.rb (moved) (moved from easyweb/trunk/script/wesabe-add.rb) (1 diff)
• script/wesabe-update.rb (modified) (1 diff)

easyweb/trunk/lib/easyweb.rb

@@ -9 +9 @@
         
         # Create a new EasyWeb object, using the given delegate for callbacks
-        def initialize(*delegate)
+        def initialize(*delegate, &block)
                 if delegate.size == 1 && Delegate === delegate.first
                         @delegate = delegate.first
                 else
-                        @delegate = Delegate.new(*delegate)
+                        @delegate = Delegate.new(*delegate, &block)
                 end
                 

easyweb/trunk/lib/easyweb/account.rb

@@ -59 +59 @@
                 tried = 0
                 got = []
-                while max && tried < max
+                while max.nil? || tried < max
                         tried += 1
                         begin
@@ -66 +66 @@
                         rescue DownloadError => e
                                 err_count += 1
-                                raise e if err_count > max_consec_errs && found.empty?
+                                raise e if err_count > max_consec_errs && got.empty?
                                 log.warn("%s: %s" % [name, e.message]) if log
                                 break if err_count > max_consec_errs # we're done

easyweb/trunk/lib/easyweb/delegate.rb

@@ -5 +5 @@
 #       :DelegateName => ["some", "args"])
 class EasyWeb::Delegate
-        def initialize(*mixins)
+        def initialize(*mixins, &block)
                 @delegates = []
                 
@@ -26 +26 @@
                 @delegates.concat(mixins)
                 @delegates << Interface.new
+                (class << self; self; end).instance_eval(&block) if block
         end
         
-        def method_missing(meth, *args)
+        def delegate_method(meth, *args)
                 @delegates.each do |d|
                         return d.__send__(meth, *args) if d.respond_to?(meth)
                 end
         end
+        alias :method_missing :delegate_method
 end
 

easyweb/trunk/lib/easyweb/delegate/debug-dir.rb

@@ -16 +16 @@
                 @log_level = level
                 @debug_dir = dir
+                Dir.mkdir(@debug_dir) unless File.directory?(@debug_dir)
         end
 end

easyweb/trunk/script/all-activity.rb

@@ -1 +1 @@
 #!/usr/bin/ruby
+require 'rubygems'
 require 'easyweb'
-require 'keychain'
-require 'wesabe'
 
+card, dir, acc_name, acc_type = ARGV
 
-EasyWebAuth = EasyWeb::KeychainAuthenticator.new('EasyWeb')
-AccountTypes = { 'VALUE ACCOUNT' => EasyWeb::Savings,
-        'TD GREEN VISA' => EasyWeb::CreditCard }
+easyweb = EasyWeb.new(
+        :CAFile => '/usr/share/curl/curl-ca-bundle.crt',
+        :DebugInteractive => nil,
+        :AuthConsole => nil) do
+                define_method(:access_card) { card }
+                define_method(:account_type) { acc_type }
+end
 
-easyweb = EasyWeb.new
-easyweb.login(EasyWebAuth)
-easyweb.account_types = AccountTypes
-
-
-InstitutionID = 'us-003429'
-WesabeAuth = MacKeychain.new.internet_password(:server => 'www.wesabe.com')
-
-wesabe = Wesabe.new(WesabeAuth.account, WesabeAuth.password)
-
-
-acc = *easyweb.accounts('TD GREEN VISA')
-ofx = acc.all_data(EasyWeb::Quicken)
-wesabe.upload(ofx, InstitutionID)
+acc = easyweb.account(acc_name)
+ofxs = acc.download_all
+Dir.mkdir(dir) unless File.directory?(dir)
+ofxs.each_with_index do |o, i|
+        open(File.join(dir, "%03d.ofx" % [i]), 'w') { |f| f.write(o) }
+end

easyweb/trunk/script/wesabe-update.rb

@@ -1 +1 @@
 #!/usr/bin/ruby
-require 'easyweb'
-require 'keychain'
+require 'rubygems'
 require 'wesabe'
 
-# EasyWeb account data constants
-EasyWebAuth = EasyWeb::KeychainAuthenticator.new('EasyWeb')
-AccountTypes = { 'VALUE ACCOUNT' => EasyWeb::Savings,
-        'TD GREEN VISA' => EasyWeb::CreditCard }
+# Requires an unreleased version for https passwords
+require 'rkeychain'
 
-# Setup EasyWeb, with debug capabilities
-easyweb = EasyWeb.new(:log_file => 'EasyWeb.log',
-        :marshal_on_error => 'EasyWeb.marshal')
-easyweb.login(EasyWebAuth)
-easyweb.account_types = AccountTypes
+require 'easyweb'
 
-# Setup Wesabe account
-InstitutionID = 'us-003429'
-WesabeAuth = MacKeychain.new.internet_password(:server => 'www.wesabe.com')
-wesabe = Wesabe.new(WesabeAuth.account, WesabeAuth.password)
+# Some constants
+Account = Struct.new(:easyweb_name, :wesabe_name, :type)
+CAFile = '/usr/share/curl/curl-ca-bundle.crt'
+MaxStatements = 3
 
-# Download the account data, and upload to Wesabe
-easyweb.accounts.each do |acc|
-        ofx = acc.recent_data(EasyWeb::Quicken)
-        wesabe.upload(ofx, InstitutionID)
+
+# Configuration (Oh noez, people will know some of my account names)
+Accounts = [
+        Account.new('TD GREEN VISA', 'TD Canada Trust - Credit Card',
+                'Credit card'),
+#       Account.new('VALUE ACCOUNT', 'TD Canada Trust - Savings', 'Savings')
+]
+KeychainItem = 'EasyWeb'
+WesabeAccount = 'vasi'
+
+
+easyweb = EasyWeb.new(
+        :CAFile => CAFile,
+        :DebugDir => nil,
+        :AuthMacKeychain => KeychainItem,
+        :AccountTypeHash => Accounts.inject({}) \
+                { |h,a| h[a.wesabe_name] = a.type; h }
+)
+wesabe = Wesabe.new(WesabeAccount, Keychain.lookup_internet_passwd(
+                'serverName' => 'www.wesabe.com', 'accountName' => WesabeAccount))
+
+Accounts.each do |acc|
+        eacc = easyweb.account(acc.easyweb_name)
+        wacc = wesabe.accounts.find { |a| a.name == acc.wesabe_name }
+        eacc.download_statements(MaxStatements).each_with_index do |stmt, i|
+                puts "Upload #{i + 1} for #{eacc.name}"
+                upload = wacc.new_upload
+                upload.statement = stmt
+                upload.upload!
+        end
 end
-
-# Remove the debug files if we finish successfully
-%w[marshal log].map { |ext| "EasyWeb.#{ext}" }.each do |x|
-        File.unlink(x) if File.exist?(x)
-end