fitting 2.15.0 → 2.18.0

data/lib/fitting/report/response.rb

@@ -14,38 +14,34 @@ module Fitting
       end
 
       def status
-        @response['status']
+        @response['status'] || @response[:status]
       end
 
       def body
-        @response['body']
+        @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

data/lib/fitting/statistics/template.rb

@@ -48,26 +48,28 @@ module Fitting
 
       def white_measurement
         @white_measurement ||=
-          if @depth == 'valid'
+          case @depth
+          when 'valid'
             Fitting::Statistics::Measurement.new(white_unit)
-          elsif @depth == 'cover'
+          when 'cover'
             Fitting::Statistics::MeasurementCover.new(white_unit)
-          elsif @depth == 'cover_enum'
+          when 'cover_enum'
             Fitting::Statistics::MeasurementCoverEnum.new(white_unit)
-          elsif @depth == 'cover_one_of'
+          when 'cover_one_of'
             Fitting::Statistics::MeasurementCoverOneOf.new(white_unit)
           end
       end
 
       def black_measurement
         @black_measurement ||=
-          if @depth == 'valid'
+          case @depth
+          when 'valid'
             Fitting::Statistics::Measurement.new(black_unit)
-          elsif @depth == 'cover'
+          when 'cover'
             Fitting::Statistics::MeasurementCover.new(black_unit)
-          elsif @depth == 'cover_enum'
+          when 'cover_enum'
             Fitting::Statistics::MeasurementCoverEnum.new(black_unit)
-          elsif @depth == 'cover_one_of'
+          when 'cover_one_of'
             Fitting::Statistics::MeasurementCoverOneOf.new(black_unit)
           end
       end

data/lib/fitting/storage/white_list.rb

@@ -17,6 +17,7 @@ module Fitting
         return nil if @white_list == nil && @resource_white_list == nil && @include_resources == nil && @include_actions == nil
         return @white_list if @white_list
         return @white_list = transformation if @resource_white_list
+
         @white_list = {}
         @white_list.merge!(new_transformation) if @include_resources
         @white_list.merge!(postnew_transformation) if @include_actions
@@ -25,6 +26,7 @@ module Fitting
 
       def without_group
         return @without_group_list if @without_group_list
+
         @without_group_list = @resource_white_list.inject([]) do |all_requests, resource|
           resource_selection(resource, all_requests)
         end.flatten.uniq
@@ -43,6 +45,7 @@ module Fitting
 
       def find_warnings(resource)
         return nil if @resources[resource]
+
         @warnings.push(
           "FITTING WARNING: In the documentation there isn't resource from the resource_white_list #{resource}"
         )
@@ -50,6 +53,7 @@ module Fitting
 
       def puts_warnings
         return nil if @warnings == []
+
         warnings_string = @warnings.join("\n")
         puts "\n#{warnings_string}"
       end
@@ -93,6 +97,7 @@ module Fitting
 
       def new_without_group
         return @newwithout_group_list if @newwithout_group_list
+
         @newwithout_group_list = @include_resources.inject([]) do |all_requests, resource|
           if resource[0] == '/'
             new_resource_selection(resource, all_requests)
@@ -120,6 +125,7 @@ module Fitting
 
       def new_find_warnings(resource)
         return nil if @new_resources[resource]
+
         @warnings.push(
           "FITTING WARNING: In the documentation there isn't resource from the resource_white_list #{resource}"
         )
@@ -135,6 +141,7 @@ module Fitting
 
       def postnew_without_group
         return @postnewwithout_group_list if @postnewwithout_group_list
+
         @postnewwithout_group_list = @include_actions.inject([]) do |all_requests, resource|
           method, path = resource.split(' ')
           if path[0] == '/'

data/lib/fitting/templates/realized_template.rb

@@ -27,8 +27,10 @@ module Fitting
           all_good = requests.all?(&:valid_json_schemas?)
           res += "path: #{key} #{all_good ? '✔' : '✖'}\n"
           next if all_good
+
           requests.map do |request|
             next if request.valid_json_schemas?
+
             res += "  full path: #{request.test_path} ✖\n"
             res += "    request.method #{request.method}\n"
             res += "    request.path #{request.path}\n"

data/lib/fitting/tests.rb

@@ -13,7 +13,7 @@ module Fitting
       end
       json = JSON.dump(array)
 
-      File.open("fitting_tests/test#{ENV["TEST_ENV_NUMBER"]}.json", 'w') { |file| file.write(json) }
+      File.open("fitting_tests/test#{ENV['TEST_ENV_NUMBER']}.json", 'w') { |file| file.write(json) }
     end
 
     def make_dir(dir_name)

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.15.0'.freeze
+  VERSION = '2.18.0'.freeze
 end

data/lib/fitting.rb

@@ -16,7 +16,6 @@ module Fitting
     end
 
     def statistics
-      puts 'DEPRECATED: deprecated method statistics, use new method save_test_data'
       responses = Fitting::Storage::Responses.new
 
       RSpec.configure do |config|
@@ -30,10 +29,13 @@ module Fitting
       end
     end
 
+    extend Gem::Deprecate
+    deprecate :statistics, :save_test_data, 2022, 1
+
     def save_test_data
       responses = Fitting::Storage::Responses.new
 
-      FileUtils.rm_r Dir.glob("fitting_tests/*"), :force => true
+      FileUtils.rm_r Dir.glob('fitting_tests/*'), force: true
 
       RSpec.configure do |config|
         config.after(:each, type: :request) do
@@ -61,6 +63,7 @@ module Fitting
 
   def self.load_tasks
     return if loaded_tasks
+
     self.loaded_tasks = true
 
     Dir[File.join(File.dirname(__FILE__), 'tasks', '**/*.rake')].each do |rake|