soaspec 0.0.79 → 0.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc958fe0aac536d439cbc015ff650574599df2e1
-  data.tar.gz: 8010383ef455985729cc65abf1992afbd42749c9
+  metadata.gz: da0b04fa67877430f80b6850de438eddff6ebec0
+  data.tar.gz: 6ab2a8342e27068d1e8004ba2d37f3183222f7e2
 SHA512:
-  metadata.gz: 3f330c9ae4275aa3d545aa523bc6abe20cd2a3a733430fefaf2dd23dfcac087232fda5ee64058e67aeab74cb53b341e4b205e14ab543136dc8e40bbcbfefb6e1
-  data.tar.gz: abcb93f6733a20288210f4175b44c94d83c91331e1008e7a2ed07c759ad475b9534542b93f888ff09bfd0767f64662629cac24f8cf311bd60caee8e9635e334d
+  metadata.gz: de6404bc0e90325c946b83cb4d98283f272b72747474892bb07aa2ef11387ea54972762ca27598e60fc58dc50494a60377fcea4c0bc3a0e12169b10bba57a463
+  data.tar.gz: 656f597d657333dd8c2159d03a3608dedef0026f2d2017ed0a5ce468067c4918a2e850a3c8e12f8bab6bd09cb3f99fcd520068a221280c4d7c558c9f6abec795

data/ChangeLog

@@ -1,3 +1,9 @@
+Version 0.0.80
+* Enhancements
+  * `values_from_path` method on `RestHandler` to easily extract multiple values for an xpath or json path
+* Bug fix
+  * Support response that has white space surrounding message
+
 Version 0.0.79
 * Enhancements
   * `values_from_path` method on `SoapHandler` to easily extract multiple values for an xpath

data/exe/soaspec-virtual-server

@@ -66,6 +66,22 @@ class SoaspecVirtualServer < Sinatra::Application
     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']

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -280,21 +280,32 @@ module Soaspec
     # Returns the value at the provided xpath
     # @param [RestClient::Response] response
     # @param [String] xpath
-    # @return [String] Value inside element found through Xpath
-    def xpath_value_for(response: nil, xpath: nil, attribute: nil)
+    # @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
-      result =
-        if Soaspec.strip_namespaces? && !xpath.include?(':')
-          temp_doc = Nokogiri.parse response.body
-          temp_doc.remove_namespaces!
-          temp_doc.xpath(xpath).first
-        else
-          Nokogiri.parse(response.body).xpath(xpath).first
-        end
-      raise NoElementAtPath, "No value at Xpath '#{xpath}'" unless result
-      return result.inner_text if attribute.nil?
-      result.attributes[attribute].inner_text
+      xpath = "//*[@#{attribute}]" unless attribute.nil?
+      if xpath[0] != '/'
+        xpath = convert_to_pascal_case(xpath) if pascal_keys?
+        xpath = '//' + xpath
+      end
+      if Soaspec.strip_namespaces? && !xpath.include?(':')
+        temp_doc = Nokogiri.parse response.body
+        temp_doc.remove_namespaces!
+        temp_doc.xpath(xpath)
+      else
+        Nokogiri.parse(response.body).xpath(xpath)
+      end
+    end
+
+    # @return [Enumerable] List of values matching JSON path
+    def json_path_values_for(response, path, attribute: nil)
+      raise 'JSON does not support attributes' if attribute
+      if path[0] != '$'
+        path = convert_to_pascal_case(path) if pascal_keys?
+        path = '$..' + path
+      end
+      JsonPath.on(response.body, path)
     end
 
     # Based on a exchange, return the value at the provided xpath
@@ -305,22 +316,14 @@ module Soaspec
     # @return [String] Value at Xpath
     def value_from_path(response, path, attribute: nil)
       path = path.to_s
-
       case Interpreter.response_type_for(response)
       when :xml
-        path = "//*[@#{attribute}]" unless attribute.nil?
-        if path[0] != '/'
-          path = convert_to_pascal_case(path) if pascal_keys?
-          path = '//' + path
-        end
-        xpath_value_for(response: response, xpath: path, attribute: attribute)
+        result = xpath_elements_for(response: response, xpath: path, attribute: attribute).first
+        raise NoElementAtPath, "No value at Xpath '#{path}'" unless result
+        return result.inner_text if attribute.nil?
+        return result.attributes[attribute].inner_text
       when :json
-        raise 'JSON does not support attributes' if attribute
-        if path[0] != '$'
-          path = convert_to_pascal_case(path) if pascal_keys?
-          path = '$..' + path
-        end
-        matching_values = JsonPath.on(response.body, path)
+        matching_values = json_path_values_for(response, path, attribute: attribute)
         raise NoElementAtPath, "Element in #{response.body} not found with path '#{path}'" if matching_values.empty?
         matching_values.first
       when :hash
@@ -330,6 +333,19 @@ module Soaspec
       end
     end
 
+    # @return [Enumerable] List of values returned from path
+    def values_from_path(response, path, attribute: nil)
+      path = path.to_s
+      case Interpreter.response_type_for(response)
+      when :xml
+        xpath_elements_for(response: response, xpath: path, attribute: attribute).map(&:inner_text)
+      when :json
+        json_path_values_for(response, path, attribute: attribute)
+      else
+        raise "Unable to interpret type of #{response.body}"
+      end
+    end
+
     # Convenience methods for once off usage of a REST request
     class << self
 

data/lib/soaspec/exchange_handlers/soap_handler.rb

@@ -188,7 +188,7 @@ module Soaspec
 
     # @return [Enumerable] List of values returned from path
     def values_from_path(response, path, attribute: nil)
-      xpath_elements_for(response: response, xpath: path, attribute: attribute).map(&:inner_text) # { |e| e.inner_text }
+      xpath_elements_for(response: response, xpath: path, attribute: attribute).map(&:inner_text)
     end
 
     # alias elements xpath_elements_for

data/lib/soaspec/interpreter.rb

@@ -6,7 +6,7 @@ class Interpreter
   # @return [Symbol] Type of provided response
   def self.response_type_for(response)
     if response.is_a? String
-      case response.body[0]
+      case response.strip.body[0]
       when '<'
         :xml
       when '{', '['

data/lib/soaspec/test_server/note.xml

@@ -1,4 +1,6 @@
 <note date="2008-01-10">
   <to>Tove</to>
   <from>Jani</from>
+  <comment_line>First comment</comment_line>
+  <comment_line>Second comment</comment_line>
 </note>

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.79'.freeze
+  VERSION = '0.0.80'.freeze
 end

metadata

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