fitting 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1476cb8037cf4a811b6549cb7102fe10529283
-  data.tar.gz: 3a4509e0a71fd394b8f2343adf744cd1b8664bfd
+  metadata.gz: 873df0636bcad7162066d90caaeaebef52eb1ef6
+  data.tar.gz: 3ec118c489b012fdcc62c6f3ff4600a5efe6131a
 SHA512:
-  metadata.gz: 141563085307095ecbffeca16a61988896637f1ba0234edfa847a899df8d4b3bcd42f7c92366812a1f85c653af1e82b4facaca94ecb0c5de8cf47c228d13e1e4
-  data.tar.gz: 89b0e98392d5787cdcd905db15e08ec6ee78f99e0cb46c9f35cad4ee8b8b1950da358ce80430e95aa5d75c9e00ef196575611c0f6fb173f6211f55d0ee348eda
+  metadata.gz: 7072803275b24d10a44a58762f5c884c06310339da331c41514b24ccb40417681d3f51fc532196cdfa9aa27a08f70d4a4281a3dd254729c2b6c58f3878ed9f94
+  data.tar.gz: cdd978371460f13dde294c13eae7b2c8ed049d1faaecbc236e4504abd56107ddc9868f9c2fb189e11b34f672cd633ddd0642df111687537c891ce032a5417cd2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 2.5.0 - 2018-07-05
+
+* features
+  * Add Tomograph JSON support
+
 ### 2.4.1 - 2018-03-16
 
 * fixes

data/README.md

@@ -1,7 +1,7 @@
 # Fitting
 
 <a href="https://funbox.ru">
-  <img src="https://funbox.ru/badges/sponsored_by_funbox.svg" alt="Sponsored by FunBox" width=250 />
+  <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/fitting.svg)](https://badge.fury.io/rb/fitting)
@@ -108,7 +108,7 @@ expect(response).to match_schema
 
 ### strictly_match_schema
 
-Makes a strict validation against JSON Schema. All properties are condisidered to have `"required": true` and all objects `"additionalProperties": false`.
+Makes a strict validation against JSON Schema. All properties are considered to have `"required": true` and all objects `"additionalProperties": false`.
 
 ```ruby
 expect(response).to strictly_match_schema
@@ -214,7 +214,7 @@ ignore_list:
   - %r{/api/v1/comments}
 ```
 
-It's work only for match_schema (NOT FOR strictly_match_schema)
+It works only for match_schema (NOT FOR strictly_match_schema)
 
 ## Contributing
 

data/fitting.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json-schema', '~> 2.6', '>= 2.6.2'
   spec.add_runtime_dependency 'multi_json'
-  spec.add_runtime_dependency 'tomograph', '~> 2.0', '>= 2.0.0'
+  spec.add_runtime_dependency 'tomograph', '~> 2.0', '>= 2.2.0'
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'

data/lib/fitting/configuration/yaml.rb

@@ -6,6 +6,7 @@ module Fitting
       attr_reader   :title
       attr_accessor :apib_path,
                     :drafter_yaml_path,
+                    :tomogram_json_path,
                     :strict,
                     :prefix,
                     :white_list,
@@ -17,6 +18,7 @@ module Fitting
       def initialize(yaml, title = 'fitting')
         @apib_path = yaml['apib_path']
         @drafter_yaml_path = yaml['drafter_yaml_path']
+        @tomogram_json_path = yaml['tomogram_json_path']
         @strict = yaml['strict']
         @prefix = yaml['prefix']
         @white_list = yaml['white_list']
@@ -32,7 +34,8 @@ module Fitting
         @tomogram ||= Tomograph::Tomogram.new(
           prefix: @prefix,
           apib_path: @apib_path,
-          drafter_yaml_path: @drafter_yaml_path
+          drafter_yaml_path: @drafter_yaml_path,
+          tomogram_json_path: @tomogram_json_path
         )
       end
 

data/lib/fitting/records/documented/request.rb

@@ -8,15 +8,11 @@ module Fitting
         end
 
         def method
-          @method ||= @tomogram_request['method']
+          @method ||= @tomogram_request.method
         end
 
         def path
-          @path ||= @tomogram_request['path']
-        end
-
-        def json_schema
-          @json_schema ||= @tomogram_request['json_schema']
+          @path ||= @tomogram_request.path
         end
 
         def responses
@@ -43,7 +39,7 @@ module Fitting
         end
 
         def groups
-          @groups ||= @tomogram_request['responses'].group_by do |tomogram_response|
+          @groups ||= @tomogram_request.responses.group_by do |tomogram_response|
             tomogram_response['status']
           end
         end

data/lib/fitting/statistics/template.rb

@@ -73,7 +73,7 @@ module Fitting
       end
 
       def documented
-        @documented_requests ||= @config.tomogram.to_hash.inject([]) do |res, tomogram_request|
+        @documented_requests ||= @config.tomogram.to_a.inject([]) do |res, tomogram_request|
           res.push(Fitting::Records::Documented::Request.new(tomogram_request, white_list.to_a))
         end
       end

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -53,7 +53,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement