soaspec 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908d8b0ef22286c2ca694e2382e394c197e366a4
-  data.tar.gz: dcc17777f4eca00da363246371ac3413fa04ea61
+  metadata.gz: 18f0661c8b343eccfa911819e895b4a971f18e91
+  data.tar.gz: 6b9f9aa4d5a318efa2c0c71962fbc93ec3198dcb
 SHA512:
-  metadata.gz: 0c1e6d0b7310a9ed57d738aec9b032a0769922ecf417d50a95351c426f9b77555ebb2a7d6cefb05e4bf90f89f21efd20864e79c5b5fc1a0f80d3a82e0abddb3b
-  data.tar.gz: 1b6548bcc759d783fa362290b3d9a8cf425d88ac0682c3b213e8b559ff3b08b1dfcd3e51d35e8a5bced08498b1b44ca2203c1a72148df3de1f05148cb557f85b
+  metadata.gz: c4ec79ab87e48032d3a142f7643484d7731b33d36d2d10d6a7640668ead69107c0e5032c7a8a5bdc87e65dad3948b9a0c9c3a773ab78baf7c639cee0e1582ad0
+  data.tar.gz: ab95079660cf8df4190137987b15b31bb0cbd0906ca8c44a28fc843fca6e921dfb01988e3f4bcbad02dfa9a79fd3975f4b9955aab52f64aa782dc320b1f27bd3

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.0.28 / 2018-3-6
+* Enhancements
+  * Added not_found matcher and used in spec example
+  * Only call request upon first need of an Exchange response. This means test request is made as part of 'it' rather than in describe
+
 Version 0.0.27 / 2018-3-5
 * Bug fix
   * Fixed log file not present error

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soaspec (0.0.27)
+    soaspec (0.0.28)
       rest-client (>= 2.0)
       rspec (~> 3.0)
       rspec-its (>= 1.2.0)

data/config/data/default.yml

@@ -3,7 +3,7 @@ japan:
   country_name: 'Japan'
 
 pet:
-  id: '0'
+  id: '1'
   category:
     id: '1'
     name: 'string'

data/lib/soaspec/exchange.rb

@@ -21,22 +21,21 @@ class Exchange
   # @return [String] Name given when initializing
   def to_s
     Soaspec::SpecLogger.add_to 'Example ' + @test_name
-    @response = make_request
     @test_name
   end
 
-  # Returns response object from Api
+  # Returns response object from Api. Will make the request if not made and then cache it for later on
   # For example for SOAP it will be a Savon response
   # response.body (body of response as Hash)
   # response.header (head of response as Hash)
   def response
-    @response
+    @response ||= make_request
   end
 
   # Get status code from api class. This is http response for Web Api
   # @return [Integer] Status code from api class
   def status_code
-    @api_class.status_code_for(@response)
+    @api_class.status_code_for(self.response)
   end
 
   # Extract value from path api class

data/lib/soaspec/matchers.rb

@@ -10,6 +10,7 @@ RSpec::Matchers.define :contain_value do |expected|
     expect(actual.api_class.include_value?(actual.response, expected)).to be true
   end
 
+  # TODO: Fix this for REST
   failure_message do |actual|
     "expected that #{actual.response.body} would contain value #{expected}"
   end
@@ -21,6 +22,7 @@ RSpec::Matchers.define :include_in_body do |expected|
     expect(actual.api_class.include_in_body?(actual.response, expected)).to be true
   end
 
+  # TODO: Fix this for REST
   failure_message do |actual|
     "expected that #{actual.response.body.to_xml} would contain value #{expected}"
   end
@@ -60,4 +62,16 @@ RSpec::Matchers.define :have_xpath_value do |expected_hash|
     "expected that xpath '#{expected_hash.keys.first}' has value '#{expected_hash.values.first}' but was '#{actual[expected_hash.keys.first]}'"
   end
 
+end
+
+RSpec::Matchers.define :be_found do
+
+  match do |exchange|
+    expect(exchange.api_class.found?(exchange.response)).to be true
+  end
+
+  failure_message do |exchange|
+    "expected result #{exchange.response} to be found. Status code is #{exchange.response.code}"
+  end
+
 end

data/lib/soaspec/rest_handler.rb

@@ -65,11 +65,13 @@ module Soaspec
     end
 
     # Used in together with Exchange request that passes such override parameters
+    # @param [Hash] override_parameters Params to characterize REST request
     def make_request(override_parameters)
       test_values = override_parameters
       test_values[:params] ||= {}
       test_values[:suburl] = test_values[:suburl].to_s if test_values[:suburl]
 
+      begin
       response = case test_values[:method]
       when :post
         if test_values[:suburl]
@@ -84,6 +86,9 @@ module Soaspec
           @resource.send(test_values[:method].to_s, test_values[:params])
         end
       end
+      rescue RestClient::ExceptionWithResponse => e
+        response = e.response
+      end
       Soaspec::SpecLogger.add_to(response)
       response
     end
@@ -92,6 +97,10 @@ module Soaspec
       response.body.include? expected
     end
 
+    def found?(response)
+      response.code != 404
+    end
+
     # Convert XML or JSON response into a Hash
     # @param [String] response Response as a String (either in XML or JSON)
     # @return [Hash]

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.27'
+  VERSION = '0.0.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,7 +165,6 @@ files:
 - lib/soaspec/xpath_not_found.rb
 - soaspec.gemspec
 - template/soap_template.xml
-- test.rb
 - test.wsdl
 - test.xml
 - test_rest.rb

data/test.rb

@@ -1,28 +0,0 @@
-
-module TestM
-  def do_something(text)
-    define_method('hi') do
-      puts 'hi' + text
-    end
-  end
-end
-
-class BaseTest
-  extend TestM
-end
-
-class Tester < BaseTest
-
-  do_something('sam')
-end
-
-class Tes < BaseTest
-  do_something 'dsfd'
-end
-
-test = Tester.new
-
-coll = Tes.new
-
-test.hi
-coll.hi