fitting 2.17.0 → 2.18.3

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/responses.rb

@@ -9,8 +9,8 @@ module Fitting
         @tested_requests = []
       end
 
-      def add(env_response, test_title = '')
-        @tested_requests.push(Fitting::Records::Tested::Request.new(env_response, test_title))
+      def add(env_response, metadata = {})
+        @tested_requests.push(Fitting::Records::Tested::Request.new(env_response, metadata))
       end
 
       def statistics

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.17.0'.freeze
+  VERSION = '2.18.3'.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,18 +29,21 @@ 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
-          responses.add(response, inspect)
+        config.after(:each, type: :request) do |example|
+          responses.add(response, example.metadata)
         end
 
-        config.after(:each, type: :controller) do
-          responses.add(response, inspect)
+        config.after(:each, type: :controller) do |example|
+          responses.add(response, example.metadata)
         end
 
         config.after(:suite) 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|

data/lib/tasks/fitting.rake

@@ -22,29 +22,33 @@ namespace :fitting do
     end
 
     prefixes.to_a.map do |prefix|
+      next if prefix.skip?
+
       prefix.actions.to_a.map do |action|
         action.responses.join(action.tests)
-      end unless prefix.skip?
+      end
     end
 
     prefixes.to_a.map do |prefix|
+      next if prefix.skip?
+
       prefix.actions.to_a.map do |action|
         action.responses.to_a.map do |response|
           response.combinations.join(response.tests)
         end
-      end unless prefix.skip?
+      end
     end
 
     report = JSON.pretty_generate(
-        {
-            tests_without_prefixes: tests.without_prefixes,
-            prefixes_details: prefixes.to_a.map { |p| p.details }
-        }
+      {
+        tests_without_prefixes: tests.without_prefixes,
+        prefixes_details: prefixes.to_a.map(&:details)
+      }
     )
 
     destination = 'fitting'
     FileUtils.mkdir_p(destination)
-    FileUtils.rm_r Dir.glob("#{destination}/*"), :force => true
+    FileUtils.rm_r Dir.glob("#{destination}/*"), force: true
     File.open('fitting/report.json', 'w') { |file| file.write(report) }
 
     gem_path = $LOAD_PATH.find { |i| i.include?('fitting') }
@@ -54,6 +58,8 @@ namespace :fitting do
     json_schemas = {}
     combinations = {}
     prefixes.to_a.map do |prefix|
+      next if prefix.skip?
+
       prefix.actions.to_a.map do |action|
         action.responses.to_a.map do |response|
           json_schemas.merge!(response.id => response.body)
@@ -61,80 +67,81 @@ namespace :fitting do
             combinations.merge!(combination.id => combination.json_schema)
           end
         end
-      end unless prefix.skip?
+      end
     end
     File.open('fitting/json_schemas.json', 'w') { |file| file.write(JSON.pretty_generate(json_schemas)) }
     File.open('fitting/combinations.json', 'w') { |file| file.write(JSON.pretty_generate(combinations)) }
     File.open('fitting/tests.json', 'w') { |file| file.write(JSON.pretty_generate(tests.to_h)) }
 
-    js_path =  Dir["#{destination}/js/*"].find { |f| f[0..14] == 'fitting/js/app.' and f[-3..-1] == '.js' }
+    js_path =  Dir["#{destination}/js/*"].find { |f| f[0..14] == 'fitting/js/app.' and f[-3..] == '.js' }
     js_file =  File.read(js_path)
-    new_js_file = js_file.gsub("{stub:\"prefixes report\"}", report)
-    new_js_file = new_js_file.gsub("{stub:\"for action page\"}", report)
-    new_js_file = new_js_file.gsub("{stub:\"json-schemas\"}", JSON.pretty_generate(json_schemas))
-    new_js_file = new_js_file.gsub("{stub:\"combinations\"}", JSON.pretty_generate(combinations))
-    new_js_file = new_js_file.gsub("{stub:\"tests\"}", JSON.pretty_generate(tests.to_h))
+    new_js_file = js_file.gsub('{stub:"prefixes report"}', report)
+    new_js_file = new_js_file.gsub('{stub:"for action page"}', report)
+    new_js_file = new_js_file.gsub('{stub:"json-schemas"}', JSON.pretty_generate(json_schemas))
+    new_js_file = new_js_file.gsub('{stub:"combinations"}', JSON.pretty_generate(combinations))
+    new_js_file = new_js_file.gsub('{stub:"tests"}', JSON.pretty_generate(tests.to_h))
     File.open(js_path, 'w') { |file| file.write(new_js_file) }
 
     console = Fitting::Report::Console.new(
-        tests.without_prefixes,
-        prefixes.to_a.map { |p| p.details }
+      tests.without_prefixes,
+      prefixes.to_a.map(&:details)
     )
 
     puts console.output
+    puts console.output_sum
 
     exit 1 unless console.good?
 
     exit 0
 
     actions.map do |action|
-      action.to_hash["responses"].map do |response|
+      action.to_hash['responses'].map do |response|
         response['combination'] ||= []
-        combinations = Fitting::Cover::JSONSchema.new(response['body']).combi + Fitting::Cover::JSONSchemaEnum.new(response['body']).combi + Fitting::Cover::JSONSchemaOneOf.new(response['body']).combi
-        if combinations != []
-          combinations.map do |combination|
-            response['combination'].push(
-                {
-                    'json_schema' => combination[0],
-                    'type' => combination[1][0],
-                    'combination' => combination[1][1],
-                    'tests' => [],
-                    'error' => []
-                }
-            )
-          end
+        combinations = Fitting::Cover::JSONSchema.new(response['body']).combi +
+                       Fitting::Cover::JSONSchemaEnum.new(response['body']).combi +
+                       Fitting::Cover::JSONSchemaOneOf.new(response['body']).combi
+        next unless combinations != []
+
+        combinations.map do |combination|
+          response['combination'].push(
+            {
+              'json_schema' => combination[0],
+              'type' => combination[1][0],
+              'combination' => combination[1][1],
+              'tests' => [],
+              'error' => []
+            }
+          )
         end
       end
     end
 
     actions.map do |action|
-      action.to_hash["responses"].map do |response|
+      action.to_hash['responses'].map do |response|
         response['tests'] ||= []
         response['tests'].map do |test|
-          if response['combination'][0]
-            response['combination'].map do |combination|
-              begin
-                res = JSON::Validator.fully_validate(combination['json_schema'], test['response']['body'])
-                if res == []
-                  combination['tests'].push(test)
-                  response['tests'] = response['tests'] - [test]
-                  next
-                else
-                  combination['error'].push({test: test, error: res})
-                end
-              rescue JSON::Schema::SchemaError => error
-                combination['error'].push({test: test, error: error})
-              end
+          next unless response['combination'][0]
+
+          response['combination'].map do |combination|
+            res = JSON::Validator.fully_validate(combination['json_schema'], test['response']['body'])
+            if res == []
+              combination['tests'].push(test)
+              response['tests'] = response['tests'] - [test]
+              next
+            else
+              combination['error'].push({ test: test, error: res })
             end
+          rescue JSON::Schema::SchemaError => e
+            combination['error'].push({ test: test, error: e })
           end
         end
       end
     end
 
-    actions_test = {actions: actions, tests: tests}
+    actions_test = { actions: actions, tests: tests }
 
     makedirs('fitting')
-    File.open('fitting/old_report.json', 'w') { |file| file.write(MultiJson.dump(actions_test)) }
+    File.open('fitting/old_report.json', 'w') { |file| file.write(JSON.dump(actions_test)) }
   end
 
   # deprecated
@@ -154,7 +161,8 @@ namespace :fitting do
 
   desc 'Fitting documentation responses cover'
   task :documentation_responses, [:size] => :environment do |_, args|
-    if args.size == 'xs'
+    case args.size
+    when 'xs'
       documented_unit = Fitting::Statistics::Template.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration
@@ -165,7 +173,7 @@ namespace :fitting do
         puts 'Not all responses from the whitelist are covered!'
         exit 1
       end
-    elsif args.size == 's'
+    when 's'
       documented_unit = Fitting::Statistics::Template.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration,
@@ -177,7 +185,7 @@ namespace :fitting do
         puts 'Not all responses from the whitelist are covered!'
         exit 1
       end
-    elsif args.size == 'm'
+    when 'm'
       documented_unit = Fitting::Statistics::Template.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration,
@@ -189,7 +197,7 @@ namespace :fitting do
         puts 'Not all responses from the whitelist are covered!'
         exit 1
       end
-    elsif args.size == 'l'
+    when 'l'
       documented_unit = Fitting::Statistics::Template.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration,
@@ -208,19 +216,20 @@ namespace :fitting do
 
   desc 'Fitting documentation responses cover error'
   task :documentation_responses_error, [:size] => :environment do |_, args|
-    if args.size == 's'
+    case args.size
+    when 's'
       documented_unit = Fitting::Statistics::TemplateCoverError.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration
       )
       puts documented_unit.stats
-    elsif args.size == 'm'
+    when 'm'
       documented_unit = Fitting::Statistics::TemplateCoverErrorEnum.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration
       )
       puts documented_unit.stats
-    elsif args.size == 'l'
+    when 'l'
       documented_unit = Fitting::Statistics::TemplateCoverErrorOneOf.new(
         Fitting::Records::Spherical::Requests.new,
         Fitting.configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.3
 platform: ruby
 authors:
 - d.efimov
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -31,19 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: tomograph
   requirement: !ruby/object:Gem::Requirement
@@ -84,100 +90,82 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: 11.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: 11.1.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.49.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 1.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.49.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.21'
 description: Coverage API Blueprint, Swagger and OpenAPI with RSpec for easily make
   high-quality API and documenatiton
 email:
@@ -205,7 +193,6 @@ files:
 - images/logo.png
 - lib/fitting.rb
 - lib/fitting/configuration.rb
-- lib/fitting/configuration/legacy.rb
 - lib/fitting/configuration/yaml.rb
 - lib/fitting/cover/json_schema.rb
 - lib/fitting/cover/json_schema_enum.rb
@@ -296,7 +283,7 @@ homepage: https://github.com/funbox/fitting
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -304,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -312,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Coverage API Blueprint, Swagger and OpenAPI with RSpec
 test_files: []

data/lib/fitting/configuration/legacy.rb

@@ -1,60 +0,0 @@
-require 'tomograph'
-
-module Fitting
-  class Configuration
-    class Legacy
-      attr_accessor :apib_path,
-                    :drafter_yaml_path,
-                    :crafter_apib_path,
-                    :crafter_yaml_path,
-                    :drafter_4_apib_path,
-                    :drafter_4_yaml_path,
-                    :strict,
-                    :prefix,
-                    :white_list,
-                    :resource_white_list,
-                    :ignore_list,
-                    :include_resources,
-                    :include_actions
-
-      def initialize
-        @strict = false
-        @prefix = ''
-        @ignore_list = []
-      end
-
-      def tomogram
-        @tomogram ||= if @crafter_apib_path || @crafter_yaml_path
-                        Tomograph::Tomogram.new(
-                          prefix: @prefix,
-                          crafter_apib_path: @crafter_apib_path,
-                          crafter_yaml_path: @crafter_yaml_path
-                        )
-                      elsif @drafter_4_apib_path || @drafter_4_yaml_path
-                        Tomograph::Tomogram.new(
-                          prefix: @prefix,
-                          drafter_4_apib_path: @drafter_4_apib_path,
-                          drafter_4_yaml_path: @drafter_4_yaml_path
-                        )
-                      else Tomograph::Tomogram.new(
-                        prefix: @prefix,
-                        apib_path: @apib_path,
-                        drafter_yaml_path: @drafter_yaml_path
-                      )
-                      end
-      end
-
-      def title
-        'fitting'
-      end
-
-      def stats_path
-        'fitting/stats'
-      end
-
-      def not_covered_path
-        'fitting/not_covered'
-      end
-    end
-  end
-end