soaspec 0.0.64 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c86df1d3a144dc27e77be77a31c9b4391fd07a
-  data.tar.gz: 9fae1931ca918a24b6d44e7a7539225d79d829ee
+  metadata.gz: 1b74599fe5d32dc78abe0ad63f1454c5173ac188
+  data.tar.gz: ab105cf905b37f63a6fc6a52c694e85d3577c621
 SHA512:
-  metadata.gz: 2f876e1f3e3e532e9c4dd0bc65cc16e50da035d165a9d712add298c4221a61cd3808c9f13a779658543d22c2339060af88ee4bedb01b01df93a44e1982c1b665
-  data.tar.gz: 9e913c8ded49a9df53a65ae78a9e3672e725486f755c562ea3610e092a301ce773e8a217143e0cda0d21dc7e498a0236e5cc5e72355ead42853130f6b111c1e1
+  metadata.gz: fe214897a46aef14ffc950badadcd818927d5e6e38d427d29a7e3ce4d9ae0916d24f4262c3457d2d812ea3b198c7d2365ee174d498d31a457c485d0f54085bac
+  data.tar.gz: ec75d15728e9b97082d9039bf9ea14652671488652991b539c1d883f77061057acf9de25ef83b6cce0d8a7b944dd51c83937e7549bc73cb6c2b920e5ca4aa0be

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.0.65
+* Enhancements
+  * Added ability to set 'suburl' and 'method' in Exchange accessor. Will be used in FactoryBot later
+
 Version 0.0.64
 * Enhancements
   * Got FactoryBot working for RestHandler. See specs for example

data/exe/soaspec-virtual-server

@@ -32,26 +32,23 @@ get '/as/token.oauth2' do
 end
 
 # Used for testing storage of data
-post '/test/id' do
-  # puts request.body.string
+post '/test/name' do
   request_hash = JSON.parse(request.body.string)
-  # request_hash = JSON.parse('{ "id": "1" }')
-  # puts request_hash
-  uuid = SecureRandom.uuid
-  Soaspec::TestServer::PuppyService.data[uuid] = {}
-  Soaspec::TestServer::PuppyService.data[uuid][:id] = request_hash['id']
-  # puts PuppyService.data
-  'Success'
+  id = Soaspec::TestServer::PuppyService.new_id
+  Soaspec::TestServer::PuppyService.data[id][:name] = request_hash['name']
+  response_hash = { result: { status: 'success', data: Soaspec::TestServer::PuppyService.data[id] } }
+  JSON.generate response_hash
 end
 
 # Used for testing retrieving storage of data
-get '/test/id/:id' do |id|
-  # puts "ID is:#{id}:"
-  # puts id.class
-  # puts PuppyService.data
-  # puts PuppyService.data['id']
-  # puts PuppyService.data[id]
-  result = Soaspec::TestServer::PuppyService.data.select { |_key, hash| hash[:id] == id }
-
-  JSON.generate(result)
+get '/test/name/:id' do |id|
+  result = Soaspec::TestServer::PuppyService.data[id.to_i]
+  JSON.generate result
+end
+
+patch '/test/name/:id' do |id|
+  request_hash = JSON.parse(request.body.string)
+  Soaspec::TestServer::PuppyService.data[id.to_i][:name] = request_hash['name']
+  response_hash = { result: { status: 'updated', with: request_hash['name'] } }
+  JSON.generate response_hash
 end

data/lib/soaspec/exchange.rb

@@ -4,11 +4,9 @@ require_relative '../soaspec'
 class Exchange
 
   # Class of Api Handler for which this exchange is made
-  attr_reader :api_class
+  attr_accessor :api_class
   # How many times to retry for a success
   attr_accessor :retry_count
-  # Params used when making a request
-  attr_accessor :default_params
   # Name used for displaying class
   attr_accessor :test_name
 
@@ -48,15 +46,16 @@ class Exchange
     end
   end
 
-  # Merge exchange initialized request params with ones set later on
-  def merge_request_body
-    if @override_parameters[:body] || default_params[:body]
-      @override_parameters[:body] ||= {}
-      @override_parameters[:body].merge!(default_params[:body])
-      @override_parameters
-    else
-      @override_parameters.merge(default_params[:body])
-    end
+  # Specify a url to add onto the base_url of the ExchangeHandler used
+  # @param [String] url Url to add onto the base_url of the ExchangeHandler used
+  def suburl=(url)
+    @override_parameters[:suburl] = url
+  end
+
+  # Specify HTTP method to use. Default is :post
+  # @param [Symbol] method HTTP method. E.g, :get, :patch
+  def method=(method)
+    @override_parameters[:method] = method
   end
 
   # Make request to handler with parameters defined
@@ -64,7 +63,7 @@ class Exchange
   # @return [Response] Response from Api handler
   def make_request
     Soaspec::SpecLogger.add_to 'Example ' + test_name
-    request_params = default_params ? merge_request_body : @override_parameters
+    request_params = @override_parameters
     retry_count.times do
       response = @api_class.make_request(request_params)
       return response unless retry_for_success?
@@ -142,8 +141,8 @@ class Exchange
   # Can be used to build a request over several steps (e.g Cucumber)
   # Will be used with FactoryBot
   def []=(key, value)
-    self.default_params = { body: {} } unless default_params # Initialize as Hash if not set
-    default_params[:body][key] = value
+    @override_parameters[:body] ||= {}
+    @override_parameters[:body][key] = value
   end
 
   # Implement undefined setter with []= for FactoryBot to use without needing to define params to set
@@ -151,7 +150,7 @@ class Exchange
   # @param [Object] args
   # @param [Object] block
   def method_missing(method_name, *args, &block)
-    if method_name[-1] == '='
+    if method_name[-1] == '=' # A setter method
       if args.first.class < Exchange # This would be prerequisite exchange
         define_singleton_method(method_name[0..-2]) do
           args.first

data/lib/soaspec/test_server/puppy_service.rb

@@ -2,8 +2,17 @@ module Soaspec
   module TestServer
     class PuppyService
       @data = {}
+      @current_id = 1
       class << self
         attr_accessor :data
+
+        def new_id
+          @data[@current_id] = {}
+          @data[@current_id][:id] = @current_id
+          @current_id += 1
+          @current_id - 1
+        end
+
       end
     end
   end

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.64'.freeze
+  VERSION = '0.0.65'.freeze
 end

metadata

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