soaspec 0.0.49 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3182f568caa56ca4f1f2982fd34cd03add94841
-  data.tar.gz: 0df96f12941e1b74393ebe45621d583f2e1ff956
+  metadata.gz: 19dafaaba6b39b922969a31020ea43fa9c93b530
+  data.tar.gz: 04ed01a14243a2f6763590c6bf2ef00b9f394715
 SHA512:
-  metadata.gz: 932fe45f675620f1afa72ef36cb84fa8c54f6beebc7dd22686258fdf27c2f158a70b0a82bb7f280b111c81ae7657a01d7c5357af745247df58406efb764fd85d
-  data.tar.gz: f0e01064bacd3a5e10f59c24b4a74fdc7c471579012a61088b60d715912113696624b1893abbbbdb0de7b63e7a70dfe46c5f450041a591cc9a4f2e9f6b8daaab
+  metadata.gz: e4c0e7c85069f3cb5263b41468523f07f675665f2616a1b4254dc3e588fab1f2f7e8992c6c9ba7a8ea0d774e312cb05ba2d7371de0cf8bcd1010bcabbaf81424
+  data.tar.gz: ad6c88d92f1563669fd2454f2eb034877040699314e8db3fe3bb65f4276a24d03baafc0ff5ba73ad5523de88940ba247374a613c0b881343a8e47f4187de8e30

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.0.50
+* Enhancements
+  * Able to use ERB in oauth parameters and extract oauth hash with 'oauth_response' method defined by 'oauth_file'
+
 Version 0.0.47
 * Bug Fix
   * Using 'Strip namespace' handle both namespace or not dependent if used

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soaspec (0.0.49)
+    soaspec (0.0.50)
       jsonpath
       rest-client (>= 2.0)
       rspec (~> 3.0)

data/lib/soaspec/exchange.rb

@@ -28,7 +28,7 @@ class Exchange
     @override_parameters = override_parameters
     @retry_for_success = false
     self.retry_count = 3
-    puts 'ELE ' + @api_class.elements.to_s
+    # puts 'ELE ' + @api_class.elements.to_s
     @api_class.elements.each do |element|
       define_singleton_method(element) do
         @api_class.__send__(element, response)

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -23,10 +23,10 @@ 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('access_token') do
+      define_method('oauth_response') do
         response = if password && username && security_token
                      RestClient.post(
-                       token_url,
+                         token_url,
                          {
                              grant_type: 'password',
                              client_id: client_id,
@@ -34,7 +34,7 @@ module Soaspec
                              username: username,
                              password: (password + security_token),
                              multipart: true
-                            },
+                         },
                          cache_control: 'no_cache',
                          verify_ssl: false
                      )
@@ -42,29 +42,36 @@ module Soaspec
                      RestClient.post(
                          token_url,
                          {
-                           grant_type: 'password',
-                           client_id: client_id,
-                           client_secret: client_secret,
-                           username: username,
-                           password: password,
-                           multipart: true
+                             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
+                         token_url,
+                         {
+                             grant_type: 'client_credentials',
+                             client_id: client_id,
+                             client_secret: client_secret
+                         },
+                         cache_control: 'no_cache',
+                         verify_ssl: false
                      )
                    end
-        JSON.parse(response)['access_token']
+        JSON.parse(response)
+      end
+
+      define_method('access_token') do
+        oauth_response['access_token']
+      end
+      define_method('instance_url') do
+        oauth_response['instance_url']
       end
     end
 

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.49'
+  VERSION = '0.0.50'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors:
 - SamuelGarrattIQA