fitting 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c3bf84f14e1bba015d774bd7866ab8a6161500
-  data.tar.gz: 3145b9524695c2a71ccbbc42798214a1e72c5029
+  metadata.gz: 84283dbea86e6b51feff80746c42083581d41062
+  data.tar.gz: 2e7bfe061b7da0572fec39b8dda02ce9cd0a1a64
 SHA512:
-  metadata.gz: 2ae3cee31ba30911cb57bf361602c704801574bb1b7ffb578616566854c460ec0eb9c24eb07d14ad98f8fc73222ff99f99690772f0ab7dab75bf866a331ddaa4
-  data.tar.gz: 0d01af67215893545c48b8e8fdb6551646159b048c03656aadd2c5c3f7b1e8f2cc954cbba9bfa9243c5551a60d655f9f3455878403cd867a0183c0bec93df2c8
+  metadata.gz: c507b40654e438c1123080328253b112803de9e407c3134eee4d321d25e43cca9e3966e96d7d48f6a51b17faec3be252b5468230fff8ffeaf7cea2af17050114
+  data.tar.gz: 67e50590a29a8ece5903df6db5c263d787f19a647a7fba1631ec354e404c665036070ce7cf0aad76b0be3b7fc2fcfd0e141a84b97165b79a570ebf7336bf11ee

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.7.2 - 2018-09-08
+
+* fixes
+  * Output full combination key in fitting:documentation_responses_error
+
 ### 2.7.1 - 2018-09-06
 
 * fixes

data/fitting.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fitting/version'
@@ -20,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'haml'
   spec.add_runtime_dependency 'json-schema', '~> 2.6', '>= 2.6.2'
   spec.add_runtime_dependency 'multi_json'
   spec.add_runtime_dependency 'tomograph', '~> 2.0', '>= 2.2.0'
-  spec.add_runtime_dependency 'haml'
   spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
-  spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
   spec.add_development_dependency 'rubocop', '~> 0.49.1', '>= 0.49.1'
+  spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
 end

data/lib/fitting.rb

@@ -20,7 +20,7 @@ module Fitting
 
       RSpec.configure do |config|
         config.after(:each, type: :controller) do
-          responses.add(response, self.inspect)
+          responses.add(response, inspect)
         end
 
         config.after(:suite) do
@@ -34,7 +34,7 @@ module Fitting
 
       RSpec.configure do |config|
         config.after(:each, type: :controller) do
-          responses.add(response, self.inspect)
+          responses.add(response, inspect)
         end
 
         config.after(:suite) do

data/lib/fitting/cover.rb

@@ -34,16 +34,16 @@ module Fitting
         if value['flags'] == []
           @template[key]['type'] = 'passed'
         else
-          flag_true = value['flags'].find_all{|flag| flag == true}
-          flag_false = value['flags'].find_all{|flag| flag == false}
-          if flag_false.size == 0
+          flag_true = value['flags'].find_all { |flag| flag == true }
+          flag_false = value['flags'].find_all { |flag| flag == false }
+          if flag_false.empty?
             @template[key]['type'] = 'passed'
           else
-            if flag_true.size == 0
-              @template[key]['cover'] = 0.0
-            else
-              @template[key]['cover'] = flag_false.size / flag_true.size
-            end
+            @template[key]['cover'] = if flag_true.empty?
+                                        0.0
+                                      else
+                                        flag_false.size / flag_true.size
+                                      end
             @template[key]['type'] = 'failed'
           end
         end

data/lib/fitting/cover/json_schema.rb

@@ -5,25 +5,33 @@ module Fitting
         @json_schema = json_schema
       end
 
-      def json_schemas
-        return @json_schemas if @json_schemas
-        @json_schemas, @combinations = required(@json_schema)
+      def combi
+        return @combinations if @combinations
+        @combinations = new_required(@json_schema)
 
-        return @json_schemas unless @json_schema['properties']
-        super_each(@json_schema['properties'], 'properties' => nil)
+        return @combinations unless @json_schema['properties']
+        @combinations = new_super_each(@json_schema['properties'], { 'properties' => nil }, @json_schema, @combinations, 'properties')
 
-        @json_schemas
+        @combinations
       end
 
-      def super_each(json_schema, old_keys_hash)
+      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)
-          if value.is_a?(Hash)
-            modify_json_shema(value, new_keys_hash)
-            super_each(value, new_keys_hash)
+
+          combinations = new_super_each(value, new_keys_hash, lol_schema, combinations, [old_key, key].compact.join('.'))
+
+          qwe = new_required(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)
@@ -47,16 +55,6 @@ module Fitting
         old_json_schema
       end
 
-      def modify_json_shema(value, vbn)
-        qwe = required(value)
-        qwe[0].map do |asd|
-          new_json_shema = clone_hash(@json_schema)
-          super_merge(vbn, asd, new_json_shema)
-          @json_schemas += [new_json_shema]
-        end
-        @combinations += qwe[1]
-      end
-
       def clone_hash(old_json_schema)
         new_json_schema = {}
         old_json_schema.each do |key, value|
@@ -71,24 +69,18 @@ module Fitting
         new_json_schema
       end
 
-      def combinations
-        json_schemas
-        @combinations
-      end
-
-      def required(json_schema)
-        combinations = []
-        json_schemas = new_keys(json_schema).inject([]) do |new_json_shemas, new_key|
+      def new_required(json_schema)
+        res = []
+        new_keys(json_schema).map do |new_key|
           new_json_shema = json_schema.dup
           if new_json_shema['required']
             new_json_shema['required'] += [new_key]
           else
             new_json_shema['required'] = [new_key]
           end
-          combinations.push(['required', new_key])
-          new_json_shemas.push(new_json_shema)
+          res.push([new_json_shema, ['required', new_key]])
         end
-        [json_schemas, combinations]
+        res
       end
 
       def new_keys(json_schema)

data/lib/fitting/records/realized_unit.rb

@@ -9,20 +9,20 @@ module Fitting
       end
 
       def fully_covered?
-        test_file_paths.each do |key, requests|
-          all_good = requests.all? { |request| request.documented? }
+        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? { |request| request.response_documented? }
+        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? { |request| request.response_json_schemas? }
+        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? { |request| request.valid_json_schemas? }
+        test_file_paths.each do |_key, requests|
+          all_good = requests.all?(&:valid_json_schemas?)
           return false unless all_good
         end
         true

data/lib/fitting/records/spherical/request.rb

@@ -34,12 +34,12 @@ module Fitting
         class << self
           def load(hash)
             new(
-              method: hash["method"],
-              path: hash["path"],
-              body: hash["body"],
-              response: Fitting::Records::Spherical::Response.load(hash["response"]),
-              title: hash["title"],
-              group: hash["group"]
+              method: hash['method'],
+              path: hash['path'],
+              body: hash['body'],
+              response: Fitting::Records::Spherical::Response.load(hash['response']),
+              title: hash['title'],
+              group: hash['group']
             )
           end
         end

data/lib/fitting/records/spherical/response.rb

@@ -29,7 +29,7 @@ module Fitting
 
         class << self
           def load(hash)
-            new(status: hash["status"], body: hash["body"])
+            new(status: hash['status'], body: hash['body'])
           end
         end
       end

data/lib/fitting/records/test_unit/request.rb

@@ -36,7 +36,7 @@ module Fitting
         def documented_requests
           @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)
+                            documented_request.path.match(@tested_request.path.to_s)
             res.push(documented_request)
           end
         end
@@ -48,7 +48,7 @@ module Fitting
         def documented_responses
           @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
+              next unless documented_response['status'] == response.status.to_s
               res.push(documented_response)
             end
           end.flatten.compact
@@ -60,7 +60,7 @@ module Fitting
 
         def response_json_schemas
           @response_json_schemas ||= documented_responses.inject([]) do |res, documented_response|
-            res.push(documented_response["json_schemas"])
+            res.push(documented_response['json_schemas'])
           end.flatten
         end
 
@@ -79,10 +79,8 @@ module Fitting
           @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)
-              }
+              json_schema: json_schema,
+              fully_validate: JSON::Validator.fully_validate(json_schema, response.body)
             )
           end.flatten
         end

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

@@ -6,9 +6,9 @@ module Fitting
       class Combination
         attr_reader :description, :json_schema, :bodies
 
-        def initialize(description, json_schema, bodies)
-          @description = description
-          @json_schema = json_schema
+        def initialize(comb, bodies)
+          @description = comb[1]
+          @json_schema = comb[0]
           @bodies = bodies
         end
 

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

@@ -28,11 +28,10 @@ module Fitting
           return @combinations if @combinations
           @combinations = []
           cover_json_schema = Fitting::Cover::JSONSchema.new(@json_schema)
