mercury_banking 0.5.36 → 0.5.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a204ef3a88607de2674a812b67b13aca1c3d55ab5ce30898e291386f35d2100a
-  data.tar.gz: 74577f4d37da40c2b542e653883e6ac0564c0d755e17f5c63cfef55729dbc946
+  metadata.gz: d911a07f674d64b6c7f51721e61f6206bf8df0617a2ff49359fe60b0c21bfd67
+  data.tar.gz: 38ea8c7134a967578e272a579f584551aee9291704d801334282f668a92c9650
 SHA512:
-  metadata.gz: 5684f7edb49b46b8d0a2629fa1f5a8fcd3deff88f82fc4c30b20226eb54d300b78df9e86e153d0a0e75eace6befa9465b1adaa5c1e4b366cfc4ef098356fd76d
-  data.tar.gz: 8673739e687274aaa9cc7c81d5fa3346eb8b68d76a48e60502db9572ff1986c654f9323215a91c0ee8590d1cb414471140524d9b82ca11fecdedf4a4a08bc2a3
+  metadata.gz: e3c9026d8ddf19000481a2ade598537f0d8d499941e789c47615bdace60b90f96ba38928f4ba8ada644966cefb9458a3ece9d15b1f1743a46e0b6b4790eee45f
+  data.tar.gz: efd73dbe4b0020e26e235775dab67d1b728ca545404ddb6471020d1e75f21139e670ec045222538a51df49e45a5777afad1e31c9e1729ad1d20a804dadd896e9

data/Gemfile.lock

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

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.37"
 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.37
 platform: ruby
 authors:
 - Jonathan Siegel