mercury_banking 0.5.36 → 0.5.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a204ef3a88607de2674a812b67b13aca1c3d55ab5ce30898e291386f35d2100a
-  data.tar.gz: 74577f4d37da40c2b542e653883e6ac0564c0d755e17f5c63cfef55729dbc946
+  metadata.gz: fd83aeec4085d1c49fe77f7ca68fbc0b7c215dc37deafba3b36a20da0e7f46c4
+  data.tar.gz: 102b6b607353df20f4494c758935fe3f3517a2a4c95fca8440f9598b364d4f71
 SHA512:
-  metadata.gz: 5684f7edb49b46b8d0a2629fa1f5a8fcd3deff88f82fc4c30b20226eb54d300b78df9e86e153d0a0e75eace6befa9465b1adaa5c1e4b366cfc4ef098356fd76d
-  data.tar.gz: 8673739e687274aaa9cc7c81d5fa3346eb8b68d76a48e60502db9572ff1986c654f9323215a91c0ee8590d1cb414471140524d9b82ca11fecdedf4a4a08bc2a3
+  metadata.gz: 06a9d7eea59264a65f07ef4073189c390b8b0d025bdbeced8af797d06f67066e14cd704db814ad61ebaedd03c0682171a5604b2be295463751808b2ddc2057b5
+  data.tar.gz: b4898456ae09b4cceb0bf6a23c01fe7f860073fd76d069f1b70c0e5a4fc8c266ce52999351dfc319178730cea7779c9649076c43398604aaeadf9824ce9d8d49

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mercury_banking (0.5.36)
+    mercury_banking (0.5.38)
       activesupport (~> 7.0.0)
       dotenv (~> 2.8)
       fiddle (~> 1.1)

data/lib/mercury_banking/api.rb

@@ -112,6 +112,7 @@ module MercuryBanking
           account_transactions.each do |transaction|
             transaction["accountName"] = account["name"]
             transaction["accountId"] = account["id"]
+            transaction["accountNumber"] = account["accountNumber"]
           end
           all_transactions.concat(account_transactions)
         rescue StandardError => e

data/lib/mercury_banking/cli/transactions.rb

@@ -27,7 +27,7 @@ module MercuryBanking
               end_date = options[:end_date]
               
               # Get format
-              format = options[:format]
+              format = options[:format] || 'all'
               
               # Get verbose option
               verbose = options[:verbose]
@@ -36,12 +36,20 @@ module MercuryBanking
               accounts.each do |account|
                 account_id = account["id"]
                 account_name = account["name"]
+                account_number = account["accountNumber"]
                 
                 puts "Fetching transactions for #{account_name} (#{account_id})..."
                 
                 # Get all transactions for this account
                 transactions = client.get_transactions(account_id, start_date)
                 
+                # Add account information to each transaction
+                transactions.each do |transaction|
+                  transaction["accountName"] = account_name
+                  transaction["accountId"] = account_id
+                  transaction["accountNumber"] = account_number
+                end
+                
                 # Filter by end date if specified
                 if end_date
                   end_date_obj = Date.parse(end_date)
@@ -135,6 +143,13 @@ module MercuryBanking
               puts "Fetching transactions for #{account["name"]}..."
               transactions = client.get_transactions(account_id, start_date)
               
+              # Add account information to each transaction
+              transactions.each do |transaction|
+                transaction["accountName"] = account["name"]
+                transaction["accountId"] = account["id"]
+                transaction["accountNumber"] = account["accountNumber"]
+              end
+              
               # Filter by end date if specified
               if end_date
                 end_date_obj = Date.parse(end_date)

data/lib/mercury_banking/reports/balance_sheet.rb

@@ -461,12 +461,27 @@ module MercuryBanking
       end
       
       def write_ledger_account_declarations(file, transactions)
-        # Get unique account names from transactions
-        account_names = transactions.map { |t| t["accountName"] || "Unknown Account" }.uniq
+        # Get unique accounts from transactions
+        accounts = transactions.map do |t| 
+          {
+            "name" => t["accountName"] || "Unknown Account",
+            "number" => t["accountNumber"]
+          }
+        end.uniq { |a| [a["name"], a["number"]] }
         
         # Define accounts dynamically based on transaction data
-        account_names.each do |account_name|
-          file.puts "account Assets:#{account_name}"
+        accounts.each do |account|
+          account_name = account["name"]
+          account_number = account["number"]
+          
+          # Format the account name to include the account number if available
+          formatted_account_name = if account_number
+                                     "#{account_name} #{account_number.to_s[-4..-1]}"
+                                   else
+                                     account_name
+                                   end
+          
+          file.puts "account Assets:#{formatted_account_name}"
         end
         file.puts "account Expenses:Unknown"
         file.puts "account Income:Unknown"
@@ -490,23 +505,31 @@ module MercuryBanking
         description = transaction["bankDescription"] || transaction["externalMemo"] || "Unknown transaction"
         amount = transaction["amount"]
         account_name = transaction["accountName"] || "Unknown Account"
