usps-imis-api 0.11.34 → 0.11.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898b26512f82544ff037e289bfe2466ac375bfa481a0c7ebf77d5d6c2d9ecf96
-  data.tar.gz: 1a01816c119999a2ca2e8b01ae75c83df028a9d2cc1542b174b23a2e49f2877e
+  metadata.gz: 4f2d6d71152c72004f40542113b03d5f4f064a9f65ed7dd233d2edbf15051b6f
+  data.tar.gz: 94223bd8ea659905b2bc031d066b2e54f4e7944114c8d57de9682265f1eddf11
 SHA512:
-  metadata.gz: 89ff926322610bc6eefaf4aa605d7ecc498d1240f577a39e8a3267ab923d744f6364c73da84afeb65eb8672114d315a043c7a5d3d492b10f788c5734f1be13b4
-  data.tar.gz: 5858b73de1805cc9ee93527964b9220c2bd3c7b91075913103adff9a36994e018f8ac2c40404e80d8afeda314c3e7d4e6ab6e5ea4ba82c12022d67347c3a6bd3
+  metadata.gz: 8b35d80cf5601afba8902cb4a337fea33e5b39ed85dcee157372aab50456a413beae2586b5c773120551d0ebc6de1a3b4e1c85af4fa25896a470708c85db369e
+  data.tar.gz: 043b2029ab1c8d72033dfa67d4a4f7b988accc745315c30bb62285fd1746482fa626923c821bcfd4029d58a2006aa4631167bff0b749f9ed83e1500bb5fb5f4f

data/lib/usps/imis/command_line/interface.rb

@@ -12,6 +12,17 @@ module Usps
 
         NAME = 'USPS iMIS API - Ruby'
 
+        # Prioritized list of config file paths to automatically check if not provided
+        #
+        CONFIG_PATHS = {
+          local_dot: File.join(Dir.pwd, '.imis.yml'),
+          local: File.join(Dir.pwd, 'imis.yml'),
+          local_dot_config: File.join(Dir.pwd, '.config', 'imis.yml'),
+          local_config: File.join(Dir.pwd, 'config', 'imis.yml'),
+          user: "#{Dir.home}/.config/imis.yml",
+          system: '/usr/local/imis/config.yml'
+        }.freeze
+
         # CLI options that indicate the response is a raw Hash rather than a Data object,
         # and should not be simplified
         #
@@ -39,7 +50,7 @@ module Usps
           @options = input_options.merge(**)
           options[:version] = true if default_options?
 
-          configure! if options[:config]
+          configure!
           logging!
           @logger ||= Imis.logger('CommandLine')
         end
@@ -111,7 +122,7 @@ module Usps
             # Hash includes Usps::Imis::Data
             logger.debug 'Returning simplified Data#properties'
             data.properties(include_ids: options[:include_ids])
-          elsif data.is_a?(Array) && data.all? { it.is_a?(Hash) }
+          elsif data.is_a?(Array) && data.all?(Hash)
             logger.debug 'Returning simplified Array<Data#properties>'
             data.map { it.properties(include_ids: options[:include_ids]) }
           else
@@ -141,7 +152,9 @@ module Usps
         # Supports YAML or JSON config data
         #
         def configure!
-          config_data = YAML.safe_load_file(options[:config])
+          return if config_path.nil?
+
+          config_data = YAML.safe_load_file(config_path)
 
           Usps::Imis.configure do |config|
             config_data.each do |key, value|
@@ -150,6 +163,13 @@ module Usps
           end
         end
 
+        def config_path
+          return @config_path if @config_path
+          return @config_path = CONFIG_PATHS.values.find { File.exist?(it) } if options[:config].nil?
+
+          @config_path = CONFIG_PATHS[options[:config].to_sym] || options[:config]
+        end
+
         def logging!
           Usps::Imis.configure do |config|
             # :nocov:

data/lib/usps/imis/command_line/options_parser.rb

@@ -36,7 +36,16 @@ module Usps
           token: ['Provide an existing auth token', { type: :string }],
 
           # General config
-          config: ['Path to the JSON/YAML config file to use', { type: :string, short: :C }],
+          config: [
+            'Path to the JSON/YAML config file to use, or one of the following preset options: ' \
+            "`#{'local'.yellow}`, " \
+            "`#{'local_dot_config'.yellow}`, " \
+            "`#{'local_config'.yellow}`, " \
+            "`#{'user'.yellow}`, " \
+            "`#{'system'.yellow}`. " \
+            'If no option is provided, the first matching preset option will be automatically used.',
+            { type: :string, short: :C }
+          ],
           raw: ['Return raw JSON output, rather than simplified data', { short: :R }],
           include_ids: ["Include any #{'iMIS ID'.yellow} and #{'Ordinal'.yellow} properties in returned data"],
           jsonl: ['Format array output as JSONL', { short: :j }],

data/lib/usps/imis/party_data.rb

@@ -81,7 +81,7 @@ module Usps
 
           if %w[Addresses AlternateIds CommunicationPreferences Emails Salutations].include?(key)
             hash[key] = value.map { format_extracted(it.to_h) }
-          elsif value.all? { it.is_a?(String) }
+          elsif value.all?(String)
             # Do nothing
           else
             hash[key] = format_extracted(value.to_h)

data/lib/usps/imis/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Imis
-    VERSION = '0.11.34'
+    VERSION = '0.11.35'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-imis-api
 version: !ruby/object:Gem::Version
-  version: 0.11.34
+  version: 0.11.35
 platform: ruby
 authors:
 - Julian Fiander