soaspec 0.2.24 → 0.2.25

data/lib/soaspec/soaspec_shared_examples.rb

@@ -1,24 +1,24 @@
-require 'rspec'
-
-RSpec.shared_examples_for 'success scenario' do
-  it 'has successful status code' do
-    expect(200..299).to cover described_class.status_code
-  end
-  context 'has expected mandatory elements' do
-    described_class.exchange_handler.expected_mandatory_elements.each do |mandatory_element|
-      it mandatory_element do
-        expect(described_class).to contain_key mandatory_element
-      end
-    end
-  end
-  described_class.exchange_handler.expected_mandatory_xpath_values.each do |xpath, value|
-    it "has xpath '#{xpath}' equal to '#{value}'" do
-      expect(described_class).to have_xpath_value(xpath => value)
-    end
-  end
-  described_class.exchange_handler.expected_mandatory_json_values.each do |xpath, value|
-    it "has json '#{xpath}' equal to '#{value}'" do
-      expect(described_class).to have_xpath_value(xpath => value)
-    end
-  end
-end
+require 'rspec'
+
+RSpec.shared_examples_for 'success scenario' do
+  it 'has successful status code' do
+    expect(200..299).to cover described_class.status_code
+  end
+  context 'has expected mandatory elements' do
+    described_class.exchange_handler.expected_mandatory_elements.each do |mandatory_element|
+      it mandatory_element do
+        expect(described_class).to contain_key mandatory_element
+      end
+    end
+  end
+  described_class.exchange_handler.expected_mandatory_xpath_values.each do |xpath, value|
+    it "has xpath '#{xpath}' equal to '#{value}'" do
+      expect(described_class).to have_xpath_value(xpath => value)
+    end
+  end
+  described_class.exchange_handler.expected_mandatory_json_values.each do |xpath, value|
+    it "has json '#{xpath}' equal to '#{value}'" do
+      expect(described_class).to have_xpath_value(xpath => value)
+    end
+  end
+end

data/lib/soaspec/spec_logger.rb

