fitting 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe2c40a89499b32b2a4989a88cb8d294c420191
-  data.tar.gz: cd0deaa0b1fb6003bc6c58054def0843fa22e656
+  metadata.gz: 8234af5ba817adef5ce3ff1bf03d4e84c7747169
+  data.tar.gz: c8a247c8467765022ef0f5f2c7b58b669464cdaf
 SHA512:
-  metadata.gz: 1e2e177b230a274a1e53d2eb525f6f59f89ffcdcc9ae4392183f0021ae727f3a4d48499dd870bf853ea49a21d7eeec00c9196f1659506348d14dae07287688e3
-  data.tar.gz: a4ae0ec1d99a3f6b9d9e9fd10bcdeaf592be1335ada092481dece76250da9caa5f4f3cf084d290f792bb16fa897fe361a0967c4c739f918fcedb53a4e8d3bac9
+  metadata.gz: 00863f51cc9692a16ce6cb24aaf83309c4490daac1430081e45081e3c5d24dfe6dba0e17b1df659f3ee84a0b1e49ecaa8c76a1ef5bfc301a70752db6beeafe18
+  data.tar.gz: fda881919cf0c1bef0ed9228a8d450e866e234da599822f843bed76a146b02ebc143d85d87bda60c294603066a98c4179f9e7dc27162f7b91489eb9d9b90563f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.12.0 - 2019-09-10
+
+* features
+  * Add l size (for cover oneOf in json-schema) in rake tasks fitting:documentation_responses, fitting:documentation_responses_error
+
 ### 2.11.0 - 2019-09-09
 
 * features

data/README.md

@@ -154,6 +154,11 @@ new json-schema: {"$schema"=>"http://json-schema.org/draft-04/schema#", "type"=>
 In addition to the previous comand, you will learn the coverage(enum) json-schemas with task `rake fitting:documentation_responses[m]`
 For details `rake fitting:documentation_responses_error[m]`
 
+### l size
+
+In addition to the previous comand, you will learn the coverage(oneOf) json-schemas with task `rake fitting:documentation_responses[l]`
+For details `rake fitting:documentation_responses_error[l]`
+
 ## Check tests cover
 
 ### xs size

data/lib/fitting/cover/json_schema_one_of.rb

@@ -0,0 +1,30 @@
+module Fitting
+  class Cover
+    class JSONSchemaOneOf
+      def initialize(json_schema)
+        @json_schema = json_schema
+      end
+
+      def combi
+        @combinations = []
+
+        return @combinations unless @json_schema['oneOf'] || @json_schema['allOf']
+
+        if @json_schema['oneOf']
+          one_of = @json_schema.delete("oneOf")
+          one_of.each_index do |index|
+            @combinations.push([@json_schema.merge(one_of[index]), ['one_of', "properties.#{index}"]])
+          end
+        elsif @json_schema['allOf']
+          all_of = @json_schema.delete("allOf")
+          one_of = all_of[0].delete("oneOf")
+          one_of.each_index do |index|
+            @combinations.push([@json_schema.merge(one_of[index]), ['one_of', "properties.#{index}"]])
+          end
+        end
+
+        @combinations
+      end
+    end
+  end
+end

data/lib/fitting/records/unit/json_schema.rb

@@ -1,6 +1,7 @@
 require 'json-schema'
 require 'fitting/cover/json_schema'
 require 'fitting/cover/json_schema_enum'
+require 'fitting/cover/json_schema_one_of'
 require 'fitting/records/unit/combination'
 
 module Fitting
@@ -51,6 +52,19 @@ module Fitting
           @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.map do |comb|
+            @combinations_with_one_of.push(Fitting::Records::Unit::Combination.new(
+              comb,
+              bodies
+            ))
+          end
+          @combinations_with_one_of
+        end
+
         def cover
           @cover ||= if bodies == []
                        0
@@ -74,6 +88,18 @@ module Fitting
             (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
+        end
       end
     end
   end

data/lib/fitting/statistics/cover_error_one_of.rb

@@ -0,0 +1,27 @@
+module Fitting
+  class Statistics
+    class CoverErrorOneOf
+      def initialize(request_unit)
+        @request_unit = request_unit
+      end
+
+      def to_s
+        res = ''
+        @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"
+              end
+            end
+          end
+        end
+        res
+      end
+    end
+  end
+end

data/lib/fitting/statistics/list.rb

@@ -45,6 +45,8 @@ module Fitting
           res.push("#{json_schema.cover}% #{response.status}")
         elsif @depth == 'cover_enum'
           res.push("#{json_schema.cover_enum}% #{response.status}")
+        elsif @depth == 'cover_one_of'
+          res.push("#{json_schema.cover_one_of}% #{response.status}")
         end
       end
     end

data/lib/fitting/statistics/measurement_cover_one_of.rb

@@ -0,0 +1,92 @@
+module Fitting
+  class Statistics
+    class MeasurementCoverOneOf
+      attr_reader :requests, :all_responses, :cover_responses, :not_cover_responses, :max_response_path,
+                  :coverage_fully, :coverage_non, :coverage_partially, :not_covered_responses
+
+      def initialize(requests)
+        @requests = requests
+        @all_responses = 0
+        @cover_responses = 0
+        @not_cover_responses = 0
+        @max_response_path = 0
+        @coverage_fully = []
+        @coverage_non = []
+        @coverage_partially = []
+        @not_covered_responses = []
+        check_responses
+      end
+
+      def check_responses
+        return if @ready
+
+        @requests.map do |request|
+          chech_request(request)
+        end
+
+        @ready = true
+      end
+
+      private
+
+      def chech_request(request)
+        check_cover(request)
+        coverage_push(request)
+
+        @max_response_path = request.path.to_s.size / 8 if request.path.to_s.size / 8 > @max_response_path
+        request.responses.map do |response|
+          check_response(response, request)
+        end
+      end
+
+      def check_response(response, request)
+        json_schema_index = 0
+        response.json_schemas.map do |json_schema|
+          json_schema_index = check_json_schema(json_schema, request, response, json_schema_index)
+        end
+      end
+
+      def check_json_schema(json_schema, request, response, json_schema_index)
+        if json_schema.cover_one_of != 100
+          @not_cover_responses += 1
+          @not_covered_responses.push("#{request.method}\t#{request.path} #{response.status} #{json_schema_index}")
+        else
+          @cover_responses += 1
+        end
+        @all_responses += 1
+        json_schema_index + 1
+      end
+
+      def coverage_push(request)
+        if @all == @cover
+          @coverage_fully.push(request)
+        elsif @all == @not_cover
+          @coverage_non.push(request)
+        else
+          @coverage_partially.push(request)
+        end
+      end
+
+      def check_cover(request)
+        @all = 0
+        @cover = 0
+        @not_cover = 0
+
+        request.responses.map do |response|
+          response.json_schemas.map do |json_schema|
+            count_cover(json_schema)
+          end
+        end
+      end
+
+      def count_cover(json_schema)
+        @all += 1
+        if json_schema.cover_one_of != 100
+          @not_cover += 1
+        else
+          @cover += 1
+        end
+      end
+    end
+  end
+end

data/lib/fitting/statistics/template.rb

@@ -3,6 +3,7 @@ require 'fitting/statistics/analysis'
 require 'fitting/statistics/measurement'
 require 'fitting/statistics/measurement_cover'
 require 'fitting/statistics/measurement_cover_enum'
+require 'fitting/statistics/measurement_cover_one_of'
 require 'fitting/records/unit/request'
 require 'fitting/storage/white_list'
 require 'fitting/records/documented/request'
@@ -53,6 +54,8 @@ module Fitting
             Fitting::Statistics::MeasurementCover.new(white_unit)
           elsif @depth == 'cover_enum'
             Fitting::Statistics::MeasurementCoverEnum.new(white_unit)
+          elsif @depth == 'cover_one_of'
+            Fitting::Statistics::MeasurementCoverOneOf.new(white_unit)
           end
       end
 
@@ -64,6 +67,8 @@ module Fitting
             Fitting::Statistics::MeasurementCover.new(black_unit)
           elsif @depth == 'cover_enum'
             Fitting::Statistics::MeasurementCoverEnum.new(black_unit)
+          elsif @depth == 'cover_one_of'
+            Fitting::Statistics::MeasurementCoverOneOf.new(black_unit)
           end
       end
 

data/lib/fitting/statistics/template_cover_error_one_of.rb

@@ -0,0 +1,50 @@
+require 'fitting/statistics/cover_error_one_of'
+require 'fitting/records/unit/request'
+require 'fitting/storage/white_list'
+require 'fitting/records/documented/request'
+
+module Fitting
+  class Statistics
+    class TemplateCoverErrorOneOf
+      def initialize(tested_requests, config)
+        @tested_requests = tested_requests
+        @config = config
+      end
+
+      def stats
+        "#{white_statistics}\n\n"
+      end
+
+      def white_statistics
+        @white_statistics ||= Fitting::Statistics::CoverErrorOneOf.new(white_unit)
+      end
+
+      def white_unit
+        @white_unit_requests ||= documented_requests_white.inject([]) do |res, documented_request|
+          res.push(Fitting::Records::Unit::Request.new(documented_request, @tested_requests))
+        end
+      end
+
+      def documented_requests_white
+        @documented_requests_white ||= documented.find_all(&:white)
+      end
+
+      def documented
+        @documented_requests ||= @config.tomogram.to_a.inject([]) do |res, tomogram_request|
+          res.push(Fitting::Records::Documented::Request.new(tomogram_request, white_list.to_a))
+        end
+      end
+
+      def white_list
+        @white_list ||= Fitting::Storage::WhiteList.new(
+          @config.prefix,
+          @config.white_list,
+          @config.resource_white_list,
+          @config.include_resources,
+          @config.include_actions,
+          @config.tomogram.to_resources
+        )
+      end
+    end
+  end
+end

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.11.0'.freeze
+  VERSION = '2.12.0'.freeze
 end

data/lib/tasks/fitting.rake

@@ -4,8 +4,10 @@ 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'
 
 namespace :fitting do
+  # deprecated
   desc 'Fitting documentation'
   task :documentation do
     documented_unit = Fitting::Statistics::Template.new(
@@ -53,12 +55,24 @@ namespace :fitting do
       )
       puts documented_unit.stats
 
+      unless documented_unit.not_covered == "\n"
+        puts 'Not all responses from the whitelist are covered!'
+        exit 1
+      end
+    elsif args.size == '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 or m'
+      puts 'need key xs, s, m or l'
     end
   end
 
@@ -76,11 +90,18 @@ namespace :fitting do
         Fitting.configuration
       )
       puts documented_unit.stats
+    elsif args.size == 'l'
+      documented_unit = Fitting::Statistics::TemplateCoverErrorOneOf.new(
+        Fitting::Records::Spherical::Requests.new,
+        Fitting.configuration
+      )
+      puts documented_unit.stats
     else
-      puts 'need key s or m'
+      puts 'need key s, m or l'
     end
   end
 
+  # deprecated
   desc 'Fitting tests'
   task :tests do
     realized_unit = Fitting::Records::RealizedUnit.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -198,6 +198,7 @@ files:
 - 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
@@ -221,12 +222,14 @@ files:
 - 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
@@ -234,6 +237,7 @@ files:
 - 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