fitting 2.17.0 → 2.18.3

data/lib/fitting/report/actions.rb

@@ -16,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
@@ -35,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

@@ -19,15 +19,16 @@ module Fitting
 
       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

@@ -1,30 +1,50 @@
+require 'terminal-table'
+
 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]}"
+        tables = []
+
+        @prefixes_details.each do |prefix_details|
+          title = prefix_details[:name]
+          @tests_without_actions += prefix_details[:actions][:tests_without_actions] # непонятно что такое
+
+          next if prefix_details[:actions][:actions_details].count.zero?
+
+          tables << Terminal::Table.new do |t|
+            t.title = title
+            t.headings = %w[method path cover]
+
+            prefix_details[:actions][:actions_details].each do |action|
+              @tests_without_responses += action[:responses][:tests_without_responses]
+
+              path_details = action[:responses][:responses_details].map do |responses_detail|
+                @good = false if responses_detail[:combinations][:cover_percent] != '100%'
+                [responses_detail[:combinations][:cover_percent], responses_detail[:method]]
+              end.join(' ')
+
+              t.add_row [action[:method], action[:path], path_details]
             end
-            res_actions += "\n"
+
+            t.style = { all_separators: true, border: :unicode }
           end
         end
-        doc_res += "\n"
+
+        tables
+      end
+
+      def output_sum
+        doc_res = ''
         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"
@@ -34,6 +54,7 @@ module Fitting
         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

data/lib/fitting/report/prefix.rb

@@ -3,79 +3,70 @@ 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)
+      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
-                         )
+        return if 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 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 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
-                         )
+                     )
+                   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
-                         )
+                     )
+                   else
+                     Fitting::Report::Actions.new(
+                       Tomograph::Tomogram.new(
+                         prefix: name,
+                         tomogram_json_path: tomogram_json_path
                        )
-                     end
-        end
+                     )
+                   end
       end
 
-      def name
-        @name
-      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

@@ -20,7 +20,7 @@ module Fitting
         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 == ''
@@ -34,14 +34,14 @@ module Fitting
         @prefixes.map do |prefix|
           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

data/lib/fitting/report/response.rb

@@ -21,31 +21,27 @@ module Fitting
         @response['body'] || @response[:body]
       end
 
-      def id
-        @id
-      end
+      attr_reader :id, :tests
 
       def add_test(test)
         @tests.push(test)
       end
 
-      def tests
-        @tests
-      end
-
       def combinations
         return @combinations if @combinations
 
         cmbntns = []
-        combinations = Fitting::Cover::JSONSchema.new(body).combi + Fitting::Cover::JSONSchemaEnum.new(body).combi + Fitting::Cover::JSONSchemaOneOf.new(body).combi
+        combinations = Fitting::Cover::JSONSchema.new(body).combi +
+                       Fitting::Cover::JSONSchemaEnum.new(body).combi +
+                       Fitting::Cover::JSONSchemaOneOf.new(body).combi
         if combinations != []
           combinations.map do |combination|
             cmbntns.push(
-                Fitting::Report::Combination.new(
-                    json_schema: combination[0],
-                    type: combination[1][0],
-                    combination: combination[1][1]
-                )
+              Fitting::Report::Combination.new(
+                json_schema: combination[0],
+                type: combination[1][0],
+                combination: combination[1][1]
+              )
             )
           end
         end
@@ -54,16 +50,19 @@ module Fitting
       end
 
       def cover_percent
-        return '0%' if @tests.size == 0
-        return '100%' if @combinations.size == 0
+        return '0%' if @tests.size.zero?
+        return '100%' if @combinations.size.zero?
+
         "#{(@combinations.size_with_tests + 1) * 100 / (@combinations.size + 1)}%"
       end
 
       def details
         {
-            cover_percent: cover_percent,
-            tests_without_combinations: @tests.without_combinations,
-            combinations_details: @combinations.to_a.map { |c| {json_schema: c.id, tests_size: c.tests.size, type: c.type, name: c.name} }
+          cover_percent: cover_percent,
+          tests_without_combinations: @tests.without_combinations,
+          combinations_details: @combinations.to_a.map do |c|
+                                  { json_schema: c.id, tests_size: c.tests.size, type: c.type, name: c.name }
+                                end
         }
       end
     end

data/lib/fitting/report/responses.rb

@@ -17,18 +17,19 @@ module Fitting
 
       def join(tests)
         tests.to_a.map do |test|
-          if is_there_a_suitable_response?(test)
+          if there_a_suitable_response?(test)
             cram_into_the_appropriate_response(test)
             test.mark_response
           end
         end
       end
 
-      def is_there_a_suitable_response?(test)
+      def there_a_suitable_response?(test)
         return false if @responses.nil?
+
         @responses.map do |response|
           return true if response.status.to_s == test.status &&
-              JSON::Validator.fully_validate(response.body, test.body) == []
+                         JSON::Validator.fully_validate(response.body, test.body) == []
         end
 
         false
@@ -36,11 +37,11 @@ module Fitting
 
       def cram_into_the_appropriate_response(test)
         @responses.map do |response|
-          if response.status.to_s == test.status &&
-              JSON::Validator.fully_validate(response.body, test.body) == []
-            response.add_test(test)
-            return
-          end
+          next unless response.status.to_s == test.status &&
+                      JSON::Validator.fully_validate(response.body, test.body) == []
+
+          response.add_test(test)
+          break
         end
       end
     end

data/lib/fitting/report/test.rb

@@ -10,16 +10,14 @@ module Fitting
         @id = SecureRandom.hex
       end
 
-      def id
-        @id
-      end
+      attr_reader :id
 
       def to_h
         {
-            path: path,
-            method: method,
-            status: status,
-            body: body
+          path: path,
+          method: method,
+          status: status,
+          body: body
         }
       end
 
@@ -55,19 +53,19 @@ module Fitting
         @combination = true
       end
 
-      def is_there_a_prefix?
+      def there_a_prefix?
         @prefix
       end
 
-      def is_there_an_actions?
+      def there_an_actions?
         @action
       end
 
-      def is_there_an_responses?
+      def there_an_responses?
         @response
       end
 
-      def is_there_an_combinations?
+      def there_an_combinations?
         @combination
       end
     end

data/lib/fitting/report/tests.rb

@@ -10,7 +10,7 @@ module Fitting
       def self.new_from_config(tests_path)
         tests = []
         Dir[tests_path].each do |file|
-          JSON.load(File.read(file)).map do |test|
+          JSON.parse(File.read(file)).map do |test|
             tests.push(Fitting::Report::Test.new(test))
           end
         end
@@ -19,30 +19,26 @@ module Fitting
       end
 
       def without_prefixes
-        @tests.inject([]) do |result, test|
-          result.push(test.path) unless test.is_there_a_prefix?
-          result
+        @tests.each_with_object([]) do |test, result|
+          result.push(test.path) unless test.there_a_prefix?
         end
       end
 
       def without_actions
-        @tests.inject([]) do |result, test|
-          result.push("#{test.method} #{test.path}") unless test.is_there_an_actions?
-          result
+        @tests.each_with_object([]) do |test, result|
+          result.push("#{test.method} #{test.path}") unless test.there_an_actions?
         end
       end
 
       def without_responses
-        @tests.inject([]) do |result, test|
-          result.push(test.id) unless test.is_there_an_responses?
-          result
+        @tests.each_with_object([]) do |test, result|
+          result.push(test.id) unless test.there_an_responses?
         end
       end
 
       def without_combinations
-        @tests.inject([]) do |result, test|
-          result.push(test.path) unless test.is_there_an_combinations?
-          result
+        @tests.each_with_object([]) do |test, result|
+          result.push(test.path) unless test.there_an_combinations?
         end
       end
 
@@ -60,6 +56,7 @@ module Fitting
 
       def to_h
         return @hash if @hash
+
         @hash = @tests.inject({}) do |res, test|
           res.merge!(test.id => test.to_h)
         end

data/lib/fitting/request.rb

@@ -7,7 +7,6 @@ module Fitting
       @path = env_request.env['PATH_INFO'] || env_request.fullpath
       @body = env_request.env['action_dispatch.request.request_parameters']
       @schema = tomogram.find_request(method: @method, path: @path)
-      self
     end
 
     def route

data/lib/fitting/response.rb

@@ -1,7 +1,6 @@
 require 'fitting/request'
 require 'fitting/response/fully_validates'
 require 'json'
-require 'multi_json'
 
 module Fitting
   class Response
@@ -27,7 +26,7 @@ module Fitting
     end
 
     def documented?
-      @schemas && @schemas.present?
+      @schemas&.present?
     end
 
     def route
@@ -47,7 +46,7 @@ module Fitting
     end
 
     def got
-      JSON.pretty_generate(MultiJson.load(@body))
+      JSON.pretty_generate(JSON.parse(@body))
     end
 
     def expected
@@ -68,6 +67,7 @@ module Fitting
 
     def index
       return @index_res if @index_res
+
       @index_res = []
       @schemas.size.times do |i|
         @index_res.push(i) if fully_validates[i] == []
@@ -77,6 +77,7 @@ module Fitting
 
     def strict_index
       return @strict_index_res if @strict_index_res
+
       @strict_index_res = []
       @schemas.size.times do |i|
         @strict_index_res.push(i) if strict_fully_validates[i] == []

data/lib/fitting/statistics/cover_error.rb

@@ -10,9 +10,11 @@ module Fitting
         @request_unit.map do |request|
           request.responses.map do |response|
             next unless response.tested_bodies != []
+
             response.json_schemas.map do |json_schema|
               json_schema.combinations.map do |combination|
                 next unless combination.valid_bodies == []
+
                 res += "request method: #{request.method}\nrequest path: #{request.path}\n"\
                         "response status: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
                        "combination: #{combination.description}\nnew json-schema: #{combination.json_schema}\n\n"

data/lib/fitting/statistics/cover_error_enum.rb

@@ -10,9 +10,11 @@ module Fitting
         @request_unit.map do |request|
           request.responses.map do |response|
             next unless response.tested_bodies != []
+
             response.json_schemas.map do |json_schema|
               json_schema.combinations_with_enum.map do |combination|
                 next unless combination.valid_bodies == []
+
                 res += "request method: #{request.method}\nrequest path: #{request.path}\n"\
                         "response status: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
                        "combination: #{combination.description}\nnew json-schema: #{combination.json_schema}\n\n"

data/lib/fitting/statistics/cover_error_one_of.rb

@@ -10,9 +10,11 @@ module Fitting
         @request_unit.map do |request|
           request.responses.map do |response|
             next unless response.tested_bodies != []
+
             response.json_schemas.map do |json_schema|
               json_schema.combinations_with_one_of.map do |combination|
                 next unless combination.valid_bodies == []
+
                 res += "request method: #{request.method}\nrequest path: #{request.path}\n"\
                         "response status: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
                        "combination: #{combination.description}\nnew json-schema: #{combination.json_schema}\n\n"

data/lib/fitting/statistics/list.rb

@@ -35,17 +35,18 @@ module Fitting
       end
 
       def json_schema_stat(res, json_schema, response)
-        if @depth == 'valid'
+        case @depth
+        when 'valid'
           if json_schema.bodies == []
             res.push("✖ #{response.status}")
           else
             res.push("✔ #{response.status}")
           end
-        elsif @depth == 'cover'
+        when 'cover'
           res.push("#{json_schema.cover}% #{response.status}")
-        elsif @depth == 'cover_enum'
+        when 'cover_enum'
           res.push("#{json_schema.cover_enum}% #{response.status}")
-        elsif @depth == 'cover_one_of'
+        when 'cover_one_of'
           res.push("#{json_schema.cover_one_of}% #{response.status}")
         end
       end

data/lib/fitting/statistics/not_covered_responses.rb

@@ -6,7 +6,7 @@ module Fitting
       end
 
       def to_s
-        @measurement.not_covered_responses.join("\n") + "\n"
+        "#{@measurement.not_covered_responses.join("\n")}\n"
       end
     end
   end

data/lib/fitting/statistics/percent.rb

@@ -8,7 +8,8 @@ module Fitting
 
       def to_f
         return 0.to_f if @divider.zero?
-        (@dividend.to_f / @divider.to_f * 100.0).round(2)
+
+        (@dividend.to_f / @divider * 100.0).round(2)
       end
 
       def to_s