webspicy 0.17.0 → 0.20.2

data/lib/webspicy/configuration/scope.rb

@@ -12,25 +12,28 @@ module Webspicy
       ###
 
       # Yields each specification file in the current scope
-      def each_specification_file(&bl)
-        return enum_for(:each_specification_file) unless block_given?
-        _each_specification_file(config, &bl)
+      def each_specification_file(apply_filter = true, &bl)
+        return enum_for(:each_specification_file, apply_filter) unless block_given?
+        _each_specification_file(config, apply_filter, &bl)
       end
 
       # Recursive implementation of `each_specification_file` for each
       # folder in the configuration.
-      def _each_specification_file(config)
+      def _each_specification_file(config, apply_filter = true)
         folder = config.folder
-        folder.glob("**/*.yml").select(&to_filter_proc(config.file_filter)).each do |file|
+        world  = config.folder/"world"
+        fs = folder.glob("**/*.yml").reject{|f| f.to_s.start_with?(world.to_s) }
+        fs = fs.select(&to_filter_proc(config.file_filter)) if apply_filter
+        fs.each do |file|
           yield file, folder
         end
       end
       private :_each_specification_file
 
       # Yields each specification in the current scope in turn.
-      def each_specification(&bl)
-        return enum_for(:each_specification) unless block_given?
-        each_specification_file do |file, folder|
+      def each_specification(apply_filter = true, &bl)
+        return enum_for(:each_specification, apply_filter) unless block_given?
+        each_specification_file(apply_filter) do |file, folder|
           yield Webspicy.specification(file.load, file, self)
         end
       end
@@ -68,6 +71,17 @@ module Webspicy
         each_generated_counterexamples(service, &bl)
       end
 
+      def find_test_case(method, url)
+        each_specification(false) do |spec|
+          next unless spec.url == url
+          spec.services.each do |service|
+            next unless service.method == method
+            return service.examples.first
+          end
+        end
+        nil
+      end
+
       ###
       ### Schemas -- For parsing input and output data schemas found in
       ### web service definitions

data/lib/webspicy/formaldoc.fio

@@ -18,6 +18,11 @@ FileUpload =
     }
 
 Specification = .Webspicy::Specification
+  <info> {
+    name: String
+    url: String
+    services: [Service]
+  }
   <singleservice> {
     name            :? String
     url             :  String
@@ -34,11 +39,6 @@ Specification = .Webspicy::Specification
     examples        :? [TestCase]
     counterexamples :? [TestCase]
   }
-  <info> {
-    name: String
-    url: String
-    services: [Service]
-  }
 
 Service =
     .Webspicy::Specification::Service <info> {

data/lib/webspicy/specification.rb

@@ -93,7 +93,10 @@ module Webspicy
   end # class Specification
 end # module Webspicy
 require_relative 'specification/service'
-require_relative 'specification/precondition'
-require_relative 'specification/postcondition'
+require_relative 'specification/condition'
+require_relative 'specification/pre'
+require_relative 'specification/post'
+require_relative 'specification/err'
+require_relative 'specification/oldies'
 require_relative 'specification/test_case'
 require_relative 'specification/file_upload'

data/lib/webspicy/specification/condition.rb

@@ -0,0 +1,48 @@
+module Webspicy
+  class Specification
+    module Condition
+      extend Forwardable
+
+      MATCH_ALL = "__all__"
+
+      attr_accessor :matching_description
+
+      # Given a service and a condition, returns a Pre instance of there is a
+      # match, nil otherwise.
+      def self.match(service, condition)
+      end
+
+      # Bind the condition instance to a current tester.
+      def bind(tester)
+        @tester = tester
+        self
+      end
+      attr_reader :tester
+
+      def_delegators :@tester, *[
+        :config, :scope, :client,
+        :specification, :spec_file,
+        :service, :test_case,
+        :invocation, :result,
+        :reporter
+      ]
+
+      def sooner_or_later(*args, &bl)
+        Webspicy::Support.sooner_or_later(*args, &bl)
+      end
+
+      def fail!(msg)
+        raise Tester::Failure, msg
+      end
+
+      def to_s
+        if matching_description == MATCH_ALL
+          self.class.name
+        else
+          matching_description
+        end
+      end
+
+    end # module Condition
+  end # class Specification
+end # module Webspicy

data/lib/webspicy/specification/err.rb

@@ -0,0 +1,18 @@
+module Webspicy
+  class Specification
+    module Err
+      include Condition
+
+      # Instrument the current test_case so as to prepare for errcondition
+      # check later
+      def instrument
+      end
+
+      # Check that the errcondition is met on last invocation & result
+      # of an counterexample
+      def check!
+      end
+
+    end # module Err
+  end # module Specification
+end # module Webspicy

data/lib/webspicy/specification/oldies.rb

@@ -0,0 +1,4 @@
+require_relative 'oldies/precondition'
+require_relative 'oldies/postcondition'
+require_relative 'oldies/errcondition'
+require_relative 'oldies/bridge'

data/lib/webspicy/specification/oldies/bridge.rb

@@ -0,0 +1,32 @@
+module Webspicy
+  class Specification
+    module Oldies
+      class Bridge
+        include Condition
+
+        def initialize(target)
+          @target = target
+        end
+        attr_reader :target
+
+        def instrument
+          return unless target.respond_to?(:instrument)
+          target.instrument(test_case, client)
+        end
+
+        def check!
+          return unless target.respond_to?(:check)
+          res = target.check(invocation)
+          res ? fail!(res) : nil
+        end
+
+        def to_s
+          "#{target} (backward compatibility bridge)"
+        end
+
+      end # class Bridge
+    end # module Errcondition
+  end # module Specification
+  Precondition = Specification::Precondition
+  Postcondition = Specification::Postcondition
+end # module Webspicy

data/lib/webspicy/specification/{errcondition.rb → oldies/errcondition.rb}

@@ -1,6 +1,12 @@
 module Webspicy
   class Specification
+    # Deprecated, use Err instead
     module Errcondition
+      include Condition
+
+      def bind(tester)
+        Oldies::Bridge.new(self).bind(tester)
+      end
 
       def self.match(service, descr)
       end

data/lib/webspicy/specification/{postcondition.rb → oldies/postcondition.rb}

@@ -1,6 +1,12 @@
 module Webspicy
   class Specification
+    # Deprecated, use Post instead
     module Postcondition
+      include Condition
+
+      def bind(tester)
+        Oldies::Bridge.new(self).bind(tester)
+      end
 
       def self.match(service, descr)
       end

data/lib/webspicy/specification/{precondition.rb → oldies/precondition.rb}

@@ -1,6 +1,12 @@
 module Webspicy
   class Specification
+    # Deprecated, use Pre instead
     module Precondition
+      include Condition
+
+      def bind(tester)
+        Oldies::Bridge.new(self).bind(tester)
+      end
 
       def self.match(service, pre)
       end
@@ -15,5 +21,3 @@ module Webspicy
     end # module Precondition
   end # class Specification
 end # module Webspicy
-require_relative 'precondition/global_request_headers'
-require_relative 'precondition/robust_to_invalid_input'

data/lib/webspicy/specification/post.rb

@@ -0,0 +1,20 @@
+module Webspicy
+  class Specification
+    module Post
+      include Condition
+
+      # Instrument the current test_case so as to prepare for postcondition
+      # check later
+      def instrument
+      end
+
+      # Check that the postcondition is met on last invocation & result
+      # of an example
+      def check!
+      end
+
+    end # module Post
+  end # module Specification
+end # module Webspicy
+require_relative "post/missing_condition_impl"
+require_relative "post/unexpected_condition_impl"

data/lib/webspicy/specification/post/missing_condition_impl.rb

@@ -0,0 +1,15 @@
+module Webspicy
+  class Specification
+    module Postcondition
+      class MissingConditionImpl
+        include Post
+
+        def check
+          msg = matching_description.gsub(/\(x\)/, "<!>")
+          raise "#{msg} (not instrumented)"
+        end
+
+      end # class MissingConditionImpl
+    end # module Postcondition
+  end # class Specification
+end # module Webspicy

data/lib/webspicy/specification/post/unexpected_condition_impl.rb

@@ -0,0 +1,15 @@
+module Webspicy
+  class Specification
+    module Postcondition
+      class UnexpectedConditionImpl
+        include Post
+
+        def check
+          msg = matching_description.gsub(/\( \)/, "<x>")
+          raise "#{msg} (is instrumented)"
+        end
+
+      end # class UnexpectedConditionImpl
+    end # module Postcondition
+  end # class Specification
+end # module Webspicy

data/lib/webspicy/specification/pre.rb

@@ -0,0 +1,19 @@
+module Webspicy
+  class Specification
+    module Pre
+      include Condition
+
+      # Instrument the current test_case so as to meet the precondition
+      def instrument
+      end
+
+      # Provide counterexamples of this precondition for a given service.
+      def counterexamples(service)
+        []
+      end
+
+    end # module Pre
+  end # class Specification
+end # module Webspicy
+require_relative 'pre/global_request_headers'
+require_relative 'pre/robust_to_invalid_input'

data/lib/webspicy/specification/{precondition → pre}/global_request_headers.rb

@@ -1,8 +1,8 @@
 module Webspicy
   class Specification
-    module Precondition
+    module Pre
       class GlobalRequestHeaders
-        include Precondition
+        include Pre
 
         DEFAULT_OPTIONS = {}
 
@@ -22,7 +22,7 @@ module Webspicy
           end
         end
 
-        def instrument(test_case, client)
+        def instrument
           extra = headers.reject{|k|
             test_case.headers.has_key?(k)
           }
@@ -30,6 +30,6 @@ module Webspicy
         end
 
       end # class GlobalRequestHeaders
-    end # module Precondition
+    end # module Pre
   end # class Specification
 end # module Webspicy

data/lib/webspicy/specification/{precondition → pre}/robust_to_invalid_input.rb

@@ -1,8 +1,8 @@
 module Webspicy
   class Specification
-    module Precondition
+    module Pre
       class RobustToInvalidInput
-        include Precondition
+        include Pre
 
         def self.match(service, pre)
           self.new
@@ -49,7 +49,7 @@ module Webspicy
                 status: Support::StatusRange.str("4xx")
               },
               :assert => []
