soaspec 0.0.58 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ae8790fbb996c10af64623bea6e7be9e6372b1
-  data.tar.gz: ff46acc85fb7aceae9079a033d659f93b3dd3798
+  metadata.gz: 00575bd80732286d4db1c5bf9fd94768e1b32125
+  data.tar.gz: b5e4e7469fe387aa0264c0dec836a7ebcb8ac7aa
 SHA512:
-  metadata.gz: e1e699420cd01b427c8259c8404ac3d53385d304e32767b4b20385fdde13d72ccad836055f0073712745e6a99aeb323faf5700118f0bd106fe23fdf904f4c7d7
-  data.tar.gz: d1eadfde7e77d7dc43dd3819fb73cfed1e2eced1d4ded41bcd16813115769fc82beebe2716901413896d416e8a2253d80b0b3e09e7240c0ce95ecaf824a02164
+  metadata.gz: 47cc6b1be05516b7571f4a7e34f3edd9b6f950c382e3c99024e3b6a36e34b9df50ce5484119155af1ad8625ae15036bb152843d4cb59db941a9e168eaeef3ba1
+  data.tar.gz: 9ad7763688e267213c26d9a1e7ed0c37b6d4deadcce979cd7ceed37dec6d86206d3e788ca85cb08cce0e6cb8c5105d6ac8ac913722179714a8bc1bfa8b997e77

data/.gitlab-ci.yml

@@ -14,7 +14,7 @@ rspec:
       - coverage/
 
 cucumber:
-  stage: acceptance
+  stage: test
   script:
     - bundle exec cucumber
 

data/.rspec

@@ -1,3 +1,3 @@
+--require spec_helper
 --format documentation
 --color
---require spec_helper

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.0.59
+* Enhancements
+  * Perform ERB in headers to make using access_token using 'headers' possible
+  * Try better way of testing `soaspec-init`.
+
 Version 0.0.58
 * Enhancements
   * Add method to set parts of the request body through `exchange[key]= 'value'`

data/Rakefile

@@ -6,19 +6,11 @@ ENV['folder'] ||= ''
 ENV['test'] ||= ''
 
 RSpec::Core::RakeTask.new(:run_spec) do |t|
-  t.pattern = "{spec/*/#{ENV['folder']}*/,tmp/*/spec/}#{ENV['test']}*_spec.rb"
+  t.pattern = "spec/**/#{ENV['folder']}*/#{ENV['test']}*_spec.rb"
 end
 
-desc 'Use soaspec_init in tmp to generate test files. Used for verifying it'
-task :use_soaspec_init do
-  mkdir_p 'tmp'
-  mkdir_p 'tmp/init'
-  puts `cd tmp/init && ruby ../../exe/soaspec-init`
-end
-
-
 desc 'Run tests'
-task spec: %w[clean clobber use_soaspec_init start_test_server run_spec]
+task spec: %w[clean clobber start_test_server run_spec]
 
 task default: :spec
 

data/exe/soaspec-virtual-server

@@ -27,6 +27,10 @@ get '/BLZService' do
   [200, { 'Content-Type' => 'text/xml' }, Soaspec::TestServer::GetBank.test_wsdl]
 end
 
+get '/as/token.oauth2' do
+
+end
+
 # Used for testing storage of data
 post '/test/id' do
   # puts request.body.string

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -25,46 +25,26 @@ module Soaspec
     # Will create access_token method based on passed parameters
     def oauth2(client_id: nil, client_secret: nil, token_url: nil, username: nil, password: nil, security_token: nil)
       define_method('oauth_response') do
-        response = if password && username && security_token
-                     RestClient.post(
-                         token_url,
-                         {
-                             grant_type: 'password',
-                             client_id: client_id,
-                             client_secret: client_secret,
-                             username: username,
-                             password: (password + security_token),
-                             multipart: true
-                         },
-                         cache_control: 'no_cache',
-                         verify_ssl: false
-                     )
-                   elsif password && username
-                     RestClient.post(
-                         token_url,
-                         {
-                             grant_type: 'password',
-                             client_id: client_id,
-                             client_secret: client_secret,
-                             username: username,
-                             password: password,
-                             multipart: true
-                         },
-                         cache_control: 'no_cache',
-                         verify_ssl: false
-                     )
-                   else
-                     RestClient.post(
-                         token_url,
-                         {
-                             grant_type: 'client_credentials',
-                             client_id: client_id,
-                             client_secret: client_secret
-                         },
-                         cache_control: 'no_cache',
-                         verify_ssl: false
-                     )
-                   end
+        payload = if password && username
+                    {
+                      grant_type: 'password',
+                      client_id: client_id,
+                      client_secret: client_secret,
+                      username: username,
+                      password: security_token ? (password + security_token) : password,
+                      multipart: true
+                    }
+                  else
+                    {
+                      grant_type: 'client_credentials',
+                      client_id: client_id,
+                      client_secret: client_secret
+                    }
+                  end
+        response = RestClient.post(token_url, payload, cache_control: 'no_cache', verify_ssl: false)
+        Soaspec::SpecLogger.add_to 'request_params: ' + payload.to_s
+        Soaspec::SpecLogger.add_to('response_headers: ' + response.headers.to_s)
+        Soaspec::SpecLogger.add_to('response_body: ' + response.to_s)
         JSON.parse(response)
       end
 
@@ -123,6 +103,11 @@ module Soaspec
       }
     end
 
+    def parse_headers
+      # rest_client_headers.map { |h| ERB.new(h).result(binding) }
+      Hash[rest_client_headers.map { |k, header| [k, ERB.new(header).result(binding)] }]
+    end
+
     # Setup object to handle communicating with a particular SOAP WSDL
     # @param [Hash] options Options defining SOAP request. WSDL, authentication
     def initialize(name = self.class.to_s, options = {})
@@ -136,7 +121,7 @@ module Soaspec
       set_remove_key(options, :default_hash)
       merged_options = rest_resource_options
       merged_options[:headers] ||= {}
-      merged_options[:headers].merge! rest_client_headers
+      merged_options[:headers].merge! parse_headers
       merged_options.merge!(options)
       @resource = RestClient::Resource.new(base_url_value, merged_options) # @resource[url_extension].get
     end

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.58'.freeze
+  VERSION = '0.0.59'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.58
+  version: 0.0.59
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler