soaspec 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a68172ce21318f8672a99f1495ebbce59fecc4617e0e3bc91505658fab127dd
-  data.tar.gz: 7f6aa9f1a6850a8733220ab1e0443b247b2edea75f4fcdd2d96d74b9a8c8d51d
+  metadata.gz: ff535556597fbdc9006d5e9482e5fd835edfb39c76a9607cb7d5c05fae6291ca
+  data.tar.gz: af6b528b564ec301a9cb80ede31bc8edaaeabccb594cb7cb85949c0057e29b7e
 SHA512:
-  metadata.gz: 751fbd2a339bdc59490befd592becc2319dd7ca165f6887f8640d8fb6e1cbe87b224a235b0dce0cbc4bad255048ad2d8d320895926846199b9fd66b00cf82681
-  data.tar.gz: fa62bc0cc31a907168583dbd09dda939f3e3f000c420044e45a34a2cadeef19b9c81abd42451c9d25dc1347b298404fa8f18c01cb289b28dde14e8644f9005aa
+  metadata.gz: 6c53fdf6578f58b9625a46cb85928e13ee566f9bffc1778f0edf5365d50196c239adf847df72a9e38a0fa1f6d5e775b3706e21d042be21504049015586aa0ce9
+  data.tar.gz: 27e48e5546ec9ccdcbc72fd958a8c4255c87f2ce71a288aa01a5b7299315ea6cde4e19bcba6fa2183872d78e7a5f23bc4ca15be4d62a1b4d2656a16bb7b46cfe

data/.gitlab-ci.yml

@@ -1,33 +1,33 @@
-image: ruby:2.5
+image: ruby:2.6
 
-before_script:
-  - ruby -v
-  - which ruby
-  - gem install bundler rake
-  - bundle install --jobs $(nproc) --path vendor # Install dependencies into ./vendor/ruby
+include:
+  - template: Code-Quality.gitlab-ci.yml
 
 cache:
   key: ${CI_COMMIT_REF_SLUG}
   paths:
     - vendor/ruby
 
+.ruby_test: &ruby_test
+  script:
+    - gem install bundler rake
+    - bundle install --jobs $(nproc) --path vendor # Install dependencies into ./vendor/ruby
+    - bundle exec rake
+
 ruby_2.3:
   stage: test
   image: ruby:2.3
-  script:
-    - bundle exec rake
+  <<: *ruby_test
 
 ruby_2.4:
   stage: test
   image: ruby:2.4
-  script:
-    - bundle exec rake
+  <<: *ruby_test
 
 ruby_2.5:
   stage: test
   image: ruby:2.5
-  script:
-    - bundle exec rake
+  <<: *ruby_test
   artifacts:
     paths:
       - coverage/
@@ -35,25 +35,28 @@ ruby_2.5:
 ruby_2.6:
   stage: test
   image: ruby:2.6
-  script:
-    - bundle exec rake
+  <<: *ruby_test
 
 cucumber:
   image: samuelgarratt/soaspec
   stage: test
   script:
+    - gem install bundler
+    - bundle install
     - bundle exec cucumber
 
 doctest:
   image: samuelgarratt/soaspec
   stage: test
   script:
+    - gem install bundler
+    - bundle install
     - bundle exec rake yard:doctest
 
 pages:
   stage: deploy
   dependencies:
-    - ruby_2.5
+    - ruby_2.6
   script:
     - mv demo/ public/
     - mv coverage/ public/coverage

data/.rubocop.yml

@@ -1,2 +1,12 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 154
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.3.11
+* Enhancement
+  * Add 'resource' parameter to OAuth2 options
+
 Version 0.3.10
 * Enhancement
   * Create `body_params` method on RestRequest object to return Hash of parameters used to form request body

data/lib/soaspec/exchange_handlers/request/rest_request.rb

@@ -164,7 +164,7 @@ module Soaspec
     def concat_urls(url, suburl)
       url = url.to_s
       suburl = suburl.to_s
-      if url.slice(-1, 1) == '/' or suburl.slice(0, 1) == '/'
+      if (url.slice(-1, 1) == '/') || (suburl.slice(0, 1) == '/')
         url + suburl
       else
         "#{url}/#{suburl}"

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -203,7 +203,7 @@ module Soaspec
         raise NoElementAtPath, "No value at Xpath '#{prefix_xpath(path, attribute)}' in '#{response.body}'" unless result
         return result.inner_text if attribute.nil?
 
-        return result.attributes[attribute].inner_text
+        result.attributes[attribute].inner_text
       when :json
         matching_values = calculated_json_path_matches(path, response, attribute, not_empty: true)
         matching_values.first

data/lib/soaspec/exchange_handlers/soap_defaults.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Soaspec
   # Default values set in order to make testing easier. Override to fit what you
   # need in testing
@@ -22,4 +23,4 @@ module Soaspec
       end
     end
   end
-end
+end

data/lib/soaspec/exchange_handlers/soap_globals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Soaspec
   # Singleton methods for assigning Savon globals (http://savonrb.com/version2/globals.html)
   module SoapGlobals

data/lib/soaspec/o_auth2.rb

@@ -55,6 +55,7 @@ module Soaspec
     # @option params_sent [client_secret] Client Secret
     # @option params_sent [username] Username used in password grant
     # @option params_sent [password] Password used in password grant
+    # @option params_sent [resource] Api server that handles authenticated requests
     # @option params_sent [security_token] Security Token used in password grant
     # @param [String] api_username Username to use which can be set by Soaspec::ExchangeHandler
     def initialize(params_sent, api_username = nil)
@@ -129,18 +130,24 @@ module Soaspec
     # @return [Hash] Payload for retrieving OAuth access token
     def payload
       payload = { client_id: params[:client_id], client_secret: params[:client_secret] }
-      payload.merge(if params[:password] && params[:username]
-                      {
-                        grant_type: 'password', username: params[:username],
-                        password: password
-                      }.merge multipart true
-                    else
-                      { grant_type: 'client_credentials' }.merge multipart false
-                    end)
+      payload.merge!(if params[:password] && params[:username]
+                       password_grant_type_params
+                     else
+                       { grant_type: 'client_credentials' }.merge multipart false
+                     end)
+      payload[:resource] = params[:resource] if params[:resource]
+      payload
     end
 
     private
 
+    def password_grant_type_params
+      {
+        grant_type: 'password', username: params[:username],
+        password: password
+      }.merge multipart true
+    end
+
     # @param [Boolean] default Default value for multipart
     # @return [Hash] Multipart set to true if not set and is grant_type password
     def multipart(default)

data/lib/soaspec/version.rb

@@ -2,5 +2,5 @@
 
 module Soaspec
   # @return [String] Version of the gem
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

data/soaspec.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Helps to create tests for 'SOAP' or 'REST' apis. Easily represent multiple requests with
 the same configuration. Examples designed for RSpec and Cucumber."
   spec.homepage      = 'https://gitlab.com/samuel-garratt/soaspec'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -22,7 +23,6 @@ the same configuration. Examples designed for RSpec and Cucumber."
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'cucumber'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler