fitting 2.15.0 → 2.18.0

data/lib/fitting/documentation.rb

@@ -1,5 +1,3 @@
-require 'multi_json'
-
 module Fitting
   class Documentation
     def initialize(tomogram, white_list)

data/lib/fitting/matchers/response_matcher.rb

@@ -39,7 +39,8 @@ module Fitting
         if response.within_prefix?(config.prefix)
           @response = response
           return true if @response.ignored?(config.ignore_list)
-          return @response.fully_validates.valid?
+
+          @response.fully_validates.valid?
         else
           true
         end

data/lib/fitting/records/documented/request.rb

@@ -35,6 +35,7 @@ module Fitting
           return false if @white_list[path.to_s] == nil
           return true if @white_list[path.to_s] == []
           return true if @white_list[path.to_s].include?(method)
+
           false
         end
 

data/lib/fitting/records/realized_unit.rb

@@ -9,27 +9,25 @@ module Fitting
       end
 
       def fully_covered?
+        all_good_documented = false
+        all_good_response_documented = false
+        all_good_response_json_schemas = false
+        all_good_valid_json_schemas = false
+
         test_file_paths.each do |_key, requests|
-          all_good = requests.all?(&:documented?)
-          return false unless all_good
-        end
-        test_file_paths.each do |_key, requests|
-          all_good = requests.all?(&:response_documented?)
-          return false unless all_good
-        end
-        test_file_paths.each do |_key, requests|
-          all_good = requests.all?(&:response_json_schemas?)
-          return false unless all_good
-        end
-        test_file_paths.each do |_key, requests|
-          all_good = requests.all?(&:valid_json_schemas?)
-          return false unless all_good
+          all_good_documented = requests.all?(&:documented?)
+          all_good_response_documented = requests.all?(&:response_documented?)
+          all_good_response_json_schemas = requests.all?(&:response_json_schemas?)
+          all_good_valid_json_schemas = requests.all?(&:valid_json_schemas?)
         end
-        true
+
+        all_good_documented && all_good_response_documented &&
+          all_good_response_json_schemas && all_good_valid_json_schemas
       end
 
       def test_file_paths
         return @test_file_paths if @test_file_paths
+
         @test_file_paths = {}
         white_unit.map do |request|
           @test_file_paths[request.test_file_path] ||= []

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

@@ -27,7 +27,7 @@ module Fitting
           }
         end
 
-        def to_json
+        def to_json(*_args)
           JSON.dump(to_hash)
         end
 

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

@@ -10,11 +10,12 @@ module Fitting
 
           array = []
           Dir['fitting_tests/*.json'].each do |file|
-            array += JSON.load(File.read(file))
+            array += JSON.parse(File.read(file))
           end
           @to_a = array.inject([]) do |res, 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

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

@@ -14,7 +14,7 @@ module Fitting
         def to_hash
           {
             status: status,
-            body: JSON.load(body)
+            body: JSON.parse(body)
           }
         rescue JSON::ParserError
           {
@@ -23,7 +23,7 @@ module Fitting
           }
         end
 
-        def to_json
+        def to_json(*_args)
           JSON.dump(to_hash)
         end
 

data/lib/fitting/records/test_unit/request.rb

@@ -37,6 +37,7 @@ module Fitting
           @documented_requests ||= @all_documented_requests.inject([]) do |res, documented_request|
             next res unless @tested_request.method == documented_request.method &&
                             documented_request.path.match(@tested_request.path.to_s)
+
             res.push(documented_request)
           end
         end
@@ -49,6 +50,7 @@ module Fitting
           @documented_responses ||= documented_requests.inject([]) do |res, documented_request|
             documented_request.responses.map do |documented_response|
               next unless documented_response['status'] == response.status.to_s
+
               res.push(documented_response)
             end
           end.flatten.compact
@@ -71,6 +73,7 @@ module Fitting
         def valid_json_schemas
           @valid_json_schemas ||= response_json_schemas.inject([]) do |res, json_schema|
             next res unless JSON::Validator.validate(json_schema, response.body)
+
             res.push(json_schema)
           end.flatten
         end
@@ -78,6 +81,7 @@ module Fitting
         def invalid_json_schemas
           @invalid_json_schemas ||= response_json_schemas.inject([]) do |res, json_schema|
             next res if JSON::Validator.validate(json_schema, response.body)
+
             res.push(
               json_schema: json_schema,
               fully_validate: JSON::Validator.fully_validate(json_schema, response.body)

data/lib/fitting/records/tested/request.rb

@@ -28,7 +28,7 @@ module Fitting
         end
 
         def test_path
-          @test_path ||= @test_title[/#{'\(\.'}(.*?)#{'\)'}/m, 1] || @test_title[/#{'\.'}(.*?)#{'\"'}/m, 1]
+          @test_path ||= @test_title[/\\(\\.(.*?)\\)/m, 1] || @test_title[/\\.(.*?)\\"/m, 1]
         end
 
         def test_file_path

data/lib/fitting/records/unit/combination.rb

@@ -14,12 +14,11 @@ module Fitting
 
         def valid_bodies
           @valid_bodies ||= @bodies.inject([]) do |res, tested_body|
-            begin
-              next res unless JSON::Validator.validate(@json_schema, tested_body)
-              res.push(tested_body)
-            rescue JSON::Schema::UriError
-              res.push(tested_body)
-            end
+            next res unless JSON::Validator.validate(@json_schema, tested_body)
+
+            res.push(tested_body)
+          rescue JSON::Schema::UriError
+            res.push(tested_body)
           end
         end
       end

data/lib/fitting/records/unit/json_schema.rb

@@ -17,50 +17,55 @@ module Fitting
 
         def bodies
           @bodies ||= @tested_bodies.inject([]) do |res, tested_body|
-            begin
-              next res unless JSON::Validator.validate(@json_schema, tested_body)
-              res.push(tested_body)
-            rescue JSON::Schema::UriError
-              res.push(tested_body)
-            end
+            next res unless JSON::Validator.validate(@json_schema, tested_body)
+
+            res.push(tested_body)
+          rescue JSON::Schema::UriError
+            res.push(tested_body)
           end
         end
 
         def combinations
           return @combinations if @combinations
+
           @combinations = []
           cover_json_schema = Fitting::Cover::JSONSchema.new(@json_schema)
           cover_json_schema.combi.map do |comb|
             @combinations.push(Fitting::Records::Unit::Combination.new(
-              comb,
-              bodies
-            ))
+                                 comb,
+                                 bodies
+                               ))
           end
           @combinations
         end
 
         def combinations_with_enum
           return @combinations_with_enum if @combinations_with_enum
+
           @combinations_with_enum = []
-          qwe = Fitting::Cover::JSONSchema.new(@json_schema).combi + Fitting::Cover::JSONSchemaEnum.new(@json_schema).combi
+          qwe = Fitting::Cover::JSONSchema.new(@json_schema).combi +
+                Fitting::Cover::JSONSchemaEnum.new(@json_schema).combi
           qwe.map do |comb|
             @combinations_with_enum.push(Fitting::Records::Unit::Combination.new(
-              comb,
-              bodies
-            ))
+                                           comb,
+                                           bodies
+                                         ))
           end
           @combinations_with_enum
         end
 
         def combinations_with_one_of
           return @combinations_with_one_of if @combinations_with_one_of
+
           @combinations_with_one_of = []
-          qwe = Fitting::Cover::JSONSchema.new(@json_schema).combi + Fitting::Cover::JSONSchemaEnum.new(@json_schema).combi + Fitting::Cover::JSONSchemaOneOf.new(@json_schema).combi
+          qwe = Fitting::Cover::JSONSchema.new(@json_schema).combi +
+                Fitting::Cover::JSONSchemaEnum.new(@json_schema).combi +
+                Fitting::Cover::JSONSchemaOneOf.new(@json_schema).combi
           qwe.map do |comb|
             @combinations_with_one_of.push(Fitting::Records::Unit::Combination.new(
-              comb,
-              bodies
-            ))
+                                             comb,
+                                             bodies
+                                           ))
           end
           @combinations_with_one_of
         end
@@ -79,26 +84,26 @@ module Fitting
 
         def cover_enum
           @cover_enum ||= if bodies == []
-            0
-          else
-            count = 0
-            combinations_with_enum.map do |combination|
-              count += 1 unless combination.valid_bodies == []
-            end
-            (count + 1) * 100 / (combinations_with_enum.size + 1)
-          end
+                            0
+                          else
+                            count = 0
+                            combinations_with_enum.map do |combination|
+                              count += 1 unless combination.valid_bodies == []
+                            end
+                            (count + 1) * 100 / (combinations_with_enum.size + 1)
+                          end
         end
 
         def cover_one_of
           @cover_one_of ||= if bodies == []
-            0
-          else
-            count = 0
-            combinations_with_one_of.map do |combination|
-              count += 1 unless combination.valid_bodies == []
-            end
-            (count + 1) * 100 / (combinations_with_one_of.size + 1)
-          end
+                              0
+                            else
+                              count = 0
+                              combinations_with_one_of.map do |combination|
+                                count += 1 unless combination.valid_bodies == []
+                              end
+                              (count + 1) * 100 / (combinations_with_one_of.size + 1)
+                            end
         end
       end
     end

data/lib/fitting/records/unit/request.rb

@@ -27,6 +27,7 @@ module Fitting
           @tested_responses ||= @tested_requests.to_a.inject([]) do |res, tested_request|
             next res unless @documented_request.method == tested_request.method &&
                             @documented_request.path.match(tested_request.path.to_s)
+
             res.push(tested_request.response)
           end
         end

data/lib/fitting/records/unit/response.rb

@@ -22,6 +22,7 @@ module Fitting
         def tested_bodies
           @tested_bodies ||= @tested_responses.inject([]) do |res, tested_response|
             next res unless status == tested_response.status.to_s
+
             res.push(tested_response.body)
           end
         end

data/lib/fitting/report/action.rb

@@ -17,9 +17,7 @@ module Fitting
         @action.path.to_s
       end
 
-      def responses
-        @responses
-      end
+      attr_reader :responses, :tests
 
       def add_test(test)
         @tests.push(test)
@@ -38,14 +36,13 @@ module Fitting
         @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} }
+          tests_without_responses: @tests.without_responses,
+          responses_details: @responses.to_a.map do |r|
+                               { method: r.status, tests_size: r.tests.size, json_schema: r.id,
+                                 combinations: r.details }
+                             end
         }
       end
     end

data/lib/fitting/report/actions.rb

@@ -3,11 +3,7 @@ require 'fitting/report/action'
 module Fitting
   module Report
     class Actions
-      def initialize(prefix, tomogram_json_path)
-        actions = Tomograph::Tomogram.new(
-            prefix: prefix,
-            tomogram_json_path: tomogram_json_path
-        )
+      def initialize(actions)
         @actions = []
         actions.to_a.map do |action|
           @actions.push(Fitting::Report::Action.new(action))
@@ -20,14 +16,14 @@ module Fitting
 
       def join(tests)
         tests.to_a.map do |test|
-          if is_there_a_suitable_action?(test)
+          if there_a_suitable_action?(test)
             cram_into_the_appropriate_action(test)
             test.mark_action
           end
         end
       end
 
-      def is_there_a_suitable_action?(test)
+      def there_a_suitable_action?(test)
         @actions.map do |action|
           return true if test.method == action.method && action.path_match(test.path)
         end
@@ -39,15 +35,17 @@ module Fitting
         @actions.map do |action|
           if test.method == action.method && action.path_match(test.path)
             action.add_test(test)
-            return
+            break
           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} }
+          tests_without_actions: prefix.tests.without_actions,
+          actions_details: @actions.map do |a|
+                             { method: a.method, path: a.path, tests_size: a.tests.size, responses: a.details }
+                           end
         }
       end
     end

data/lib/fitting/report/combination.rb

@@ -9,26 +9,12 @@ module Fitting
         @id = SecureRandom.hex
       end
 
-      def json_schema
-        @json_schema
-      end
-
-      def id
-        @id
-      end
-
-      def type
-        @type
-      end
+      attr_reader :json_schema, :id, :type, :tests
 
       def name
         @combination
       end
 
-      def tests
-        @tests
-      end
-
       def add_test(test)
         @tests.push(test)
       end

data/lib/fitting/report/combinations.rb

@@ -14,20 +14,21 @@ module Fitting
       end
 
       def size_with_tests
-        @combinations.count { |c| c.tests.size != 0 }
+        @combinations.count { |c| !c.tests.empty? }
       end
 
       def join(tests)
         tests.to_a.map do |test|
-          if is_there_a_suitable_combination?(test)
+          if there_a_suitable_combination?(test)
             cram_into_the_appropriate_combinations(test)
             test.mark_combination
           end
         end
       end
 
-      def is_there_a_suitable_combination?(test)
+      def 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
@@ -37,9 +38,7 @@ module Fitting
 
       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
+          combination.add_test(test) if JSON::Validator.fully_validate(combination.json_schema, test.body) == []
         end
       end
     end

data/lib/fitting/report/console.rb

@@ -15,7 +15,7 @@ module Fitting
           @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" * ((3 - action[:path].size / 8) + 3)
+            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%'
@@ -31,9 +31,10 @@ module Fitting
       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
+        return false unless @tests_without_prefixes.empty?
+        return false unless @tests_without_actions.empty?
+        return false unless @tests_without_responses.empty?
+
         @good
       end
     end

data/lib/fitting/report/prefix.rb

@@ -3,44 +3,70 @@ require 'fitting/report/actions'
 module Fitting
   module Report
     class Prefix
-      def initialize(name, tomogram_json_path, skip = false)
+      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 = Fitting::Report::Actions.new(name, tomogram_json_path)
-        end
-      end
+        return if skip
 
-      def name
-        @name
+        @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
 
-      def tests
-        @tests
-      end
+      attr_reader :name, :tests, :actions
 
       def skip?
         @skip
       end
 
-      def actions
-        @actions
-      end
-
       def details
         if @skip
           {
-              name: @name,
-              tests_size: @tests.size,
-              actions: {tests_without_actions: [], actions_details: []}
+            name: @name,
+            tests_size: @tests.size,
+            actions: { tests_without_actions: [], actions_details: [] }
           }
         else
           {
-              name: @name,
-              tests_size: @tests.size,
-              actions: @actions.details(self)
+            name: @name,
+            tests_size: @tests.size,
+            actions: @actions.details(self)
           }
         end
       end

data/lib/fitting/report/prefixes.rb

@@ -6,12 +6,24 @@ module Fitting
       def initialize(config_path)
         @prefixes = []
         YAML.safe_load(File.read(config_path))['prefixes'].map do |prefix|
-          @prefixes.push(Fitting::Report::Prefix.new(prefix['name'], prefix['tomogram_json_path'], prefix['skip']))
+          @prefixes.push(
+            Fitting::Report::Prefix.new(
+              name: prefix['name'],
+              openapi2_json_path: prefix['openapi2_json_path'],
+              openapi3_yaml_path: prefix['openapi3_yaml_path'],
+              drafter_yaml_path: prefix['drafter_yaml_path'],
+              tomogram_json_path: prefix['tomogram_json_path'],
+              crafter_yaml_path: prefix['crafter_yaml_path'],
+              skip: prefix['skip']
+            )
+          )
         end
       end
 
-      def is_there_a_suitable_prefix?(test_path)
+      def there_a_suitable_prefix?(test_path)
         @prefixes.map do |prefix|
+          return true if prefix.name.nil?
+          return true if prefix.name == ''
           return true if test_path[0..prefix.name.size - 1] == prefix.name
         end
 
@@ -20,16 +32,16 @@ module Fitting
 
       def cram_into_the_appropriate_prefix(test)
         @prefixes.map do |prefix|
-          if test.path[0..prefix.name.size - 1] == prefix.name
+          if prefix.name.nil? || prefix.name == '' || test.path[0..prefix.name.size - 1] == prefix.name
             prefix.add_test(test)
-            return
+            break
           end
         end
       end
 
       def join(tests)
         tests.to_a.map do |test|
-          if is_there_a_suitable_prefix?(test.path)
+          if there_a_suitable_prefix?(test.path)
             cram_into_the_appropriate_prefix(test)
             test.mark_prefix
           end