soaspec 0.0.73 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560cab022af5b3297cf79ae3bfd3b71cb023ac3d
-  data.tar.gz: c178b241de61f0ff91001ab1c710dd196ec6e611
+  metadata.gz: 43fd4464188493e9968c067148b269757e361b12
+  data.tar.gz: 94f6d5ea2560811e1069dcdb257f0823c777b301
 SHA512:
-  metadata.gz: 4aad8d63361904d563c10534248dc90376d493712e579e6da2d1e8a787940664e51261531bcd2d37e038c28bfe19e300665f9df3a65b7c5841a968246ec9fcd7
-  data.tar.gz: 0e93c0c83266d50026b4c36488b63abbe26a31987006fa2f964487b9c94d3c74517c26c228ba0a927c3840716e4f2b9ace495ac6bb8d8bd3e7e3d36a6495c16b
+  metadata.gz: 32d11b91846fb9d336076babc1dec2c9a398d04b234f90fed6dfdb9cb99f80fd6ada68884a057d090cbe83be447e579eb59c7a18b8900f8dc7f435a48b29f870
+  data.tar.gz: 795b62a2d2eaf78cbf6d58271389bdfca3f682411669c877f3088ffa0b61b954a233986a086bbea3d7513c8c85b3f01ff9991b1a5f8882b1d5eb458e6638a9e1

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.0.74
+* Enhancements
+  * RestHandler, enable api username to be set upon initialisation
+
 Version 0.0.73
 * Enhancements
   * Added 'default_handler' method with which define an exchange_handler to be created when an exchange is initialized

data/exe/soaspec-virtual-server

@@ -32,11 +32,12 @@ class SoaspecVirtualServer < Sinatra::Application
 
   # Simulate retrieving an ouath token. Passed to '/invoices'
   post '/as/token.oauth2' do
-    [200, Soaspec::TestServer::Invoices.oauth_headers, JSON.generate(Soaspec::TestServer::Invoices.oauth_body) ] #Soaspec::TestServer::Invoices.oauth_headers, ]# JSON.generate(Soaspec::TestServer::Invoices.oauth_body)]
+    Soaspec::TestServer::Invoices.user_used = request.env['rack.request.form_hash']['username']
+    [200, Soaspec::TestServer::Invoices.oauth_headers, JSON.generate(Soaspec::TestServer::Invoices.oauth_body)]
   end
 
   get '/invoice/:id' do |id|
-    JSON.generate(customer_id: id, oauth: request.env['HTTP_AUTHORIZATION'])
+    JSON.generate(customer_id: id, oauth: request.env['HTTP_AUTHORIZATION'], user: Soaspec::TestServer::Invoices.user_used)
   end
 
   authorize do |username, password|

data/lib/soaspec/exchange.rb

@@ -5,9 +5,12 @@ module ExchangeAccessors
 
   # Set default exchange handler for this exchange
   # This is helpful for when you need a new exchange handler created for each exchange
-  def default_handler(handler_class, name = handler_class.to_s, params = {})
+  def default_handler(handler_class, name = handler_class.to_s, params = '')
     define_method('default_handler_used') do
-      handler_class.new name, params
+      params_used = Hash[params.map do |k, param|
+        [k, param.is_a?(String) ? ERB.new(param).result(binding) : param]
+      end]
+      handler_class.new name, params_used
     end
   end
 end
@@ -19,7 +22,7 @@ class Exchange
 
   extend ExchangeAccessors
 
-  # Class of Exchange Handler for which this exchange is made
+  # Instance of ExchangeHandler for which this exchange is made
   attr_accessor :exchange_handler
   # How many times to retry for a success
   attr_accessor :retry_count

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -100,10 +100,6 @@ module Soaspec
   class RestHandler < ExchangeHandler
     extend Soaspec::RestAccessors
 
-    # Savon client used to make SOAP calls
-    attr_accessor :client
-    # SOAP Operation to use by default
-    attr_accessor :operation
     # User used in making API calls
     attr_accessor :api_username
 
@@ -142,6 +138,7 @@ module Soaspec
         name = self.class.to_s
       end
       super
+      set_remove_key(options, :api_username)
       set_remove_key(options, :default_hash)
       @init_options = options
     end

data/lib/soaspec/test_server/invoices.rb

@@ -2,7 +2,11 @@ module Soaspec
   module TestServer
     # Used to simulate requests requiring oauth authentication
     class Invoices
+      @user_used = nil
+
       class << self
+        attr_accessor :user_used
+
         def oauth_headers
           {
             'Content-Type' => 'application/json;charset=UTF-8'

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.73'.freeze
+  VERSION = '0.0.74'.freeze
 end

metadata

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