-          cover_json_schema.json_schemas.each_index do |index|
-             @combinations.push(Fitting::Records::Unit::Combination.new(
-              cover_json_schema.combinations[index],
-              cover_json_schema.json_schemas[index],
-              bodies
+          cover_json_schema.combi.map do |comb|
+            @combinations.push(Fitting::Records::Unit::Combination.new(
+                                 comb,
+                                 bodies
             ))
           end
           @combinations

data/lib/fitting/statistics/cover_error.rb

@@ -9,15 +9,13 @@ module Fitting
         res = ''
         @request_unit.map do |request|
           request.responses.map do |response|
-            if response.tested_bodies != []
-              response.json_schemas.map do |json_schema|
-                json_schema.combinations.map do |combination|
-                  if 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
+            next unless response.tested_bodies != []
+            response.json_schemas.map do |json_schema|
+              json_schema.combinations.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

data/lib/fitting/statistics/measurement.rb

@@ -33,9 +33,7 @@ module Fitting
         check_cover(request)
         coverage_push(request)
 
-        if request.path.to_s.size / 8 > @max_response_path
-          @max_response_path = request.path.to_s.size / 8
-        end
+        @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

data/lib/fitting/statistics/measurement_cover.rb

@@ -33,9 +33,7 @@ module Fitting
         check_cover(request)
         coverage_push(request)
 
-        if request.path.to_s.size / 8 > @max_response_path
-          @max_response_path = request.path.to_s.size / 8
-        end
+        @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

data/lib/fitting/statistics/template_cover_error.rb

@@ -15,7 +15,6 @@ module Fitting
         "#{white_statistics}\n\n"
       end
 
-
       def white_statistics
         @white_statistics ||= Fitting::Statistics::CoverError.new(white_unit)
       end

data/lib/fitting/storage/white_list.rb

@@ -18,12 +18,8 @@ module Fitting
         return @white_list if @white_list
         return @white_list = transformation if @resource_white_list
         @white_list = {}
-        if @include_resources
-          @white_list.merge!(new_transformation)
-        end
-        if @include_actions
-          @white_list.merge!(postnew_transformation)
-        end
+        @white_list.merge!(new_transformation) if @include_resources
+        @white_list.merge!(postnew_transformation) if @include_actions
         @white_list
       end
 

data/lib/fitting/templates/realized_template.rb

@@ -9,36 +9,34 @@ module Fitting
         res = ''
         res += "1. Find request method and path:\n"
         @realized_unit.test_file_paths.each do |key, requests|
-          all_good = requests.all? { |request| request.documented? }
+          all_good = requests.all?(&:documented?)
           res += "file: #{key} #{all_good ? '✔' : '✖'}\n"
         end
         res += "\n2. Find response status code:\n"
         @realized_unit.test_file_paths.each do |key, requests|
-          all_good = requests.all? { |request| request.response_documented? }
+          all_good = requests.all?(&:response_documented?)
           res += "file: #{key} #{all_good ? '✔' : '✖'}\n"
         end
         res += "\n3. Find response json-schemas:\n"
         @realized_unit.test_file_paths.each do |key, requests|
-          all_good = requests.all? { |request| request.response_json_schemas? }
+          all_good = requests.all?(&:response_json_schemas?)
           res += "file: #{key} #{all_good ? '✔' : '✖'}\n"
         end
         res += "\n4. Check valid json-schemas:\n"
         @realized_unit.test_file_paths.each do |key, requests|
-          all_good = requests.all? { |request| request.valid_json_schemas? }
+          all_good = requests.all?(&:valid_json_schemas?)
           res += "path: #{key} #{all_good ? '✔' : '✖'}\n"
-          unless all_good
-            requests.map do |request|
-              unless request.valid_json_schemas?
-                res += "  full path: #{request.test_path} ✖\n"
-                res += "    request.method #{request.method}\n"
-                res += "    request.path #{request.path}\n"
-                res += "    request.response.status #{request.response.status}\n"
-                res += "    request.response.body #{request.response.body}\n\n"
-                request.invalid_json_schemas.map do |schema|
-                  res += "    json_schemas: #{schema[:json_schema]}\n"
-                  res += "    fully_validate: #{schema[:fully_validate]}\n\n"
-                end
-              end
+          next if all_good
+          requests.map do |request|
+            next if request.valid_json_schemas?
+            res += "  full path: #{request.test_path} ✖\n"
+            res += "    request.method #{request.method}\n"
+            res += "    request.path #{request.path}\n"
+            res += "    request.response.status #{request.response.status}\n"
+            res += "    request.response.body #{request.response.body}\n\n"
+            request.invalid_json_schemas.map do |schema|
+              res += "    json_schemas: #{schema[:json_schema]}\n"
+              res += "    fully_validate: #{schema[:fully_validate]}\n\n"
             end
           end
         end

data/lib/fitting/tests.rb

@@ -12,7 +12,7 @@ module Fitting
         res.push(request.to_spherical.to_hash)
       end
       json = JSON.dump(array)
-      File.open("tests.json", 'w') { |file| file.write(json) }
+      File.open('tests.json', 'w') { |file| file.write(json) }
     end
 
     def make_dir(dir_name)
@@ -20,4 +20,3 @@ module Fitting
     end
   end
 end
-

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.7.1'.freeze
+  VERSION = '2.7.2'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +78,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,39 +93,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '8.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '8.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.2.1
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -147,45 +147,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.49.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.49.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.11.2
 description: Validation responses in the rspec with the help of API Blueprint
 email:
 - d.efimov@fun-box.ru