Cleanup implementation with the help of recent upstream changes

Author: Sija

README.md

@@ -43,6 +43,12 @@ You can use a configuration file (`-c /path/to/config.yml`) instead of providing
 options through the command line:
 
 ```yaml
+rate_store:
+  name: File
+  options:
+    filepath: ~/.cache/fx-calculator/currency-rates.json
+    ttl: 15 minutes
+
 rate_provider:
   name: Compound
   options:
@@ -52,7 +58,6 @@ rate_provider:
         options:
           api_key: your-api-key
 
-currency_rates_ttl: 15 minutes
 currency: EUR
 ```
 

shard.lock

@@ -10,5 +10,5 @@ shards:
 
   money:
     git: https://github.com/crystal-money/money.git
-    version: 2.0.0-dev+git.commit.f8ec13ccb04e52f0448ba9338f48defb8bf14274
+    version: 2.0.0-dev+git.commit.e1fe8d48fed75eed8389b2b53f27bd9b2ee27b05
 

src/cli.cr

@@ -3,17 +3,23 @@ require "option_parser"
 require "colorize"
 require "./fx-calculator"
 
+DEFAULT_CONFIG_PATH =
+  Path["~", ".config", "fx-calculator", "config.yml"].expand(home: true)
+
 Log.setup_from_env
 
 clear_currency_rates_cache = false
 config_path =
-  if File.exists?(FXCalculator::Config::DEFAULT_CONFIG_PATH)
-    FXCalculator::Config::DEFAULT_CONFIG_PATH
+  if File.exists?(DEFAULT_CONFIG_PATH)
+    DEFAULT_CONFIG_PATH
   end
 
 currency_code = ENV["FX_CALCULATOR_CURRENCY"]?.presence
 currency_rates_ttl = ENV["FX_CALCULATOR_CURRENCY_RATES_TTL"]?.presence
 
+rate_store_name = ENV["FX_CALCULATOR_RATE_STORE"]?.presence
+rate_store_opts = ENV["FX_CALCULATOR_RATE_STORE_OPTIONS"]?.presence
+
 rate_provider_name = ENV["FX_CALCULATOR_RATE_PROVIDER"]?.presence
 rate_provider_opts = ENV["FX_CALCULATOR_RATE_PROVIDER_OPTIONS"]?.presence
 
@@ -26,19 +32,25 @@ option_parser = OptionParser.new do |parser|
     clear_currency_rates_cache = true
   end
   parser.on("-c PATH", "--config=PATH", "Path to configuration file") do |path|
-    config_path = Path[path] if path.presence
+    config_path = Path[path].expand(home: true) if path.presence
   end
   parser.on("-C CURRENCY", "--currency=CODE", "Default target currency") do |code|
-    currency_code = code.presence
+    currency_code = code if code.presence
   end
   parser.on("-t TTL", "--currency-rates-ttl=TIME_SPAN", "Currency rates TTL") do |ttl|
-    currency_rates_ttl = ttl.presence
+    currency_rates_ttl = ttl if ttl.presence
+  end
+  parser.on("-s RATE_STORE", "--store=NAME", "Currency store to use") do |name|
+    rate_store_name = name if name.presence
+  end
+  parser.on("-S RATE_STORE_OPTIONS", "--store-options=JSON", "Currency store options") do |opts|
+    rate_store_opts = opts if opts.presence
   end
   parser.on("-p RATE_PROVIDER", "--provider=NAME", "Currency provider to use") do |name|
-    rate_provider_name = name.presence
+    rate_provider_name = name if name.presence
   end
-  parser.on("-o RATE_PROVIDER_OPTIONS", "--provider-options=JSON", "Currency provider options") do |opts|
-    rate_provider_opts = opts.presence
+  parser.on("-P RATE_PROVIDER_OPTIONS", "--provider-options=JSON", "Currency provider options") do |opts|
+    rate_provider_opts = opts if opts.presence
   end
   parser.on("-v", "--version", "Print version") do
     puts FXCalculator::VERSION
@@ -48,63 +60,35 @@ option_parser = OptionParser.new do |parser|
     puts parser
     exit(0)
   end
-  parser.unknown_args do |args|
-    values.concat(args)
-  end
   parser.invalid_option do |flag|
     STDERR.puts "ERROR: #{flag} is not a valid option".colorize(:red)
     STDERR.puts parser
     exit(1)
   end
+  parser.unknown_args do |args|
+    values.concat(args)
+  end
 end
 
 option_parser.parse
 
-begin
-  if clear_currency_rates_cache
-    FXCalculator::Config.clear_currency_rates_cache!
-  end
-
-  if values.empty?
-    if clear_currency_rates_cache
-      exit(0)
-    else
-      STDERR.puts option_parser
-      exit(1)
-    end
-  end
-
-  config =
-    if path = config_path
-      File.open(path) do |file|
-        FXCalculator::Config.from_yaml(file)
-      end
-    else
-      FXCalculator::Config.from_yaml("{}")
-    end
-
-  if code = currency_code
-    config.currency = Money::Currency.find(code)
-  end
-
-  if name = rate_provider_name
-    config.rate_provider = begin
-      klass = Money::Currency::RateProvider.find(name)
-
-      if opts = rate_provider_opts
-        klass.from_json(opts)
-      else
-        klass.from_json("{}")
-      end
-    end
-  end
+if values.empty?
+  abort option_parser
+end
 
-  if ttl = currency_rates_ttl
-    config.currency_rates_ttl = Time::Span.parse(ttl)
-  end
+begin
+  config = FXCalculator::Utils.config_from_opts(
+    config_path,
+    rate_store_name,
+    rate_store_opts,
+    rate_provider_name,
+    rate_provider_opts,
+    currency_code,
+    currency_rates_ttl,
+  )
 
-  unless config.rate_provider?
-    raise ArgumentError.new("Currency rate provider is required")
+  if clear_currency_rates_cache
+    config.rate_store.clear
   end
 
   Money.configure do |context|
@@ -120,6 +104,5 @@ begin
   renderer = FXCalculator::Renderer.new
   renderer.render(moneys)
 rescue ex
-  STDERR.puts "ERROR: #{ex.message}".colorize(:red)
-  exit(1)
+  abort "ERROR: #{ex.message}".colorize(:red)
 end

src/core_ext/time/span.cr

@@ -1,5 +1,4 @@
 require "yaml"
 require "money"
 
-require "./core_ext/**"
 require "./fx-calculator/**"

src/fx-calculator.cr

@@ -2,50 +2,15 @@ module FXCalculator
   class Config
     include YAML::Serializable
 
-    # Default configuration file path.
-    DEFAULT_CONFIG_PATH =
-      Path["~", ".config", "fx-calculator", "config.yml"].expand(home: true)
-
-    # Filepath to currency rates cache.
-    CURRENCY_RATES_FILEPATH =
-      Path[Dir.tempdir] / "fx-calculator" / ".cache" / "currency_rates.json"
-
-    # Initializes currency rates cache.
-    def self.init_currency_rates_cache! : Nil
-      Dir.mkdir_p(CURRENCY_RATES_FILEPATH.dirname)
-    end
-
-    # Clears currency rates cache.
-    def self.clear_currency_rates_cache! : Bool
-      File.delete?(CURRENCY_RATES_FILEPATH)
-    end
-
     # Currency rate store to use.
-    @[YAML::Field(ignore: true)]
     property rate_store : Money::Currency::RateStore do
-      if ttl = currency_rates_ttl
-        Money::Currency::RateStore::File.new(
-          filepath: CURRENCY_RATES_FILEPATH,
-          ttl: ttl,
-        )
-      else
-        Money::Currency::RateStore::Memory.new
-      end
+      Money.default_rate_store
     end
 
     # Rate provider used for currency exchange.
-    @[YAML::Field(converter: Money::Currency::RateProvider::Converter)]
     property! rate_provider : Money::Currency::RateProvider
 
-    # Time to live (TTL) for currency rates, `nil` means no persistence.
-    @[YAML::Field(converter: Time::Span::Converter)]
-    property currency_rates_ttl : Time::Span?
-
     # Target currency.
     property currency : Money::Currency?
-
-    private def after_initialize
-      Config.init_currency_rates_cache!
-    end
   end
 end

src/fx-calculator/config.cr

@@ -2,6 +2,55 @@ module FXCalculator
   module Utils
     extend self
 
+    def config_from_opts(
+      config_path : Path | String?,
+      rate_store_name : String?,
+      rate_store_opts : String?,
+      rate_provider_name : String?,
+      rate_provider_opts : String?,
+      currency_code : String?,
+      currency_rates_ttl : String?,
+    )
+      config =
+        if config_path
+          File.open(config_path) do |file|
+            FXCalculator::Config.from_yaml(file)
+          end
+        else
+          FXCalculator::Config.from_yaml("{}")
+        end
+
+      if rate_store_name
+        config.rate_store = begin
+          klass = Money::Currency::RateStore.find(rate_store_name)
+          klass.from_json(rate_store_opts || "{}")
+        end
+      end
+
+      if rate_provider_name
+        config.rate_provider = begin
+          klass = Money::Currency::RateProvider.find(rate_provider_name)
+          klass.from_json(rate_provider_opts || "{}")
+        end
+      end
+
+      if currency_code
+        config.currency =
+          Money::Currency.find(currency_code)
+      end
+
+      if currency_rates_ttl
+        config.rate_store.ttl =
+          Time::Span::StringConverter.parse(currency_rates_ttl)
+      end
+
+      unless config.rate_provider?
+        raise ArgumentError.new("Currency rate provider is required")
+      end
+
+      config
+    end
+
     # Parses a string representing a money value along with target currency,
     # if present, and returns it as a tuple of `Money` and `Money::Currency`.
     def parse_money_with_currency(str : String) : {Money, Money::Currency}