fitting 2.18.2 → 3.0.2

data/lib/fitting/storage/responses.rb

@@ -1,24 +1,20 @@
-require 'fitting/statistics'
-require 'fitting/tests'
 require 'fitting/records/tested/request'
 
 module Fitting
   module Storage
     class Responses
+      attr_reader :tested_requests
+
       def initialize
         @tested_requests = []
       end
 
-      def add(env_response, metadata = {})
-        @tested_requests.push(Fitting::Records::Tested::Request.new(env_response, metadata))
-      end
-
-      def statistics
-        Fitting::Statistics.new(@tested_requests)
+      def add(response, example)
+        tested_requests.push(Fitting::Records::Tested::Request.new(response, example))
       end
 
       def tests
-        Fitting::Tests.new(@tested_requests)
+        Fitting::Tests.new(tested_requests)
       end
     end
   end

data/lib/fitting/tests.rb

@@ -1,5 +1,3 @@
-require 'fitting/statistics/template'
-
 module Fitting
   class Tests
     def initialize(tested_requests)
@@ -7,13 +5,23 @@ module Fitting
     end
 
     def save
-      make_dir('fitting_tests')
+      make_dir(Fitting.configuration.rspec_json_path)
+      array = @tested_requests.inject([]) do |res, request|
+        res.push(request.to_spherical.to_hash)
+      end
+      json = JSON.dump(array)
+
+      File.open("#{Fitting.configuration.rspec_json_path}/test#{ENV['TEST_ENV_NUMBER']}.json", 'w') { |file| file.write(json) }
+    end
+
+    def outgoing_save
+      make_dir('./outgoing_request_tests')
       array = @tested_requests.inject([]) do |res, request|
         res.push(request.to_spherical.to_hash)
       end
       json = JSON.dump(array)
 
-      File.open("fitting_tests/test#{ENV['TEST_ENV_NUMBER']}.json", 'w') { |file| file.write(json) }
+      File.open("./outgoing_request_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.18.2'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/lib/fitting.rb

@@ -1,73 +1,68 @@
+require 'json-schema'
 require 'fitting/version'
 require 'fitting/configuration'
-require 'fitting/matchers/response_matcher'
-require 'fitting/documentation'
 require 'fitting/storage/responses'
+require 'fitting/tests'
+require 'fitting/cover/json_schema_enum'
+require 'fitting/cover/json_schema_one_of'
+require 'fitting/records/documented/request'
 require 'fitting/railtie' if defined?(Rails)
 
 module Fitting
   class << self
-    def configure
-      yield configuration
-    end
-
     def configuration
-      @configuration ||= Configuration.craft
+      yaml = YAML.safe_load(File.read('.fitting.yml'))
+      @configuration ||= Configuration.new(yaml)
     end
 
-    def statistics
-      responses = Fitting::Storage::Responses.new
-
-      RSpec.configure do |config|
-        config.after(:each, type: :controller) do
-          responses.add(response, inspect)
-        end
-
-        config.after(:suite) do
-          responses.statistics.save
-        end
-      end
+    def configure
+      yield(configuration)
     end
 
-    extend Gem::Deprecate
-    deprecate :statistics, :save_test_data, 2022, 1
+    def clear_tests_directory
+      FileUtils.rm_r Dir.glob(configuration.rspec_json_path), force: true
+      FileUtils.rm_r Dir.glob(configuration.webmock_json_path), force: true
+    end
 
     def save_test_data
-      responses = Fitting::Storage::Responses.new
+      clear_tests_directory
 
-      FileUtils.rm_r Dir.glob('fitting_tests/*'), force: true
+      outgoing_responses = Fitting::Storage::Responses.new
+      responses = Fitting::Storage::Responses.new
 
       RSpec.configure do |config|
+        if defined?(WebMock)
+          config.before(:each) do |example|
+            WebMock.after_request do |request_signature, response|
+              env = Rack::MockRequest.env_for(request_signature.uri, { method: request_signature.method })
+              # Парсим в тот формат с которым работает fitting
+              mock_request = ActionDispatch::Request.new(env)
+              mock_response = ActionDispatch::Response.create(response.status.first || 200, response.headers || {},
+                                                              response.body || {})
+              mock_response.instance_variable_set(:@request, mock_request)
+
+              outgoing_responses.add(mock_response, example)
+            end
+          end
+        end
+
         config.after(:each, type: :request) do |example|
-          responses.add(response, example.metadata)
+          responses.add(response, example)
         end
 
         config.after(:each, type: :controller) do |example|
-          responses.add(response, example.metadata)
+          responses.add(response, example)
+        end
+
+        config.after(:each) do
+          WebMock::CallbackRegistry.reset
         end
 
         config.after(:suite) do
           responses.tests.save
+          outgoing_responses.tests.outgoing_save
         end
       end
     end
   end
-
-  def self.loaded_tasks=(val)
-    @loaded_tasks = val
-  end
-
-  def self.loaded_tasks
-    @loaded_tasks
-  end
-
-  def self.load_tasks
-    return if loaded_tasks
-
-    self.loaded_tasks = true
-
-    Dir[File.join(File.dirname(__FILE__), 'tasks', '**/*.rake')].each do |rake|
-      load rake
-    end
-  end
 end

data/lib/tasks/fitting.rake

@@ -1,10 +1,4 @@
 require 'fitting/records/spherical/requests'
-require 'fitting/configuration'
-require 'fitting/records/realized_unit'
-require 'fitting/templates/realized_template'
-require 'fitting/statistics/template_cover_error'
-require 'fitting/statistics/template_cover_error_enum'
-require 'fitting/statistics/template_cover_error_one_of'
 require 'fitting/cover/json_schema'
 require 'fitting/report/prefixes'
 require 'fitting/report/tests'
@@ -12,8 +6,8 @@ require 'fitting/report/console'
 
 namespace :fitting do
   task :report do
-    tests = Fitting::Report::Tests.new_from_config('fitting_tests/*.json')
-    prefixes = Fitting::Report::Prefixes.new('.fitting.yml')
+    tests = Fitting::Report::Tests.new_from_config
+    prefixes = Fitting::Report::Prefixes.new(Fitting.configuration.prefixes)
 
     prefixes.join(tests)
 
@@ -88,187 +82,10 @@ namespace :fitting do
     )
 
     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|
-        response['combination'] ||= []
-        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|
-        response['tests'] ||= []
-        response['tests'].map do |test|
-          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 }
-
-    makedirs('fitting')
-    File.open('fitting/old_report.json', 'w') { |file| file.write(JSON.dump(actions_test)) }
-  end
-
-  # deprecated
-  desc 'Fitting documentation'
-  task :documentation do
-    documented_unit = Fitting::Statistics::Template.new(
-      Fitting::Records::Spherical::Requests.new,
-      Fitting.configuration
-    )
-    puts documented_unit.stats
-
-    unless documented_unit.not_covered == "\n"
-      puts 'Not all responses from the whitelist are covered!'
-      exit 1
-    end
-  end
-
-  desc 'Fitting documentation responses cover'
-  task :documentation_responses, [:size] => :environment do |_, args|
-    case args.size
-    when 'xs'
-      documented_unit = Fitting::Statistics::Template.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration
-      )
-      puts documented_unit.stats
-
-      unless documented_unit.not_covered == "\n"
-        puts 'Not all responses from the whitelist are covered!'
-        exit 1
-      end
-    when 's'
-      documented_unit = Fitting::Statistics::Template.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration,
-        'cover'
-      )
-      puts documented_unit.stats
-
-      unless documented_unit.not_covered == "\n"
-        puts 'Not all responses from the whitelist are covered!'
-        exit 1
-      end
-    when 'm'
-      documented_unit = Fitting::Statistics::Template.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration,
-        'cover_enum'
-      )
-      puts documented_unit.stats
-
-      unless documented_unit.not_covered == "\n"
-        puts 'Not all responses from the whitelist are covered!'
-        exit 1
-      end
-    when 'l'
-      documented_unit = Fitting::Statistics::Template.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration,
-        'cover_one_of'
-      )
-      puts documented_unit.stats
-
-      unless documented_unit.not_covered == "\n"
-        puts 'Not all responses from the whitelist are covered!'
-        exit 1
-      end
-    else
-      puts 'need key xs, s, m or l'
-    end
-  end
-
-  desc 'Fitting documentation responses cover error'
-  task :documentation_responses_error, [:size] => :environment do |_, args|
-    case args.size
-    when 's'
-      documented_unit = Fitting::Statistics::TemplateCoverError.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration
-      )
-      puts documented_unit.stats
-    when 'm'
-      documented_unit = Fitting::Statistics::TemplateCoverErrorEnum.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration
-      )
-      puts documented_unit.stats
-    when 'l'
-      documented_unit = Fitting::Statistics::TemplateCoverErrorOneOf.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration
-      )
-      puts documented_unit.stats
-    else
-      puts 'need key s, m or l'
-    end
-  end
-
-  # deprecated
-  desc 'Fitting tests'
-  task :tests do
-    realized_unit = Fitting::Records::RealizedUnit.new(
-      Fitting::Records::Spherical::Requests.new,
-      Fitting.configuration.tomogram
-    )
-    puts Fitting::Templates::RealizedTemplate.new(realized_unit).to_s
-
-    unless realized_unit.fully_covered?
-      puts 'Not all responses from the whitelist are covered!'
-      exit 1
-    end
-  end
-
-  desc 'Fitting tests'
-  task :tests_responses, [:size] => :environment do |_, args|
-    if args.size == 'xs'
-      realized_unit = Fitting::Records::RealizedUnit.new(
-        Fitting::Records::Spherical::Requests.new,
-        Fitting.configuration.tomogram
-      )
-      puts Fitting::Templates::RealizedTemplate.new(realized_unit).to_s
-
-      unless realized_unit.fully_covered?
-        puts 'Not all responses from the whitelist are covered!'
-        exit 1
-      end
-    else
-      puts 'need key xs'
-    end
   end
 end

data/lib/tasks/fitting_outgoing.rake

@@ -0,0 +1,91 @@
+require 'fitting/records/spherical/requests'
+require 'fitting/cover/json_schema'
+require 'fitting/report/prefixes'
+require 'fitting/report/tests'
+require 'fitting/report/console'
+
+namespace :fitting_out do
+  task :report do
+    tests = Fitting::Report::Tests.new_from_outgoing_config
+    prefixes = Fitting::Report::Prefixes.new(Fitting.configuration.outgoing_prefixes)
+
+    prefixes.join(tests)
+
+    prefixes.to_a.map do |prefix|
+      prefix.actions.join(prefix.tests) unless prefix.skip?
+    end
+
+    prefixes.to_a.map do |prefix|
+      next if prefix.skip?
+
+      prefix.actions.to_a.map do |action|
+        action.responses.join(action.tests)
+      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
+    end
+
+    report = JSON.pretty_generate(
+      {
+        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
+    File.open('fitting/report.json', 'w') { |file| file.write(report) }
+
+    gem_path = $LOAD_PATH.find { |i| i.include?('fitting') }
+    source_path = "#{gem_path}/templates/bomboniere/dist"
+    FileUtils.copy_entry source_path, destination
+
+    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[response.id] = response.body
+          response.combinations.to_a.map do |combination|
+            combinations.merge!(combination.id => combination.json_schema)
+          end
+        end
+      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..] == '.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))
+    File.open(js_path, 'w') { |file| file.write(new_js_file) }
+
+    console = Fitting::Report::Console.new(
+      tests.without_prefixes,
+      prefixes.to_a.map(&:details)
+    )
+
+    puts console.output
+    puts console.output_sum
+
+    exit 1 unless console.good?
+
+    exit 0
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.18.2
+  version: 3.0.2
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: tomograph
   requirement: !ruby/object:Gem::Requirement
@@ -122,14 +142,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.22.0
 - !ruby/object:Gem::Dependency
@@ -173,26 +193,16 @@ files:
 - images/logo.png
 - lib/fitting.rb
 - lib/fitting/configuration.rb
-- lib/fitting/configuration/yaml.rb
 - lib/fitting/cover/json_schema.rb
 - lib/fitting/cover/json_schema_enum.rb
 - lib/fitting/cover/json_schema_one_of.rb
-- lib/fitting/cover/response.rb
-- lib/fitting/documentation.rb
-- lib/fitting/matchers/response_matcher.rb
 - lib/fitting/railtie.rb
 - lib/fitting/records/documented/request.rb
-- lib/fitting/records/realized_unit.rb
 - lib/fitting/records/spherical/request.rb
 - lib/fitting/records/spherical/requests.rb
 - lib/fitting/records/spherical/response.rb
-- lib/fitting/records/test_unit/request.rb
 - lib/fitting/records/tested/request.rb
 - lib/fitting/records/tested/response.rb
-- lib/fitting/records/unit/combination.rb
-- lib/fitting/records/unit/json_schema.rb
-- lib/fitting/records/unit/request.rb
-- lib/fitting/records/unit/response.rb
 - lib/fitting/report/action.rb
 - lib/fitting/report/actions.rb
 - lib/fitting/report/combination.rb
@@ -204,37 +214,11 @@ files:
 - lib/fitting/report/responses.rb
 - lib/fitting/report/test.rb
 - lib/fitting/report/tests.rb
-- lib/fitting/request.rb
-- lib/fitting/response.rb
-- lib/fitting/response/fully_validates.rb
-- lib/fitting/statistics.rb
-- lib/fitting/statistics/analysis.rb
-- lib/fitting/statistics/cover_error.rb
-- lib/fitting/statistics/cover_error_enum.rb
-- lib/fitting/statistics/cover_error_one_of.rb
-- lib/fitting/statistics/great.rb
-- lib/fitting/statistics/list.rb
-- lib/fitting/statistics/lists.rb
-- lib/fitting/statistics/measurement.rb
-- lib/fitting/statistics/measurement_cover.rb
-- lib/fitting/statistics/measurement_cover_enum.rb
-- lib/fitting/statistics/measurement_cover_one_of.rb
-- lib/fitting/statistics/not_covered_responses.rb
-- lib/fitting/statistics/percent.rb
-- lib/fitting/statistics/requests_stats.rb
-- lib/fitting/statistics/responses_stats.rb
-- lib/fitting/statistics/template.rb
-- lib/fitting/statistics/template_cover_error.rb
-- lib/fitting/statistics/template_cover_error_enum.rb
-- lib/fitting/statistics/template_cover_error_one_of.rb
 - lib/fitting/storage/responses.rb
-- lib/fitting/storage/white_list.rb
-- lib/fitting/templates/realized_template.rb
 - lib/fitting/tests.rb
 - lib/fitting/version.rb
-- lib/fitting/view/report.html.haml
-- lib/fitting/view/style.css
 - lib/tasks/fitting.rake
+- lib/tasks/fitting_outgoing.rake
 - lib/templates/bomboniere/.gitignore
 - lib/templates/bomboniere/.tool-versions
 - lib/templates/bomboniere/README.md

data/lib/fitting/configuration/yaml.rb

@@ -1,89 +0,0 @@
-require 'tomograph'
-
-module Fitting
-  class Configuration
-    class Yaml
-      attr_reader   :title
-      attr_accessor :apib_path,
-                    :drafter_yaml_path,
-                    :crafter_apib_path,
-                    :crafter_yaml_path,
-                    :drafter_4_apib_path,
-                    :drafter_4_yaml_path,
-                    :tomogram_json_path,
-                    :strict,
-                    :prefix,
-                    :white_list,
-                    :resource_white_list,
-                    :ignore_list,
-                    :include_resources,
-                    :include_actions
-
-      def initialize(yaml, title = 'fitting')
-        @apib_path = yaml['apib_path']
-        @drafter_yaml_path = yaml['drafter_yaml_path']
-        @crafter_apib_path = yaml['crafter_apib_path']
-        @crafter_yaml_path = yaml['crafter_yaml_path']
-        @drafter_4_apib_path = yaml['drafter_4_apib_path']
-        @drafter_4_yaml_path = yaml['drafter_4_yaml_path']
-        @tomogram_json_path = yaml['tomogram_json_path']
-        @strict = yaml['strict']
-        @prefix = yaml['prefix']
-        @white_list = yaml['white_list']
-        @resource_white_list = yaml['resource_white_list']
-        @ignore_list = yaml['ignore_list']
-        @include_resources = yaml['include_resources']
-        @include_actions = yaml['include_actions']
-        @title = title
-        default
-      end
-
-      def tomogram
-        @tomogram ||= if crafter_yaml_path || crafter_apib_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,
-                          tomogram_json_path: tomogram_json_path
-                        )
-                      end
-      end
-
-      def stats_path
-        if @title == 'fitting'
-          'fitting/stats'
-        else
-          "fitting/#{@title}/stats"
-        end
-      end
-
-      def not_covered_path
-        if @title == 'fitting'
-          'fitting/not_covered'
-        else
-          "fitting/#{@title}/not_covered"
-        end
-      end
-
-      private
-
-      def default
-        @strict ||= false if strict.nil?
-        @prefix ||= ''
-        @ignore_list ||= []
-      end
-    end
-  end
-end