webspicy 0.16.0 → 0.18.0

data/lib/webspicy/rspec/tester.rb

@@ -0,0 +1,4 @@
+require_relative 'support/rspec_runnable'
+require_relative 'tester/rspec_matchers'
+require_relative 'tester/rspec_asserter'
+require_relative 'tester/rspec_tester'

data/lib/webspicy/{tester → rspec/tester}/rspec_asserter.rb

@@ -8,6 +8,10 @@ module Webspicy
       end
       attr_reader :rspec,  :invocation
 
+      def self.call(rspec, invocation)
+        new(rspec, invocation).send(:assert!)
+      end
+
       def response
         invocation.response
       end
@@ -20,15 +24,20 @@ module Webspicy
         test_case.service
       end
 
+    protected
+
       def assert!
-        assert_status_met
-        assert_content_type_met
-        assert_expected_headers
+        rspec.aggregate_failures do
+          assert_status_met
+          assert_content_type_met
+          assert_expected_headers
+        end
         assert_output_schema_met
-        assert_assertions_met
-        assert_postconditions_met
-
-        assert_no_other_errors
+        rspec.aggregate_failures do
+          assert_assertions_met
+          assert_postconditions_met
+          assert_errconditions_met
+        end
       end
 
       def assert_status_met
@@ -45,7 +54,7 @@ module Webspicy
         if ect.nil?
           rspec.expect(ect).to rspec.have_no_response_type
         else
-          rspec.expect(ect).to rspec.match_content_type(got)
+          rspec.expect(got).to rspec.match_content_type(ect)
         end
       end
 
@@ -98,9 +107,13 @@ module Webspicy
         end
       end
 
-      def assert_no_other_errors
-        errors = invocation.errors
-        rspec.expect(errors).to rspec.be_an_empty_errors_array
+      def assert_errconditions_met
+        return unless service.has_errconditions?
+        return unless test_case.counterexample?
+        service.errconditions.each do |post|
+          msg = post.check(invocation)
+          rspec.expect(msg).to rspec.meet_errcondition(post)
+        end
       end
 
     end # class RSpecAsserter

data/lib/webspicy/{tester → rspec/tester}/rspec_matchers.rb

@@ -94,6 +94,16 @@ RSpec::Matchers.define :meet_postcondition do |post|
   end
 end
 
+RSpec::Matchers.define :meet_errcondition do |post|
+  match do |actual|
+    actual.nil?
+  end
+  failure_message_for_should do |actual|
+    "expected errcondition `#{post.class.name}` to be met, got following error:\n" + \
+    "    #{actual}"
+  end
+end
+
 RSpec::Matchers.define :be_an_empty_errors_array do
   match do |actual|
     actual.empty?

data/lib/webspicy/rspec/tester/rspec_tester.rb

@@ -0,0 +1,63 @@
+module Webspicy
+  class Tester
+    class RSpecTester
+      include Webspicy::Support::RSpecRunnable
+
+    protected
+
+      def load_rspec_examples
+        tester = self
+        RSpec.describe "Webspicy test suite" do
+          before(:all) do
+            tester.config.listeners(:before_all).each do |l|
+              l.call(tester.config)
+            end
+          end
+          after(:all) do
+            tester.config.listeners(:after_all).each do |l|
+              l.call(tester.config)
+            end
+          end
+          tester.config.each_scope do |scope|
+            client = scope.get_client
+            scope.each_specification do |specification|
+              scope.each_service(specification) do |service|
+                scope.each_testcase(service) do |test_case|
+                  str = "#{service} #{test_case}"
+                  str = Webspicy::Support::Colorize.colorize_highlight(str, tester.config)
+                  describe(str) do
+
+                    around(:each) do |example|
+                      client.around(test_case) do
+                        client.before(test_case)
+                        test_case.instrument(client)
+                        client.instrument(test_case)
+                        @response = client.call(test_case)
+                        @invocation = Tester::Invocation.new(test_case, @response, client)
+                        example.run
+                        client.after(test_case, @invocation)
+                        @invocation
+                      end
+                    end
+        
+                    let(:invocation) do
+                      @invocation
+                    end
+        
+                    it "meets its specification" do
+                      raise "Test not ran" unless invocation.done?
+                      RSpecAsserter.call(self, invocation)
+                    end
+
+                  end
+                end
+              end
+            end
+          end
+        end
+        self
+      end
+
+    end # class RSpecTester
+  end # class Tester
+end # module Webspicy

data/lib/webspicy/specification.rb

@@ -1,11 +1,13 @@
 module Webspicy
   class Specification
+    include Support::DataObject
 
     def initialize(raw, location = nil)
-      @raw = raw
+      super(raw)
       @location = location
       bind_services
     end
+    attr_accessor :config
     attr_reader :location
 
     def self.info(raw)
@@ -14,11 +16,13 @@ module Webspicy
 
     def self.singleservice(raw)
       converted = {
-        name: raw.has_key?(:name) ? raw[:name] : "Unamed specification",
+        name: raw[:name] || "Unamed specification",
         url: raw[:url],
-        services: [raw.reject{|k, _| k == :name || k == :url}]
+        services: [
+          Webspicy.service(raw.reject{|k| k==:url or k==:name }, Webspicy.current_scope)
+        ]
       }
-      self.info(raw)
+      info(converted)
     end
 
     def located_at!(location)
@@ -44,7 +48,7 @@ module Webspicy
     end
 
     def services
-      @raw[:services]
+      @raw[:services] || []
     end
 
     def url_placeholders
@@ -60,10 +64,6 @@ module Webspicy
       [ url, rest ]
     end
 
-    def to_info
-      @raw
-    end
-
     def to_singleservice
       raise NotImplementedError
     end
@@ -85,7 +85,7 @@ module Webspicy
     end
 
     def bind_services
-      (@raw[:services] ||= []).each do |s|
+      services.each do |s|
         s.specification = self
       end
     end

data/lib/webspicy/specification/errcondition.rb

@@ -0,0 +1,16 @@
+module Webspicy
+  class Specification
+    module Errcondition
+
+      def self.match(service, descr)
+      end
+
+      def instrument(test_case, client)
+      end
+
+      def check(invocation)
+      end
+
+    end # module Errcondition
+  end # module Specification
+end # module Webspicy

data/lib/webspicy/specification/precondition/robust_to_invalid_input.rb

@@ -40,7 +40,7 @@ module Webspicy
         def empty_input_counterexamples(service, first)
           placeholders = service.specification.url_placeholders
           empty_input = first.params.reject{|k| !placeholders.include?(k) }
-          if !empty_input.empty? && invalid_input?(service, empty_input)
+          if invalid_input?(service, empty_input)
             [first.mutate({
               :description => "it is robust to an invalid empty input (RobustToInvalidInput)",
               :dress_params => false,

data/lib/webspicy/specification/service.rb

@@ -1,13 +1,12 @@
 module Webspicy
   class Specification
     class Service
+      include Support::DataObject
 
       def initialize(raw)
-        @raw = raw
+        super(raw)
         bind_examples
         bind_counterexamples
-        @preconditions = compile_preconditions
-        @postconditions = compile_postconditions
       end
       attr_accessor :specification
 
@@ -15,6 +14,10 @@ module Webspicy
         new(raw)
       end
 
+      def config
+        specification.config
+      end
+
       def method
         @raw[:method]
       end
@@ -24,7 +27,7 @@ module Webspicy
       end
 
       def preconditions
-        @preconditions
+        @preconditions ||= compile_preconditions
       end
 
       def has_preconditions?
@@ -32,23 +35,31 @@ module Webspicy
       end
 
       def postconditions
-        @postconditions
+        @postconditions ||= compile_postconditions
       end
 
       def has_postconditions?
         !postconditions.empty?
       end
 
+      def errconditions
+        @errconditions ||= compile_errconditions
+      end
+
+      def has_errconditions?
+        !errconditions.empty?
+      end
+
       def default_example
         @raw[:default_example]
       end
 
       def examples
-        @raw[:examples]
+        @raw[:examples] || []
       end
 
       def counterexamples
-        @raw[:counterexamples]
+        @raw[:counterexamples] || []
       end
 
       def generated_counterexamples
@@ -76,28 +87,25 @@ module Webspicy
         input_schema.dress(params)
       end
 
-      def to_info
-        @raw
-      end
-
       def to_s
         "#{method} #{specification.url}"
       end
 
     private
 
-      def scope
-        Webspicy.current_scope
-      end
-
       def compile_preconditions
         @raw[:preconditions] = [@raw[:preconditions]] if @raw[:preconditions].is_a?(String)
-        compile_conditions(@raw[:preconditions] ||= [], scope.preconditions)
+        compile_conditions(@raw[:preconditions] ||= [], config.preconditions)
       end
 
       def compile_postconditions
         @raw[:postconditions] = [@raw[:postconditions]] if @raw[:postconditions].is_a?(String)
-        compile_conditions(@raw[:postconditions] ||= [], scope.postconditions)
+        compile_conditions(@raw[:postconditions] ||= [], config.postconditions)
+      end
+
+      def compile_errconditions
+        @raw[:errconditions] = [@raw[:errconditions]] if @raw[:errconditions].is_a?(String)
+        compile_conditions(@raw[:errconditions] ||= [], config.errconditions)
       end
 
       def compile_conditions(descriptions, conditions)
@@ -112,13 +120,13 @@ module Webspicy
       end
 
       def bind_examples
-        (@raw[:examples] ||= []).each do |ex|
+        examples.each do |ex|
           ex.bind(self, false)
         end
       end
 
       def bind_counterexamples
-        (@raw[:counterexamples] ||= []).each do |ex|
+        counterexamples.each do |ex|
           ex.bind(self, true)
         end
       end

data/lib/webspicy/specification/test_case.rb

@@ -1,17 +1,15 @@
 module Webspicy
   class Specification
     class TestCase
+      include Support::DataObject
 
       def initialize(raw)
-        @raw = raw
+        super(raw)
         @counterexample = nil
       end
       attr_reader :service
       attr_reader :counterexample
 
-      attr_accessor :raw
-      protected :raw, :raw=
-
       def bind(service, counterexample)
         @service = service
         @counterexample = counterexample
@@ -111,13 +109,9 @@ module Webspicy
         !assert.empty?
       end
 
-      def to_info
-        @raw
-      end
-
       def instrument(client)
         service.preconditions.each do |pre|
-          pre.instrument(self, client)
+          pre.instrument(self, client) if pre.respond_to?(:instrument)
         end
         service.postconditions.each do |post|
           post.instrument(self, client) if post.respond_to?(:instrument)

data/lib/webspicy/support.rb

@@ -1,2 +1,3 @@
+require_relative 'support/data_object'
 require_relative 'support/status_range'
 require_relative 'support/colorize'

data/lib/webspicy/support/data_object.rb

@@ -0,0 +1,25 @@
+module Webspicy
+  module Support
+    module DataObject
+
+      def initialize(raw)
+        @raw = raw
+      end
+      attr_accessor :raw
+      protected :raw, :raw=
+
+      def method_missing(name, *args, &bl)
+        if @raw.has_key?(name) && args.empty? && bl.nil?
+          @raw[name]
+        else
+          super
+        end
+      end
+
+      def to_info
+        @raw
+      end
+
+    end # module DataObject
+  end # module Support
+end # module Webspicy

data/lib/webspicy/tester.rb

@@ -1,89 +1,15 @@
 module Webspicy
   class Tester
-    include Webspicy::Support::Colorize
 
-    def initialize(config)
-      @config = Configuration.dress(config)
-      @test_suite = load
-    end
-    attr_reader :config
-
-    def call(err=$stderr, out=$stdout)
-      $_rspec_core_load_started_at = nil
-      options = RSpec::Core::ConfigurationOptions.new(config.rspec_options)
-      conf = RSpec::Core::Configuration.new
-      RSpec::Core::Runner.new(options, conf).run(err, out)
-    end
-
-  # protected
-
-    def load
-      tester = self
-      RSpec.reset
-      rspec_config!
-      RSpec.describe "" do
-        before(:all) do
-          tester.config.listeners(:before_all).each do |l|
-            l.call(tester.config)
-          end
-        end
-        after(:all) do
-          tester.config.listeners(:after_all).each do |l|
-            l.call(tester.config)
-          end
-        end
-        tester.config.each_scope do |scope|
-          client = scope.get_client
-          scope.each_specification do |specification|
-            scope.each_service(specification) do |service|
-              tester.rspec_service!(self, service, client, scope)
-            end
-          end
-        end
-      end
-      self
-    end
-
-    def rspec_service!(on, service, client, scope)
-      scope.each_testcase(service) do |test_case|
-        str = "#{service} #{test_case}"
-        str = colorize_highlight(str)
-        on.describe(str) do
-          include_examples 'a successful test case invocation', client, test_case
-        end
-      end
-    end
-
-    def rspec_config!
-      RSpec.shared_examples "a successful test case invocation" do |client, test_case|
-
-        around(:each) do |example|
-          client.around(test_case) do
-            client.before(test_case)
-            test_case.instrument(client)
-            client.instrument(test_case)
-            @response = client.call(test_case)
-            @invocation = Tester::Invocation.new(test_case, @response, client)
-            example.run
-            client.after(test_case, @invocation)
-            @invocation
-          end
-        end
-
-        let(:invocation) do
-          @invocation
-        end
-
-        it "meets its specification" do
-          raise "Test not ran" unless invocation.done?
-          invocation.rspec_assert!(self)
-        end
-      end
+    def self.new(*args, &bl)
+      require_relative 'rspec/tester'
+      RSpecTester.new(*args, &bl)
     end
 
   end # class Tester
 end # module Webspicy
 require_relative 'tester/client'
 require_relative 'tester/invocation'
+require_relative 'tester/failure'
 require_relative 'tester/assertions'
 require_relative 'tester/asserter'