usps-imis-api 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae10bc832e8ffa7cb4bc3bb14f5ea0b2d2daef3866cde32cdaea89bfcfe60376
-  data.tar.gz: 137943c3dce52c4c56bc32e2b2dcb6329e1bd568bb95c653084b299d701ed39e
+  metadata.gz: 5cb250d5dd836f5ca8b2382bcc45e788d57307dc47800337d59ff2976b4c52dd
+  data.tar.gz: 65c492cb9bec04a98be6aa8c5821cda5f3bf28304b91fb9202c13c95ab21ae67
 SHA512:
-  metadata.gz: 9bfc02dddae6d07ee6fedfcc0a89101415d4af68cab2b90380f199957976dd4d128c2913373b38066a4da76d41fbc0a21bca6dab672032e3e6cd03ade2114547
-  data.tar.gz: f31225ef3c5f2b24a69220d165c42697f052427b27967525678846c8ddd0280a4177ef4f4b388e70a45c033a7e1dda7f6d16ead1d6c9ce786b552c96c6aefdbd
+  metadata.gz: 764a6555ba593dc6e7b6b159aa741d9866f9981278fc1d4b7820d3a83efaa0ff5ddfff8eb93c7f2d09868853251db89163471582ed4a8f0086809c824823703d
+  data.tar.gz: 949e90aa4c506455184fd162cc75fb6b8a45c8c98b4e3561e3656d2445ca32b5174c6bd14164d51108fb5c69d7275a30a8cb06eda04ee480290eacb77524a6bd

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

@@ -131,11 +131,13 @@ module Usps
         end
         # :nocov:
 
+        # Supports YAML or JSON config data
+        #
         def configure!
-          json_config = JSON.parse(File.read(options[:config]))
+          config_data = YAML.safe_load_file(options[:config])
 
           Usps::Imis.configure do |config|
-            json_config.each do |key, value|
+            config_data.each do |key, value|
               config.public_send("#{key}=", value)
             end
           end

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

@@ -20,7 +20,7 @@ module Usps
           field: ['Specific field to return or update', { type: :string }],
           fields: ['Specific field(s) to return', { type: :strings, short: :F }],
           data: ["JSON string input\n  When present, sets the default HTTP verb to #{'PUT'.cyan}", { type: :string }],
-          config: ['Path to the JSON config file to use', { type: :string, short: :C }],
+          config: ['Path to the JSON/YAML config file to use', { type: :string, short: :C }],
           raw: ['Return raw JSON output, rather than simplified data', { short: :R }],
           include_ids: ["Include #{'iMIS ID'.yellow} and #{'Ordinal'.yellow} properties in returned data, if present"],
           quiet: ["Suppress logging to #{'STDERR'.red}"],
@@ -73,25 +73,9 @@ module Usps
 
             #{'Configuration'.underline}
 
-              API configuration can be specified in two ways:
+              For an explanation of how to provide API configuration, please refer to the wiki:
 
-
-              With #{'--config'.green}/#{'-C'.green} given the path to a JSON file, e.g.:
-
-              {
-                "imis_id_query_name": "#{'$/IQA_QUERY_NAME'.yellow}",
-                "environment": "#{'development'.yellow}",
-                "username": "#{'USERNAME'.yellow}",
-                "password": "#{'PASSWORD'.yellow}"
-              }
-
-
-              By setting the following environment variables:
-
-              #{'IMIS_ID_QUERY_NAME'.yellow}
-              #{'IMIS_ENVIRONMENT'.yellow}
-              #{'IMIS_USERNAME'.yellow}
-              #{'IMIS_PASSWORD'.yellow}
+              https://github.com/unitedstatespowersquadrons/imis-api-ruby/wiki/Usage#command-line-interface
 
 
             #{'Options'.underline}

data/lib/usps/imis/query.rb

@@ -52,7 +52,6 @@ module Usps
         @api = api
         @query_name = query_name
         @query_params = query_params
-        @query_params.merge!(QueryName: query_name) if iqa?
         @page_size = page_size
         @offset = offset
         @count = 0
@@ -137,10 +136,16 @@ module Usps
       def iqa? = query_name.match?(/^\$/)
       def query_type = iqa? ? :IQA : :'Business Object'
       def path_params = query_params.merge({ Offset: offset, Limit: page_size }.compact)
-      def endpoint = iqa? ? IQA_PATH : "#{Imis::BusinessObject::API_PATH}/#{query_name}"
-      def path = "#{endpoint}?#{path_params.to_query}"
       def uri = URI(File.join(Imis.configuration.hostname, path))
 
+      def path
+        if iqa?
+          "#{IQA_PATH}?#{path_params.merge(QueryName: query_name).to_query}"
+        else
+          "#{Imis::BusinessObject::API_PATH}/#{query_name}?#{path_params.to_query}"
+        end
+      end
+
       def logger = Imis.logger("#{query_type} Query")
     end
   end

data/lib/usps/imis/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Imis
-    VERSION = '0.11.7'
+    VERSION = '0.11.8'
   end
 end

data/lib/usps/imis.rb

@@ -4,6 +4,7 @@
 # Core dependencies
 require 'net/https'
 require 'json'
+require 'yaml'
 require 'time'
 require 'cgi'
 

metadata

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