tomograph 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 937a82ea94c38bdfbb1a92a6710936c7d525e228
-  data.tar.gz: 33cf0b7e2a4643acf32175e22c9ade017e3db49d
+SHA256:
+  metadata.gz: c457270d6d9ab0b7d23c4af643248636f3fe9b3f673858700505ab55ee31716f
+  data.tar.gz: d089a1f21d1ab2e739854f962eff9e0e7fcdc3cdb631a595f84a328afc016823
 SHA512:
-  metadata.gz: a88be0b668cce03d6c6b2a13fca948bc620cd92c21936de32189db078f1872fe67b1a63c7a3e93da3352d9eeee755583f2406aac92691e268676dff65b6ac050
-  data.tar.gz: 9d07f3e96dfd6ba0c7075682c048719072c2cb6c3df22754703de42371f3bc5c6bed63af18c069076f0d80ca47f82dc3221db3d8e4c45064ec0607d4e5954a4d
+  metadata.gz: 4f31296ba8532f93e0f89f881e0c0aa07a3a2a2752d2f6764be9ac6bf0ee5a8e1103b4f5bc2eb9b8ef0472f70432acaec379d2b914338fefed6f8e7c2842f3d3
+  data.tar.gz: b54f9a273905b2e7d3bd2d91777f46fc5c626dec43124abf6a3b5fed85a63e3ec63e21568498e6f072ab48020a58e6c833ab89a2ef7bf2692acc184c614cb6d4

data/.github/workflows/gempush.yml

@@ -0,0 +1,28 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.7
 
 Metrics/LineLength:
   Max: 120

data/.ruby-version

@@ -1 +1 @@
-2.2.10
+2.7.1

data/.tool-versions

@@ -0,0 +1,2 @@
+ruby 2.7.1
+nodejs 11.3.0

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-- 2.2
-before_install: gem install bundler -v 1.12
-
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7

data/CHANGELOG.md

@@ -1,6 +1,35 @@
 # Change log
 
-### 2.5.0 - 2018-05-28
+### 3.0.0 - 2020-08-27
+
+* features
+  * support multi request for one resource path [#27](https://github.com/funbox/tomograph/issues/27)
+* removed
+  * delete support drafter 3 [#29](https://github.com/funbox/tomograph/issues/29)
+
+### 2.5.4 - 2020-04-06
+
+* fixed warnings on ruby 2.7
+* updated dependences
+
+# Change log
+
+### 2.5.3 - 2020-03-10
+
+* bug fixes
+  * fix parser status to string
+
+### 2.5.2 - 2020-01-10
+
+* bug fixes
+  * fix parser for new crafter version
+
+### 2.5.1 - 2019-12-09
+
+* bug fixes
+  * fix content_type parsing.
+
+### 2.5.0 - 2019-05-28
 
 * features
   * аdded support for documents with pre-parsed by drafter 4.

data/README.md

@@ -1,194 +1,210 @@
-# Tomograph [![Build Status](https://travis-ci.org/funbox/tomograph.svg?branch=master)](https://travis-ci.org/funbox/tomograph) [![Gem Version](https://badge.fury.io/rb/tomograph.svg)](https://badge.fury.io/rb/tomograph)
+# Tomograph 
 
-<a href="https://funbox.ru">
-  <img src="https://funbox.ru/badges/sponsored_by_funbox_compact.svg" alt="Sponsored by FunBox" width=250 />
-</a>
+[![Build Status](https://travis-ci.org/funbox/tomograph.svg?branch=master)](https://travis-ci.org/funbox/tomograph) [![Gem Version](https://badge.fury.io/rb/tomograph.svg)](https://badge.fury.io/rb/tomograph)
 
 Convert API Blueprint to JSON Schema and search.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+First you need to install [drafter](https://github.com/apiaryio/drafter).
+
+Then add this line to your application's Gemfile:
 
 ```ruby
 gem 'tomograph'
 ```
 
-And then execute:
+After that execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
-Or install it yourself as:
+Or install the gem by yourself:
 
-    $ gem install tomograph
+```bash
+$ gem install tomograph
+```
 
 ## Usage
 
 ```ruby
 require 'tomograph'
-```
 
-```ruby
 tomogram = Tomograph::Tomogram.new(apib_path: '/path/to/doc.apib')
 ```
 
 ### Command line tool
 
-The command line tool allows you to convert files from API Blueprint or API Elements to JSON Schema.
-```
+CLI allows you to convert files from API Blueprint or API Elements to JSON Schema.
+
+```bash
 tomograph doc.apib doc.json
 ```
-Now there is support for documents pre-parsed by [drafter](https://github.com/apiaryio/drafter) versions 3 and 4. To select the handler version, use the -d key and specify the required version. For example:
-```
+
+There is also support for documents pre-parsed by [drafter](https://github.com/apiaryio/drafter) versions 3 and 4, or `crafter`. 
+To specify the handler version use the `-d` flag:
+
+```bash
 tomograph -d 4 doc_by_drafter4.yaml doc.json
 ```
-See
-```
+
+Run CLI with `-h` to get detailed help:
+
+```bash
 tomograph -h
 ```
-for more details on usage.
 
 ## Convert
 
+Use `to_json` for converting APIB to JSON:
+
 ```ruby
 tomogram.to_json
 ```
 
-Example input:
-```apib
-FORMAT: 1A
-HOST: http://test.local
-
-# project
-
-# Group project
-
-Project
-
-## Authentication [/sessions]
-
-### Sign In [POST]
-
-+ Request (application/json)
-
-    + Attributes
-     + login (string, required)
-     + password (string, required)
-     + captcha (string, optional)
-
-+ Response 401 (application/json)
-
-+ Response 429 (application/json)
-
-+ Response 201 (application/json)
-
-    + Attributes
-     + confirmation (Confirmation, optional)
-     + captcha (string, optional)
-     + captcha_does_not_match (boolean, optional)
-
-
-# Data Structures
-
-## Confirmation (object)
-  + id (string, required)
-  + type (string, required)
-  + operation (string, required)
-```
-
-Example output:
-```json
-[
-  {
-    "path": "/sessions",
-    "method": "POST",
-    "content-type": "application/json",
-    "request": {
-      "$schema": "http://json-schema.org/draft-04/schema#",
-      "type": "object",
-      "properties": {
-        "login": {
-          "type": "string"
+<details>
+  <summary>Example input</summary>
+  
+  ```apib
+  FORMAT: 1A
+  HOST: http://test.local
+  
+  # project
+  
+  # Group project
+  
+  Project
+  
+  ## Authentication [/sessions]
+  
+  ### Sign In [POST]
+  
+  + Request (application/json)
+  
+      + Attributes
+       + login (string, required)
+       + password (string, required)
+       + captcha (string, optional)
+  
+  + Response 401 (application/json)
+  
+  + Response 429 (application/json)
+  
+  + Response 201 (application/json)
+  
+      + Attributes
+       + confirmation (Confirmation, optional)
+       + captcha (string, optional)
+       + captcha_does_not_match (boolean, optional)
+  
+  
+  # Data Structures
+  
+  ## Confirmation (object)
+    + id (string, required)
+    + type (string, required)
+    + operation (string, required)
+  ```
+</details>
+
+<details>
+  <summary>Example output</summary>
+  
+  ```json
+  [
+    {
+      "path": "/sessions",
+      "method": "POST",
+      "content-type": "application/json",
+      "requests": [{
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "object",
+        "properties": {
+          "login": {
+            "type": "string"
+          },
+          "password": {
+            "type": "string"
+          },
+          "captcha": {
+            "type": "string"
+          }
         },
-        "password": {
-          "type": "string"
+        "required": [
+          "login",
+          "password"
+        ]
+      }],
+      "responses": [
+        {
+          "status": "401",
+          "content-type": "application/json",
+          "body": {}
         },
-        "captcha": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "login",
-        "password"
-      ]
-    },
-    "responses": [
-      {
-        "status": "401",
-        "content-type": "application/json",
-        "body": {}
-      },
-      {
-        "status": "429",
-        "content-type": "application/json",
-        "body": {}
-      },
-      {
-        "status": "201",
-        "content-type": "application/json",
-        "body": {
-          "$schema": "http://json-schema.org/draft-04/schema#",
-          "type": "object",
-          "properties": {
-            "confirmation": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "type": {
-                  "type": "string"
+        {
+          "status": "429",
+          "content-type": "application/json",
+          "body": {}
+        },
+        {
+          "status": "201",
+          "content-type": "application/json",
+          "body": {
+            "$schema": "http://json-schema.org/draft-04/schema#",
+            "type": "object",
+            "properties": {
+              "confirmation": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string"
+                  },
+                  "operation": {
+                    "type": "string"
+                  }
                 },
-                "operation": {
-                  "type": "string"
-                }
+                "required": [
+                  "id",
+                  "type",
+                  "operation"
+                ]
               },
-              "required": [
-                "id",
-                "type",
-                "operation"
-              ]
-            },
-            "captcha": {
-              "type": "string"
-            },
-            "captcha_does_not_match": {
-              "type": "boolean"
+              "captcha": {
+                "type": "string"
+              },
+              "captcha_does_not_match": {
+                "type": "boolean"
+              }
             }
           }
         }
-      }
-    ]
-  }
-]
-```
+      ]
+    }
+  ]
+  ```
+</details> 
 
 ## Search
 
-### find_request
+Use these methods to search through parsed API Blueprint spec to get request => responses hash maps.
+
+### `find_request`
 
 ```ruby
 request = tomogram.find_request(method: 'GET', path: '/status/1?qwe=rty')
 ```
 
-### find_request
+### `find_request_with_content_type`
 
 ```ruby
 request = tomogram.find_request_with_content_type(method: 'GET', path: '/status/1?qwe=rty', content_type: 'application/json')
 ```
 
-### find_responses
-
+### `find_responses`
 
 ```ruby
 responses = request.find_responses(status: '200')
@@ -196,64 +212,70 @@ responses = request.find_responses(status: '200')
 
 ## Other methods
 
-### prefix_match?
+### `prefix_match?`
 
-This can be useful if you use a prefix.
+This may be useful if you specify a prefix.
 
 ```ruby
 tomogram.prefix_match?('http://local/api/v2/users')
 ```
 
-## Params
+### `to_resources`
 
-Example:
+Maps resources with possible requests.
+
+Example output:
 
 ```ruby
-Tomograph::Tomogram.new(prefix: '/api/v2', apib_path: '/path/to/doc.apib')
+{
+  '/sessions' => ['POST /sessions']
+}
 ```
 
-or
+## Constructor params
+
+You can specify API prefix and path to the spec using one of the possible formats:
 
 ```ruby
-Tomograph::Tomogram.new(prefix: '/api/v2', drafter_yaml_path: '/path/to/doc.yaml')
+Tomograph::Tomogram.new(prefix: '/api/v2', apib_path: '/path/to/doc.apib')
 ```
 
-or
+```ruby
+Tomograph::Tomogram.new(prefix: '/api/v2', drafter_yaml_path: '/path/to/doc.yaml')
+```
 
 ```ruby
 Tomograph::Tomogram.new(prefix: '/api/v2', tomogram_json_path: '/path/to/doc.json')
 ```
 
-### apib_path
+### `apib_path`
 
 Path to API Blueprint documentation. There must be an installed [drafter](https://github.com/apiaryio/drafter) to parse it.
 
-### drafter_yaml_path
+### `drafter_yaml_path`
 
 Path to API Blueprint documentation pre-parsed with `drafter` and saved to a YAML file.
 
-Drafter v.4
+### Drafter v4 & Crafter support
 
-If you are using a `drafter v.4`, then you need to use the following parameters`drafter_4_apib_path` and `drafter_4_yaml_path` respectively.
+If you are using a `drafter v4`, you should use `drafter_4_apib_path` and `drafter_4_yaml_path` respectively. 
 
-### tomogram_json_path
+In case when you want to use `сrafter`, then you should pass these params: `crafter_apib_path`, `crafter_yaml_path`. 
+
+### `tomogram_json_path`
 
 Path to API Blueprint documentation converted with `tomograph` to a JSON file.
 
-### prefix
+### `prefix`
 
-Default empty String. Prefix of API requests. Example: `'/api'`.
+Default: `''`
 
-### to_resources
+Prefix for API requests. 
 
-Hash resource with requests.
-The result for the example above:
-```ruby
-{
-  '/sessions' => ['POST /sessions']
-}
-```
+Example: `'/api'`.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+[![Sponsored by FunBox](https://funbox.ru/badges/sponsored_by_funbox_centered.svg)](https://funbox.ru)

data/exe/tomograph

@@ -12,7 +12,7 @@ include Methadone::CLILogging
 
 version Tomograph::VERSION
 description 'Converts API Blueprint to JSON Schema'
-on('-d DRAFTER_VERSION', '--drafter', 'Choose drafter version: crafter, 3 or 4. Default: use drafter v.3.')
+on('-d DRAFTER_VERSION', '--drafter', 'Choose drafter version: crafter or 4. Default: use drafter v.4.')
 on('-f INPUT_FORMAT', '--format', 'Force input format: "apib" or "yaml". Default: detect by file extension.')
 on('--exclude-description', 'Exclude "description" keys.')
 on('--split', 'Split output into files by method.')
@@ -52,12 +52,10 @@ def choose_drafter(opt_parser)
   case opt_parser
   when 'crafter'
     :crafter
-  when '3'
-    :drafter_3
   when '4'
     :drafter_4
   when nil
-    :drafter_3
+    :drafter_4
   else
     raise 'Unsupported drafter version!'
   end
@@ -88,17 +86,13 @@ main do |input, output|
   version = choose_drafter(options['drafter'])
   format_key = case format
                when :apib
-                 if version == :drafter_3
-                   :apib_path
-                 elsif version == :crafter
+                 if version == :crafter
                    :crafter_apib_path
                  else
                    :drafter_4_apib_path
                  end
                when :yaml
-                 if version == :drafter_3
-                   :drafter_yaml_path
-                 elsif version == :crafter
+                 if version == :crafter
                    :crafter_yaml_path
                  else
                    :drafter_4_yaml_path

data/lib/tomograph/api_blueprint/crafter/yaml.rb

@@ -29,7 +29,7 @@ module Tomograph
         def group?(group)
           return false if group['element'] == 'resource'
           group['element'] != 'copy' && # Element is a human readable text
-            group['meta']['classes'][0] == 'resourceGroup' # skip Data Structures
+            group['meta']['classes']['content'][0]['content'] == 'resourceGroup' # skip Data Structures
         end
 
         def resources
@@ -101,15 +101,15 @@ module Tomograph
             path: "#{@prefix}#{related_actions.first.path}",
             method: related_actions.first.method,
             content_type: related_actions.first.content_type,
-            request: related_actions.first.request,
-            responses: related_actions.map(&:responses).flatten,
+            requests: related_actions.map(&:request).flatten.uniq,
+            responses: related_actions.map(&:responses).flatten.uniq,
             resource: related_actions.first.resource
           }
         end
 
         def to_tomogram
           @tomogram ||= actions.inject([]) do |result, action|
-            result.push(Tomograph::Tomogram::Action.new(action))
+            result.push(Tomograph::Tomogram::Action.new(**action))
           end
         end
 

data/lib/tomograph/api_blueprint/crafter/yaml/action.rb

@@ -18,8 +18,10 @@ module Tomograph
           end
 
           def content_type
-            @content_type ||= @content.first['attributes'].has_key?('headers') ?
-              @content.first['attributes']['headers']['content'][0]['content']['value']['content'] : nil
+            if @content.first['attributes'].has_key?('headers')
+              @content.first['attributes']['headers']['content'][0]['content']['key']['content'] == 'Content-Type' ?
+                @content.first['attributes']['headers']['content'][0]['content']['value']['content'] : nil
+            end
           end
 
           def request
@@ -49,7 +51,7 @@ module Tomograph
             end
             @responses = @responses.map do |response|
               {
-                'status' => response['attributes']['statusCode']['content'],
+                'status' => response['attributes']['statusCode']['content'].to_s,
                 'body' => json_schema(response['content']),
                 'content-type' => response['attributes'].has_key?('headers') ?
                   response['attributes']['headers']['content'][0]['content']['value']['content'] : nil

data/lib/tomograph/api_blueprint/drafter_4/yaml.rb

@@ -101,15 +101,15 @@ module Tomograph
             path: "#{@prefix}#{related_actions.first.path}",
             method: related_actions.first.method,
             content_type: related_actions.first.content_type,
-            request: related_actions.first.request,
-            responses: related_actions.map(&:responses).flatten,
+            requests: related_actions.map(&:request).flatten.uniq,
+            responses: related_actions.map(&:responses).flatten.uniq,
             resource: related_actions.first.resource
           }
         end
 
         def to_tomogram
           @tomogram ||= actions.inject([]) do |result, action|
-            result.push(Tomograph::Tomogram::Action.new(action))
+            result.push(Tomograph::Tomogram::Action.new(**action))
           end
         end
 

data/lib/tomograph/api_blueprint/drafter_4/yaml/action.rb

@@ -18,8 +18,10 @@ module Tomograph
           end
 
           def content_type
-            @content_type ||= @content.first['attributes'].has_key?('headers') ?
-              @content.first['attributes']['headers']['content'][0]['content']['value']['content'] : nil
+            if @content.first['attributes'].has_key?('headers')
+              @content.first['attributes']['headers']['content'][0]['content']['key']['content'] == 'Content-Type' ?
+                @content.first['attributes']['headers']['content'][0]['content']['value']['content'] : nil
+            end
           end
 
           def request
@@ -49,7 +51,7 @@ module Tomograph
             end
             @responses = @responses.map do |response|
               {
-                'status' => response['attributes']['statusCode']['content'],
+                'status' => response['attributes']['statusCode']['content'].to_s,
                 'body' => json_schema(response['content']),
                 'content-type' => response['attributes'].has_key?('headers') ?
                   response['attributes']['headers']['content'][0]['content']['value']['content'] : nil

data/lib/tomograph/api_blueprint/json_schema.rb

@@ -14,7 +14,7 @@ module Tomograph
                         path: "#{@prefix}#{action['path']}",
                         method:  action['method'],
                         content_type: action['content-type'],
-                        request: action['request'],
+                        requests: action['requests'],
                         responses: action['responses'],
                         resource: action['resource']))
         end

data/lib/tomograph/tomogram.rb

@@ -1,7 +1,6 @@
 require 'multi_json'
 require 'tomograph/path'
 require 'tomograph/api_blueprint/json_schema'
-require 'tomograph/api_blueprint/drafter_3/yaml'
 require 'tomograph/api_blueprint/drafter_4/yaml'
 require 'tomograph/api_blueprint/crafter/yaml'
 
@@ -12,12 +11,10 @@ module Tomograph
     def initialize(prefix: '', apib_path: nil, drafter_yaml_path: nil, tomogram_json_path: nil, drafter_4_apib_path: nil, drafter_4_yaml_path: nil, crafter_apib_path: nil, crafter_yaml_path: nil)
       @documentation = if tomogram_json_path
                          Tomograph::ApiBlueprint::JsonSchema.new(prefix, tomogram_json_path)
-                       elsif drafter_4_yaml_path || drafter_4_apib_path
-                         Tomograph::ApiBlueprint::Drafter4::Yaml.new(prefix, drafter_4_apib_path, drafter_4_yaml_path)
                        elsif crafter_yaml_path || crafter_apib_path
                          Tomograph::ApiBlueprint::Crafter::Yaml.new(prefix, crafter_apib_path, crafter_yaml_path)
                        else
-                         Tomograph::ApiBlueprint::Drafter3::Yaml.new(prefix, apib_path, drafter_yaml_path)
+                         Tomograph::ApiBlueprint::Drafter4::Yaml.new(prefix, drafter_4_apib_path, drafter_4_yaml_path)
                        end
       @prefix = prefix
     end

data/lib/tomograph/tomogram/action.rb

@@ -3,13 +3,13 @@ require 'tomograph/path'
 module Tomograph
   class Tomogram
     class Action
-      attr_reader :path, :method, :content_type, :request, :responses, :resource
+      attr_reader :path, :method, :content_type, :requests, :responses, :resource
 
-      def initialize(path:, method:, content_type:, request:, responses:, resource:)
+      def initialize(path:, method:, content_type:, requests:, responses:, resource:)
         @path ||= Tomograph::Path.new(path)
         @method ||= method
         @content_type ||= content_type
-        @request ||= request
+        @requests ||= requests
         @responses ||= responses
         @resource ||= resource
       end
@@ -25,7 +25,7 @@ module Tomograph
           'path' => path,
           'method' => method,
           'content-type' => content_type,
-          'request' => request,
+          'requests' => requests,
           'responses' => responses,
           'resource' => resource
         }

data/lib/tomograph/version.rb

@@ -1,3 +1,3 @@
 module Tomograph
-  VERSION = '2.5.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/tomograph.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'methadone', '~> 1.9', '>= 1.9.5'
-  spec.add_runtime_dependency 'multi_json', '~> 1.11', '>= 1.11.1'
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  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 'rubocop', '~> 0.52.1', '>= 0.52.1'
-  spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
+  spec.add_runtime_dependency 'methadone', '~> 2', '>= 2.0.2'
+  spec.add_runtime_dependency 'multi_json', '~> 1.14', '>= 1.14.1'
+  spec.add_development_dependency 'byebug', '~> 11.1', '>= 11.1.1'
+  spec.add_development_dependency 'rake', '>= 13.0.1'
+  spec.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'
+  spec.add_development_dependency 'rubocop', '~> 0.81', '>= 0.81.0'
+  spec.add_development_dependency 'simplecov', '~> 0.18', '>= 0.18.5'
+  spec.required_ruby_version = '>= 2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomograph
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -16,148 +16,134 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.14.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: 11.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: 11.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.81'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.81'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.18.5
 description: Convert API Blueprint to routes and JSON-Schemas
 email:
 - d.efimov@fun-box.ru
@@ -166,9 +152,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -182,8 +170,6 @@ files:
 - lib/tomograph.rb
 - lib/tomograph/api_blueprint/crafter/yaml.rb
 - lib/tomograph/api_blueprint/crafter/yaml/action.rb
-- lib/tomograph/api_blueprint/drafter_3/yaml.rb
-- lib/tomograph/api_blueprint/drafter_3/yaml/action.rb
 - lib/tomograph/api_blueprint/drafter_4/yaml.rb
 - lib/tomograph/api_blueprint/drafter_4/yaml/action.rb
 - lib/tomograph/api_blueprint/json_schema.rb
@@ -205,15 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Convert API Blueprint to Tomogram

data/lib/tomograph/api_blueprint/drafter_3/yaml.rb

@@ -1,128 +0,0 @@
-require 'yaml'
-require 'tomograph/api_blueprint/drafter_3/yaml/action'
-require 'tomograph/tomogram/action'
-
-module Tomograph
-  module ApiBlueprint
-    class Drafter3
-      class Yaml
-        def initialize(prefix, apib_path, drafter_yaml_path)
-          @prefix = prefix
-          @documentation = if apib_path
-            YAML.safe_load(`drafter #{apib_path}`)
-          elsif drafter_yaml_path
-            YAML.safe_load(File.read(drafter_yaml_path))
-          end
-        end
-
-        def groups
-          @groups ||= @documentation['content'][0]['content'].inject([]) do |result_groups, group|
-            next result_groups unless group?(group)
-            result_groups.push(group)
-          end
-        end
-
-        def group?(group)
-          group['element'] != 'copy' && # Element is a human readable text
-            group['meta']['classes'][0] == 'resourceGroup' # skip Data Structures
-        end
-
-        def resources
-          @resources ||= groups.inject([]) do |result_groups, group|
-            result_groups.push(group['content'].inject([]) do |result_resources, resource|
-              next result_resources unless resource?(resource)
-              result_resources.push('resource' => resource, 'resource_path' => resource_path(resource))
-            end)
-          end.flatten
-        end
-
-        def resource?(resource)
-          resource['element'] != 'copy' # Element is a human readable text
-        end
-
-        def resource_path(resource)
-          resource['attributes'] && resource['attributes']['href']
-        end
-
-        def transitions
-          @transitions ||= resources.inject([]) do |result_resources, resource|
-            result_resources.push(resource['resource']['content'].inject([]) do |result_transitions, transition|
-              next result_transitions unless transition?(transition)
-              result_transitions.push(transition_hash(transition, resource))
-            end)
-          end.flatten
-        end
-
-        def transition?(transition)
-          transition['element'] == 'transition'
-        end
-
-        def transition_hash(transition, resource)
-          {
-            'transition' => transition,
-            'transition_path' => transition_path(transition, resource['resource_path']),
-            'resource' => resource['resource_path']
-          }
-        end
-
-        def transition_path(transition, resource_path)
-          transition['attributes'] && transition['attributes']['href'] || resource_path
-        end
-
-        def without_group_actions
-          transitions.inject([]) do |result_transition, transition|
-            result_transition.push(transition['transition']['content'].inject([]) do |result_contents, content|
-              next result_contents unless action?(content)
-              result_contents.push(Tomograph::ApiBlueprint::Drafter3::Yaml::Action.new(
-                content['content'],
-                transition['transition_path'],
-                transition['resource']
-              ))
-            end)
-          end
-        end
-
-        def action?(content)
-          content['element'] == 'httpTransaction'
-        end
-
-        def actions
-          @actions ||= without_group_actions
-            .flatten
-            .group_by { |action| "#{action.method} #{action.path}" }.map do |_key, related_actions|
-            action_hash(related_actions)
-          end.flatten
-        end
-
-        def action_hash(related_actions)
-          {
-            path: "#{@prefix}#{related_actions.first.path}",
-            method: related_actions.first.method,
-            content_type: related_actions.first.content_type,
-            request: related_actions.first.request,
-            responses: related_actions.map(&:responses).flatten,
-            resource: related_actions.first.resource
-          }
-        end
-
-        def to_tomogram
-          @tomogram ||= actions.inject([]) do |result, action|
-            result.push(Tomograph::Tomogram::Action.new(action))
-          end
-        end
-
-        def to_resources
-          return @to_resources if @to_resources
-
-          @to_resources = actions.group_by { |action| action[:resource] }
-          @to_resources = @to_resources.inject({}) do |res, related_actions|
-            requests = related_actions[1].map do |action|
-              "#{action[:method]} #{action[:path]}"
-            end
-            res.merge(related_actions[1].first[:resource] => requests)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tomograph/api_blueprint/drafter_3/yaml/action.rb

@@ -1,63 +0,0 @@
-require 'tomograph/tomogram/action'
-
-module Tomograph
-  module ApiBlueprint
-    class Drafter3
-      class Yaml
-        class Action
-          def initialize(content, path, resource)
-            @content = content
-            @path = path
-            @resource = resource
-          end
-
-          attr_reader :path, :resource
-
-          def method
-            @method ||= @content.first['attributes']['method']
-          end
-
-          def content_type
-            @content_type ||= @content.first['attributes'].has_key?('headers') ?
-              @content.first['attributes']['headers']['content'][0]['content']['value']['content'] : nil
-          end
-
-          def request
-            return @request if @request
-
-            request_action = @content.find { |el| el['element'] == 'httpRequest' }
-            @request = json_schema(request_action['content'])
-          end
-
-          def json_schema(actions)
-            schema_node = actions.find do |action|
-              action && action['element'] == 'asset' && action['attributes']['contentType'] == 'application/schema+json'
-            end
-            return {} unless schema_node
-
-            MultiJson.load(schema_node['content'])
-          rescue MultiJson::ParseError => e
-            puts "[Tomograph] Error while parsing #{e}. skipping..."
-            {}
-          end
-
-          def responses
-            return @responses if @responses
-
-            @responses = @content.select do |response|
-              response['element'] == 'httpResponse' && response['attributes']
-            end
-            @responses = @responses.map do |response|
-              {
-                'status' => response['attributes']['statusCode'],
-                'body' => json_schema(response['content']),
-                'content-type' => response['attributes'].has_key?('headers') ?
-                  response['attributes']['headers']['content'][0]['content']['value']['content'] : nil
-              }
-            end
-          end
-        end
-      end
-    end
-  end
-end