fitting 2.12.1 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1415f580792a267f0db27df63a8ef8334d0cd0cc
-  data.tar.gz: 4e5868e53b370121ab7cfad0e1762d014b4f310d
+  metadata.gz: 3cb768409f791b3b1af04fdcee07ae65bb5156ee
+  data.tar.gz: 2ff46f1b9f5412cc3d79c9d3908243584d896bee
 SHA512:
-  metadata.gz: f93db3c0f9c83d2ec34b84ab4d3e91e8b5d06ba988bc5f4d40eb9c2e63664a30589857909c054e4d19b3099ca223403df2cd8026856a25360dae4ab050cf4dce
-  data.tar.gz: 81ce958a9daed16da84fea079964caf4b7e396bb473a5d89f856f6ff9a453e398b742aedd667a1dbaebb56a71347b3056d3b61f4b188b32615e1050dfb75e3c3
+  metadata.gz: 70f5a4114b36c30a665cc3792b73000c557b78c8d1fd925a10d66b5aac3df16f953aa40b72be5093dca176915059697867807f8e8923ced92151f990da7aaceb
+  data.tar.gz: aaecda82b7dcc6307a7dc168c162f2654568cae2ea0327653127e7b688bec23969b0f51eb7090aec58e8ba46e18d144f3734da8813d405e0a0220217d2678c08

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+### 2.13.0 - 2020-02-26
+
+* features
+  * use request tests
+
+* patch
+  * improve combination name for enum cover
+  * improve combination name for required cover
+
 ### 2.12.1 - 2020-02-07
 
 * fixes

data/lib/fitting.rb

@@ -16,6 +16,7 @@ module Fitting
     end
 
     def statistics
+      puts 'DEPRECATED: deprecated method statistics, use new method save_test_data'
       responses = Fitting::Storage::Responses.new
 
       RSpec.configure do |config|
@@ -35,6 +36,10 @@ module Fitting
       FileUtils.rm_r Dir.glob("fitting_tests/*"), :force => true
 
       RSpec.configure do |config|
+        config.after(:each, type: :request) do
+          responses.add(response, inspect)
+        end
+
         config.after(:each, type: :controller) do
           responses.add(response, inspect)
         end

data/lib/fitting/cover/json_schema.rb

@@ -3,95 +3,34 @@ module Fitting
     class JSONSchema
       def initialize(json_schema)
         @json_schema = json_schema
+        @combinations = []
       end
 
       def combi
-        return @combinations if @combinations
-        @combinations = new_required(@json_schema)
-
-        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_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)
-        vbn.each do |key, value|
-          if value
-            add_super_key(value, new_key)
-          else
-            vbn[key] = { new_key => nil }
-          end
+        inception(@json_schema, @combinations).each do |combination|
+          combination[0] = @json_schema.merge(combination[0])
+          combination[1] = ['required', combination[1]]
         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_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]
+      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|
+              next if one_of.include?(property)
+              combinations.push([json_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]}
+              combination[1] = "#{key}.#{combination[1]}"
+            end
           end
-          res.push([new_json_shema, ['required', new_key]])
         end
-        res
-      end
 
-      def new_keys(json_schema)
-        return [] unless json_schema && json_schema['properties']
-        all = json_schema['properties'].keys.map(&:to_s)
-        old = json_schema['required']
-        if old
-          all - old
-        else
-          all
-        end
+        combinations
       end
     end
   end

data/lib/fitting/cover/json_schema_enum.rb

@@ -3,85 +3,33 @@ module Fitting
     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
+      def combi
+        inception(@json_schema, @combinations).each do |combination|
+          combination[0] = @json_schema.merge(combination[0])
+          combination[1] = ['enum', combination[1]]
         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)
+      def inception(json_schema, combinations)
+        json_schema.each do |key, value|
+          if key == 'enum'
+            one_of = json_schema.delete('enum')
+            one_of.each_index do |index|
+              combinations.push([json_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]}
+              combination[1] = "#{key}.#{combination[1]}"
+            end
           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']
+        combinations
       end
     end
   end

data/lib/fitting/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema