fitting 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8234af5ba817adef5ce3ff1bf03d4e84c7747169
-  data.tar.gz: c8a247c8467765022ef0f5f2c7b58b669464cdaf
+  metadata.gz: 1415f580792a267f0db27df63a8ef8334d0cd0cc
+  data.tar.gz: 4e5868e53b370121ab7cfad0e1762d014b4f310d
 SHA512:
-  metadata.gz: 00863f51cc9692a16ce6cb24aaf83309c4490daac1430081e45081e3c5d24dfe6dba0e17b1df659f3ee84a0b1e49ecaa8c76a1ef5bfc301a70752db6beeafe18
-  data.tar.gz: fda881919cf0c1bef0ed9228a8d450e866e234da599822f843bed76a146b02ebc143d85d87bda60c294603066a98c4179f9e7dc27162f7b91489eb9d9b90563f
+  metadata.gz: f93db3c0f9c83d2ec34b84ab4d3e91e8b5d06ba988bc5f4d40eb9c2e63664a30589857909c054e4d19b3099ca223403df2cd8026856a25360dae4ab050cf4dce
+  data.tar.gz: 81ce958a9daed16da84fea079964caf4b7e396bb473a5d89f856f6ff9a453e398b742aedd667a1dbaebb56a71347b3056d3b61f4b188b32615e1050dfb75e3c3

data/.gitignore

@@ -9,4 +9,3 @@
 /tmp/
 .idea/
 .byebug_history
-.tool-versions

data/.tool-versions

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

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.12.1 - 2020-02-07
+
+* fixes
+  * oneOf
+
 ### 2.12.0 - 2019-09-10
 
 * features

data/README.md

@@ -12,7 +12,9 @@ To do this, when you run your RSpec tests on controllers, it automatically searc
 
 ## Installation
 
-Add this line to your application's Gemfile:
+First you need to install [drafter](https://github.com/apiaryio/drafter).
+
+Second add this line to your application's Gemfile:
 
 ```ruby
 gem 'fitting'
@@ -82,7 +84,17 @@ Example:
 
 ### xs size
 
-For match routes and valid json-schemas run `rake fitting:documentation_responses[xs]`
+For match routes and valid json-schemas run
+
+for bash
+```
+rake fitting:documentation_responses[xs]
+```
+
+for zsh
+```
+rake 'fitting:documentation_responses[xs]'
+```
 
 You will get statistics:
 

data/lib/fitting/cover/json_schema_one_of.rb

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

data/lib/fitting/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -182,6 +182,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md