@@ -1,121 +1,122 @@
-require 'logger'
-require 'fileutils'
-require 'colorize'
-
-module Soaspec
-  # Custom class for logging API traffic
-  class ApiLogger < Logger
-    #
-    # Rewrite << to use info logger with formatting
-    #
-    def <<(msg)
-      info msg
-    end
-  end
-
-  # Handles logs of API requests and responses
-  class SpecLogger
-    # Folder to put API traffic logs
-    @traffic_folder = 'logs'
-    # Whether to output api traffic to terminal
-    @output_to_terminal = false
-    # Color shown when displaying in terminal
-    @terminal_color = :light_blue
-    # Whether to output API traffic to log file
-    @output_to_file = true
-    # Time test run. Will only be calculated once once called
-    @time_test_run = Time.now.strftime('%Y-%m-%d_%H_%M_%S')
-    # By default file is based on time
-    @traffic_file = nil
-    class << self
-      # Folder to put API traffic logs
-      attr_accessor :traffic_folder
-      # Color shown when displaying in terminal
-      attr_accessor :terminal_color
-      # Readers for log parameters
-      attr_reader :output_to_terminal, :output_to_file, :time_test_run
-
-      # Set file to log traffic to
-      def traffic_file=(file)
-        @traffic_file = file
-        reset_log
-      end
-
-      # @return [String] Traffic file to create logs at
-      def traffic_file
-        return File.join(traffic_folder, @traffic_file) if @traffic_file
-
-        filename = "traffic_#{time_test_run}.log"
-        File.join(traffic_folder, filename)
-      end
-
-      # Unset Logger object. It will be recreated on next time 'info' is called
-      def reset_log
-        @logger = nil
-      end
-
-      # Whether to log all API traffic
-      def log_api_traffic=(set)
-        @log_api_traffic = set
-        reset_log
-      end
-
-      # @return [Boolean] Whether to log all API traffic
-      def log_api_traffic?
-        @log_api_traffic.nil? ? true : @log_api_traffic
-      end
-
-      # @param [Symbol, Boolean] value # Whether to output API traffic to log file
-      def output_to_file=(value)
-        @output_to_file = value
-        reset_log
-      end
-
-      # @param [Symbol, Boolean] value # Whether to output API traffic to STDOUT
-      def output_to_terminal=(value)
-        @output_to_terminal = value
-        reset_log
-      end
-
-      # Create new log file if necessary and setup logging level
-      # @return [Logger] Logger class to record API traffic
-      def create
-        create_log_file
-        @logger = ApiLogger.new(traffic_file) # Where request and responses of APIs are stored
-        @logger.formatter = proc do |severity, datetime, _progname, msg|
-          message = "SpecLog, [#{datetime.strftime('%Y-%m-%d_%H:%M:%S')}] #{severity} -- : #{msg}\n"
-          print message.colorize(terminal_color) if @output_to_terminal
-          message if @output_to_file
-        end
-        RestClient.log = @logger
-        @logger
-      end
-
-      # Log a message using Soaspec logger
-      # Logger (and it's file) will be created if it's not already set
-      # @param [String] message The message to add to the logger
-      def info(message)
-        return unless log_api_traffic?
-
-        create unless @logger
-        if message.respond_to? :each
-          message.each do |message_item|
-            @logger.info(message_item)
-          end
-        else
-          @logger.info(message)
-        end
-      end
-
-      private
-
-      # Create folder and file to store logs
-      def create_log_file
-        return if File.exist?(traffic_file)
-
-        FileUtils.mkdir_p traffic_folder
-        FileUtils.touch traffic_file
-      end
-    end
-  end
-end
+require 'logger'
+require 'fileutils'
+require 'colorize'
+
+module Soaspec
+  # Custom class for logging API traffic
+  class ApiLogger < Logger
+    #
+    # Rewrite << to use info logger with formatting
+    #
+    def <<(msg)
+      info msg
+    end
+  end
+
+  # Handles logs of API requests and responses
+  class SpecLogger
+    # Folder to put API traffic logs
+    @traffic_folder = 'logs'
+    # Whether to output api traffic to terminal
+    @output_to_terminal = false
+    # Color shown when displaying in terminal
+    @terminal_color = :light_blue
+    # Whether to output API traffic to log file
+    @output_to_file = true
+    # Time test run. Will only be calculated once once called
+    @time_test_run = Time.now.strftime('%Y-%m-%d_%H_%M_%S')
+    # By default file is based on time
+    @traffic_file = nil
+    class << self
+      # Folder to put API traffic logs
+      attr_accessor :traffic_folder
+      # Color shown when displaying in terminal
+      attr_accessor :terminal_color
+      # Readers for log parameters
+      attr_reader :output_to_terminal, :output_to_file, :time_test_run
+
+      # Set file to log traffic to
+      def traffic_file=(file)
+        @traffic_file = file
+        reset_log
+      end
+
+      # @return [String] Traffic file to create logs at
+      def traffic_file
+        return File.join(traffic_folder, @traffic_file) if @traffic_file
+
+        filename = "traffic_#{time_test_run}.log"
+        File.join(traffic_folder, filename)
+      end
+
+      # Unset Logger object. It will be recreated on next time 'info' is called
+      def reset_log
+        @logger = nil
+        RestClient.log = nil
+      end
+
+      # Whether to log all API traffic
+      def log_api_traffic=(set)
+        @log_api_traffic = set
+        reset_log
+      end
+
+      # @return [Boolean] Whether to log all API traffic
+      def log_api_traffic?
+        @log_api_traffic.nil? ? true : @log_api_traffic
+      end
+
+      # @param [Symbol, Boolean] value # Whether to output API traffic to log file
+      def output_to_file=(value)
+        @output_to_file = value
+        reset_log
+      end
+
+      # @param [Symbol, Boolean] value # Whether to output API traffic to STDOUT
+      def output_to_terminal=(value)
+        @output_to_terminal = value
+        reset_log
+      end
+
+      # Create new log file if necessary and setup logging level
+      # @return [Logger] Logger class to record API traffic
+      def create
+        create_log_file
+        @logger = ApiLogger.new(traffic_file) # Where request and responses of APIs are stored
+        @logger.formatter = proc do |severity, datetime, _progname, msg|
+          message = "SpecLog, [#{datetime.strftime('%Y-%m-%d_%H:%M:%S')}] #{severity} -- : #{msg}\n"
+          print message.colorize(terminal_color) if @output_to_terminal
+          message if @output_to_file
+        end
+        RestClient.log = @logger
+        @logger
+      end
+
+      # Log a message using Soaspec logger
+      # Logger (and it's file) will be created if it's not already set
+      # @param [String] message The message to add to the logger
+      def info(message)
+        return unless log_api_traffic?
+
+        create unless @logger
+        if message.respond_to? :each
+          message.each do |message_item|
+            @logger.info(message_item)
+          end
+        else
+          @logger.info(message)
+        end
+      end
+
+      private
+
+      # Create folder and file to store logs
+      def create_log_file
+        return if File.exist?(traffic_file)
+
+        FileUtils.mkdir_p traffic_folder
+        FileUtils.touch traffic_file
+      end
+    end
+  end
+end

data/lib/soaspec/template_reader.rb

@@ -1,28 +1,28 @@
-require 'erb'
-
-module Soaspec
-  # Handles reading templates for tests
-  class TemplateReader
-    # Name of file where template is stored
-    attr_accessor :template_name
-
-    # @return [String] Path to where template file is stored
-    def file_location
-      File.join(*Soaspec.template_folder, template_name)
-    end
-
-    # @param [String] template_name File where template is stored
-    # @return [String] Body of template after determining test_values
-    def render_body(template_name, binding)
-      self.template_name = template_name
-      unless File.exist? file_location
-        raise "Cannot see file at #{file_location}. "\
-              "Global folder is '#{Soaspec.template_folder}' and filename is '#{template_name}'"
-      end
-      request_body = File.read file_location
-      raise "Template at #{file_location} not parsed correctly" if request_body.strip.empty?
-
-      ERB.new(request_body).result(binding)
-    end
-  end
-end
+require 'erb'
+
+module Soaspec
+  # Handles reading templates for tests
+  class TemplateReader
+    # Name of file where template is stored
+    attr_accessor :template_name
+
+    # @return [String] Path to where template file is stored
+    def file_location
+      File.join(*Soaspec.template_folder, template_name)
+    end
+
+    # @param [String] template_name File where template is stored
+    # @return [String] Body of template after determining test_values
+    def render_body(template_name, binding)
+      self.template_name = template_name
+      unless File.exist? file_location
+        raise "Cannot see file at #{file_location}. "\
+              "Global folder is '#{Soaspec.template_folder}' and filename is '#{template_name}'"
+      end
+      request_body = File.read file_location
+      raise "Template at #{file_location} not parsed correctly" if request_body.strip.empty?
+
+      ERB.new(request_body).result(binding)
+    end
+  end
+end

data/lib/soaspec/test_server/bank.wsdl

@@ -1,91 +1,91 @@
-<?xml version="1.0"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:tns="http://thomas-bayer.com/blz/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://thomas-bayer.com/blz/">
-  <wsdl:documentation>BLZService</wsdl:documentation>
-  <wsdl:types>
-    <xsd:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://thomas-bayer.com/blz/">
-      <xsd:element name="getBank" type="tns:getBankType"/>
-      <xsd:element name="getBankResponse" type="tns:getBankResponseType"/>
-      <xsd:complexType name="getBankType">
-        <xsd:sequence>
-          <xsd:element name="blz" type="xsd:string"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:complexType name="getBankResponseType">
-        <xsd:sequence>
-          <xsd:element name="details" type="tns:detailsType"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:complexType name="detailsType">
-        <xsd:sequence>
-          <xsd:element minOccurs="0" name="bezeichnung" type="xsd:string"/>
-          <xsd:element minOccurs="0" name="bic" type="xsd:string"/>
-          <xsd:element maxOccurs="unbounded" minOccurs="0" name="ort" type="xsd:string"/>
-          <xsd:element minOccurs="0" name="plz" type="xsd:string"/>
-        </xsd:sequence>
-      </xsd:complexType>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="getBank">
-    <wsdl:part name="parameters" element="tns:getBank"/>
-  </wsdl:message>
-  <wsdl:message name="getBankResponse">
-    <wsdl:part name="parameters" element="tns:getBankResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="BLZServicePortType">
-    <wsdl:operation name="getBank">
-      <wsdl:input message="tns:getBank"/>
-      <!--<wsdl:output message="tns:getBankResponse" wsaw:Action="http://thomas-bayer.com/blz/BLZService/getBankResponse"/>-->
-      <wsdl:output message="tns:getBankResponse" wsaw:Action="http://localhost:4567/BLZService/getBankResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BLZServiceSOAP11Binding" type="tns:BLZServicePortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="getBank">
-      <soap:operation style="document" soapAction=""/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="BLZServiceSOAP12Binding" type="tns:BLZServicePortType">
-    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="getBank">
-      <soap12:operation style="document" soapAction=""/>
-      <wsdl:input>
-        <soap12:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="BLZServiceHttpBinding" type="tns:BLZServicePortType">
-    <http:binding verb="POST"/>
-    <wsdl:operation name="getBank">
-      <http:operation location="BLZService/getBank"/>
-      <wsdl:input>
-        <mime:content part="getBank" type="text/xml"/>
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="getBank" type="text/xml"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="BLZService">
-    <wsdl:port name="BLZServiceSOAP11port_http" binding="tns:BLZServiceSOAP11Binding">
-      <!-- <soap:address location="http://www.thomas-bayer.com/axis2/services/BLZService"/> -->
-      <soap:address location="http://localhost:4999/BLZService"/>
-    </wsdl:port>
-    <wsdl:port name="BLZServiceSOAP12port_http" binding="tns:BLZServiceSOAP12Binding">
-      <!--<soap12:address location="http://www.thomas-bayer.com/axis2/services/BLZService"/>-->
-      <soap12:address location="http://localhost:4999/BLZService"/>
-    </wsdl:port>
-    <wsdl:port name="BLZServiceHttpport" binding="tns:BLZServiceHttpBinding">
-      <!--<http:address location="http://www.thomas-bayer.com/axis2/services/BLZService"/>-->
-      <soap:address location="http://localhost:4999/BLZService"/>
-    </wsdl:port>
-  </wsdl:service>
+<?xml version="1.0"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:tns="http://thomas-bayer.com/blz/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://thomas-bayer.com/blz/">
+  <wsdl:documentation>BLZService</wsdl:documentation>
+  <wsdl:types>
+    <xsd:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://thomas-bayer.com/blz/">
+      <xsd:element name="getBank" type="tns:getBankType"/>
+      <xsd:element name="getBankResponse" type="tns:getBankResponseType"/>
+      <xsd:complexType name="getBankType">
+        <xsd:sequence>
+          <xsd:element name="blz" type="xsd:string"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="getBankResponseType">
+        <xsd:sequence>
+          <xsd:element name="details" type="tns:detailsType"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="detailsType">
+        <xsd:sequence>
+          <xsd:element minOccurs="0" name="bezeichnung" type="xsd:string"/>
+          <xsd:element minOccurs="0" name="bic" type="xsd:string"/>
+          <xsd:element maxOccurs="unbounded" minOccurs="0" name="ort" type="xsd:string"/>
+          <xsd:element minOccurs="0" name="plz" type="xsd:string"/>
+        </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="getBank">
+    <wsdl:part name="parameters" element="tns:getBank"/>
+  </wsdl:message>
+  <wsdl:message name="getBankResponse">
+    <wsdl:part name="parameters" element="tns:getBankResponse"/>
+  </wsdl:message>
+  <wsdl:portType name="BLZServicePortType">
+    <wsdl:operation name="getBank">
+      <wsdl:input message="tns:getBank"/>
+      <!--<wsdl:output message="tns:getBankResponse" wsaw:Action="http://thomas-bayer.com/blz/BLZService/getBankResponse"/>-->
+      <wsdl:output message="tns:getBankResponse" wsaw:Action="http://localhost:4567/BLZService/getBankResponse"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="BLZServiceSOAP11Binding" type="tns:BLZServicePortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getBank">
+      <soap:operation style="document" soapAction=""/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="BLZServiceSOAP12Binding" type="tns:BLZServicePortType">
+    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getBank">
+      <soap12:operation style="document" soapAction=""/>
+      <wsdl:input>
+        <soap12:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="BLZServiceHttpBinding" type="tns:BLZServicePortType">
+    <http:binding verb="POST"/>
+    <wsdl:operation name="getBank">
+      <http:operation location="BLZService/getBank"/>
+      <wsdl:input>
+        <mime:content part="getBank" type="text/xml"/>
+      </wsdl:input>
+      <wsdl:output>
+        <mime:content part="getBank" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="BLZService">
+    <wsdl:port name="BLZServiceSOAP11port_http" binding="tns:BLZServiceSOAP11Binding">
+      <!-- <soap:address location="http://www.thomas-bayer.com/axis2/services/BLZService"/> -->
+      <soap:address location="http://localhost:4999/BLZService"/>
+    </wsdl:port>
+    <wsdl:port name="BLZServiceSOAP12port_http" binding="tns:BLZServiceSOAP12Binding">
+      <!--<soap12:address location="http://www.thomas-bayer.com/axis2/services/BLZService"/>-->
+      <soap12:address location="http://localhost:4999/BLZService"/>
+    </wsdl:port>
+    <wsdl:port name="BLZServiceHttpport" binding="tns:BLZServiceHttpBinding">
+      <!--<http:address location="http://www.thomas-bayer.com/axis2/services/BLZService"/>-->
+      <soap:address location="http://localhost:4999/BLZService"/>
+    </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>