usps-imis-api 0.12.4 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460debbc45155c240ff211c34b38ca921889f221371c43bd85dfcb59fdd85691
-  data.tar.gz: be08f0ad62da140e91bc5b53624cf0e9afa2c1ee8082f8cbcd60d9fe738fd8cf
+  metadata.gz: 856bf739e0e0b82c34436be2f0bf897d442a8080513f12f387204f0a5a5e095d
+  data.tar.gz: 655004a782af3a21ae1224678c34dcd9936f71b943af1d657579a7bf4991bbf4
 SHA512:
-  metadata.gz: edbb4022d9d222a8b330618062af666a814c251022e28028ed7ba04616f1618cc7820186231cadc64cfaab83c73a9558fc81b71fac1da05f9ccace792a204916
-  data.tar.gz: '083ce7fce5fb6172421c47f9807630c31c8250bb6d3b5bc212a486217999a4720dde89bdbb646adfd450bbf67d67176266346491a19ddfcf81fbd3a48a135edf'
+  metadata.gz: ba31e19e7a0fd96800c83f7727b000acbcea80066c8edcabcf03f4cf020066e65573127f20a07f6fe155b807b25b531c8179d11a0e1adc6082a3566186c57724
+  data.tar.gz: 5b9e6900ff14f31d1eab9d00ba559861790ae89b6f09b2a29df3a81de149bbd62f681df57a3b09e03725bfcf4e607a6c5a0d63102178f757eabd9be0fe33006f

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

@@ -46,24 +46,30 @@ module Usps
 
           value = yield
 
+          puts format_output(value)
+        end
+        # :nocov:
+
+        def format_output(value)
           if value.is_a?(Array) && @options[:jsonl] then jsonl(value)
           elsif value.is_a?(Array) && @options[:csv] then csv(value)
-          else raw(value)
+          else json(value)
           end
         end
 
-        def raw(value) = puts(JSON.dump(value))
+        def json(value) = JSON.dump(value)
 
-        def jsonl(value) = puts(value.map { JSON.dump(it) })
+        def jsonl(value) = value.map { JSON.dump(it) }
 
         def csv(value)
+          return '' if value.empty?
+
           headers = value.first.keys if value.first.is_a?(Hash) || value.first.is_a?(BaseData)
 
-          puts(CSV.generate(headers:, write_headers: !headers.nil?) do |csv|
+          CSV.generate(headers:, write_headers: !headers.nil?) do |csv|
             headers ? value.each { csv << it } : csv << value
-          end)
+          end
         end
-        # :nocov:
       end
     end
   end

data/lib/usps/imis/command_line/options.yml.erb

@@ -110,7 +110,7 @@ include_ids:
   - "Include any <%= 'iMIS ID'.yellow %> and <%= 'Ordinal'.yellow %> properties in returned data"
   - short: N
 
-# Iteractions for supporting other language wrappers
+# Interactions for supporting other language wrappers
 auth_token:
   - Return an auth token for other language wrappers
   - short: T

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

@@ -105,8 +105,6 @@ module Usps
 
             OptionsParser.options.each { |option, data| opt(option, *data) }
             CONFLICTING_OPTION_GROUPS.each { |group| conflicts(*group) }
-
-            educate_on_error
           end
         end
 
@@ -116,10 +114,12 @@ module Usps
         # :nocov:
 
         def defaults?
-          options_with_defaults = OptionsParser.options.select { |_, data| data[1]&.key?(:default) }
+          options_with_defaults = self.class.options.select { |_, data| data[1]&.key?(:default) }
+
+          default_options_not_given = options_with_defaults.none? { |option, _| @options[:"#{option}_given"] }
+          only_default_options_set = options.except(*options_with_defaults.keys).values.none?
 
-          options_with_defaults.all? { |option, data| data[1].nil? || options[option] == data[1][:default] } &&
-            options.except(*options_with_defaults.keys).values.none?
+          default_options_not_given && only_default_options_set
         end
 
         def pre_process_options!
@@ -129,6 +129,8 @@ module Usps
 
           @options[:data] = JSON.parse(@options[:data]) if @options[:data]
 
+          validate_query_options!
+
           raise Errors::CommandLineError, 'Maximum page size is 500' if @options[:page_size] > 500
 
           @options[:offset] = (@options[:page] - 1) * @options[:page_size] if @options[:page]
@@ -136,8 +138,14 @@ module Usps
           # Support shorthand for setting `certificate` param on queries
           return unless @options[:query] && @options[:certificate]
 
-          @options[:data] ||= {}
-          @options[:data]['certificate'] = @options.delete(:certificate)
+          @options[:data] = { 'certificate' => @options.delete(:certificate) }
+        end
+
+        def validate_query_options!
+          query_options = QUERY_FLAGS - [:query]
+          return unless !@options[:query] && query_options.any? { @options[:"#{it}_given"] }
+
+          Optimist.die(:query, "must be provided if any of --#{query_options.join(', --').gsub('_', '-')} are provided")
         end
       end
     end

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

@@ -75,16 +75,11 @@ module Usps
         end
 
         def perform_query(query, **options)
-          case options
-          in page: _, page_size:, offset:, data: then api.query(query, page_size:, offset:, **data).page
-          in page: _, page_size:, offset: then api.query(query, page_size:, offset:).page
-          in page: _, page_size:, data: then api.query(query, page_size:, **data).page
-          in page: _, page_size: then api.query(query, page_size:).page
-          in page_size:, offset:, data: then api.query(query, page_size:, offset:, **data)
-          in page_size:, data: then api.query(query, page_size:, **data)
-          in data: then api.query(query, **data)
-          else api.query(query)
-          end
+          kwargs = options.slice(:page_size, :offset)
+          kwargs.merge!(options[:data]) if options[:data]
+
+          result = api.query(query, **kwargs)
+          options.key?(:page) ? result.page : result
         end
       end
     end

data/lib/usps/imis/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Imis
-    VERSION = '0.12.4'
+    VERSION = '0.12.6'
   end
 end

metadata

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