-            })]            
+            })]
           else
             []
           end
@@ -63,6 +63,6 @@ module Webspicy
         end
 
       end # class RobustToInvalidInput
-    end # module Precondition
+    end # module Pre
   end # class Specification
 end # module Webspicy

data/lib/webspicy/specification/service.rb

@@ -10,6 +10,9 @@ module Webspicy
       end
       attr_accessor :specification
 
+      # Deprecated
+      alias :resource :specification
+
       def self.info(raw)
         new(raw)
       end
@@ -111,12 +114,38 @@ module Webspicy
       def compile_conditions(descriptions, conditions)
         # Because we want pre & post to be able to match in all cases
         # we need at least one condition
-        descriptions = ["all"] if descriptions.empty?
-        descriptions
-          .map{|descr|
-            conditions.map{|c| c.match(self, descr) }.compact
+        descriptions = [Condition::MATCH_ALL] if descriptions.empty?
+        mapping = {}
+        instances = conditions.map{|c|
+          instance = nil
+          descr = descriptions.find do |d|
+            instance = c.match(self, d)
+          end
+          instance.tap{|i|
+            mapping[descr] ||= i if i
+            i.matching_description = descr if i.respond_to?(:matching_description=)
+          }
+        }.compact
+        mapped = descriptions
+          .select{|d| mapping[d] }
+          .map{|d| mapping[d] }
+        unmapped = descriptions
+          .reject{|d| mapping[d] }
+          .select{|d| d.strip =~ /^(\(\w+\))?\(x\)/ }
+          .map{|d|
+            Postcondition::MissingConditionImpl.new.tap{|mc|
+              mc.matching_description = d
+            }
+          }
+        unexpected = descriptions
+          .select{|d| mapping[d] }
+          .select{|d| d.strip =~ /^(\(\w+\))?\( \)/ }
+          .map{|d|
+            Postcondition::UnexpectedConditionImpl.new.tap{|mc|
+              mc.matching_description = d
+            }
           }
-          .flatten
+        mapped + unmapped + unexpected
       end
 
       def bind_examples

data/lib/webspicy/specification/test_case.rb

@@ -16,6 +16,10 @@ module Webspicy
         self
       end
 
+      def example?
+        !@counterexample
+      end
+
       def counterexample?
         !!@counterexample
       end
@@ -24,6 +28,9 @@ module Webspicy
         service.specification
       end
 
+      # Deprecated
+      alias :resource :specification
+
       def self.info(raw)
         new(raw)
       end
@@ -85,6 +92,10 @@ module Webspicy
         expected_status === status
       end
 
+      def has_expected_status?
+        not expected[:status].nil?
+      end
+
       def expected_error
         expected[:error]
       end
@@ -109,15 +120,6 @@ module Webspicy
         !assert.empty?
       end
 
-      def instrument(client)
-        service.preconditions.each do |pre|
-          pre.instrument(self, client) if pre.respond_to?(:instrument)
-        end
-        service.postconditions.each do |post|
-          post.instrument(self, client) if post.respond_to?(:instrument)
-        end
-      end
-
       def mutate(override)
         m = self.dup
         m.raw = self.raw.merge(override)