fitting 2.8.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2cacd061443e2b01a8632268f720ded08dffce1
-  data.tar.gz: 1d0237514578651a2376ae63b47b8ca6433a3a9c
+  metadata.gz: 9fe2c40a89499b32b2a4989a88cb8d294c420191
+  data.tar.gz: cd0deaa0b1fb6003bc6c58054def0843fa22e656
 SHA512:
-  metadata.gz: a23cd2b021cfc20b7fa23a02cc97446e27a99714bb0069cfd4b08303a2011daca9e59fab7f38cc98476fd7b447df8389d9247806e451b2277d7f6a8dd6d0208f
-  data.tar.gz: d10e832b45a744eabf84cdbdbe0f213bd901f80bce104e6639d391d83d1123df4f95426a64cda0c28706210eac6c6e2100d031696413c6bbc23fcd536202cb94
+  metadata.gz: 1e2e177b230a274a1e53d2eb525f6f59f89ffcdcc9ae4392183f0021ae727f3a4d48499dd870bf853ea49a21d7eeec00c9196f1659506348d14dae07287688e3
+  data.tar.gz: a4ae0ec1d99a3f6b9d9e9fd10bcdeaf592be1335ada092481dece76250da9caa5f4f3cf084d290f792bb16fa897fe361a0967c4c739f918fcedb53a4e8d3bac9

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .idea/
 .byebug_history
+.tool-versions

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # 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
+  * add crafter_yaml_path
+
+### 2.9.1 - 2019-07-15
+
+* fixes
+  * Improve gemspec
+  * Delete experimental code with haml
+
+### 2.9.0 - 2019-07-15
+
+* features
+  * Delete old spec json
+* fixes
+  * Improve gemspec
+
+### 2.8.1 - 2018-12-18
+
+* features
+  * Add support for [parallel_tests](https://github.com/grosser/parallel_tests)
+
 ### 2.8.0 - 2018-10-13
 
 * features

data/README.md

@@ -42,7 +42,7 @@ require 'fitting'
 Fitting.save_test_data
 ```
 
-The tests.json file will be created
+The files will be created in ./fitting_tests/ path
 
 Example:
 
@@ -141,9 +141,9 @@ API responses with validation errors or untested: 9 (36.00% of 25).
 For details `rake fitting:documentation_responses_error[s]`
 
 ```
-request metohd: GET
+request method: GET
 request path: /api/v1/book
-response staus: 200
+response status: 200
 source json-schema: {"$schema"=>"http://json-schema.org/draft-04/schema#", "type"=>"object", ...}
 combination: ["required", "pages"]
 new json-schema: {"$schema"=>"http://json-schema.org/draft-04/schema#", "type"=>"object", ...}
@@ -167,11 +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 v4 documentation pre-parsed with `crafter` and saved to a YAML file.
 
 ### tomogram_json_path
 

data/fitting.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'haml'
   spec.add_runtime_dependency 'json-schema', '~> 2.6', '>= 2.6.2'
-  spec.add_runtime_dependency 'multi_json'
+  spec.add_runtime_dependency 'multi_json', '~> 1.11'
   spec.add_runtime_dependency 'tomograph', '~> 2.0', '>= 2.2.0'
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'

data/lib/fitting.rb

@@ -32,6 +32,8 @@ module Fitting
     def save_test_data
       responses = Fitting::Storage::Responses.new
 
+      FileUtils.rm_r Dir.glob("fitting_tests/*"), :force => true
+
       RSpec.configure do |config|
         config.after(:each, type: :controller) do
           responses.add(response, inspect)

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,11 +24,24 @@ module Fitting
       end
 
       def tomogram
-        @tomogram ||= Tomograph::Tomogram.new(
-          prefix: @prefix,
-          apib_path: @apib_path,
-          drafter_yaml_path: @drafter_yaml_path
-        )
+        @tomogram ||= if @crafter_apib_path || @crafter_yaml_path
+                        Tomograph::Tomogram.new(
+                          prefix: @prefix,
+                          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,
+                        drafter_yaml_path: @drafter_yaml_path
+                      )
+                      end
       end
 
       def title

data/lib/fitting/configuration/yaml.rb

@@ -6,6 +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,
@@ -18,6 +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']
@@ -31,12 +39,26 @@ module Fitting
       end
 
       def tomogram
-        @tomogram ||= Tomograph::Tomogram.new(
-          prefix: @prefix,
-          apib_path: @apib_path,
-          drafter_yaml_path: @drafter_yaml_path,
-          tomogram_json_path: @tomogram_json_path
-        )
+        @tomogram ||= if @crafter_yaml_path || @crafter_apib_path
+                        Tomograph::Tomogram.new(
+                          prefix: @prefix,
+                          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,
+                          drafter_yaml_path: @drafter_yaml_path,
+                          tomogram_json_path: @tomogram_json_path
+                        )
+                      end
       end
 
       def stats_path

data/lib/fitting/records/spherical/requests.rb

@@ -8,7 +8,10 @@ module Fitting
         def to_a
           return @to_a if @to_a
 
-          array = JSON.load(File.read('tests.json'))
+          array = []
+          Dir['fitting_tests/*.json'].each do |file|
+            array += JSON.load(File.read(file))
+          end
           @to_a = array.inject([]) do |res, tested_request|
             res.push(Fitting::Records::Spherical::Request.load(tested_request))
           end

data/lib/fitting/statistics/cover_error.rb

@@ -13,8 +13,8 @@ module Fitting
             response.json_schemas.map do |json_schema|
               json_schema.combinations.map do |combination|
                 next unless combination.valid_bodies == []
-                res += "request metohd: #{request.method}\nrequest path: #{request.path}\n"\
-                        "response staus: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
+                res += "request method: #{request.method}\nrequest path: #{request.path}\n"\
+                        "response status: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
                        "combination: #{combination.description}\nnew json-schema: #{combination.json_schema}\n\n"
               end
             end

data/lib/fitting/statistics/cover_error_enum.rb

@@ -13,8 +13,8 @@ module Fitting
             response.json_schemas.map do |json_schema|
               json_schema.combinations_with_enum.map do |combination|
                 next unless combination.valid_bodies == []
-                res += "request metohd: #{request.method}\nrequest path: #{request.path}\n"\
-                        "response staus: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
+                res += "request method: #{request.method}\nrequest path: #{request.path}\n"\
+                        "response status: #{response.status}\nsource json-schema: #{json_schema.json_schema}\n"\
                        "combination: #{combination.description}\nnew json-schema: #{combination.json_schema}\n\n"
               end
             end

data/lib/fitting/tests.rb

@@ -7,12 +7,14 @@ module Fitting
     end
 
     def save
+      make_dir('fitting_tests')
       array = @tested_requests.inject([]) do |res, request|
         next res unless request.path.to_s.start_with?(Fitting.configuration.prefix)
         res.push(request.to_spherical.to_hash)
       end
       json = JSON.dump(array)
-      File.open('tests.json', 'w') { |file| file.write(json) }
+
+      File.open("fitting_tests/test#{ENV["TEST_ENV_NUMBER"]}.json", 'w') { |file| file.write(json) }
     end
 
     def make_dir(dir_name)

data/lib/fitting/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.11.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -48,16 +34,16 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: tomograph
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +196,6 @@ files:
 - lib/fitting/configuration.rb
 - lib/fitting/configuration/legacy.rb
 - lib/fitting/configuration/yaml.rb
-- lib/fitting/cover.rb
 - lib/fitting/cover/json_schema.rb
 - lib/fitting/cover/json_schema_enum.rb
 - lib/fitting/cover/response.rb

data/lib/fitting/cover.rb

@@ -1,66 +0,0 @@
-require 'fitting/cover/response'
-require 'haml'
-require 'json'
-
-module Fitting
-  class Cover
-    def initialize(all_responses, coverage)
-      @all_responses = all_responses
-      @coverage = coverage
-      @list = {}
-    end
-
-    def to_hash
-      return @list unless @list == {}
-      @all_responses.each_with_object({}) do |response, res|
-        next res unless response.documented?
-        if res.key?(response.route)
-          res[response.route].update(response)
-        else
-          res[response.route] = Fitting::Cover::Response.new(response)
-        end
-      end.map do |key, value|
-        @list[key] = value.to_hash
-      end
-      @list
-    end
-
-    def template
-      return @template if @template
-      @template = {}
-      to_hash.each do |key, value|
-        @template[key] = value
-        @template[key]['cover'] = 100.0
-        if value['flags'] == []
-          @template[key]['type'] = 'passed'
-        else
-          flag_true = value['flags'].find_all { |flag| flag == true }
-          flag_false = value['flags'].find_all { |flag| flag == false }
-          if flag_false.empty?
-            @template[key]['type'] = 'passed'
-          else
-            @template[key]['cover'] = if flag_true.empty?
-                                        0.0
-                                      else
-                                        flag_false.size / flag_true.size
-                                      end
-            @template[key]['type'] = 'failed'
-          end
-        end
-        @template[key]['json_schema'] = JSON.pretty_generate(value['json_schemas'].last)
-      end
-      @template
-    end
-
-    def save
-      to_hash
-      contents = File.read(File.expand_path('../view/report.html.haml', __FILE__))
-      html = "<style>\n#{File.read(File.expand_path('../view/style.css', __FILE__))}\n</style>\n"
-      html += Haml::Engine.new(contents).render(
-        Object.new,
-        :@to_hash => template
-      )
-      html
-    end
-  end
-end