soaspec 0.0.81 → 0.0.82

data/exe/soaspec-virtual-server

@@ -1,93 +1,99 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-require 'soaspec'
-require 'sinatra'
-require 'sinatra/basic_auth'
-require 'nokogiri'
-require 'erb'
-require 'json'
-require 'faker'
-
-class SoaspecVirtualServer < Sinatra::Application
-
-  # Used to run virtual web service on localhost. This makes tests more reliable and faster
-
-  set :port, 4999
-
-  # Used to test attributes
-  get '/test_attribute' do
-    Soaspec::TestServer::TestAttribute.note
-  end
-
-  # This is the one being hit by SOAP actions
-  post '/BLZService' do
-    Soaspec::TestServer::GetBank.response_for request
-  end
-
-  # This is returned when a query for the WSDL is made
-  get '/BLZService' do
-    [200, { 'Content-Type' => 'text/xml' }, Soaspec::TestServer::GetBank.test_wsdl]
-  end
-
-  # Simulate retrieving an ouath token. Passed to '/invoices'
-  post '/as/token.oauth2' do
-    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'], user: Soaspec::TestServer::Invoices.user_used)
-  end
-
-  authorize do |username, password|
-    username == 'admin' && password == 'secret'
-  end
-
-  protect do
-    get '/basic_secrets' do
-      'Secret data'
-    end
-  end
-
-  # Used for testing storage of data
-  post '/test/puppy' do
-    request_hash = JSON.parse(request.body.string)
-    id = Soaspec::TestServer::PuppyService.new_id
-    Soaspec::TestServer::PuppyService.data[id][:Name] = request_hash['Name']
-    Soaspec::TestServer::PuppyService.data[id][:Failure_Type__c] = request_hash['Failure_Type__c'] if request_hash['Failure_Type__c']
-    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/puppy/:id' do |id|
-    result = Soaspec::TestServer::PuppyService.data[id.to_i]
-    JSON.generate result
-  end
-
-  get '/test/multiple_json' do
-    <<-BOOKS
-  {"store":
-    {"bicycle":
-      {"price":19.95, "color":"red"},
-      "book":[
-        {"price":8.95, "category":"reference", "title":"Sayings of the Century", "author":"Nigel Rees"},
-        {"price":12.99, "category":"fiction", "title":"Sword of Honour", "author":"Evelyn Waugh"},
-        {"price":8.99, "category":"fiction", "isbn":"0-553-21311-3", "title":"Moby Dick", "author":"Herman Melville","color":"blue"},
-        {"price":22.99, "category":"fiction", "isbn":"0-395-19395-8", "title":"The Lord of the Rings", "author":"Tolkien"}
-      ]
-    }
-  }
-    BOOKS
-  end
-
-  patch '/test/puppy/: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
-end
-
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+require 'soaspec'
+require 'sinatra'
+require 'sinatra/basic_auth'
+require 'nokogiri'
+require 'erb'
+require 'json'
+require 'faker'
+
+class SoaspecVirtualServer < Sinatra::Application
+
+  # Used to run virtual web service on localhost. This makes tests more reliable and faster
+
+  set :port, 4999
+
+  # Used to test attributes
+  get '/test_attribute' do
+    Soaspec::TestServer::TestAttribute.note
+  end
+
+  # Used to test attributes
+  get '/namespace' do
+    # Soaspec::TestServer::TestAttribute.note
+    Soaspec::TestServer::TestNamespace.food
+  end
+
+  # This is the one being hit by SOAP actions
+  post '/BLZService' do
+    Soaspec::TestServer::GetBank.response_for request
+  end
+
+  # This is returned when a query for the WSDL is made
+  get '/BLZService' do
+    [200, { 'Content-Type' => 'text/xml' }, Soaspec::TestServer::GetBank.test_wsdl]
+  end
+
+  # Simulate retrieving an ouath token. Passed to '/invoices'
+  post '/as/token.oauth2' do
+    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'], user: Soaspec::TestServer::Invoices.user_used)
+  end
+
+  authorize do |username, password|
+    username == 'admin' && password == 'secret'
+  end
+
+  protect do
+    get '/basic_secrets' do
+      'Secret data'
+    end
+  end
+
+  # Used for testing storage of data
+  post '/test/puppy' do
+    request_hash = JSON.parse(request.body.string)
+    id = Soaspec::TestServer::PuppyService.new_id
+    Soaspec::TestServer::PuppyService.data[id][:Name] = request_hash['Name']
+    Soaspec::TestServer::PuppyService.data[id][:Failure_Type__c] = request_hash['Failure_Type__c'] if request_hash['Failure_Type__c']
+    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/puppy/:id' do |id|
+    result = Soaspec::TestServer::PuppyService.data[id.to_i]
+    JSON.generate result
+  end
+
+  get '/test/multiple_json' do
+    <<-BOOKS
+  {"store":
+    {"bicycle":
+      {"price":19.95, "color":"red"},
+      "book":[
+        {"price":8.95, "category":"reference", "title":"Sayings of the Century", "author":"Nigel Rees"},
+        {"price":12.99, "category":"fiction", "title":"Sword of Honour", "author":"Evelyn Waugh"},
+        {"price":8.99, "category":"fiction", "isbn":"0-553-21311-3", "title":"Moby Dick", "author":"Herman Melville","color":"blue"},
+        {"price":22.99, "category":"fiction", "isbn":"0-395-19395-8", "title":"The Lord of the Rings", "author":"Tolkien"}
+      ]
+    }
+  }
+    BOOKS
+  end
+
+  patch '/test/puppy/: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
+end
+
 SoaspecVirtualServer.run!

data/exe/xml_to_yaml_file

@@ -1,61 +1,61 @@
-#!/usr/bin/env ruby
-
-require 'xmlsimple'
-require 'yaml'
-require 'fileutils'
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-require 'soaspec'
-
-include Soaspec::ExeHelpers
-
-default_output_file = 'output.yml'
-
-# Create file if not present. If present but different give warning
-def create_file(options)
-  filename = options[:filename]
-  raise 'Need to pass filename' unless filename
-  content = options[:content]
-  raise 'Need to pass contents to insert into file' unless content
-  if File.exist? filename
-    old_content = File.read(filename)
-    if old_content != content
-      warn "!! #{filename} already exists and differs from template"
-    end
-  else
-    File.open(filename, 'w') do |f|
-      f.puts content
-    end
-    puts 'Created: ' + filename
-  end
-end
-
-# For all keys in a Hash, convert Camelcase to underscore separated
-def convert_hash_keys(value)
-  case value
-  when Array
-    value.map { |v| convert_hash_keys(v) }
-  when Hash
-    Hash[value.map { |k, v| [k.snakecase, convert_hash_keys(v)] }]
-  else
-    value
-  end
-end
-
-# Remove arrays created as another string
-def clean_up_yaml(yaml_string)
-  yaml_string = yaml_string.gsub(/\R+(\s*)-/, '').gsub(/{}/, "''") # Remove arrays, {} -> ''
-  # Insert new line where there are 2 ':' on 1 line. Issue from first gsub
-  yaml_string.gsub(/:(\s)(\w*):/){|s| s.insert(1, "\n")}
-end
-
-if ARGV[0]
-  warn "Using '#{default_output_file}' as default output file since no 2nd argument passed" unless ARGV[1]
-  hash = XmlSimple.xml_in(ARGV[0])
-  converted = convert_hash_keys hash
-  yaml_file = clean_up_yaml(converted.to_yaml)
-  create_file(filename: ARGV[1] || default_output_file, content: yaml_file)
-else
-  puts 'usage: xml_to_yaml_file [input.xml] [output.yml] '
+#!/usr/bin/env ruby
+
+require 'xmlsimple'
+require 'yaml'
+require 'fileutils'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require 'soaspec'
+
+include Soaspec::ExeHelpers
+
+default_output_file = 'output.yml'
+
+# Create file if not present. If present but different give warning
+def create_file(options)
+  filename = options[:filename]
+  raise 'Need to pass filename' unless filename
+  content = options[:content]
+  raise 'Need to pass contents to insert into file' unless content
+  if File.exist? filename
+    old_content = File.read(filename)
+    if old_content != content
+      warn "!! #{filename} already exists and differs from template"
+    end
+  else
+    File.open(filename, 'w') do |f|
+      f.puts content
+    end
+    puts 'Created: ' + filename
+  end
+end
+
+# For all keys in a Hash, convert Camelcase to underscore separated
+def convert_hash_keys(value)
+  case value
+  when Array
+    value.map { |v| convert_hash_keys(v) }
+  when Hash
+    Hash[value.map { |k, v| [k.snakecase, convert_hash_keys(v)] }]
+  else
+    value
+  end
+end
+
+# Remove arrays created as another string
+def clean_up_yaml(yaml_string)
+  yaml_string = yaml_string.gsub(/\R+(\s*)-/, '').gsub(/{}/, "''") # Remove arrays, {} -> ''
+  # Insert new line where there are 2 ':' on 1 line. Issue from first gsub
+  yaml_string.gsub(/:(\s)(\w*):/){|s| s.insert(1, "\n")}
+end
+
+if ARGV[0]
+  warn "Using '#{default_output_file}' as default output file since no 2nd argument passed" unless ARGV[1]
+  hash = XmlSimple.xml_in(ARGV[0])
+  converted = convert_hash_keys hash
+  yaml_file = clean_up_yaml(converted.to_yaml)
+  create_file(filename: ARGV[1] || default_output_file, content: yaml_file)
+else
+  puts 'usage: xml_to_yaml_file [input.xml] [output.yml] '
 end

data/lib/soaspec.rb

@@ -1,85 +1,86 @@
-require 'rest-client' # REST
-require 'erb' # Embedded ruby
-require 'yaml' # Reading yaml
-require 'rspec' # Testing framework
-require 'rspec/its'
-require 'savon' # SOAP
-require 'nokogiri' # XPath
-require 'date'
-require 'jsonpath'
-
-require 'soaspec/version'
-require 'soaspec/exchange_handlers/soap_handler'
-require 'soaspec/exchange_handlers/exchange_handler'
-require 'soaspec/exchange_handlers/rest_methods'
-require 'soaspec/exchange'
-require 'soaspec/matchers'
-require 'soaspec/soaspec_shared_examples'
-require 'soaspec/core_ext/hash'
-require 'soaspec/spec_logger'
-require 'soaspec/exe_helpers'
-require 'soaspec/exchange_handlers/rest_handler'
-require 'soaspec/exchange_handlers/handler_accessors'
-require 'soaspec/interpreter'
-require 'soaspec/not_found_errors'
-require 'soaspec/test_server/get_bank'
-require 'soaspec/test_server/test_attribute'
-require 'soaspec/test_server/puppy_service'
-require 'soaspec/test_server/invoices'
-require 'soaspec/wsdl_generator'
-
-# Gem for handling SOAP and REST api tests
-module Soaspec
-
-  class << self
-
-    # Folder used to store credentials
-    # Used in auth2_file command
-    # @param [String] folder
-    def credentials_folder=(folder)
-      @credentials_folder = folder
-    end
-
-    # Credentials folder used to store secret data (not in source control) E.g passwords
-    def credentials_folder
-      @credentials_folder
-    end
-
-    # Used so that exchange class knows what context it's in
-    # @param [ExchangeHandler] handler A class inheriting from Soaspec::ExchangeHandler. Exchange class uses this
-    def api_handler=(handler)
-      @api_handler = handler
-    end
-
-    # Exchange Handler class currently being used
-    def api_handler
-      @api_handler
-    end
-
-    # Set whether to transform strings to keys in request automatically
-    # @param [Boolean] use_keys
-    def always_use_keys=(use_keys)
-      @always_use_keys = use_keys
-    end
-
-    # @return [Boolean] Whether to transform strings to keys in request automatically
-    def always_use_keys?
-      @always_use_keys || true
-    end
-
-    # Whether to remove namespaces from response in Xpath assertion automatically
-    # For why this may not be a good thing in general see
-    # http://tenderlovemaking.com/2009/04/23/namespaces-in-xml.html
-    # This will be overridden if xpath has a ':' in it
-    def strip_namespaces=(remove_namespaces)
-      @strip_namespaces = remove_namespaces
-    end
-
-    # Whether to remove namespaces in xpath assertion automatically
-    def strip_namespaces?
-      @strip_namespaces || false
-    end
-  end
-end
-
-RestClient.log = Soaspec::SpecLogger.create
+require 'rest-client' # REST
+require 'erb' # Embedded ruby
+require 'yaml' # Reading yaml
+require 'rspec' # Testing framework
+require 'rspec/its'
+require 'savon' # SOAP
+require 'nokogiri' # XPath
+require 'date'
+require 'jsonpath'
+
+require 'soaspec/version'
+require 'soaspec/exchange_handlers/soap_handler'
+require 'soaspec/exchange_handlers/exchange_handler'
+require 'soaspec/exchange_handlers/rest_methods'
+require 'soaspec/exchange'
+require 'soaspec/matchers'
+require 'soaspec/soaspec_shared_examples'
+require 'soaspec/core_ext/hash'
+require 'soaspec/spec_logger'
+require 'soaspec/exe_helpers'
+require 'soaspec/exchange_handlers/rest_handler'
+require 'soaspec/exchange_handlers/handler_accessors'
+require 'soaspec/interpreter'
+require 'soaspec/not_found_errors'
+require 'soaspec/test_server/get_bank'
+require 'soaspec/test_server/test_attribute'
+require 'soaspec/test_server/puppy_service'
+require 'soaspec/test_server/invoices'
+require 'soaspec/test_server/test_namespace'
+require 'soaspec/wsdl_generator'
+
+# Gem for handling SOAP and REST api tests
+module Soaspec
+
+  class << self
+
+    # Folder used to store credentials
+    # Used in auth2_file command
+    # @param [String] folder
+    def credentials_folder=(folder)
+      @credentials_folder = folder
+    end
+
+    # Credentials folder used to store secret data (not in source control) E.g passwords
+    def credentials_folder
+      @credentials_folder
+    end
+
+    # Used so that exchange class knows what context it's in
+    # @param [ExchangeHandler] handler A class inheriting from Soaspec::ExchangeHandler. Exchange class uses this
+    def api_handler=(handler)
+      @api_handler = handler
+    end
+
+    # Exchange Handler class currently being used
+    def api_handler
+      @api_handler
+    end
+
+    # Set whether to transform strings to keys in request automatically
+    # @param [Boolean] use_keys
+    def always_use_keys=(use_keys)
+      @always_use_keys = use_keys
+    end
+
+    # @return [Boolean] Whether to transform strings to keys in request automatically
+    def always_use_keys?
+      @always_use_keys || true
+    end
+
+    # Whether to remove namespaces from response in Xpath assertion automatically
+    # For why this may not be a good thing in general see
+    # http://tenderlovemaking.com/2009/04/23/namespaces-in-xml.html
+    # This will be overridden if xpath has a ':' in it
+    def strip_namespaces=(remove_namespaces)
+      @strip_namespaces = remove_namespaces
+    end
+
+    # Whether to remove namespaces in xpath assertion automatically
+    def strip_namespaces?
+      @strip_namespaces || false
+    end
+  end
+end
+
+RestClient.log = Soaspec::SpecLogger.create