+        account_number = transaction["accountNumber"]
         
         file.puts "#{date} #{description}"
         file.puts "    ; Transaction ID: #{transaction["id"]}"
         file.puts "    ; Status: #{transaction["status"]}"
         file.puts "    ; Reconciled: No"
         
-        write_ledger_postings(file, amount, account_name)
+        write_ledger_postings(file, amount, account_name, account_number)
         file.puts
       end
       
-      def write_ledger_postings(file, amount, account_name)
+      def write_ledger_postings(file, amount, account_name, account_number = nil)
+        # Format the account name to include the account number if available
+        formatted_account_name = if account_number
+                                   "#{account_name} #{account_number.to_s[-4..-1]}"
+                                 else
+                                   account_name
+                                 end
+        
         if amount > 0
           file.puts "    Income:Unknown          $-#{format("%.2f", amount)}"
-          file.puts "    Assets:#{account_name}    $#{format("%.2f", amount)}"
+          file.puts "    Assets:#{formatted_account_name}    $#{format("%.2f", amount)}"
         else
           file.puts "    Expenses:Unknown          $#{format("%.2f", amount.abs)}"
-          file.puts "    Assets:#{account_name}    $-#{format("%.2f", amount.abs)}"
+          file.puts "    Assets:#{formatted_account_name}    $-#{format("%.2f", amount.abs)}"
         end
       end
       
@@ -529,14 +552,30 @@ module MercuryBanking
       end
       
       def write_beancount_account_declarations(file, transactions)
-        # Get unique account names from transactions
-        account_names = transactions.map { |t| t["accountName"] || "Unknown Account" }.uniq
+        # Get unique accounts from transactions
+        accounts = transactions.map do |t| 
+          {
+            "name" => t["accountName"] || "Unknown Account",
+            "number" => t["accountNumber"]
+          }
+        end.uniq { |a| [a["name"], a["number"]] }
         
         # Define accounts dynamically based on transaction data
-        account_names.each do |account_name|
+        accounts.each do |account|
+          account_name = account["name"]
+          account_number = account["number"]
+          
           # Sanitize account name for beancount format
           safe_account_name = account_name.gsub(/[^a-zA-Z0-9]/, '-')
-          file.puts "1970-01-01 open Assets:#{safe_account_name}"
+          
+          # Format the account name to include the account number if available
+          formatted_account_name = if account_number
+                                     "#{safe_account_name}-#{account_number.to_s[-4..-1]}"
+                                   else
+                                     safe_account_name
+                                   end
+          
+          file.puts "1970-01-01 open Assets:#{formatted_account_name}"
         end
         file.puts "1970-01-01 open Expenses:Unknown"
         file.puts "1970-01-01 open Income:Unknown"
@@ -560,6 +599,8 @@ module MercuryBanking
         description = transaction["bankDescription"] || transaction["externalMemo"] || "Unknown transaction"
         amount = transaction["amount"]
         account_name = transaction["accountName"] || "Unknown Account"
+        account_number = transaction["accountNumber"]
+        
         # Sanitize account name for beancount format
         safe_account_name = account_name.gsub(/[^a-zA-Z0-9]/, '-')
         
@@ -568,17 +609,24 @@ module MercuryBanking
         file.puts "  ; Status: #{transaction["status"]}"
         file.puts "  ; Reconciled: No"
         
-        write_beancount_postings(file, amount, safe_account_name)
+        write_beancount_postings(file, amount, safe_account_name, account_number)
         file.puts
       end
       
-      def write_beancount_postings(file, amount, account_name)
+      def write_beancount_postings(file, amount, account_name, account_number = nil)
+        # Format the account name to include the account number if available
+        formatted_account_name = if account_number
+                                   "#{account_name}-#{account_number.to_s[-4..-1]}"
+                                 else
+                                   account_name
+                                 end
+        
         if amount > 0
           file.puts "  Income:Unknown          -#{format("%.2f", amount)} USD"
-          file.puts "  Assets:#{account_name}    #{format("%.2f", amount)} USD"
+          file.puts "  Assets:#{formatted_account_name}    #{format("%.2f", amount)} USD"
         else
           file.puts "  Expenses:Unknown          #{format("%.2f", amount.abs)} USD"
-          file.puts "  Assets:#{account_name}    -#{format("%.2f", amount.abs)} USD"
+          file.puts "  Assets:#{formatted_account_name}    -#{format("%.2f", amount.abs)} USD"
         end
       end
     end

data/lib/mercury_banking/version.rb

@@ -1,3 +1,3 @@
 module MercuryBanking
-  VERSION = "0.5.36"
+  VERSION = "0.5.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury_banking
 version: !ruby/object:Gem::Version
-  version: 0.5.36
+  version: 0.5.38
 platform: ruby
 authors:
 - Jonathan Siegel