tomograph 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd13ddea2ad89aa83a1fb6f63e3fb11f43c35695
-  data.tar.gz: e923b97d4fecf64944f852ac309bf6460163352d
+  metadata.gz: 0f6bd7ef6a03950f113a0492c08e4d9aa17f26eb
+  data.tar.gz: bd068832137f783a9d50b5d42b73824f7355f0a2
 SHA512:
-  metadata.gz: 6adeaa6ea548b8649854bbd23a0682d6721f93c6a63c0449fcc48b99bc14b6113cf822e60a10e41ab9a73ea9f1e745dbe288fedb7b095944f268d0ba98df2f0e
-  data.tar.gz: b1aa467325fd8798cfd8d04a10548e70da31ab79a0a7736052a40cfbebe2ea24f937087dc97ba163bf0ce3ba889de4bde39b2dcbd1cdeb0b54ae71ab4c075027
+  metadata.gz: 580304b7f2e90c5ed4f34e016549277025fef310ddb97deb758787e73376243da3e96fa58abd4d48adabcdb4751c4facaf47c02ccc2d97f5050ca2718fd6dd9a
+  data.tar.gz: fef696a261c995d5fa8c44cc8b553742271a99486738a8a70bca989f3b95341cf4b4f71fe3ed81ebe16dfb6d90f01eacba7b3fe7d840391729cfc7b6575646fc

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+### 2.1.0 - 2018-03-16
+
+* features
+  * add content-type for requests and responses
+  * add find_request_with_content_type
+
 ### 2.0.1 - 2018-03-02
 
 * bug fixes

data/README.md

@@ -1,4 +1,11 @@
-# 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>
+
+[![Gem Version](https://badge.fury.io/rb/tomograph.svg)](https://badge.fury.io/rb/tomograph)
+[![Build Status](https://travis-ci.org/funbox/tomograph.svg?branch=master)](https://travis-ci.org/funbox/tomograph)
 
 Convert API Blueprint to JSON Schema and search.
 
@@ -82,6 +89,7 @@ Example output:
   {
     "path": "/sessions",
     "method": "POST",
+    "content-type": "application/json",
     "request": {
       "$schema": "http://json-schema.org/draft-04/schema#",
       "type": "object",
@@ -104,14 +112,17 @@ Example output:
     "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",
@@ -157,6 +168,12 @@ Example output:
 request = tomogram.find_request(method: 'GET', path: '/status/1?qwe=rty')
 ```
 
+### find_request
+
+```ruby
+request = tomogram.find_request_with_content_type(method: 'GET', path: '/status/1?qwe=rty', content_type: 'application/json')
+```
+
 ### find_responses
 
 

data/lib/tomograph/api_blueprint/yaml.rb

@@ -97,6 +97,7 @@ 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,
           resource: related_actions.first.resource

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

@@ -16,6 +16,11 @@ module Tomograph
           @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
 
@@ -44,7 +49,9 @@ module Tomograph
           @responses = @responses.map do |response|
             {
               'status' => response['attributes']['statusCode'],
-              'body' => json_schema(response['content'])
+              'body' => json_schema(response['content']),
+              'content-type' => response['attributes'].has_key?('headers') ?
+                response['attributes']['headers']['content'][0]['content']['value']['content'] : nil
             }
           end
         end

data/lib/tomograph/tomogram.rb

@@ -25,6 +25,14 @@ module Tomograph
       end
     end
 
+    def find_request_with_content_type(method:, path:, content_type:)
+      path = Tomograph::Path.new(path).to_s
+
+      @documentation.to_tomogram.find do |action|
+        action.method == method && action.path.match(path) && action.content_type == content_type
+      end
+    end
+
     def to_resources
       @documentation.to_resources
     end

data/lib/tomograph/tomogram/action.rb

@@ -3,11 +3,12 @@ require 'tomograph/path'
 module Tomograph
   class Tomogram
     class Action
-      attr_reader :path, :method, :request, :responses
+      attr_reader :path, :method, :content_type, :request, :responses
 
-      def initialize(path:, method:, request:, responses:, resource:)
+      def initialize(path:, method:, content_type:, request:, responses:, resource:)
         @path ||= Tomograph::Path.new(path)
         @method ||= method
+        @content_type ||= content_type
         @request ||= request
         @responses ||= responses
         @resource ||= resource
@@ -23,6 +24,7 @@ module Tomograph
         @action ||= {
           'path' => path,
           'method' => method,
+          'content-type': content_type,
           'request' => request,
           'responses' => responses
         }

data/lib/tomograph/version.rb

@@ -1,3 +1,3 @@
 module Tomograph
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomograph
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -147,6 +147,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Convert API Blueprint to JSON Schema and search