fitting 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a664a5ee6f2890aa3b340d9458adb1e33d968489990b283420fa524eedca870a
-  data.tar.gz: b2cde427ba82b5f4b1c0519de0a14b3748a2226a404de9019d0a5a2e6617ff8f
+  metadata.gz: acf56757fc3fe3dca52c0ffc19624debab877fd8f9ea71ffa891ab19674c1a65
+  data.tar.gz: c2238a9ad8374f72075aa07b48323910bfb670ab57f95dfff6ca12dace14faaf
 SHA512:
-  metadata.gz: 6aa6103361b20ba9069a1326bbec95892d53ad28d5a9a0c3cb692dbf88a0458f54b03b1228c4f7a34bf7abde09f89ad627adc1c411179e6e215fea080074c61d
-  data.tar.gz: 64b8855baf8bf2693e19984bc3a13a9484246c24b54d591517d3f0799092fa48d1f1998c781fce7ef8fe7713c3c8bd31a7ca81ce83d11890bb3b017afcd6bc5c
+  metadata.gz: 3e2a972498110e3c2b8ea625d0b7e73f5a127209b94e3f4373cf49a3cd38eb5c04483e876dc07bcb9b71ee3c90c7b5900e8fe31fc73ce39aec597bf70fad7e88
+  data.tar.gz: debb064c3590bc59c5a783d3546d4de6f75727ab4aa354d3e40f6548f7b72cc8ae9b05a1d009dab55aa0eba900a0e783979265c38dfda89b483f64c3e0f2d6ee

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .idea/
 .byebug_history
+spec/fixtures/report/*

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.5.5

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change log
 
+### 4.0.0 - 2023-02-03
+
+* features
+  * use fitting*.log instead of new two dirs
+  * output validation details
+  * new cover report
+  * smart skip
+  * smart nocov
+
+### 3.0.2 - 2022-01-25
+
+* patch
+  * fix require
+
 ### 3.0.1 - 2021-12-09
 
 * patch

data/README.md

@@ -1,19 +1,90 @@
 # Fitting
 
 <img align="right" width="192" height="192"
-alt="Optimizt avatar: OK sign with Mona Lisa picture between the fingers"
+alt="Fitting avatar: Documents with hangers"
 src="./images/logo.png">
 
-There are such ways of describing the API documentation as API Blueprint, Swagger and OpenAPI. And using the tests already writed for your code, you can reuse them to find out the documentation coverage.
-This makes it easy to find out how much the documentation matches the implementation.
+We set up test logs, validate them according to your API documentation and show the documentation coverage with logs.
 
-* Cool if you already have a project with tests and documentation, you can check how good everything is and fix microbags.
+Test logs setting supports RSpec test (and WebMock stubbing) for Ruby On Rails application and API documentation supports API Blueprint,
+Swagger and OpenAPI.
 
-* If are you going developing API and  write documentation for it, this tool will help you document-driven development easily create high-quality write API documentation and API.
+This reduces the costs of support, testers and analysts.
 
-* Also, if you have an undocumented API, this is an easy way to describe it.
+Log
+```text
+FITTING incoming request {"method":"POST","path":"/public/api/v1/inboxes/tEX5JiZyceiwuKMi1oN9Sf8S/contacts","body":{},"response":{"status":200,"content_type":"application/json","body":{"source_id":"00dbf18d-879e-47cb-ac45-e9aece266eb1","pubsub_token":"ktn6YwPus57JDf4e59eFPom5","id":3291,"name":"shy-surf-401","email":null,"phone_number":null}},"title":"./spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb:9","group":"./spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb","host":"www.example.com"}
+FITTING outgoing request {"method":"POST","path":"/v1/organizations/org_id/meeting","body":{},"response":{"status":200,"content_type":"application/json","body":{"success":true,"data":{"meeting":{"id":"meeting_id","roomName":"room_name"}}}},"title":"./spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb:50","group":"./spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb","host":"api.cluster.dyte.in"}
+```
+
+validation
+```console
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF.FFF..FFFFFFFFFF....F.......F...FF.....F...F....F..............................FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF..FF.F..FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF..FF........FFF...FFFF......FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF........FFFFFFFFFFF..FFFFFF..FFFFFFFFFFFFFFFFF.......FFFFFF.............FFFFFFFFFFFF....F........FFF.F...FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF............FF........FFF......FFFFFFFFFFFFFFFFFFFFFF....FFFFFF......F............FFFF........FFFFFFFFFFFFFF.....FFFFFFFFFFFFFFFFFFFFFFF..FF.....FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF.....FF..........FFFFFFFFFFFFFFFFFF...FFFF...............F.F....FF..FFFFFFFF
+
+  1) Fitting::Doc::NotFound log error:
+
+host: www.example.com
+method: POST
+path: /public/api/v1/inboxes/{inbox_identifier}/contacts
+code: 200
+
+content-type: application/json
+
+json-schema: {
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "integer",
+      "description": "Id of the contact"
+    },
+    "source_id": {
+      "type": "string",
+      "description": "The session identifier of the contact"
+    },
+    "name": {
+      "type": "string",
+      "description": "Name of the contact"
+    },
+    "email": {
+      "type": "string",
+      "description": "Email of the contact"
+    },
+    "pubsub_token": {
+      "type": "string",
+      "description": "The token to be used to connect to chatwoot websocket"
+    }
+  }
+}
+
+body: {
+  "source_id": "c9e8c31f-06df-49b4-8fb9-4466457ae65b",
+  "pubsub_token": "Zgc7DEvaj5TkgZ1a4C7AvJXo",
+  "id": 3293,
+  "name": "restless-snowflake-670",
+  "email": null,
+  "phone_number": null
+}
+
+error [
+  "The property '#/email' of type null did not match the following type: string in schema e56b7e65-d70c-5f7a-a96c-982df5f8f2f7"
+]
+
+...
+
+804 examples, 565 failure, 0 pending
+
+Coverage: 65.51%
+```
 
-![exmaple](images/example.png)
+and cover
+![exmaple](images/b1.png)
+
+![exmaple](images/b2.png)
+
+![exmaple](images/w1.png)
+
+![exmaple](images/w2.png)
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -32,41 +103,146 @@ $ gem install fitting
 ```
 
 ## Usage
-And next to your `spec_helper.rb`:
+### Log
+Firstly, improve `test.log`.
+
+To your `spec_helper.rb`:
 
 ```ruby
 require 'fitting'
 
-Fitting.save_test_data
+Fitting.logger
 ```
 
+Delete all files `log/*.log` and run rspec
+
+You get more information about incoming and outgoing request in `log/fitting*.log`.
+
+```text
+FITTING incoming request {"method":"POST","path":"/public/api/v1/inboxes/tEX5JiZyceiwuKMi1oN9Sf8S/contacts","body":{},"response":{"status":200,"content_type":"application/json","body":{"source_id":"00dbf18d-879e-47cb-ac45-e9aece266eb1","pubsub_token":"ktn6YwPus57JDf4e59eFPom5","id":3291,"name":"shy-surf-401","email":null,"phone_number":null}},"title":"./spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb:9","group":"./spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb","host":"www.example.com"}
+FITTING outgoing request {"method":"POST","path":"/v1/organizations/org_id/meeting","body":{},"response":{"status":200,"content_type":"application/json","body":{"success":true,"data":{"meeting":{"id":"meeting_id","roomName":"room_name"}}}},"title":"./spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb:50","group":"./spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb","host":"api.cluster.dyte.in"}
+```
+
+### Validation
+Secondly, validate the logs to the documentation.
+
 Add this to your `.fitting.yml`:
 
-### OpenAPI 2.0
-Also Swagger
+```yaml
+APIs:
+  - host: www.example.com
+    type: openapi2
+    path: swagger/swagger.json
+```
+
+Run 
+```bash
+bundle e rake fitting:validate
+```
+
+Console output
+
+```console
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF.FFF..FFFFFFFFFF....F.......F...FF.....F...F....F..............................FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF..FF.F..FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF..FF........FFF...FFFF......FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF........FFFFFFFFFFF..FFFFFF..FFFFFFFFFFFFFFFFF.......FFFFFF.............FFFFFFFFFFFF....F........FFF.F...FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF............FF........FFF......FFFFFFFFFFFFFFFFFFFFFF....FFFFFF......F............FFFF........FFFFFFFFFFFFFF.....FFFFFFFFFFFFFFFFFFFFFFF..FF.....FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF.....FF..........FFFFFFFFFFFFFFFFFF...FFFF...............F.F....FF..FFFFFFFF
+
+  1) Fitting::Doc::NotFound log error:
+
+host: www.example.com
+method: POST
+path: /public/api/v1/inboxes/{inbox_identifier}/contacts
+code: 200
+
+content-type: application/json
+
+json-schema: {
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "integer",
+      "description": "Id of the contact"
+    },
+    "source_id": {
+      "type": "string",
+      "description": "The session identifier of the contact"
+    },
+    "name": {
+      "type": "string",
+      "description": "Name of the contact"
+    },
+    "email": {
+      "type": "string",
+      "description": "Email of the contact"
+    },
+    "pubsub_token": {
+      "type": "string",
+      "description": "The token to be used to connect to chatwoot websocket"
+    }
+  }
+}
+
+body: {
+  "source_id": "c9e8c31f-06df-49b4-8fb9-4466457ae65b",
+  "pubsub_token": "Zgc7DEvaj5TkgZ1a4C7AvJXo",
+  "id": 3293,
+  "name": "restless-snowflake-670",
+  "email": null,
+  "phone_number": null
+}
+
+error [
+  "The property '#/email' of type null did not match the following type: string in schema e56b7e65-d70c-5f7a-a96c-982df5f8f2f7"
+]
+
+...
+
+804 examples, 565 failure, 0 pending
+
+Coverage: 65.51%
+```
+
+### Coverage
+And task will create HTML (`coverage/fitting.html`) reports.
+
+![exmaple](images/b1.png)
+
+![exmaple](images/b2.png)
+
+More information on action coverage
+
+![exmaple2](images/w1.png)
+
+![exmaple2](images/w2.png)
+
+## Settings
+
+### APIs
+
+#### type
+
+##### OpenAPI 2.0
+Swagger
 
 ```yaml
-prefixes:
-  - name: /api/v1
+APIs:
+  - host: www.example.com
     type: openapi2
-    schema_paths:
-      - doc.json
+    path: doc/api.json
 ```
 
-### OpenAPI 3.0
+##### OpenAPI 3.0
 Also OpenAPI
 
 ```yaml
-prefixes:
-  - name: /api/v1
+APIs:
+  - host: www.example.com
     type: openapi3
-    schema_paths:
-      - doc.yaml
+    path: doc/api.json
 ```
 
-### API Blueprint
-First you need to install [drafter](https://github.com/apiaryio/drafter).
-Works after conversion from API Blueprint to API Elements (in YAML file) with Drafter.
+##### API Blueprint
+First you need to install [drafter](https://github.com/apiaryio/drafter) or [crafter](https://github.com/funbox/crafter).
+Works after conversion from API Blueprint to API Elements (in YAML file) with Drafter or Crafter.
 
 That is, I mean that you first need to do this
 
@@ -74,128 +250,115 @@ That is, I mean that you first need to do this
 drafter doc.apib -o doc.yaml
 ```
 
+or
+
+```bash
+node_modules/.bin/crafter doc.apib > doc.yaml
+```
+
 and then
 
 ```yaml
-prefixes:
-  - name: /api/v1
+APIs:
+  - host: www.example.com
     type: drafter
-    schema_paths:
-      - doc.yaml
+    path: doc/api.yaml
 ```
 
-### Tomograph
-
-To use additional features of the pre-converted [tomograph](https://github.com/funbox/tomograph)
+or
 
 ```yaml
-prefixes:
-  - name: /api/v1
-    type: tomogram
-    schema_paths:
-      - doc.json
+APIs:
+  - host: www.example.com
+    type: crafter
+    path: doc/api.yaml
 ```
 
-## Run
-Run tests first to get run artifacts
+##### Tomograph
+
+To use additional features of the pre-converted [tomograph](https://github.com/funbox/tomograph)
+
+example
+
 ```bash
-bundle e rspec
+bundle exec tomograph -d crafter --exclude-description doc/api.yml doc/api.json
 ```
 
 and then
-```bash
-bundle e rake fitting:report
+
+```yaml
+APIs:
+  - host: www.example.com
+    type: tomogram
+    path: doc/api.json
 ```
 
-Run tests by outgoing request first to get run artifacts
-```bash
-bundle e rake fitting_out:report
+#### prefix
+
+Setting the prefix name is optional. For example, you can do this:
+
+```yaml
+APIs:
+  - host: www.example.com
+    prefix: /api/v3
+    type: openapi2
+    path: swagger/swagger.json
 ```
 
-Console ouptut
+### SkipValidation
 
-```text
-/api/v1
-POST	/api/v1/accounts/{account_id}/inboxes				 0% 200 0% 404 0% 403
-PATCH	/api/v1/accounts/{account_id}/inboxes/{id}			 0% 200 0% 404 0% 403
-POST	/api/v1/accounts/{account_id}/inboxes/{id}/set_agent_bot	 0% 204 100% 404 0% 403
-GET	/api/v1/agent_bots						 0% 200 0% 404 0% 403
-GET	/api/v1/accounts/{account_id}/conversations			 0% 200 0% 400 0% description
-POST	/api/v1/accounts/{account_id}/conversations			 0% 200 0% 403
-GET	/api/v1/accounts/{account_id}/conversations/{id}		 59% 200 0% 404 0% 403
-POST	/api/v1/accounts/{account_id}/conversations/{id}/toggle_status	 80% 200 0% 404 0% 403
-GET	/api/v1/accounts/{account_id}/conversations/{id}/messages	 47% 200 0% 404 0% 403
-POST	/api/v1/accounts/{account_id}/conversations/{id}/messages	 0% 200 0% 404 0% 403
-GET	/api/v1/accounts/{account_id}/conversations/{id}/labels		 100% 200 0% 404 0% 403
-POST	/api/v1/accounts/{account_id}/conversations/{id}/labels		 100% 200 0% 404 0% 403
-POST	/api/v1/accounts/{account_id}/conversations/{id}/assignments	 77% 200 0% 404 0% 403
-GET	/api/v1/accounts/{account_id}/contacts				 0% 200 0% 400
-POST	/api/v1/accounts/{account_id}/contacts				 14% 200 0% 400
-GET	/api/v1/accounts/{account_id}/contacts/{id}			 14% 200 0% 404 0% 403
-PUT	/api/v1/accounts/{account_id}/contacts/{id}			 0% 204 0% 404 0% 403
-GET	/api/v1/accounts/{account_id}/contacts/{id}/conversations	 0% 200 0% 404 0% 403
-GET	/api/v1/accounts/{account_id}/contacts/search			 0% 200 0% 401
-POST	/api/v1/accounts/{account_id}/contacts/{id}/contact_inboxes	 0% 200 0% 401 100% 422
-GET	/api/v1/profile							 88% 200 100% 401
-
-tests_without_prefixes: 42
-tests_without_actions: 144
-tests_without_responses: 43
-```
-
-And task will create HTML (`fitting/index.html`) reports.
-
-![exmaple](images/example.png)
+#### host
 
-More information on action coverage
+It is not necessary to immediately describe each host in detail, you can only specify its name and skip it until you are ready to documented it
 
-![exmaple2](images/example2.png)
+```yaml
+SkipAPIs:
+  - host: api.cluster.dyte.in
+```
 
-## prefix name
+#### prefix
 
-Setting the prefix name is optional. For example, you can do this:
+If you want to skip a specific prefix in the host
 
 ```yaml
-prefixes:
-  - type: openapi2
-    schema_paths:
-      - doc.json
+SkipAPIs:
+  - host: api.cluster.dyte.in
+    prefix: /admin/api
 ```
 
-## prefix skip
+#### method and path
+
+If you want to skip a specific request in the host
 
-It is not necessary to immediately describe each prefix in detail, you can only specify its name and skip it until you are ready to documented it
 ```yaml
-prefixes:
-- name: /api/v1
-  type: openapi2
-  schema_paths:
-    - doc.json
-- name: /api/v3
-  skip: true
+SkipAPIs:
+  - host: api.cluster.dyte.in
+    method: GET
+    path: /api/v1/cars
 ```
 
-For work with WebMock outgoing request, you should set up outgoing prefixes
+### NoCov
+
+It is not necessary to immediately test each doc in detail, you can only specify its name and skip it until you are ready to test it
+
 ```yaml
-outgoing_prefixes:
-- name: /api/v1
-  type: openapi2
-  schema_paths:
-    - doc.json
-- name: /api/v3
-  skip: true
+NoCov:
+  - host: sso.test
+    method: GET
+    path: /users/{userId}
 ```
 
-You can choose location that must be teste
+### Debug
+
+If you find bug, you can debug it or create task in this github project  with new file `coverage/fitting.debug.yml`
 
 ```yaml
-prefixes:
-  - type: openapi2
-    schema_paths:
-      - doc.json
-    only:
-      - POST /api/v1/users
-      - GET /api/v1/user/{id}
+Debug:
+  - host: www.example.com
+    method: GET
+    path: /api/v3/users
+    code: 200
+    content-type: application/json
 ```
 
 ## Contributing

data/fitting.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.add_runtime_dependency 'json-schema', '~> 2.6', '>= 2.6.2'
   spec.add_runtime_dependency 'terminal-table', '~> 3.0', '>= 3.0.2'
-  spec.add_runtime_dependency 'tomograph', '~> 3.1', '>= 3.1.0'
+  spec.add_runtime_dependency 'tomograph', '~> 3.1', '>= 3.1.5'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'byebug', '~> 11.1', '>= 11.1.3'

data/lib/fitting/action.rb

@@ -0,0 +1,105 @@
+require 'fitting/host'
+require 'fitting/prefix'
+require 'fitting/report/prefixes'
+
+module Fitting
+  class Action
+    class Skip < RuntimeError; end
+    class Empty < RuntimeError; end
+    class NotFound < RuntimeError
+      attr_reader :log
+
+      def initialize(msg, log)
+        @log = log
+        super(msg)
+      end
+    end
+
+    def initialize(action)
+      @action = action
+    end
+
+    def action
+      @action
+    end
+
+    def self.all
+      []
+    end
+
+    def self.find!(actions, log)
+      host = Fitting::Host.find!(log)
+      host.cover!
+
+      prefix = Fitting::Prefix.find(host: host, log: log)
+      prefix.cover!
+
+      new(prefix.actions.find!(log))
+    rescue Fitting::Report::Actions::Empty,
+      Fitting::Host::Skip,
+      Fitting::Prefix::Skip
+      raise Skip
+    rescue Fitting::Report::Combinations::Empty,
+      Fitting::Report::Combinations::NotFound
+      raise Skip
+    rescue Fitting::Host::NotFound,
+      Fitting::Prefix::NotFound,
+      Fitting::Report::Actions::NotFound,
+      Fitting::Report::Responses::NotFound => e
+      raise NotFound.new(e.message, log)
+    end
+
+    def cover!(log)
+      action.cover!
+
+      response = action.responses.find!(log)
+      response.cover!
+
+      combination = response.combinations.find!(log)
+      combination.cover!
+
+      print "\e[32m.\e[0m"
+    rescue Fitting::Report::Actions::Empty,
+      Fitting::Host::Skip,
+      Fitting::Prefix::Skip
+    rescue Fitting::Report::Combinations::Empty,
+      Fitting::Report::Combinations::NotFound
+    rescue Fitting::Host::NotFound,
+      Fitting::Prefix::NotFound,
+      Fitting::Report::Actions::NotFound,
+      Fitting::Report::Responses::NotFound => e
+    end
+
+    def self.report(actions)
+      all = 0
+      cover = 0
+
+      # prefixes.to_a.map do |prefix|
+      #   all += 1
+      #   break unless prefix.cover?
+      #   cover += 1
+      #   prefix.actions.to_a.map do |action|
+      #     all += 1
+      #     break unless action.cover?
+      #     cover += 1
+      #     action.responses.to_a.map do |response|
+      #       all += 1
+      #       break unless action.cover?
+      #       cover += 1
+      #       response.combinations.to_a.map do |combination|
+      #         all += 1
+      #         break unless combination.cover?
+      #         cover += 1
+      #       end
+      #     end
+      #   end
+      # end
+
+      puts
+      puts "Coverage #{(cover.to_f / all.to_f * 100).round(2)}%"
+      exit 1 unless false
+
+      exit 0
+    end
+  end
+end

data/lib/fitting/cover/json_schema.rb

@@ -17,12 +17,12 @@ module Fitting
 
       def inception(json_schema, combinations)
         json_schema.each do |key, value|
-          if (key == 'properties') && (json_schema['required'] != value.keys)
+          if (key == 'properties') && value && (json_schema['required'] != value.keys)
             schema = json_schema.dup
             one_of = schema.delete('required') || []
             schema['properties'].each_key do |property|
               next if one_of.include?(property)
-
+              next if property == 'type' || property == 'properties'
               combinations.push([schema.merge('required' => one_of + [property]), "required.#{property}"])
             end
           elsif value.is_a?(Hash)

data/lib/fitting/cover/json_schema_one_of.rb

@@ -10,7 +10,7 @@ module Fitting
 
       def combi
         inception(json_schema, combinations).each do |combination|
-          combination[0] = json_schema.merge(combination[0])
+          combination[0] = combination[0]
           combination[1] = ['one_of', combination[1]]
         end
       end
@@ -21,7 +21,9 @@ module Fitting
             schema = json_schema.dup
             one_of = schema.delete('oneOf')
             one_of.each_index do |index|
-              combinations.push([schema.merge('oneOf' => [one_of[index]]), "oneOf.#{index}"])
+              schema_new = json_schema.dup
+              schema_new.delete('oneOf')
+              combinations.push([schema_new.merge(one_of[index]), "oneOf.#{index}"])
             end
           elsif value.is_a?(Hash)
             com = inception(value, [])