mercury_banking 0.5.38 → 0.7.0

data/lib/mercury_banking/reports/reconciliation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MercuryBanking
   module Reports
     # Module for reconciliation between ledger and Mercury balances
@@ -5,42 +7,42 @@ module MercuryBanking
       # Generate a reconciliation report to identify when balances diverged
       def generate_reconciliation_report(client, account_name, start_date, end_date = nil, format = 'ledger')
         puts "Generating reconciliation report for #{account_name} from #{start_date} to #{end_date || 'present'}..."
-        
+
         # Find the account by name
         account = find_account_by_name(client, account_name)
         return unless account
-        
+
         # Get current balance from Mercury
         current_mercury_balance = account['currentBalance']
-        
+
         # Get all transactions for the account
         transactions = get_account_transactions(client, account['id'], start_date)
-        
+
         # Filter by end date if specified
         if end_date
           end_date_obj = Date.parse(end_date)
           transactions = transactions.select do |t|
-            transaction_date = t["postedAt"] ? Date.parse(t["postedAt"]) : Date.parse(t["createdAt"])
+            transaction_date = Date.parse(t["postedAt"] || t["createdAt"])
             transaction_date <= end_date_obj
           end
         end
-        
+
         if transactions.empty?
           puts "No transactions found for reconciliation."
           return
         end
-        
+
         # Sort transactions by date
         transactions = sort_transactions_by_date(transactions)
-        
+
         # Group transactions by month for easier analysis
         monthly_transactions = group_transactions_by_month(transactions)
-        
+
         # Create a temporary file for ledger export
         require 'tempfile'
         temp_file = Tempfile.new(['mercury_reconciliation', ".#{format}"])
         output_file = temp_file.path
-        
+
         # Export all transactions to the ledger file
         case format
         when 'ledger'
@@ -52,48 +54,47 @@ module MercuryBanking
           temp_file.unlink
           return
         end
-        
+
         # Analyze each month to find when divergence occurred
         puts "\n=== Monthly Reconciliation Analysis ==="
-        puts "Period".ljust(15) + "Mercury Balance".ljust(20) + "Ledger Balance".ljust(20) + "Difference".ljust(15) + "Status"
+        puts "#{'Period'.ljust(15)}#{'Mercury Balance'.ljust(20)}#{'Ledger Balance'.ljust(20)}#{'Difference'.ljust(15)}Status"
         puts "-" * 80
-        
-        cumulative_ledger_balance = 0
+
+        # Initialize variables for tracking
         divergence_point = nil
         monthly_data = []
-        
+
         monthly_transactions.each do |month, month_transactions|
           # Calculate the Mercury balance at the end of this month
           last_transaction = month_transactions.last
-          last_date = last_transaction["postedAt"] ? Date.parse(last_transaction["postedAt"]) : Date.parse(last_transaction["createdAt"])
-          
+          last_date = Date.parse(last_transaction["postedAt"] || last_transaction["createdAt"])
+
           # Get ledger balance for this month
           month_end_date = last_date.strftime("%Y-%m-%d")
           ledger_balance = get_ledger_balance_at_date(output_file, month_end_date, account_name, format)
-          
+
           # Calculate Mercury balance at this point in time
           # This is an approximation based on current balance and subsequent transactions
-          mercury_balance_at_month_end = calculate_mercury_balance_at_date(current_mercury_balance, transactions, last_date)
-          
+          mercury_balance_at_month_end = calculate_mercury_balance_at_date(current_mercury_balance, transactions,
+                                                                           last_date)
+
           # Calculate difference
           difference = mercury_balance_at_month_end - ledger_balance
-          
+
           # Determine status
           status = difference.abs < 0.01 ? "✓ Balanced" : "⚠️ Diverged"
-          
+
           # Record the first divergence point
-          if difference.abs >= 0.01 && divergence_point.nil?
-            divergence_point = month
-          end
-          
+          divergence_point = month if difference.abs >= 0.01 && divergence_point.nil?
+
           # Format for display
           month_str = month
           mercury_balance_str = format("$%.2f", mercury_balance_at_month_end)
           ledger_balance_str = format("$%.2f", ledger_balance)
           difference_str = format("$%.2f", difference)
-          
+
           puts month_str.ljust(15) + mercury_balance_str.ljust(20) + ledger_balance_str.ljust(20) + difference_str.ljust(15) + status
-          
+
           monthly_data << {
             period: month,
             mercury_balance: mercury_balance_at_month_end,
@@ -102,78 +103,80 @@ module MercuryBanking
             status: status
           }
         end
-        
+
         puts "-" * 80
-        
+
         # If divergence was found, analyze the specific month in more detail
         if divergence_point
           puts "\n=== Detailed Analysis of Divergence Point: #{divergence_point} ==="
-          
+
           # Get transactions for the divergence month
           divergence_month_transactions = monthly_transactions[divergence_point]
-          
+
           # Check for pending or failed transactions
-          pending_transactions = divergence_month_transactions.select { |t| t["status"] != "posted" }
-          
+          pending_transactions = divergence_month_transactions.reject { |t| t["status"] == "posted" }
+
           if pending_transactions.any?
             puts "\nPotential issues found: #{pending_transactions.count} transactions with non-posted status"
             puts "\nTransactions with non-posted status:"
-            
+
             pending_transactions.each do |t|
               date = t["postedAt"] ? Time.parse(t["postedAt"]).strftime("%Y-%m-%d") : Time.parse(t["createdAt"]).strftime("%Y-%m-%d")
               amount = format("$%.2f", t["amount"])
               description = t["bankDescription"] || t["externalMemo"] || "Unknown transaction"
               status = t["status"]
-              
+
               puts "#{date} | #{amount} | #{status.upcase} | #{description}"
             end
           end
-          
+
           # Check for transactions on the same day with opposite amounts (potential duplicates or corrections)
           potential_corrections = find_potential_corrections(divergence_month_transactions)
-          
+
           if potential_corrections.any?
             puts "\nPotential corrections or duplicates found:"
-            
+
             potential_corrections.each do |pair|
               t1, t2 = pair
               date1 = t1["postedAt"] ? Time.parse(t1["postedAt"]).strftime("%Y-%m-%d") : Time.parse(t1["createdAt"]).strftime("%Y-%m-%d")
               date2 = t2["postedAt"] ? Time.parse(t2["postedAt"]).strftime("%Y-%m-%d") : Time.parse(t2["createdAt"]).strftime("%Y-%m-%d")
-              
-              puts "#{date1} | #{format("$%.2f", t1["amount"])} | #{t1["bankDescription"] || t1["externalMemo"] || "Unknown"}"
-              puts "#{date2} | #{format("$%.2f", t2["amount"])} | #{t2["bankDescription"] || t2["externalMemo"] || "Unknown"}"
+
+              puts "#{date1} | #{format('$%.2f',
+                                        t1['amount'])} | #{t1['bankDescription'] || t1['externalMemo'] || 'Unknown'}"
+              puts "#{date2} | #{format('$%.2f',
+                                        t2['amount'])} | #{t2['bankDescription'] || t2['externalMemo'] || 'Unknown'}"
               puts "-" * 50
             end
           end
         end
-        
+
         # Clean up temporary file
         temp_file.unlink
-        
-        return monthly_data
+
+        monthly_data
       end
-      
+
       private
-      
+
       # Find account by name
       def find_account_by_name(client, account_name)
         accounts = client.accounts
         account = accounts.find { |a| a["name"] == account_name }
-        
+
         unless account
           puts "Error: Account '#{account_name}' not found. Available accounts:"
           accounts.each { |a| puts "- #{a['name']}" }
           return nil
         end
-        
+
         account
       end
-      
+
       # Get transactions for a specific account
       def get_account_transactions(client, account_id, start_date)
         client.get_transactions(account_id, start_date)
       end
-      
+
       # Sort transactions by date
       def sort_transactions_by_date(transactions)
         transactions.sort_by do |t|
@@ -181,15 +184,15 @@ module MercuryBanking
           Time.parse(date)
         end
       end
-      
+
       # Group transactions by month
       def group_transactions_by_month(transactions)
         transactions.group_by do |t|
-          date = t["postedAt"] ? Time.parse(t["postedAt"]) : Time.parse(t["createdAt"])
+          date = Time.parse(t["postedAt"] || t["createdAt"])
           date.strftime("%Y-%m")
         end
       end
-      
+
       # Get ledger balance at a specific date
       def get_ledger_balance_at_date(file_path, date, account_name, format)
         case format
@@ -199,48 +202,28 @@ module MercuryBanking
           accounts_output = `#{accounts_cmd}`
           puts "\n=== Available Accounts in Ledger File ==="
           puts accounts_output
-          
+
           # Find the closest matching account
           ledger_accounts = accounts_output.split("\n")
-          
-          # Try to find an exact match first
-          exact_match = ledger_accounts.find { |a| a == "Assets:#{account_name}" }
-          if exact_match
-            puts "Found exact account match: #{exact_match}"
-            account_to_use = exact_match
-          else
-            # Try to find a partial match
-            partial_matches = ledger_accounts.select { |a| a.include?(account_name.split(' ').first) }
-            if partial_matches.any?
-              puts "Found partial account matches: #{partial_matches.join(', ')}"
-              account_to_use = partial_matches.first
-            else
-              # If no match found, just use the first Assets account
-              assets_accounts = ledger_accounts.select { |a| a.start_with?('Assets:') }
-              if assets_accounts.any?
-                puts "No match found, using first Assets account: #{assets_accounts.first}"
-                account_to_use = assets_accounts.first
-              else
-                puts "No Assets accounts found in ledger file"
-                return 0.0
-              end
-            end
-          end
-          
+
+          # Find the appropriate account to use
+          account_to_use = find_matching_account(ledger_accounts, account_name)
+          return 0.0 unless account_to_use
+
           # Now use the matched account for the balance command
           cmd = "ledger -f #{file_path} --end #{date} balance --flat '#{account_to_use}'"
           output = `#{cmd}`
-          
+
           # Debug information
           puts "\n=== Ledger Debug Information ==="
           puts "Command: #{cmd}"
           puts "Raw output: #{output}"
-          
+
           # Extract balance from output using a more flexible regex
           # The ledger output format is typically something like:
           #    $2950.00  Assets:Mercury Checking
           if output =~ /\s+\$\s*([\d,.-]+)\s+/
-            balance = $1.gsub(',', '').to_f
+            balance = ::Regexp.last_match(1).gsub(',', '').to_f
             puts "Extracted balance: $#{balance}"
             balance
           else
@@ -250,10 +233,10 @@ module MercuryBanking
         when 'beancount'
           cmd = "bean-report #{file_path} -e #{date} balances 'Assets:#{account_name.gsub(/[^a-zA-Z0-9]/, '-')}'"
           output = `#{cmd}`
-          
+
           # Extract balance from output
           if output =~ /([\d,.-]+)\s+USD/
-            $1.gsub(',', '').to_f
+            ::Regexp.last_match(1).gsub(',', '').to_f
           else
             0.0
           end
@@ -261,47 +244,78 @@ module MercuryBanking
           0.0
         end
       end
-      
+
       # Calculate Mercury balance at a specific date
       def calculate_mercury_balance_at_date(current_balance, transactions, target_date)
         # Start with current balance
         balance_at_date = current_balance
-        
+
         # Subtract all transactions that occurred after the target date
         transactions.each do |t|
-          transaction_date = t["postedAt"] ? Date.parse(t["postedAt"]) : Date.parse(t["createdAt"])
-          
+          transaction_date = Date.parse(t["postedAt"] || t["createdAt"])
+
           if transaction_date > target_date
             # Reverse the effect of this transaction
             balance_at_date -= t["amount"]
           end
         end
-        
+
         balance_at_date
       end
-      
+
       # Find potential corrections or duplicates
       def find_potential_corrections(transactions)
         potential_pairs = []
-        
+
         # Group transactions by date
         by_date = transactions.group_by do |t|
-          date = t["postedAt"] ? Time.parse(t["postedAt"]) : Time.parse(t["createdAt"])
+          date = Time.parse(t["postedAt"] || t["createdAt"])
           date.strftime("%Y-%m-%d")
         end
-        
+
         # Look for transactions on the same day with opposite amounts
-        by_date.each do |date, day_transactions|
+        by_date.each do |_date, day_transactions|
           day_transactions.combination(2).each do |t1, t2|
             # Check if amounts are opposite (with small tolerance for rounding)
-            if (t1["amount"] + t2["amount"]).abs < 0.01
-              potential_pairs << [t1, t2]
-            end
+            potential_pairs << [t1, t2] if (t1["amount"] + t2["amount"]).abs < 0.01
           end
         end
-        
+
         potential_pairs
       end
+
+      # Find a matching account in the ledger file
+      def find_matching_account(ledger_accounts, account_name)
+        # Try exact match first
+        exact_match = ledger_accounts.find { |a| a == "Assets:#{account_name}" }
+        if exact_match
+          puts "Found exact account match: #{exact_match}"
+          return exact_match
+        end
+
+        # Try partial match
+        partial_matches = ledger_accounts.select { |a| a.include?(account_name.split.first) }
+        if partial_matches.any?
+          puts "Found partial account matches: #{partial_matches.join(', ')}"
+          return partial_matches.first
+        end
+
+        # Fall back to any Assets account
+        find_fallback_account(ledger_accounts)
+      end
+
+      # Find a fallback account when no direct match is found
+      def find_fallback_account(ledger_accounts)
+        # Try to use the first Assets account
+        assets_accounts = ledger_accounts.select { |a| a.start_with?('Assets:') }
+        if assets_accounts.any?
+          puts "No match found, using first Assets account: #{assets_accounts.first}"
+          assets_accounts.first
+        else
+          puts "No Assets accounts found in ledger file"
+          nil
+        end
+      end
     end
   end
-end 
+end

data/lib/mercury_banking/utils/command_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MercuryBanking
   module Utils
     # Utility methods for command operations
@@ -15,4 +17,4 @@ module MercuryBanking
       end
     end
   end
-end 
+end

data/lib/mercury_banking/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MercuryBanking
-  VERSION = "0.5.38"
+  VERSION = "0.7.0"
 end

data/lib/mercury_banking.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "mercury_banking/version"
 require 'uri'
 require 'net/http'
@@ -9,10 +11,7 @@ require 'csv'
 require 'mercury_banking/api'
 require 'mercury_banking/recipient'
 require 'mercury_banking/multi'
-require 'mercury_banking/reconciliation'
 require 'mercury_banking/utils/command_utils'
-require 'mercury_banking/reports/balance_sheet'
-require 'mercury_banking/reports/reconciliation'
 
 module MercuryBanking
   class Error < StandardError; end

data/mercury_banking.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/mercury_banking/version'
 
 Gem::Specification.new do |spec|
@@ -6,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jonathan Siegel", "Yusuke Ishida"]
   spec.email         = ["jonathan@siegel.io", "yusuke@xenon.io"]
 
-  spec.summary       = %q{Client library for talking to Mercury API.}
-  spec.description   = %q{Using this gem, you can access all of your accounts and their transaction histories or make payments to other accounts.
-  }
+  spec.summary       = 'Client library for talking to Mercury API.'
+  spec.description   = 'Using this gem, you can access all of your accounts and their transaction histories or make payments to other accounts.
+  '
   spec.homepage      = "https://github.com/XenonIO/mercury-banking"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
@@ -21,27 +23,28 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   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 "rake", "~> 13.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 'dotenv', '~> 2.8'
+  spec.add_dependency 'fiddle', '~> 1.1'
   spec.add_dependency 'json', '~> 2.6'
   spec.add_dependency 'lockbox', '~> 1.1'
   spec.add_dependency 'logger', '~> 1.5'
-  spec.add_dependency 'fiddle', '~> 1.1'
+  spec.add_dependency 'symmetric-encryption', '~> 4.6.0'
+  spec.add_dependency 'terminal-table', '~> 1.8.0'
+  spec.add_dependency 'thor', '~> 1.2.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end