soaspec 0.0.48 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66f4dd1240984bed39579008a20ca1c08127b52
-  data.tar.gz: bb11a11eb0d9c6d51ad10f6f95a181c2eea2d572
+  metadata.gz: c3182f568caa56ca4f1f2982fd34cd03add94841
+  data.tar.gz: 0df96f12941e1b74393ebe45621d583f2e1ff956
 SHA512:
-  metadata.gz: 5fe6dfb9d15a1357929a447b1f02d2dd88703880ed22310df523a309c1d487c583101253f212012dc7aae7a1df1d278d374dd65bd4169223ecd086863935c16a
-  data.tar.gz: 05d5655a71a73503dfa09b511a6bff38bd906fb4079e604b28b23a57b045dd5d7bb5940e9083ed7e46f9051a1b076dc7c9a15b5f3dba983c56e82fea484223fe
+  metadata.gz: 932fe45f675620f1afa72ef36cb84fa8c54f6beebc7dd22686258fdf27c2f158a70b0a82bb7f280b111c81ae7657a01d7c5357af745247df58406efb764fd85d
+  data.tar.gz: f0e01064bacd3a5e10f59c24b4a74fdc7c471579012a61088b60d715912113696624b1893abbbbdb0de7b63e7a70dfe46c5f450041a591cc9a4f2e9f6b8daaab

data/Gemfile.lock

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

data/Todo.md

@@ -1,4 +1,9 @@
+* ouath2 - handler
+  * Need to handle where username and password and no security token
+  * Perform ERB on values taken by file
+
 * SoapHandler - define exhange method for each SOAP operation
+* Accessors - similar to HappyMapper
 * exchange add fields to overide parameters to support cucumber steps. exchange[from_temp] =
 * Demonstrate using Cucumber
 * Give examples and convenience methods for building classes for each SOAP or REST operation

data/lib/soaspec.rb

@@ -19,7 +19,7 @@ require 'soaspec/hash_methods'
 require 'soaspec/spec_logger'
 require 'soaspec/exe_helpers'
 require 'soaspec/exchange_handlers/rest_handler'
-require 'soaspec/accessors'
+require 'soaspec/exchange_handlers/handler_accessors'
 require 'soaspec/interpreter'
 require 'soaspec/not_found_errors'
 

data/lib/soaspec/exchange.rb

@@ -28,6 +28,12 @@ class Exchange
     @override_parameters = override_parameters
     @retry_for_success = false
     self.retry_count = 3
+    puts 'ELE ' + @api_class.elements.to_s
+    @api_class.elements.each do |element|
+      define_singleton_method(element) do
+        @api_class.__send__(element, response)
+      end
+    end
   end
 
   # Make request to handler with parameters defined

data/lib/soaspec/exchange_handlers/exchange_handler.rb

@@ -1,12 +1,21 @@
 
+require_relative 'handler_accessors'
+
 module Soaspec
+
   # Inherit this for a class describing how to implement a particular exchange.
   # Has basic methods common for methods defining RSpec tests in YAML
   class ExchangeHandler
+    extend Soaspec::HandlerAccessors
 
     # Retrieve the name of the template file to be used in the API request
     attr_reader :template_name
 
+    # Explicitly defined elements for which a path has been predefined
+    def elements
+      @elements || []
+    end
+
     # Set instance variable name
     # @param [String, Symbol] name Name used when describing API test
     # @param [Hash] options Parameters defining handler. Used in descendants
@@ -30,6 +39,7 @@ module Soaspec
     end
 
     # Set the request option type and the template name
+    # Erb is used to parse the template file, executing Ruby code in `<%= %>` blocks to work out the final request
     # @param [String] name Name of file inside 'template' folder excluding extension
     def template_name=(name)
       @request_option = :template

data/lib/soaspec/{accessors.rb → exchange_handlers/handler_accessors.rb}

@@ -1,7 +1,7 @@
 module Soaspec
   # Describes methods test handlers use to easily set attributes
   # Some are included in 'success scenarios' and to configure the request sent
-  module Accessors
+  module HandlerAccessors
 
     # Defines expected_mandatory_elements method used in 'success_scenario' shared examples
     # to indicate certain elements must be present
@@ -60,5 +60,19 @@ module Soaspec
       end
     end
 
+    # Links a particular path to a meaningful name. This will use the 'value_from_path' method which
+    # should be implemented by each ExchangeHandler
+    # @param [String, Symbol] name Method name used to access element
+    # @param [String, Symbol] path Path to find object (e.g, XPath, JSONPath)
+    def element(name, path)
+      # puts 'Making with ' + name.to_s + path
+      @elements ||= []
+      @elements << name.to_s # Add record to list of elements used by exchange
+      # puts 'NOW ELE' + @elements.to_s
+      define_method(name.to_s) do |response|
+        value_from_path(response, path.to_s)
+      end
+    end
+
   end
 end

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -2,7 +2,7 @@
 require_relative 'exchange_handler'
 require_relative '../hash_methods'
 require_relative '../not_found_errors'
-require_relative '../accessors'
+require_relative 'handler_accessors'
 require_relative '../interpreter'
 require 'json'
 require 'jsonpath'
@@ -34,6 +34,20 @@ module Soaspec
                              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
@@ -41,11 +55,11 @@ module Soaspec
                    else
                      RestClient.post(
                        token_url,
-                        {
-                             grant_type: 'client_credentials',
-                             client_id: client_id,
-                             client_secret: client_secret
-                                },
+                      {
+                         grant_type: 'client_credentials',
+                         client_id: client_id,
+                         client_secret: client_secret
+                              },
                        cache_control: 'no_cache',
                        verify_ssl: false
                      )
@@ -58,7 +72,7 @@ module Soaspec
     # @param [String] path_to_filename Will have Soaspec.credentials_folder appended to it if set
     def oauth2_file(path_to_filename)
       full_path = Soaspec.credentials_folder ? File.join(Soaspec.credentials_folder, path_to_filename + '.yml') : path_to_filename + '.yml'
-      file_hash = YAML.load_file(full_path)
+      file_hash = eval(ERB.new(YAML.load_file(full_path).to_s).result(binding))
       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
@@ -69,7 +83,6 @@ module Soaspec
   # Wraps around Savon client defining default values dependent on the soap request
   class RestHandler < ExchangeHandler
     extend Soaspec::RestAccessors
-    extend Soaspec::Accessors
 
     # Savon client used to make SOAP calls
     attr_accessor :client

data/lib/soaspec/exchange_handlers/soap_handler.rb

@@ -2,7 +2,7 @@
 require_relative 'exchange_handler'
 require_relative '../hash_methods'
 require_relative '../not_found_errors'
-require_relative '../accessors'
+require_relative 'handler_accessors'
 require_relative '../interpreter'
 
 module Soaspec
@@ -20,7 +20,6 @@ module Soaspec
 
   # Wraps around Savon client defining default values dependent on the soap request
   class SoapHandler < ExchangeHandler
-    extend Soaspec::Accessors
     extend Soaspec::SoapAccessors
 
     # Savon client used to make SOAP calls
@@ -89,8 +88,7 @@ module Soaspec
 
     # Used in together with Exchange request that passes such override parameters
     def make_request(override_parameters)
-      test_values = override_parameters # Used in Erb
-      # Erb parses template file, executing Ruby code in `<% %>` blocks to work out final request
+      test_values = override_parameters # Used in making request via hash or in template via Erb
       test_values = test_values.transform_keys_to_symbols if Soaspec.always_use_keys?
       begin
         if @request_option == :template

data/lib/soaspec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,9 +167,9 @@ files:
 - exe/soaspec-init
 - exe/xml_to_yaml_file
 - lib/soaspec.rb
-- lib/soaspec/accessors.rb
 - lib/soaspec/exchange.rb
 - lib/soaspec/exchange_handlers/exchange_handler.rb
+- lib/soaspec/exchange_handlers/handler_accessors.rb
 - lib/soaspec/exchange_handlers/rest_handler.rb
 - lib/soaspec/exchange_handlers/rest_methods.rb
 - lib/soaspec/exchange_handlers/soap_handler.rb