usps-imis-api 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460debbc45155c240ff211c34b38ca921889f221371c43bd85dfcb59fdd85691
-  data.tar.gz: be08f0ad62da140e91bc5b53624cf0e9afa2c1ee8082f8cbcd60d9fe738fd8cf
+  metadata.gz: f3339b55eb073ceb6d09da8f6855a6b35181d9ba341968c19a029dc916e5f6da
+  data.tar.gz: 3366076637725838e3f4b404d2db28f349632681bb2211fb7cf1d3493965073f
 SHA512:
-  metadata.gz: edbb4022d9d222a8b330618062af666a814c251022e28028ed7ba04616f1618cc7820186231cadc64cfaab83c73a9558fc81b71fac1da05f9ccace792a204916
-  data.tar.gz: '083ce7fce5fb6172421c47f9807630c31c8250bb6d3b5bc212a486217999a4720dde89bdbb646adfd450bbf67d67176266346491a19ddfcf81fbd3a48a135edf'
+  metadata.gz: e5d137638ffabd6b8ecdf5a72ec2d3769ef511d0963f431d7fc9d34d5659d7a460e3c7e60acbc87532b04ca519e7ed2f5bfd38c30f50fc70ddcd97302a44066a
+  data.tar.gz: b9e980910b7507a39dec6ad2ca992ebbcf57227f119775bdfa972d58045a60d0b569137e3952c81aff16ed311ac2e49306b528800c4dca22e3c26f4a4fe2bc24

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

@@ -46,24 +46,28 @@ module Usps
 
           value = yield
 
+          puts format(value)
+        end
+        # :nocov:
+
+        def format(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)
           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_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]
@@ -139,6 +141,13 @@ module Usps
           @options[:data] ||= {}
           @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
   end

data/lib/usps/imis/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Imis
-    VERSION = '0.12.4'
+    VERSION = '0.12.5'
   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.5
 platform: ruby
 authors:
 - Julian Fiander