soaspec 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d48c8b910dd2bf87abcae57a3a7ef25f9bdd59d
-  data.tar.gz: 4c0d3566be81b05fa06878f7a01d0b54ccf776ca
+  metadata.gz: 2f8a71ef7aaaed332941f635ea0c8dae5635b2c7
+  data.tar.gz: ace048d3a5dbd883c0523c6f2a5f654e51b486b6
 SHA512:
-  metadata.gz: ee025f3a394441a6ee3612befcaf94f36c3a0d3d5dc2901230f300f4d0798424f08315e6c82009b574d0ab98dce77f432579d265e445bf4ec15c8220f5b05824
-  data.tar.gz: 50abba523c74d01f098a9bd1e9b061ea9e6fbe66735c59cf5110e13174c5cb166537f1d0361c1fae9377f1889f2e2c6b048d81e358e3a6aac0f108c4b9644ab7
+  metadata.gz: 13201679a589ce4856d1f9e61df09d25e8ec72242a1f4d2e8e781654e72c961c8a653555a6c3c7c9197e51b7d2643348ea0f5049115b2255b2546890db15a1b8
+  data.tar.gz: 52962a53cb57f808154936718de1aab8a0a30b2488e5cf2bf302e9f6c62caf8b58590c1be4832089221fcd60fd385f0bf9b490cd018a53315b9a1d2f5445d848

data/ChangeLog

@@ -1,9 +1,14 @@
+Version 0.1.11
+* Enhancements
+  * OAuth2 class can be initialized with strings as keys
+  * Global attribute, 'Soaspec::OAuth2.token_url' for setting common value
+
 Version 0.1.10
 * Enhancements
   * Rename default template folder from to 'template' to 'templates'
   * Use TemplateReader to simplify and add error handling to extracting templates
   * Got convenience Rest Methods able to handle taking in template_name
-  * Started making a request method to access request of API actually sent
+  * Started making a 'request' method to access request of API actually sent
 
 Version 0.1.9
 * Enhancements

data/lib/soaspec/exchange_handlers/rest_accessors.rb

@@ -34,8 +34,7 @@ module Soaspec
       full_path += '.yml' unless full_path.end_with?('.yml')
       file_hash = YAML.load_file(full_path)
       raise 'File at ' + full_path + ' is not a hash ' unless file_hash.is_a? Hash
-      oauth_hash = file_hash.transform_keys_to_symbols
-      oauth2 **oauth_hash
+      oauth2 file_hash
     end
 
     # @param [Hash] headers Hash of REST headers used in RestClient

data/lib/soaspec/o_auth2.rb

@@ -3,15 +3,23 @@ require 'erb'
 module Soaspec
   # Handles working with OAuth2
   class OAuth2
+    class << self
+      # Default token url used across entire suite
+      attr_accessor :token_url
+    end
+
+    # [Hash] OAuth parameters
     attr_accessor :params
     # Count of tries to obtain access token
     attr_accessor :retry_count
 
-    # @param [Hash] params Parameters to make OAuth request
+    # @param [Hash] params_sent Parameters to make OAuth request
     # @param [String] api_username Username to use which can be set by Soaspec::ExchangeHandler
-    def initialize(params, api_username)
+    def initialize(params_sent, api_username = nil)
+      params = params_sent.transform_keys_to_symbols
+      params[:token_url] ||= Soaspec::OAuth2.token_url
       raise 'client_id and client_secret not set' unless params[:client_id] && params[:client_secret]
-      raise 'token_url mandatory' unless params[:token_url]
+      raise ArgumentError, 'token_url mandatory' unless params[:token_url]
       self.params = params
       params[:username] = api_username || ERB.new(params[:username]).result(binding) if params[:username]
       params[:security_token] = ERB.new(params[:security_token]).result(binding) if params[:security_token]
@@ -62,6 +70,5 @@ module Soaspec
                       { grant_type: 'client_credentials' }
                     end)
     end
-
   end
 end

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler