fitting 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb768409f791b3b1af04fdcee07ae65bb5156ee
-  data.tar.gz: 2ff46f1b9f5412cc3d79c9d3908243584d896bee
+  metadata.gz: 483a7f1462b7204b2dbeb31d372ad2526783c775
+  data.tar.gz: eef485bd208b70fbe0fd10e350e3bda9e82ac084
 SHA512:
-  metadata.gz: 70f5a4114b36c30a665cc3792b73000c557b78c8d1fd925a10d66b5aac3df16f953aa40b72be5093dca176915059697867807f8e8923ced92151f990da7aaceb
-  data.tar.gz: aaecda82b7dcc6307a7dc168c162f2654568cae2ea0327653127e7b688bec23969b0f51eb7090aec58e8ba46e18d144f3734da8813d405e0a0220217d2678c08
+  metadata.gz: 16b2442c467a9a507262b721fe4d0528af989ae7ab9a7f8f703d740ca692aedf97c47c7cb8eec180955ade9b151c85948af723ca301dcdb73c56cf9b06e14250
+  data.tar.gz: 2e42661f2d0a13f794cb6c808ea5b4d6e3b7fbc8d2ae368c4948a2cfc69a7e8a398333cc8de76a3e70cc6db63bceea03f4df76b14acdc6757dc53107fc883400

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.13.1 - 2020-04-17
+
+* fixes
+  * combinations
+
 ### 2.13.0 - 2020-02-26
 
 * features

data/fitting.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tomograph', '~> 2.0', '>= 2.2.0'
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 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'

data/lib/fitting/cover/json_schema.rb

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

data/lib/fitting/cover/json_schema_enum.rb

@@ -15,17 +15,19 @@ module Fitting
 
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
-          if key == 'enum'
-            one_of = json_schema.delete('enum')
+          if key == 'enum' && value.size > 1
+            schema = json_schema.dup
+            one_of = schema.delete('enum')
             one_of.each_index do |index|
-              combinations.push([json_schema.merge('enum' => [one_of[index]]), "enum.#{one_of[index]}"])
+              combinations.push([schema.merge('enum' => [one_of[index]]), "enum.#{one_of[index]}"])
             end
           elsif value.is_a?(Hash)
-            inception(value, combinations)
-            combinations.each do |combination|
-              combination[0] = { key => combination[0]}
+            com = inception(value, [])
+            com.each do |combination|
+              combination[0] = { key => value.merge(combination[0])}
               combination[1] = "#{key}.#{combination[1]}"
             end
+            combinations += com
           end
         end
 

data/lib/fitting/cover/json_schema_one_of.rb

@@ -16,16 +16,18 @@ module Fitting
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
           if key == 'oneOf'
-            one_of = json_schema.delete('oneOf')
+            schema = json_schema.dup
+            one_of = schema.delete('oneOf')
             one_of.each_index do |index|
-              combinations.push([json_schema.merge('oneOf' => [one_of[index]]), "oneOf.#{index}"])
+              combinations.push([schema.merge('oneOf' => [one_of[index]]), "oneOf.#{index}"])
             end
           elsif value.is_a?(Hash)
-            inception(value, combinations)
-            combinations.each do |combination|
-              combination[0] = { key => combination[0]}
+            com = inception(value, [])
+            com.each do |combination|
+              combination[0] = { key => value.merge(combination[0])}
               combination[1] = "#{key}.#{combination[1]}"
             end
+            combinations += com
           end
         end
 

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.13.0'.freeze
+  VERSION = '2.13.1'.freeze
 end

data/lib/tasks/fitting.rake

@@ -5,8 +5,101 @@ 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'
 
 namespace :fitting do
+  task :report do
+    yaml = YAML.safe_load(File.read('.fitting.yml'))
+    tomogram = Tomograph::Tomogram.new(
+        prefix: yaml['prefix'],
+        tomogram_json_path:  yaml['tomogram_json_path']
+    )
+    tests = []
+    Dir['fitting_tests/*.json'].each do |file|
+      tests += JSON.load(File.read(file))
+    end
+    actions = tomogram.to_a
+    actions.map do |action|
+      action = action.to_hash
+      action["tests"] = []
+    end
+
+    tests.map do |test|
+      actions.map do |action|
+        if test['method'] == action.method && action.path.match(test['path'])
+          action.to_hash["tests"].push(test)
+          tests = tests - [test]
+          break
+        end
+      end
+    end
+
+
+    actions.map do |action|
+      action.to_hash["tests"].map do |test|
+        action.to_hash["responses"].map do |response|
+          if response['status'].to_s == test['response']['status'].to_s
+            if JSON::Validator.fully_validate(response['body'], test['response']['body']) == []
+              response['tests'] ||= []
+              response['tests'].push(test)
+              action.to_hash["tests"] = action.to_hash["tests"] - [test]
+              break
+            end
+          end
+        end
+      end
+    end
+
+    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
+        if 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
+    end
+
+    actions.map do |action|
+      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
+            end
+          end
+        end
+      end
+    end
+
+    actions_test = {actions: actions, tests: tests}
+
+    makedirs('fitting')
+    File.open('fitting/report.json', 'w') { |file| file.write(MultiJson.dump(actions_test)) }
+  end
+
   # deprecated
   desc 'Fitting documentation'
   task :documentation do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -102,16 +102,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement