soaspec 0.0.78 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81af3fccf7fe08aef640bb651f3db64a35becdee
-  data.tar.gz: 4f3147e1f49580a340a698adf1531da764f21d58
+  metadata.gz: fc958fe0aac536d439cbc015ff650574599df2e1
+  data.tar.gz: 8010383ef455985729cc65abf1992afbd42749c9
 SHA512:
-  metadata.gz: '049af0af886c7087970fc9825afbbe1590a5088ce0cdcc60db865d1d8271578dba801c5603c50bdc1d44e38d920513612f0ccb724e30eca5551f4d19062dfb32'
-  data.tar.gz: a03feb257476d536b6cc03a4ce7c05939b90660d847dbae522f4d667be991596434c21f988361a28d94fee7f5f26afcda70b8759ab84c28cc48a44a703d1bfb2
+  metadata.gz: 3f330c9ae4275aa3d545aa523bc6abe20cd2a3a733430fefaf2dd23dfcac087232fda5ee64058e67aeab74cb53b341e4b205e14ab543136dc8e40bbcbfefb6e1
+  data.tar.gz: abcb93f6733a20288210f4175b44c94d83c91331e1008e7a2ed07c759ad475b9534542b93f888ff09bfd0767f64662629cac24f8cf311bd60caee8e9635e334d

data/.gitlab-ci.yml

@@ -13,11 +13,6 @@ rspec:
     paths:
       - coverage/
 
-exe_spec:
-  stage: test
-    script:
-      - bundle exec rake exe_spec
-
 cucumber:
   stage: test
   script:

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.0.79
+* Enhancements
+  * `values_from_path` method on `SoapHandler` to easily extract multiple values for an xpath
+  * If `id` is specified on associated factory, FactoryBot will populate the primary factory with that id. See `rest/factory_spec` for eg
+
 Version 0.0.78
 * Enhancements
   * Use 'thor' for `soaspec generate`, allowing less prompt and more options through command line. Added tests for it

data/Rakefile

@@ -5,18 +5,11 @@ require 'rake/clean'
 ENV['folder'] ||= ''
 ENV['test'] ||= ''
 
-RSpec::Core::RakeTask.new(:run_spec) do |t|
+desc 'Run tests'
+RSpec::Core::RakeTask.new(spec: %i[clean clobber start_test_server]) do |t|
   t.pattern = "spec/**/#{ENV['folder']}*/#{ENV['test']}*_spec.rb"
-  t.exclude_pattern = 'spec/exe/*_spec.rb'
-end
-
-RSpec::Core::RakeTask.new(exe_spec: %i[start_test_server]) do |t|
-  t.pattern = 'spec/exe/*_spec.rb'
 end
 
-desc 'Run tests'
-task spec: %w[clean clobber start_test_server run_spec]
-
 task default: :spec
 
 CLEAN.include 'tmp/*'

data/exe/soaspec

@@ -27,8 +27,8 @@ module Soaspec
     option :ci, default: 'jenkins', banner: 'What Continuous Integration is used'
     option :virtual, type: :boolean, default: true, banner: 'Whether to set things up for a virtual server'
     def new(type = 'initial')
-      puts 'Creating files for soaspec'
       @virtual = options[:virtual]
+      puts "Creating files for soaspec. options are #{options}"
       create_file(filename: 'Gemfile')
       create_file(filename: 'Rakefile')
       create_file(filename: '.rspec')

data/lib/soaspec/exchange.rb

@@ -30,7 +30,6 @@ end
 # Essentially, params in the exchange that are set are related to the request
 # What is returned is related to the response
 class Exchange
-
   extend ExchangeAccessors
 
   # Instance of ExchangeHandler for which this exchange is made
@@ -42,6 +41,11 @@ class Exchange
   # Expect Factory to fail upon trying to create
   attr_writer :fail_factory
 
+
+  def values_from_path(path, attribute: nil)
+    exchange_handler.values_from_path(response, path, attribute: attribute)
+  end
+
   # Set retry for success variable to true so that request will be retried
   # for retry_count until it's true
   def retry_for_success
@@ -194,13 +198,16 @@ class Exchange
   # @param [Object] args Arguments passed to method
   # @param [Object] block
   def method_missing(method_name, *args, &block)
+    set_value = args.first
     if method_name[-1] == '=' # A setter method
-      if args.first.class < Exchange # This would be prerequisite exchange
-        define_singleton_method(method_name[0..-2]) do
-          args.first
+      getter_name = method_name[0..-2]
+      if set_value.class < Exchange # This would be prerequisite exchange
+        define_singleton_method(getter_name) do
+          set_value
         end
+        self[getter_name] = set_value.id if set_value.respond_to?(:id)
       else
-        self[method_name[0..-2]] = args.first
+        self[getter_name] = set_value
       end
     else
       super

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -58,7 +58,6 @@ module Soaspec
         end
         Soaspec::SpecLogger.add_to("response_headers: #{response.headers}")
         Soaspec::SpecLogger.add_to("response_body: #{response.body}")
-        Soaspec::SpecLogger.add_to("response: #{response}")
         JSON.parse(response)
       end
 

data/lib/soaspec/exchange_handlers/soap_handler.rb

@@ -158,21 +158,19 @@ module Soaspec
     # Returns the value at the provided xpath
     # @param [Savon::Response] response
     # @param [String] xpath
-    # @param [String] attribute Generic attribute to find
-    # @return [String] Value inside element found through Xpath
-    def xpath_value_for(response: nil, xpath: nil, attribute: nil)
+    # @return [Enumerable] Elements found through Xpath
+    def xpath_elements_for(response: nil, xpath: nil, attribute: nil)
       raise ArgumentError('response and xpath must be passed to method') unless response && xpath
+      xpath = "//*[@#{attribute}]" unless attribute.nil?
+      xpath = '//' + xpath if xpath[0] != '/'
       temp_doc = response.doc.dup
       convert_to_lower_case(temp_doc) if convert_to_lower?
-      result = if Soaspec.strip_namespaces? && !xpath.include?(':')
-                 temp_doc.remove_namespaces!
-                 temp_doc.at_xpath(xpath)
-               else
-                 temp_doc.at_xpath(xpath, temp_doc.collect_namespaces)
-               end
-      raise NoElementAtPath, "No value at Xpath '#{xpath}' in XML #{response.doc}" unless result
-      return result.inner_text if attribute.nil?
-      result.attributes[attribute].inner_text
+      if Soaspec.strip_namespaces? && !xpath.include?(':')
+        temp_doc.remove_namespaces!
+        temp_doc.xpath(xpath)
+      else
+        temp_doc.xpath(xpath, temp_doc.collect_namespaces)
+      end
     end
 
     # Based on a exchange, return the value at the provided xpath
@@ -182,16 +180,23 @@ module Soaspec
     # @param [String] attribute Generic attribute to find. Will override path
     # @return [String] Value at Xpath
     def value_from_path(response, path, attribute: nil)
-      path = "//*[@#{attribute}]" unless attribute.nil?
-      path = '//' + path if path[0] != '/'
-      xpath_value_for(response: response, xpath: path, attribute: attribute)
+      results = xpath_elements_for(response: response, xpath: path, attribute: attribute)
+      raise NoElementAtPath, "No value at Xpath '#{path}' in XML #{response.doc}" if results.empty?
+      return results.first.inner_text if attribute.nil?
+      results.first.attributes[attribute].inner_text
+    end
+
+    # @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 }
     end
 
-    # Whether any of the keys of the Body Hash include value
+    # alias elements xpath_elements_for
+
+    # @return [Boolean] Whether any of the keys of the Body Hash include value
     def include_value?(response, expected_value)
       response.body.include_value?(expected_value)
     end
-
   end
 
   # Deprecated class name. Will be removed in the future

data/lib/soaspec/test_server/bank.wsdl

@@ -19,7 +19,7 @@
         <xsd:sequence>
           <xsd:element minOccurs="0" name="bezeichnung" type="xsd:string"/>
           <xsd:element minOccurs="0" name="bic" type="xsd:string"/>
-          <xsd:element minOccurs="0" name="ort" 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>

data/lib/soaspec/test_server/get_bank.rb

@@ -21,6 +21,10 @@ module Soaspec
             <ns1:bezeichnung lang="German"><%= @title %></ns1:bezeichnung>
             <ns1:bic>DEUTDEMMXXX <%= soap_action %></ns1:bic>
             <ns1:ort>München</ns1:ort>
+            <% if @multiple_ort %>
+            <ns1:ort>Wellington</ns1:ort>
+            <ns1:ort>Tokyo</ns1:ort>
+            <% end %>
             <ns1:plz><%= @bank_name %></ns1:plz>
           </ns1:details>
         </ns1:getBankResponse>
@@ -147,6 +151,7 @@ module Soaspec
           @bank_id = @bank_name.to_i
           return 500, ERB.new(bank_not_found).result(binding) if @bank_id.zero?
           @title = 'DAB Bank' if @bank_id == 500
+          @multiple_ort = (@bank_id == 20)
           ERB.new(success_response_template).result(binding)
         end
 

data/lib/soaspec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler