soaspec 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc517686970c428dfdc01fbd10939e89a051e4b1748167341d2f7c276416f88
-  data.tar.gz: '08359bd7b82c35d4e4559f182a8968c8dc7e79b5a4d44270edcf21f56f249623'
+  metadata.gz: 6d04d8069ff220fabc590725f88eb322d1346067c16efcdd007d235b55ac2d20
+  data.tar.gz: b7391039e8f3dd04845b49bba4fba4ca2d50dd444c088ceabc7f515907c2949c
 SHA512:
-  metadata.gz: 82578194b7b967d3f9eefa3e0b0646568be998a346cf5579e95de904dadf2ba0c7b2b55816a15319ca2c0ca4353747c1628ddfe78d47dfd798d8a797d0d02fc9
-  data.tar.gz: 0d28e2326ca767e0670eae5b3ec2fe61a46376bd45f48b53d4980746d11f292211563929641decadf198888f2e2ab5b83bb3f88ad69b7e1e370900c75d2782e7
+  metadata.gz: b0ef8082d8e1e24576a0ea9bb9e477e33764a135b994d26e4a52a6a1366f57e8e3e89cb7d22f64914abbac27bce5c04ab21b6e1d9ee7703025539875b7187769
+  data.tar.gz: c984d69e28910e13171cd588ee98f363f0186b0d46b9ee8144a05964d7089054308f4017d4842ee7b064d25661b42c02d8a69fbf1c7a4c3e23106481819cdb61

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.3.2
+* Enhancement
+  * Handle 'html' format
+
 Version 0.3.1
 * Bug fix
   * Should create logs folder for hosting virtual server's error logs

data/exe/soaspec

@@ -79,9 +79,10 @@ module Soaspec
 
     desc 'generate', 'Generate initial test code from wsdl'
     long_desc <<-LONGDESC
-    If no wsdl is given a server will be started from which code to generate Exchanges
+    If no wsdl is given a server will be started with a web page front end from which ExchangeHandler's can
+    can be created.
 
-    `soaspec generate wsdl=wsdl name=ServiceName ` will generate the initial files and folders to test each operation in a wsdl
+    `soaspec generate wsdl=wsdl name=ServiceName` will generate the initial files and folders to test each operation in a wsdl
     \x5
     Additionally the auth parameter can be used to use basic authentication to retrieve the WSDL.
     To do use the following `soaspec generate --auth=basic`

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -193,7 +193,7 @@ module Soaspec
     # @return [Enumerable] Value inside element found through Xpath
     def xpath_elements_for(response: nil, xpath: nil, attribute: nil)
       raise ArgumentError unless response && xpath
-      raise "Can't perform XPATH if response is not XML" unless Interpreter.response_type_for(response) == :xml
+      raise "Can't perform XPATH if response is not XML" unless %i[xml html].include? Interpreter.response_type_for(response)
 
       xpath = prefix_xpath(xpath, attribute)
       temp_doc = Nokogiri.parse(response.body).dup
@@ -239,7 +239,7 @@ module Soaspec
     def value_from_path(response, path, attribute: nil)
       path = path.to_s
       case Interpreter.response_type_for(response)
-      when :xml
+      when :xml, :html
         result = xpath_elements_for(response: response, xpath: path, attribute: attribute).first
         raise NoElementAtPath, "No value at Xpath '#{prefix_xpath(path, attribute)}' in '#{response.body}'" unless result
         return result.inner_text if attribute.nil?

data/lib/soaspec/interpreter.rb

@@ -20,6 +20,8 @@ class Interpreter
           :xml
         elsif json?
           :json
+        elsif html?
+          :html
         else
           :string
         end
@@ -54,6 +56,18 @@ class Interpreter
     # @return [Boolean] Whether valid XML
     def xml?
       Nokogiri::XML(@response) { |config| config.options = Nokogiri::XML::ParseOptions::STRICT }
+      true
+    rescue Nokogiri::XML::SyntaxError => e
+      self.xml_errors = e
+      false
+    end
+
+    # @return [Boolean] Whether valid HTML. Must include at least one tag
+    def html?
+      Nokogiri::HTML(@response) do |config|
+        config.options = Nokogiri::XML::ParseOptions::DEFAULT_HTML
+      end
+      @response.include?('<') && @response.include?('>')
     rescue Nokogiri::XML::SyntaxError => e
       self.xml_errors = e
       false

data/lib/soaspec/version.rb

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

data/lib/soaspec/virtual_server.rb

@@ -189,5 +189,18 @@ module Soaspec
     }
       BOOKS
     end
+
+    documentation 'HTML doc that is not valid HTML'
+    get '/html_doc' do
+      <<-HTML
+<!doctype html>
+<html lang="en">
+<head></head>
+<body>
+<h1>Heading</h1>
+</body>
+</html>
+      HTML
+    end
   end
 end

data/lib/soaspec/wsdl_generator.rb

@@ -7,10 +7,12 @@ module Soaspec
 
     # Generate from WSDL
     def generate_from_wsdl(options)
-      auth_name, auth_password = enter_auth_details if options[:auth] == 'basic'
+      if options[:auth] == 'basic'
+        auth_name, auth_password = enter_auth_details
+        savon_options[:basic_auth] = [auth_name, auth_password]
+      end
       @virtual = false
       savon_options = { wsdl: options[:wsdl] }
-      savon_options[:basic_auth] = [auth_name, auth_password] if options[:auth] == 'basic'
 
       wsdl_doc = Savon.client(**savon_options).wsdl
       @wsdl_schemas = wsdl_doc.parser.schemas

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler