fitting 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122a6d2713a74d7e0610f1378b7be6fdd42d0798fa6f6a008dc114186f86eade
-  data.tar.gz: 3af5cf786f1489c9b249603551fe64c2d1fbb6b69183054d9ddadc8553b0a6de
+  metadata.gz: 86988a5ed3f114df581b0d6c6550867e2f9864f05808b6ec66a063f2ad573c93
+  data.tar.gz: 0b1c58784f5838caea3942d022f9dfaa4196912a7f30119e0b3e1b71080f9e43
 SHA512:
-  metadata.gz: f11047db22a04c8562c75be538152e61cbf78ecd223ac941a61adaca5c2edda6ad44d1a14ac2dd535ca3f5e20bc4ffde4c101e9b48f0525392e248f6c870157e
-  data.tar.gz: 99309897c90a7ea145141a00a073cf82ad56091557c9cd0044a9c5421440f945439e510440820f0f48c7a9f5dd8abec246e6e1872d8ba77d25d8843e94519b80
+  metadata.gz: d8f5d03f52a1332fc7483f17c8bbfde3c3a751a1c8f539f65637137e8b6ef95d251574105b5cecd9f4292f47f3a951ad45d9a9c914cfbee450b2d1eee8f1e25e
+  data.tar.gz: d40fe0ae76fa5a381e19c1444d84ae90262571cbf2ab9d3198d299b71333f042ccd1a637f150c28403b2a4ccb96b7abf230d9638ffb4ef645700244c4d8194db

data/.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
 
-Metrics/LineLength:
-  Max: 120
+Layout/LineLength:
+  Max: 130
 
 Style/Documentation:
   Enabled: false
@@ -18,3 +18,31 @@ Style/CaseEquality:
 
 Style/NilComparison:
   Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+Lint/UnreachableCode:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 50
+
+# FIXME
+Metrics/AbcSize:
+  Max: 50
+
+Metrics/PerceivedComplexity:
+  Max: 20
+
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Metrics/ParameterLists:
+  Max: 7
+
+Metrics/ClassLength:
+  Max: 150
+
+Lint/UselessAssignment:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.18.0 - 2021-09-29
+
+* patch
+  * remove multi_json [#119](https://github.com/funbox/fitting/issues/119)
+
 ### 2.17.0 - 2021-09-20
 
 * features

data/fitting.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fitting/version'
 
@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.6.0'
   spec.add_runtime_dependency 'json-schema', '~> 2.6', '>= 2.6.2'
-  spec.add_runtime_dependency 'multi_json', '~> 1.11'
   spec.add_runtime_dependency 'tomograph', '~> 3.1', '>= 3.1.0'
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
-  spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49.1', '>= 0.49.1'
-  spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
+  spec.add_development_dependency 'byebug', '~> 11.1', '>= 11.1.3'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.22.0'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
 end

data/lib/fitting/configuration/legacy.rb

@@ -36,11 +36,12 @@ module Fitting
                           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
-                      )
+                      else
+                        Tomograph::Tomogram.new(
+                          prefix: @prefix,
+                          apib_path: @apib_path,
+                          drafter_yaml_path: @drafter_yaml_path
+                        )
                       end
       end
 

data/lib/fitting/configuration/yaml.rb

@@ -43,13 +43,13 @@ module Fitting
                         Tomograph::Tomogram.new(
                           prefix: @prefix,
                           crafter_apib_path: @crafter_apib_path,
-                          crafter_yaml_path: @crafter_yaml_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,
+                          drafter_4_yaml_path: @drafter_4_yaml_path
                         )
                       else
                         Tomograph::Tomogram.new(

data/lib/fitting/cover/json_schema.rb

@@ -15,17 +15,18 @@ module Fitting
 
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
-          if key == 'properties' and json_schema['required'] != value.keys
+          if (key == 'properties') && (json_schema['required'] != value.keys)
             schema = json_schema.dup
             one_of = schema.delete('required') || []
             schema['properties'].each_key do |property|
               next if one_of.include?(property)
+
               combinations.push([schema.merge('required' => one_of + [property]), "required.#{property}"])
             end
           elsif value.is_a?(Hash)
             com = inception(value, [])
             com.each do |combination|
-              combination[0] = { key => value.merge(combination[0])}
+              combination[0] = { key => value.merge(combination[0]) }
               combination[1] = "#{key}.#{combination[1]}"
             end
             combinations += com

data/lib/fitting/cover/json_schema_enum.rb

@@ -24,7 +24,7 @@ module Fitting
           elsif value.is_a?(Hash)
             com = inception(value, [])
             com.each do |combination|
-              combination[0] = { key => value.merge(combination[0])}
+              combination[0] = { key => value.merge(combination[0]) }
               combination[1] = "#{key}.#{combination[1]}"
             end
             combinations += com

data/lib/fitting/cover/json_schema_one_of.rb

@@ -24,7 +24,7 @@ module Fitting
           elsif value.is_a?(Hash)
             com = inception(value, [])
             com.each do |combination|
-              combination[0] = { key => value.merge(combination[0])}
+              combination[0] = { key => value.merge(combination[0]) }
               combination[1] = "#{key}.#{combination[1]}"
             end
             combinations += com

data/lib/fitting/cover/response.rb

@@ -13,11 +13,7 @@ module Fitting
         end
       end
 
-      attr_reader :json_schemas
-
-      attr_reader :combinations
-
-      attr_reader :flags
+      attr_reader :json_schemas, :combinations, :flags
 
       def update(response)
         index = 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

@@ -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

@@ -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

@@ -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