fitting 2.13.0 → 2.16.0

data/fitting.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['d.efimov']
   spec.email         = ['d.efimov@fun-box.ru']
 
-  spec.summary       = 'Validation in the rspec of API Blueprint'
-  spec.description   = 'Validation responses in the rspec with the help of API Blueprint'
+  spec.summary       = 'Coverage API Blueprint, Swagger and OpenAPI with rspec tests'
+  spec.description   = 'Coverage API Blueprint, Swagger and OpenAPI with rspec tests for easily make high-quality API and documenatiton.'
   spec.homepage      = 'https://github.com/funbox/fitting'
   spec.license       = 'MIT'
 
@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json-schema', '~> 2.6', '>= 2.6.2'
   spec.add_runtime_dependency 'multi_json', '~> 1.11'
-  spec.add_runtime_dependency 'tomograph', '~> 2.0', '>= 2.2.0'
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_runtime_dependency 'tomograph', '~> 3.1', '>= 3.1.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
   spec.add_development_dependency 'rubocop', '~> 0.49.1', '>= 0.49.1'
   spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'

data/lib/fitting/cover/json_schema.rb

@@ -16,17 +16,19 @@ module Fitting
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
           if key == 'properties' and json_schema['required'] != value.keys
-            one_of = json_schema.delete('required') || []
-            json_schema['properties'].each_key do |property|
+            schema = json_schema.dup
+            one_of = schema.delete('required') || []
+            schema['properties'].each_key do |property|
               next if one_of.include?(property)
-              combinations.push([json_schema.merge('required' => one_of + [property]), "required.#{property}"])
+              combinations.push([schema.merge('required' => one_of + [property]), "required.#{property}"])
             end
           elsif value.is_a?(Hash)
-            inception(value, combinations)
-            combinations.each do |combination|
-              combination[0] = { key => combination[0]}
+            com = inception(value, [])
+            com.each do |combination|
+              combination[0] = { key => value.merge(combination[0])}
               combination[1] = "#{key}.#{combination[1]}"
             end
+            combinations += com
           end
         end
 

data/lib/fitting/cover/json_schema_enum.rb

@@ -15,17 +15,19 @@ module Fitting
 
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
-          if key == 'enum'
-            one_of = json_schema.delete('enum')
+          if key == 'enum' && value.size > 1
+            schema = json_schema.dup
+            one_of = schema.delete('enum')
             one_of.each_index do |index|
-              combinations.push([json_schema.merge('enum' => [one_of[index]]), "enum.#{one_of[index]}"])
+              combinations.push([schema.merge('enum' => [one_of[index]]), "enum.#{one_of[index]}"])
             end
           elsif value.is_a?(Hash)
-            inception(value, combinations)
-            combinations.each do |combination|
-              combination[0] = { key => combination[0]}
+            com = inception(value, [])
+            com.each do |combination|
+              combination[0] = { key => value.merge(combination[0])}
               combination[1] = "#{key}.#{combination[1]}"
             end
+            combinations += com
           end
         end
 

data/lib/fitting/cover/json_schema_one_of.rb

@@ -16,16 +16,18 @@ module Fitting
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
           if key == 'oneOf'
-            one_of = json_schema.delete('oneOf')
+            schema = json_schema.dup
+            one_of = schema.delete('oneOf')
             one_of.each_index do |index|
-              combinations.push([json_schema.merge('oneOf' => [one_of[index]]), "oneOf.#{index}"])
+              combinations.push([schema.merge('oneOf' => [one_of[index]]), "oneOf.#{index}"])
             end
           elsif value.is_a?(Hash)
-            inception(value, combinations)
-            combinations.each do |combination|
-              combination[0] = { key => combination[0]}
+            com = inception(value, [])
+            com.each do |combination|
+              combination[0] = { key => value.merge(combination[0])}
               combination[1] = "#{key}.#{combination[1]}"
             end
+            combinations += com
           end
         end
 

data/lib/fitting/records/spherical/requests.rb

@@ -13,7 +13,9 @@ module Fitting
             array += JSON.load(File.read(file))
           end
           @to_a = array.inject([]) do |res, tested_request|
-            res.push(Fitting::Records::Spherical::Request.load(tested_request))
+            request = Fitting::Records::Spherical::Request.load(tested_request)
+            next res unless request.path.to_s.start_with?(Fitting.configuration.prefix)
+            res.push(request)
           end
         end
       end

data/lib/fitting/report/action.rb

@@ -0,0 +1,53 @@
+require 'fitting/report/responses'
+
+module Fitting
+  module Report
+    class Action
+      def initialize(action)
+        @action = action
+        @tests = Fitting::Report::Tests.new([])
+        @responses = Fitting::Report::Responses.new(@action.responses)
+      end
+
+      def method
+        @action.method
+      end
+
+      def path
+        @action.path.to_s
+      end
+
+      def responses
+        @responses
+      end
+
+      def add_test(test)
+        @tests.push(test)
+      end
+
+      def path_match(find_path)
+        regexp =~ find_path
+      end
+
+      def regexp
+        return @regexp if @regexp
+
+        str = Regexp.escape(path)
+        str = str.gsub(/\\{\w+\\}/, '[^&=\/]+')
+        str = "\\A#{str}\\z"
+        @regexp = Regexp.new(str)
+      end
+
+      def tests
+        @tests
+      end
+
+      def details
+        {
+            tests_without_responses: @tests.without_responses,
+            responses_details: @responses.to_a.map { |r| {method: r.status, tests_size: r.tests.size, json_schema: r.id, combinations: r.details} }
+        }
+      end
+    end
+  end
+end

data/lib/fitting/report/actions.rb

@@ -0,0 +1,51 @@
+require 'fitting/report/action'
+
+module Fitting
+  module Report
+    class Actions
+      def initialize(actions)
+        @actions = []
+        actions.to_a.map do |action|
+          @actions.push(Fitting::Report::Action.new(action))
+        end
+      end
+
+      def to_a
+        @actions
+      end
+
+      def join(tests)
+        tests.to_a.map do |test|
+          if is_there_a_suitable_action?(test)
+            cram_into_the_appropriate_action(test)
+            test.mark_action
+          end
+        end
+      end
+
+      def is_there_a_suitable_action?(test)
+        @actions.map do |action|
+          return true if test.method == action.method && action.path_match(test.path)
+        end
+
+        false
+      end
+
+      def cram_into_the_appropriate_action(test)
+        @actions.map do |action|
+          if test.method == action.method && action.path_match(test.path)
+            action.add_test(test)
+            return
+          end
+        end
+      end
+
+      def details(prefix)
+        {
+            tests_without_actions: prefix.tests.without_actions,
+            actions_details: @actions.map { |a| {method: a.method, path: a.path, tests_size: a.tests.size, responses: a.details} }
+        }
+      end
+    end
+  end
+end

data/lib/fitting/report/combination.rb

@@ -0,0 +1,37 @@
+module Fitting
+  module Report
+    class Combination
+      def initialize(json_schema:, type:, combination:)
+        @json_schema = json_schema
+        @type = type
+        @combination = combination
+        @tests = Fitting::Report::Tests.new([])
+        @id = SecureRandom.hex
+      end
+
+      def json_schema
+        @json_schema
+      end
+
+      def id
+        @id
+      end
+
+      def type
+        @type
+      end
+
+      def name
+        @combination
+      end
+
+      def tests
+        @tests
+      end
+
+      def add_test(test)
+        @tests.push(test)
+      end
+    end
+  end
+end

data/lib/fitting/report/combinations.rb

@@ -0,0 +1,47 @@
+module Fitting
+  module Report
+    class Combinations
+      def initialize(combinations)
+        @combinations = combinations
+      end
+
+      def to_a
+        @combinations
+      end
+
+      def size
+        @combinations.size
+      end
+
+      def size_with_tests
+        @combinations.count { |c| c.tests.size != 0 }
+      end
+
+      def join(tests)
+        tests.to_a.map do |test|
+          if is_there_a_suitable_combination?(test)
+            cram_into_the_appropriate_combinations(test)
+            test.mark_combination
+          end
+        end
+      end
+
+      def is_there_a_suitable_combination?(test)
+        return false if @combinations.nil?
+        @combinations.map do |combination|
+          return true if JSON::Validator.fully_validate(combination.json_schema, test.body) == []
+        end
+
+        false
+      end
+
+      def cram_into_the_appropriate_combinations(test)
+        @combinations.map do |combination|
+          if JSON::Validator.fully_validate(combination.json_schema, test.body) == []
+            combination.add_test(test)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fitting/report/console.rb

@@ -0,0 +1,41 @@
+module Fitting
+  module Report
+    class Console
+      def initialize(tests_without_prefixes, prefixes_details)
+        @tests_without_prefixes = tests_without_prefixes
+        @prefixes_details = prefixes_details
+        @good = true
+        @tests_without_actions = []
+        @tests_without_responses = []
+      end
+
+      def output
+        doc_res = @prefixes_details.inject('') do |res, prefix_details|
+          res += "#{prefix_details[:name]}\n"
+          @tests_without_actions += prefix_details[:actions][:tests_without_actions]
+          res += prefix_details[:actions][:actions_details].inject('') do |res_actions, action|
+            res_actions += "#{action[:method]}\t#{action[:path]}"
+            tab = "\t" * (8 - action[:path].size / 8)
+            @tests_without_responses += action[:responses][:tests_without_responses]
+            res_actions += tab + action[:responses][:responses_details].inject('') do |res_responses, response|
+              @good = false if response[:combinations][:cover_percent] != '100%'
+              res_responses += " #{response[:combinations][:cover_percent]} #{response[:method]}"
+            end
+            res_actions += "\n"
+          end
+        end
+        doc_res += "\n"
+        doc_res += "tests_without_prefixes: #{@tests_without_prefixes.size}\n"
+        doc_res += "tests_without_actions: #{@tests_without_actions.size}\n"
+        doc_res += "tests_without_responses: #{@tests_without_responses.size}\n"
+      end
+
+      def good?
+        return false if @tests_without_prefixes.size != 0
+        return false if @tests_without_actions.size != 0
+        return false if @tests_without_responses.size != 0
+        @good
+      end
+    end
+  end
+end

data/lib/fitting/report/prefix.rb

@@ -0,0 +1,88 @@
+require 'fitting/report/actions'
+
+module Fitting
+  module Report
+    class Prefix
+      def initialize(name: '', openapi2_json_path: nil, openapi3_yaml_path: nil, drafter_yaml_path: nil, tomogram_json_path: nil, crafter_yaml_path: nil, skip: false)
+        @name = name
+        @tomogram_json_path = tomogram_json_path
+        @tests = Fitting::Report::Tests.new([])
+        @skip = skip
+        unless skip
+          @actions = if openapi2_json_path
+                       Fitting::Report::Actions.new(
+                         Tomograph::Tomogram.new(
+                           prefix: name,
+                           openapi2_json_path: openapi2_json_path
+                         )
+                       )
+                     elsif openapi3_yaml_path
+                       Fitting::Report::Actions.new(
+                         Tomograph::Tomogram.new(
+                           prefix: name,
+                           openapi3_yaml_path: openapi3_yaml_path
+                         )
+                       )
+                     elsif drafter_yaml_path
+                       Fitting::Report::Actions.new(
+                         Tomograph::Tomogram.new(
+                           prefix: name,
+                           drafter_yaml_path: drafter_yaml_path
+                         )
+                       )
+                     elsif crafter_yaml_path
+                       Fitting::Report::Actions.new(
+                         Tomograph::Tomogram.new(
+                           prefix: name,
+                           crafter_yaml_path: crafter_yaml_path
+                         )
+                       )
+                     else
+                       Fitting::Report::Actions.new(
+                         Tomograph::Tomogram.new(
+                           prefix: name,
+                           tomogram_json_path: tomogram_json_path
+                         )
+                       )
+                     end
+        end
+      end
+
+      def name
+        @name
+      end
+
+      def tests
+        @tests
+      end
+
+      def skip?
+        @skip
+      end
+
+      def actions
+        @actions
+      end
+
+      def details
+        if @skip
+          {
+              name: @name,
+              tests_size: @tests.size,
+              actions: {tests_without_actions: [], actions_details: []}
+          }
+        else
+          {
+              name: @name,
+              tests_size: @tests.size,
+              actions: @actions.details(self)
+          }
+        end
+      end
+
+      def add_test(test)
+        @tests.push(test)
+      end
+    end
+  end
+end