mercury_banking 0.5.34 → 0.5.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30960a19dc6f93e69961414fa8eaa97d39821b5143c1c68f745d95f73f71fe38
-  data.tar.gz: 67b8f43f1035cd73bb266a82c306844781973c0cb51dcd2a2c8b9ef02c764c71
+  metadata.gz: d911a07f674d64b6c7f51721e61f6206bf8df0617a2ff49359fe60b0c21bfd67
+  data.tar.gz: 38ea8c7134a967578e272a579f584551aee9291704d801334282f668a92c9650
 SHA512:
-  metadata.gz: 947d1a012d252ad361cd629216cf4376a7580b947975f0f776b1f58bce82eb7f7fb6eaa0c737a194e3eff552b6e0a864c0aa2d8a5d6a2dd0e9ea16ffe09613b5
-  data.tar.gz: 40e68e11df82741dfa756e43a8d58dc335a03b9582489dec803a40785cda0abc1a4b03ff440bc5a3bb49db35c7f66d0e8c8f19b5546ee0bb86adcc4073ab7563
+  metadata.gz: e3c9026d8ddf19000481a2ade598537f0d8d499941e789c47615bdace60b90f96ba38928f4ba8ada644966cefb9458a3ece9d15b1f1743a46e0b6b4790eee45f
+  data.tar.gz: efd73dbe4b0020e26e235775dab67d1b728ca545404ddb6471020d1e75f21139e670ec045222538a51df49e45a5777afad1e31c9e1729ad1d20a804dadd896e9

data/Gemfile

@@ -9,7 +9,7 @@ gem 'dotenv'
 gem 'activesupport'
 gem 'terminal-table'
 gem 'pry'
-gem 'webmock'
+gem 'webmock', '~> 3.18'
 gem 'thor'
 gem 'symmetric-encryption'
 gem 'lockbox'

data/Gemfile.lock

@@ -1,8 +1,13 @@
 PATH
   remote: .
   specs:
-    mercury_banking (0.5.34)
+    mercury_banking (0.5.37)
       activesupport (~> 7.0.0)
+      dotenv (~> 2.8)
+      fiddle (~> 1.1)
+      json (~> 2.6)
+      lockbox (~> 1.1)
+      logger (~> 1.5)
       symmetric-encryption (~> 4.6.0)
       terminal-table (~> 1.8.0)
       thor (~> 1.2.0)
@@ -36,12 +41,14 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.6.0)
-    dotenv (3.1.7)
+    dotenv (2.8.1)
+    fiddle (1.1.2)
     hashdiff (1.1.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     json (2.10.1)
-    lockbox (2.0.1)
+    lockbox (1.4.1)
+    logger (1.6.6)
     method_source (1.1.0)
     minitest (5.25.4)
     parallel (1.26.3)
@@ -131,7 +138,7 @@ DEPENDENCIES
   symmetric-encryption
   terminal-table
   thor
-  webmock
+  webmock (~> 3.18)
 
 RUBY VERSION
    ruby 3.3.5p100

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.34"
+  VERSION = "0.5.37"
 end

data/mercury_banking.gemspec

@@ -27,11 +27,21 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  
+  # Development dependencies
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency 'pry', '>= 0'
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'webmock', '~> 3.18'
+  
+  # Runtime dependencies
+  spec.add_dependency 'dotenv', '~> 2.8'
   spec.add_dependency 'thor', '~> 1.2.0'
   spec.add_dependency 'terminal-table', '~> 1.8.0'
   spec.add_dependency 'activesupport', '~> 7.0.0'
   spec.add_dependency 'symmetric-encryption', '~> 4.6.0'
+  spec.add_dependency 'json', '~> 2.6'
+  spec.add_dependency 'lockbox', '~> 1.1'
+  spec.add_dependency 'logger', '~> 1.5'
+  spec.add_dependency 'fiddle', '~> 1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury_banking
 version: !ruby/object:Gem::Version
-  version: 0.5.34
+  version: 0.5.37
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.6.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: lockbox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: "Using this gem, you can access all of your accounts and their transaction
   histories or make payments to other accounts.\n  "
 email: