fitting 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84283dbea86e6b51feff80746c42083581d41062
-  data.tar.gz: 2e7bfe061b7da0572fec39b8dda02ce9cd0a1a64
+  metadata.gz: e2cacd061443e2b01a8632268f720ded08dffce1
+  data.tar.gz: 1d0237514578651a2376ae63b47b8ca6433a3a9c
 SHA512:
-  metadata.gz: c507b40654e438c1123080328253b112803de9e407c3134eee4d321d25e43cca9e3966e96d7d48f6a51b17faec3be252b5468230fff8ffeaf7cea2af17050114
-  data.tar.gz: 67e50590a29a8ece5903df6db5c263d787f19a647a7fba1631ec354e404c665036070ce7cf0aad76b0be3b7fc2fcfd0e141a84b97165b79a570ebf7336bf11ee
+  metadata.gz: a23cd2b021cfc20b7fa23a02cc97446e27a99714bb0069cfd4b08303a2011daca9e59fab7f38cc98476fd7b447df8389d9247806e451b2277d7f6a8dd6d0208f
+  data.tar.gz: d10e832b45a744eabf84cdbdbe0f213bd901f80bce104e6639d391d83d1123df4f95426a64cda0c28706210eac6c6e2100d031696413c6bbc23fcd536202cb94

data/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.8.0 - 2018-10-13
+
+* features
+  * Add m size (for cover enum in json-schema) in rake tasks fitting:documentation_responses, fitting:documentation_responses_error
+
 ### 2.7.2 - 2018-09-08
 
 * fixes

data/README.md

@@ -112,7 +112,7 @@ API responses with validation errors or untested: 9 (36.00% of 25).
 
 ### s size
 
-In addition to the previous comand, you will learn the coverage json-schemas with task `rake fitting:documentation_responses[s]`
+In addition to the previous comand, you will learn the coverage(required) json-schemas with task `rake fitting:documentation_responses[s]`
 
 ```
 Fully conforming requests:
@@ -149,6 +149,11 @@ combination: ["required", "pages"]
 new json-schema: {"$schema"=>"http://json-schema.org/draft-04/schema#", "type"=>"object", ...}
 ```
 
+### m size
+
+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]`
+
 ## Check tests cover
 
 ### xs size
@@ -168,6 +173,10 @@ Path to API Blueprint documentation. There must be an installed [drafter](https:
 
 Path to API Blueprint documentation pre-parsed with `drafter` and saved to a YAML file.
 
+### tomogram_json_path
+
+Path to Tomogram documentation pre-parsed with [tomograph](https://github.com/funbox/tomograph) and saved to a JSON file.
+
 ### strict
 
 Default `false`. If `true` then all properties are condisidered to have `"required": true` and all objects `"additionalProperties": false`.

data/lib/fitting/cover/json_schema_enum.rb

@@ -0,0 +1,88 @@
+module Fitting
+  class Cover
+    class JSONSchemaEnum
+      def initialize(json_schema)
+        @json_schema = json_schema
+      end
+
+      def combi
+        return @combinations if @combinations
+        @combinations = []
+
+        return @combinations unless @json_schema['properties']
+        @combinations = new_super_each(@json_schema['properties'], { 'properties' => nil }, @json_schema, @combinations, 'properties')
+
+        @combinations
+      end
+
+      def new_super_each(json_schema, old_keys_hash, lol_schema, combinations, old_key)
+        json_schema.each do |key, value|
+          next unless value.is_a?(Hash)
+
+          new_keys_hash = clone_hash(old_keys_hash)
+          add_super_key(new_keys_hash, key)
+
+          combinations = new_super_each(value, new_keys_hash, lol_schema, combinations, [old_key, key].compact.join('.'))
+
+          qwe = new_enum(value)
+          qwe.map do |asd|
+            new_json_shema = clone_hash(lol_schema)
+            super_merge(new_keys_hash, asd[0], new_json_shema)
+            combinations.push([new_json_shema, [asd[1][0], [old_key, key, asd[1][1]].compact.join('.')]])
+          end
+        end
+        combinations
+      end
+
+      def add_super_key(vbn, new_key)
+        vbn.each do |key, value|
+          if value
+            add_super_key(value, new_key)
+          else
+            vbn[key] = { new_key => nil }
+          end
+        end
+      end
+
+      def super_merge(vbn, asd, old_json_schema)
+        vbn.each do |key, value|
+          if value
+            super_merge(value, asd, old_json_schema[key])
+          else
+            old_json_schema[key].merge!(asd)
+          end
+        end
+        old_json_schema
+      end
+
+      def clone_hash(old_json_schema)
+        new_json_schema = {}
+        old_json_schema.each do |key, value|
+          if value.is_a?(Hash)
+            new_json_schema.merge!(key => clone_hash(value))
+          elsif value
+            new_json_schema.merge!(key => value.clone)
+          else
+            new_json_schema.merge!(key => nil)
+          end
+        end
+        new_json_schema
+      end
+
+      def new_enum(json_schema)
+        res = []
+        new_keys(json_schema).map do |new_key|
+          new_json_shema = json_schema.dup
+          new_json_shema['enum'] = [new_key]
+          res.push([new_json_shema, ['enum', new_key]])
+        end
+        res
+      end
+
+      def new_keys(json_schema)
+        return [] unless json_schema['enum']
+        json_schema['enum']
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'json-schema'
 require 'fitting/cover/json_schema'
+require 'fitting/cover/json_schema_enum'
 require 'fitting/records/unit/combination'
 
 module Fitting
@@ -30,13 +31,26 @@ module Fitting
           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.map do |comb|
+            @combinations_with_enum.push(Fitting::Records::Unit::Combination.new(
+              comb,
+              bodies
+            ))
+          end
+          @combinations_with_enum
+        end
+
         def cover
           @cover ||= if bodies == []
                        0
@@ -48,6 +62,18 @@ module Fitting
                        (count + 1) * 100 / (combinations.size + 1)
                      end
         end
+
+        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
+        end
       end
     end
   end

data/lib/fitting/statistics/cover_error_enum.rb

@@ -0,0 +1,27 @@
+module Fitting
+  class Statistics
+    class CoverErrorEnum
+      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_enum.map do |combination|
+                next unless combination.valid_bodies == []
+                res += "request metohd: #{request.method}\nrequest path: #{request.path}\n"\
+                        "response staus: #{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

@@ -41,8 +41,10 @@ module Fitting
           else
             res.push("✔ #{response.status}")
           end
-        else
+        elsif @depth == 'cover'
           res.push("#{json_schema.cover}% #{response.status}")
+        elsif @depth == 'cover_enum'
+          res.push("#{json_schema.cover_enum}% #{response.status}")
         end
       end
     end

data/lib/fitting/statistics/measurement_cover_enum.rb

@@ -0,0 +1,92 @@
+module Fitting
+  class Statistics
+    class MeasurementCoverEnum
+      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_enum != 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_enum != 100
+          @not_cover += 1
+        else
+          @cover += 1
+        end
+      end
+    end
+  end
+end

data/lib/fitting/statistics/template.rb

@@ -2,6 +2,7 @@ require 'fitting/statistics/not_covered_responses'
 require 'fitting/statistics/analysis'
 require 'fitting/statistics/measurement'
 require 'fitting/statistics/measurement_cover'
+require 'fitting/statistics/measurement_cover_enum'
 require 'fitting/records/unit/request'
 require 'fitting/storage/white_list'
 require 'fitting/records/documented/request'
@@ -48,8 +49,10 @@ module Fitting
         @white_measurement ||=
           if @depth == 'valid'
             Fitting::Statistics::Measurement.new(white_unit)
-          else
+          elsif @depth == 'cover'
             Fitting::Statistics::MeasurementCover.new(white_unit)
+          elsif @depth == 'cover_enum'
+            Fitting::Statistics::MeasurementCoverEnum.new(white_unit)
           end
       end
 
@@ -57,8 +60,10 @@ module Fitting
         @black_measurement ||=
           if @depth == 'valid'
             Fitting::Statistics::Measurement.new(black_unit)
-          else
+          elsif @depth == 'cover'
             Fitting::Statistics::MeasurementCover.new(black_unit)
+          elsif @depth == 'cover_enum'
+            Fitting::Statistics::MeasurementCoverEnum.new(black_unit)
           end
       end
 

data/lib/fitting/statistics/template_cover_error_enum.rb

@@ -0,0 +1,50 @@
+require 'fitting/statistics/cover_error_enum'
+require 'fitting/records/unit/request'
+require 'fitting/storage/white_list'
+require 'fitting/records/documented/request'
+
+module Fitting
+  class Statistics
+    class TemplateCoverErrorEnum
+      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::CoverErrorEnum.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.7.2'.freeze
+  VERSION = '2.8.0'.freeze
 end

data/lib/tasks/fitting.rake

@@ -3,6 +3,7 @@ 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'
 
 namespace :fitting do
   desc 'Fitting documentation'
@@ -40,12 +41,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 == '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
     else
-      puts 'need key xs or s'
+      puts 'need key xs, s or m'
     end
   end
 
@@ -57,8 +70,14 @@ namespace :fitting do
         Fitting.configuration
       )
       puts documented_unit.stats
+    elsif args.size == 'm'
+      documented_unit = Fitting::Statistics::TemplateCoverErrorEnum.new(
+        Fitting::Records::Spherical::Requests.new,
+        Fitting.configuration
+      )
+      puts documented_unit.stats
     else
-      puts 'need key s'
+      puts 'need key s or m'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -195,6 +195,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -211,6 +212,7 @@ files:
 - lib/fitting/configuration/yaml.rb
 - lib/fitting/cover.rb
 - lib/fitting/cover/json_schema.rb
+- lib/fitting/cover/json_schema_enum.rb
 - lib/fitting/cover/response.rb
 - lib/fitting/documentation.rb
 - lib/fitting/matchers/response_matcher.rb
@@ -233,17 +235,20 @@ files:
 - 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/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/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/storage/responses.rb
 - lib/fitting/storage/white_list.rb
 - lib/fitting/templates/realized_template.rb