tomograph 2.5.3 → 3.1.1

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.3'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/tomograph.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors        = ['d.efimov']
   spec.email          = ['d.efimov@fun-box.ru']
 
-  spec.summary        = 'Convert API Blueprint to Tomogram'
-  spec.description    = 'Convert API Blueprint to routes and JSON-Schemas'
+  spec.summary        = 'Convert API Blueprint, Swagger and OpenAPI to Tomogram'
+  spec.description    = 'Convert API Blueprint, Swagger and OpenAPI to routes and JSON-Schemas'
   spec.homepage       = 'https://github.com/funbox/tomograph'
   spec.license        = 'MIT'
 
@@ -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', '>= 12.3.3'
-  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_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.add_development_dependency 'json-schema', '~> 2.8', '>= 2.8.1'
+  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.3
+  version: 3.1.1
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -16,149 +16,135 @@ 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
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
-  type: :runtime
+        version: 11.1.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 11.1.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.1
+        version: 3.9.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
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.81'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.81'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 2.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
-description: Convert API Blueprint to routes and JSON-Schemas
+        version: 2.8.1
+description: Convert API Blueprint, Swagger and OpenAPI to routes and JSON-Schemas
 email:
 - d.efimov@fun-box.ru
 executables:
@@ -166,11 +152,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".tool-versions"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -183,11 +169,11 @@ 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
+- lib/tomograph/openapi/openapi2.rb
+- lib/tomograph/openapi/openapi3.rb
 - lib/tomograph/path.rb
 - lib/tomograph/tomogram.rb
 - lib/tomograph/tomogram/action.rb
@@ -206,16 +192,15 @@ 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
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Convert API Blueprint to Tomogram
+summary: Convert API Blueprint, Swagger and OpenAPI to Tomogram
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-- 2.2
-before_install: gem install bundler -v 1.12
-

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,65 +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
-            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
-            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'].to_s,
-                '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