tomograph 2.5.1 → 3.0.1

data/exe/tomograph

@@ -12,11 +12,10 @@ 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('-f INPUT_FORMAT', '--format', 'Force input format: "apib" or "yaml". Default: detect by file extension.')
+on('-d DRAFTER_VERSION', '--drafter', 'Choose drafter version: crafter or 4. Default: use drafter v.4.')
 on('--exclude-description', 'Exclude "description" keys.')
 on('--split', 'Split output into files by method.')
-arg :input, 'path/to/doc.apib (API Blueprint) or path/to/doc.yaml (API Elements)'
+arg :input, 'path/to/doc.yaml (API Elements)'
 arg :output, 'path/to/doc.json or path/to/dir if --split is used.'
 
 def prune!(obj, unwanted_key)
@@ -28,36 +27,14 @@ def prune!(obj, unwanted_key)
   end
 end
 
-def guess_format(opt_format, input)
-  case opt_format && opt_format.downcase
-  when 'apib'
-    :apib
-  when 'yaml'
-    :yaml
-  when nil
-    case File.extname(input).downcase
-    when '.apib'
-      :apib
-    when '.yaml', '.yml'
-      :yaml
-    else
-      fail 'Unsupported input file extension!'
-    end
-  else
-    fail 'Unsupported input format!'
-  end
-end
-
 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
@@ -77,35 +54,19 @@ def write_split_json(actions, output)
 end
 
 def write_json(obj, path)
-  json = MultiJson.dump(obj, pretty: true)
+  json = JSON.pretty_generate(obj)
   File.open(path, 'w') do |file|
     file.write(json)
   end
 end
 
 main do |input, output|
-  format = guess_format(options['format'], input)
   version = choose_drafter(options['drafter'])
-  format_key = case format
-               when :apib
-                 if version == :drafter_3
-                   :apib_path
-                 elsif version == :crafter
-                   :crafter_apib_path
-                 else
-                   :drafter_4_apib_path
-                 end
-               when :yaml
-                 if version == :drafter_3
-                   :drafter_yaml_path
-                 elsif version == :crafter
-                   :crafter_yaml_path
-                 else
-                   :drafter_4_yaml_path
-                 end
-               else
-                 fail NotImplementedError
-               end
+  format_key = {
+                  crafter:   :crafter_yaml_path,
+                  drafter_4: :drafter_yaml_path
+               }[version]
+
   tomogram = Tomograph::Tomogram.new(format_key => input)
   actions = tomogram.to_a.map(&:to_hash)
 

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

@@ -6,13 +6,9 @@ module Tomograph
   module ApiBlueprint
     class Crafter
       class Yaml
-        def initialize(prefix, apib_path, drafter_yaml_path)
+        def initialize(prefix, 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
+          @documentation = YAML.safe_load(File.read(drafter_yaml_path))
         end
 
         def groups
@@ -29,7 +25,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 +97,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

@@ -37,8 +37,8 @@ module Tomograph
             end
             return {} unless schema_node
 
-            MultiJson.load(schema_node['content'])
-          rescue MultiJson::ParseError => e
+            JSON.parse(schema_node['content'])
+          rescue JSON::ParserError => e
             puts "[Tomograph] Error while parsing #{e}. skipping..."
             {}
           end
@@ -51,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

@@ -6,13 +6,9 @@ module Tomograph
   module ApiBlueprint
     class Drafter4
       class Yaml
-        def initialize(prefix, apib_path, drafter_yaml_path)
+        def initialize(prefix, 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
+          @documentation = YAML.safe_load(File.read(drafter_yaml_path))
         end
 
         def groups
@@ -101,15 +97,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

@@ -37,8 +37,8 @@ module Tomograph
             end
             return {} unless schema_node
 
-            MultiJson.load(schema_node['content'])
-          rescue MultiJson::ParseError => e
+            JSON.parse(schema_node['content'])
+          rescue JSON::ParserError => e
             puts "[Tomograph] Error while parsing #{e}. skipping..."
             {}
           end
@@ -51,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

@@ -5,7 +5,7 @@ module Tomograph
     class JsonSchema
       def initialize(prefix, json_schema_path)
         @prefix = prefix
-        @documentation = MultiJson.load(File.read(json_schema_path))
+        @documentation = JSON.parse(File.read(json_schema_path))
       end
 
       def to_tomogram
@@ -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 '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'
 
@@ -9,15 +8,13 @@ module Tomograph
   class Tomogram
     extend Gem::Deprecate
 
-    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)
+    def initialize(prefix: '', drafter_yaml_path: nil, tomogram_json_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)
+                       elsif crafter_yaml_path
+                         Tomograph::ApiBlueprint::Crafter::Yaml.new(prefix, crafter_yaml_path)
                        else
-                         Tomograph::ApiBlueprint::Drafter3::Yaml.new(prefix, apib_path, drafter_yaml_path)
+                         Tomograph::ApiBlueprint::Drafter4::Yaml.new(prefix, drafter_yaml_path)
                        end
       @prefix = prefix
     end
@@ -32,7 +29,7 @@ module Tomograph
     deprecate :to_hash, 'to_a with method access', 2018, 8
 
     def to_json
-      MultiJson.dump(to_a.map(&:to_hash), pretty: true)
+      JSON.pretty_generate(to_a.map(&:to_hash))
     end
 
     def find_request(method:, path:)

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.1'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/tomograph.gemspec

@@ -18,12 +18,11 @@ 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_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.1
+  version: 3.0.1
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -16,148 +16,114 @@ 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
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    - - ">="
-      - !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: 2.0.2
 - !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,6 +132,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -183,8 +150,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
@@ -206,15 +171,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
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Convert API Blueprint to Tomogram