fitting 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a58b7be52158cd26f8ae3fd7454cbc89512610
-  data.tar.gz: cb6bb15b054e2ec15e6262d16e3c697932d81640
+  metadata.gz: 9fe2c40a89499b32b2a4989a88cb8d294c420191
+  data.tar.gz: cd0deaa0b1fb6003bc6c58054def0843fa22e656
 SHA512:
-  metadata.gz: ffb5323b7ab335ad9f2ad966c7bfd2249b9388dcc9d434f35eff2f7626ba97ce3a5ac5f6bf386041840f7db397fe8c596ae52c95406e584120558865340a8742
-  data.tar.gz: 8db3c993339889701401ec962e0576f31ea746cbec06e3c5f326fe07487527cec79d36a20a7de0c5949418ebf2e2aaee5b9c269e03446a740530a0006535d51e
+  metadata.gz: 1e2e177b230a274a1e53d2eb525f6f59f89ffcdcc9ae4392183f0021ae727f3a4d48499dd870bf853ea49a21d7eeec00c9196f1659506348d14dae07287688e3
+  data.tar.gz: a4ae0ec1d99a3f6b9d9e9fd10bcdeaf592be1335ada092481dece76250da9caa5f4f3cf084d290f792bb16fa897fe361a0967c4c739f918fcedb53a4e8d3bac9

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+### 2.11.0 - 2019-09-09
+
+* features
+ * crafter_apib_path
+ * drafter_4_apib_path
+ * drafter_4_yaml_path
+
+* fixes
+  * crafter_yaml_path
+
 ### 2.10.0 - 2019-09-05
 
 * features

data/README.md

@@ -167,15 +167,27 @@ If your project uses several prefixes, for each one you need to create a separat
 
 ### apib_path
 
-Path to API Blueprint documentation. There must be an installed [drafter](https://github.com/apiaryio/drafter) to parse it.
+Path to API Blueprint v3 documentation. There must be an installed [drafter](https://github.com/apiaryio/drafter) to parse it.
 
 ### drafter_yaml_path
 
-Path to API Blueprint documentation pre-parsed with `drafter` and saved to a YAML file.
+Path to API Blueprint v3 documentation pre-parsed with `drafter` and saved to a YAML file.
+
+### drafter_4_apib_path
+
+Path to API Blueprint v4 documentation. There must be an installed [drafter](https://github.com/apiaryio/drafter) to parse it.
+
+### drafter_4_yaml_path
+
+Path to API Blueprint v4 documentation pre-parsed with `drafter` and saved to a YAML file.
+
+### crafter_apib_path
+
+Path to API Blueprint v4 documentation.
 
 ### crafter_yaml_path
 
-Path to API Blueprint documentation pre-parsed with `crafter` and saved to a YAML file.
+Path to API Blueprint v4 documentation pre-parsed with `crafter` and saved to a YAML file.
 
 ### tomogram_json_path
 

data/lib/fitting/configuration/legacy.rb

@@ -5,6 +5,10 @@ module Fitting
     class Legacy
       attr_accessor :apib_path,
                     :drafter_yaml_path,
+                    :crafter_apib_path,
+                    :crafter_yaml_path,
+                    :drafter_4_apib_path,
+                    :drafter_4_yaml_path,
                     :strict,
                     :prefix,
                     :white_list,
@@ -20,12 +24,18 @@ module Fitting
       end
 
       def tomogram
-        @tomogram ||= if @crafter_yaml_path
+        @tomogram ||= if @crafter_apib_path || @crafter_yaml_path
                         Tomograph::Tomogram.new(
                           prefix: @prefix,
-                          apib_path: @apib_path,
+                          crafter_apib_path: @crafter_apib_path,
                           crafter_yaml_path: @crafter_yaml_path
                         )
+                      elsif @drafter_4_apib_path || @drafter_4_yaml_path
+                        Tomograph::Tomogram.new(
+                          prefix: @prefix,
+                          drafter_4_apib_path: @drafter_4_apib_path,
+                          drafter_4_yaml_path: @drafter_4_yaml_path
+                        )
                       else Tomograph::Tomogram.new(
                         prefix: @prefix,
                         apib_path: @apib_path,

data/lib/fitting/configuration/yaml.rb

@@ -6,7 +6,10 @@ module Fitting
       attr_reader   :title
       attr_accessor :apib_path,
                     :drafter_yaml_path,
+                    :crafter_apib_path,
                     :crafter_yaml_path,
+                    :drafter_4_apib_path,
+                    :drafter_4_yaml_path,
                     :tomogram_json_path,
                     :strict,
                     :prefix,
@@ -19,7 +22,10 @@ module Fitting
       def initialize(yaml, title = 'fitting')
         @apib_path = yaml['apib_path']
         @drafter_yaml_path = yaml['drafter_yaml_path']
+        @crafter_apib_path = yaml['crafter_apib_path']
         @crafter_yaml_path = yaml['crafter_yaml_path']
+        @drafter_4_apib_path = yaml['drafter_4_apib_path']
+        @drafter_4_yaml_path = yaml['drafter_4_yaml_path']
         @tomogram_json_path = yaml['tomogram_json_path']
         @strict = yaml['strict']
         @prefix = yaml['prefix']
@@ -33,12 +39,17 @@ module Fitting
       end
 
       def tomogram
-        @tomogram ||= if @crafter_yaml_path
+        @tomogram ||= if @crafter_yaml_path || @crafter_apib_path
                         Tomograph::Tomogram.new(
                           prefix: @prefix,
-                          apib_path: @apib_path,
+                          crafter_apib_path: @crafter_apib_path,
                           crafter_yaml_path: @crafter_yaml_path,
-                          tomogram_json_path: @tomogram_json_path
+                        )
+                      elsif @drafter_4_apib_path || @drafter_4_yaml_path
+                        Tomograph::Tomogram.new(
+                          prefix: @prefix,
+                          drafter_4_apib_path: @drafter_4_apib_path,
+                          drafter_4_yaml_path: @drafter_4_yaml_path,
                         )
                       else
                         Tomograph::Tomogram.new(

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.10.0'.freeze
+  VERSION = '2.11.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema