fitting 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adba51bf994a83f976b645f80537581c51da7fd2
-  data.tar.gz: 56df90a70b7dc86516d58706b945f35556e0c771
+  metadata.gz: a085daed12d7e3b16bdeb141928c50db861ff4ba
+  data.tar.gz: 73cf6002cb3b3b55a83c6c723a329f90c7a4f164
 SHA512:
-  metadata.gz: 4beb00e43f17d6cd07a9eb0e14a62e7c384773f9285e12f44cd5dfa6c7342cfbfe2fcba1af8deab170b33d2837c6356710fe233b22ec5cb42d665537878d8f45
-  data.tar.gz: 2be9f6e2ffb542e0b0391266ad8281ed435dd805027358b443ea875dfd807f1fc971fe28550fb4607740f9d9b887d282516ced737dd4735b64dbec2d61613d55
+  metadata.gz: 66b61927387c25a314c800dc5d385f34ed0a89c5bf754532674e64f092a3100e9476d539be357883b1e71b1094715fda3245bf4b6a4d6a0828380f5ba73e0b5a
+  data.tar.gz: d5ad8dd2673d588d9f0d2b32b0a2cac492a62787d6ddc600f14731d8fc24096ca8fa42376ce23e1ff4a0f4777af9b8f0d7d929bbc9927b4fb1dcdae929bced97

data/.rubocop.yml

@@ -9,3 +9,12 @@ Style/Documentation:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Style/CaseEquality:
+  Enabled: false
+
+Style/NilComparison:
+  Enabled: false

data/CHANGELOG.md

@@ -3,9 +3,14 @@
 ### 2.0.2 - 2017-05-02
 
 * bug fixes
-  * Validate html response
+  * validate html response
 
 ### 2.0.3 - 2017-05-02
 
 * bug fixes
-  * Skip expect if prefix not match
+  * skip expect if prefix not match
+
+### 2.1.0 - 2017-06-19
+
+* features
+  * add resource_white_list config

data/README.md

@@ -131,7 +131,7 @@ Prefix of API requests. Example: `'/api'`. Validation will not be performed if t
 
 ### white_list
 
-Default: all resources. This is an array of resources that are mandatory for implementation.
+Default: all paths. This is an array of paths that are mandatory for implementation.
 This list does not affect the work of the matcher.
 This list is only for the report in the console.
 
@@ -146,6 +146,22 @@ config.white_list = {
 
 Empty array `[]` means all methods.
 
+### resource_white_list
+
+Default: all resources. This is an array of resources that are mandatory for implementation.
+This list does not affect the work of the matcher.
+This list is only for the report in the console.
+
+```ruby
+config.resource_white_list = {
+  '/users' =>                ['DELETE /users/{id}', 'POST /users', 'GET /users/{id}', 'PATCH /users/{id}'],
+  '/users/{id}/employees' => ['GET /users/{id}/employees'],
+  '/sessions' =>             []
+}
+```
+
+Empty array `[]` means all methods.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/funbox/fitting. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/fitting.gemspec

@@ -21,7 +21,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', '~> 1.0', '>= 1.0.0'
+  spec.add_runtime_dependency 'tomograph', '~> 1.1', '>= 1.1.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.rb

@@ -4,7 +4,8 @@ module Fitting
                   :drafter_yaml_path,
                   :strict,
                   :prefix,
-                  :white_list
+                  :white_list,
+                  :resource_white_list
 
     def initialize
       @strict = false

data/lib/fitting/documentation.rb

@@ -10,8 +10,7 @@ module Fitting
     def black
       if @white_list
         all.select do |response|
-          data = response.split(' ')
-          data[1] && !@white_list[data[1]] || (@white_list[data[1]] != [] && !@white_list[data[1]].include?(data[0]))
+          black?(response)
         end
       else
         []
@@ -21,8 +20,7 @@ module Fitting
     def white
       if @white_list
         all.select do |response|
-          data = response.split(' ')
-          data[1] && @white_list[data[1]] && (@white_list[data[1]] == [] || @white_list[data[1]].include?(data[0]))
+          white?(response)
         end
       else
         all
@@ -30,19 +28,31 @@ module Fitting
     end
 
     def all
-      @all ||= @tomogram.to_hash.inject([]) do |routes, request|
-        request['responses'].inject({}) do |responses, response|
-          responses[response['status']] ||= 0
-          responses[response['status']] += 1
-          responses
-        end.map do |status, indexes|
+      @all ||= @tomogram.to_hash.each_with_object([]) do |request, routes|
+        responses(request).map do |status, indexes|
           indexes.times do |index|
             route = "#{request['method']}\t#{request['path']} #{status} #{index}"
             routes.push(route)
           end
         end
-        routes
       end.uniq
     end
+
+    def responses(request)
+      request['responses'].each_with_object({}) do |response, responses|
+        responses[response['status']] ||= 0
+        responses[response['status']] += 1
+      end
+    end
+
+    def black?(response)
+      data = response.split(' ')
+      data[1] && !@white_list[data[1]] || (@white_list[data[1]] != [] && !@white_list[data[1]].include?(data[0]))
+    end
+
+    def white?(response)
+      data = response.split(' ')
+      data[1] && @white_list[data[1]] && (@white_list[data[1]] == [] || @white_list[data[1]].include?(data[0]))
+    end
   end
 end

data/lib/fitting/matchers/response_matcher.rb

@@ -27,12 +27,12 @@ module Fitting
                  "got: #{@response.real_request_with_status}"
         end
 
-        unless @response.fully_validates.valid?
-          "response does not conform to json-schema\n"\
+        return nil if @response.fully_validates.valid?
+
+        "response does not conform to json-schema\n"\
           "schemas: \n#{@response.expected}\n\n"\
           "got: #{@response.got}\n\n"\
           "errors: \n#{@response.fully_validates}\n"
-        end
       end
     end
 
@@ -55,12 +55,12 @@ module Fitting
                  "got: #{@response.real_request_with_status}"
         end
 
-        unless @response.strict_fully_validates.valid?
-          "response does not conform to json-schema\n"\
+        return nil if @response.strict_fully_validates.valid?
+
+        "response does not conform to json-schema\n"\
           "schemas: \n#{@response.expected}\n\n"\
           "got: #{@response.got}\n\n"\
           "errors: \n#{@response.strict_fully_validates}\n"
-        end
       end
     end
 

data/lib/fitting/request.rb

@@ -19,10 +19,10 @@ module Fitting
     end
 
     def schemas_of_possible_responses(status:)
-      if @schema
-        @schema.find_responses(status: status).map do |response|
-          response['body']
-        end
+      return nil unless @schema
+
+      @schema.find_responses(status: status).map do |response|
+        response['body']
       end
     end
 

data/lib/fitting/response.rb

@@ -46,7 +46,7 @@ module Fitting
 
     def expected
       @expected ||= @schemas.inject([]) do |res, schema|
-        res.push("#{JSON.pretty_generate(schema)}")
+        res.push(JSON.pretty_generate(schema).to_s)
       end.join("\n\n")
     end
 
@@ -54,17 +54,13 @@ module Fitting
 
     def index
       @schemas.size.times do |i|
-        if fully_validates[i] == []
-          return i
-        end
+        return i if fully_validates[i] == []
       end
     end
 
     def strict_index
       @schemas.size.times do |i|
-        if strict_fully_validates[i] == []
-          return i
-        end
+        return i if strict_fully_validates[i] == []
       end
     end
   end

data/lib/fitting/response/fully_validates.rb

@@ -22,12 +22,12 @@ module Fitting
         @to_s ||= join("\n\n")
       end
 
-      private
-
-      def self.fully_validate(schema, body, strict)
-        JSON::Validator.fully_validate(schema, body, :strict => strict)
-      rescue JSON::Schema::UriError
-        []
+      class << self
+        def fully_validate(schema, body, strict)
+          JSON::Validator.fully_validate(schema, body, strict: strict)
+        rescue JSON::Schema::UriError
+          []
+        end
       end
     end
   end

data/lib/fitting/route.rb

@@ -10,14 +10,15 @@ module Fitting
       @responses = Fitting::Route::Responses.new(routes, @coverage)
     end
 
-    def statistics
-      [@requests.statistics, @responses.statistics].join("\n\n")
-    end
-
     def statistics_with_conformity_lists
-      return "All responses are 100% valid! Great job!\n" if @coverage.not_coverage.empty?
+      congratulation = 'All responses are 100% valid! Great job!' if @coverage.not_coverage.empty?
 
-      [@requests.conformity_lists, statistics].join("\n\n")
+      [
+        @requests.conformity_lists,
+        @requests.statistics,
+        @responses.statistics,
+        congratulation
+      ].compact.join("\n\n")
     end
 
     def errors

data/lib/fitting/route/requests.rb

@@ -1,147 +1,24 @@
 require 'multi_json'
+require 'fitting/route/requests/statistics'
+require 'fitting/route/requests/lists'
+require 'fitting/route/requests/coverage'
+require 'fitting/route/requests/combine'
 
 module Fitting
   class Route
     class Requests
       def initialize(coverage)
-        @coverage = coverage
-      end
-
-      def coverage_statistic
-        stat = {}
-        @coverage.coverage.map do |route|
-          macro_key = route.split(' ')[0..1].join(' ')
-          micro_key = route.split(' ')[2..3].join(' ')
-          stat[macro_key] ||= {}
-          stat[macro_key]['cover'] ||= []
-          stat[macro_key]['not_cover'] ||= []
-          stat[macro_key]['cover'].push(micro_key)
-          stat[macro_key]['all'] ||= []
-          stat[macro_key]['all'].push("✔ #{route.split(' ')[2..3].join(' ')}")
-        end
-        @coverage.not_coverage.map do |route|
-          macro_key = route.split(' ')[0..1].join(' ')
-          micro_key = route.split(' ')[2..3].join(' ')
-          stat[macro_key] ||= {}
-          stat[macro_key]['cover'] ||= []
-          stat[macro_key]['not_cover'] ||= []
-          stat[macro_key]['not_cover'].push(micro_key)
-          stat[macro_key]['all'] ||= []
-          stat[macro_key]['all'].push("✖ #{route.split(' ')[2..3].join(' ')}")
-        end
-        @stat = stat.inject(
-          {
-            'full cover' => [],
-            'partial cover' => [],
-            'no cover' => []
-          }
-        ) do |res, date|
-          ratio = date.last['cover_ratio'] =
-            (date.last['cover'].size.to_f /
-              (date.last['cover'].size + date.last['not_cover'].size).to_f * 100.0).round(2)
-          info = {date.first => {
-            'cover' => date.last['cover'],
-            'not_cover' => date.last['not_cover'],
-            'all' => "#{beautiful_output(date.last)}"
-          }}
-          if ratio == 100.0
-            res['full cover'].push(info)
-          elsif ratio == 0.0
-            res['no cover'].push(info)
-          else
-            res['partial cover'].push(info)
-          end
-          path = date.first.split(' ')[1].size / 8
-          @max ||= 1
-          if path.size > @max
-            @max = path.size
-          end
-          res
-        end
-      end
-
-      def to_hash
-        @stat ||= coverage_statistic
-      end
-
-      def fully_implemented
-        @stat ||= coverage_statistic
-        @fully_implemented ||= @stat['full cover'].map do |response|
-          "#{response.first.to_a.first.split(' ').join("\t")}#{"\t"*(@max-response.first.to_a.first.split(' ')[1].size/8)}#{response.first.to_a.last['all']}"
-        end.sort do |first, second|
-          first.split("\t")[1] <=> second.split("\t")[1]
-        end
-      end
-
-      def partially_implemented
-        @stat ||= coverage_statistic
-        @partially_implemented ||= @stat['partial cover'].map do |response|
-          "#{response.first.to_a.first.split(' ').join("\t")}#{"\t"*(@max-response.first.to_a.first.split(' ')[1].size/8)}#{response.first.to_a.last['all']}"
-        end.sort do |first, second|
-          first.split("\t")[1] <=> second.split("\t")[1]
-        end
-      end
-
-      def no_implemented
-        @stat ||= coverage_statistic
-        @no_implemented ||= @stat['no cover'].map do |response|
-          "#{response.first.to_a.first.split(' ').join("\t")}#{"\t"*(@max-response.first.to_a.first.split(' ')[1].size/8)}#{response.first.to_a.last['all']}"
-        end.sort do |first, second|
-          first.split("\t")[1] <=> second.split("\t")[1]
-        end
-      end
-
-      def statistics
-        @stat ||= coverage_statistic
-        full_count = @stat.to_hash['full cover'].size
-        part_count = @stat.to_hash['partial cover'].size
-        no_count = @stat.to_hash['no cover'].size
-        total_count = full_count + part_count + no_count
-        full_percentage = (full_count.to_f / total_count.to_f * 100.0).round(2)
-        part_percentage = (part_count.to_f / total_count.to_f * 100.0).round(2)
-        no_percentage = (no_count.to_f / total_count.to_f * 100.0).round(2)
-
-        [
-          "API requests with fully implemented responses: #{full_count} (#{full_percentage}% of #{total_count}).",
-          "API requests with partially implemented responses: #{part_count} (#{part_percentage}% of #{total_count}).",
-          "API requests with no implemented responses: #{no_count} (#{no_percentage}% of #{total_count})."
-        ].join("\n")
+        @combine = Fitting::Route::Requests::Combine.new(Fitting::Route::Requests::Coverage.new(coverage))
+        @lists = Fitting::Route::Requests::Lists.new(@combine)
+        @statistics = Fitting::Route::Requests::Statistics.new(@combine)
       end
 
       def conformity_lists
-        @stat ||= coverage_statistic
-        fully_implemented ||= self.fully_implemented.join("\n")
-        partially_implemented ||= self.partially_implemented.join("\n")
-        no_implemented ||= self.no_implemented.join("\n")
-
-        [
-          ['Fully conforming requests:', fully_implemented].join("\n"),
-          ['Partially conforming requests:', partially_implemented].join("\n"),
-          ['Non-conforming requests:', no_implemented].join("\n")
-        ].join("\n\n")
+        @lists.to_s
       end
 
-      private
-
-      def beautiful_output(hash)
-        methods = {}
-        res = []
-        hash['cover'].map do |response|
-          method, index = response.split(' ')
-          methods[method] ||= []
-          methods[method][index.to_i] = {'method' => method, 'cover' => true}
-        end
-        hash['not_cover'].map do |response|
-          method, index = response.split(' ')
-          methods[method] ||= []
-          methods[method][index.to_i] = {'method' => method, 'cover' => false}
-        end
-        methods.map do |method|
-          method.last.size.times do |index|
-            res.push("#{method.last[index]['cover'] ? '✔' : '✖'} #{method.first}")
-          end
-        end
-        res.join(' ')
+      def statistics
+        @statistics.to_s
       end
     end
   end

data/lib/fitting/route/requests/combine.rb

@@ -0,0 +1,113 @@
+module Fitting
+  class Route
+    class Requests
+      class Combine
+        def initialize(stat)
+          @stat = stat
+          @full_cover = []
+          @partial_cover = []
+          @no_cover = []
+        end
+
+        def to_hash
+          stat_each
+          @to_hash ||= {
+            'full cover' => @full_cover,
+            'partial cover' => @partial_cover,
+            'no cover' => @no_cover
+          }
+        end
+
+        def max
+          stat_each
+          @max
+        end
+
+        def full_cover
+          stat_each
+          @full_cover
+        end
+
+        def partial_cover
+          stat_each
+          @partial_cover
+        end
+
+        def no_cover
+          stat_each
+          @no_cover
+        end
+
+        private
+
+        def stat_each
+          @stat_each ||= @stat.to_hash.map do |date|
+            date.last['cover_ratio'] = ratio(date)
+            res_cover(ratio(date), info(date))
+            path = date.first.split(' ')[1].size / 8
+            find_max(path)
+          end
+        end
+
+        def find_max(path)
+          @max ||= 1
+          @max = path.size if path.size > @max
+        end
+
+        def res_cover(ratio, info)
+          if ratio == 100.0
+            @full_cover.push(info)
+          elsif ratio == 0.0
+            @no_cover.push(info)
+          else
+            @partial_cover.push(info)
+          end
+        end
+
+        def ratio(date)
+          (date.last['cover'].size.to_f /
+            (date.last['cover'].size + date.last['not_cover'].size).to_f * 100.0).round(2)
+        end
+
+        def info(date)
+          { date.first => {
+            'cover' => date.last['cover'],
+            'not_cover' => date.last['not_cover'],
+            'all' => beautiful_output(date.last).to_s
+          } }
+        end
+
+        def beautiful_output(hash)
+          methods = {}
+          res = []
+          methods = beautiful_cover(hash, methods)
+          methods = beautiful_not_cover(hash, methods)
+          methods.map do |method|
+            method.last.size.times do |index|
+              res.push("#{method.last[index]['cover'] ? '✔' : '✖'} #{method.first}")
+            end
+          end
+          res.join(' ')
+        end
+
+        def beautiful_cover(hash, methods)
+          hash['cover'].map do |response|
+            method, index = response.split(' ')
+            methods[method] ||= []
+            methods[method][index.to_i] = { 'method' => method, 'cover' => true }
+          end
+          methods
+        end
+
+        def beautiful_not_cover(hash, methods)
+          hash['not_cover'].map do |response|
+            method, index = response.split(' ')
+            methods[method] ||= []
+            methods[method][index.to_i] = { 'method' => method, 'cover' => false }
+          end
+          methods
+        end
+      end
+    end
+  end
+end

data/lib/fitting/route/requests/coverage.rb

@@ -0,0 +1,58 @@
+module Fitting
+  class Route
+    class Requests
+      class Coverage
+        def initialize(coverage)
+          @coverage = coverage
+        end
+
+        def to_hash
+          stat = {}
+          @coverage.coverage.map do |route|
+            stat = coverage_stat(stat, route, '✔')
+          end
+          @coverage.not_coverage.map do |route|
+            stat = not_coverage_stat(stat, route, '✖')
+          end
+          stat
+        end
+
+        private
+
+        def coverage_stat(stat, route, symbol)
+          macro_key = macro_key(route)
+          micro_key = micro_key(route)
+          stat = default_stat(stat, macro_key)
+          stat[macro_key]['cover'].push(micro_key)
+          stat[macro_key]['all'].push("#{symbol} #{route.split(' ')[2..3].join(' ')}")
+          stat
+        end
+
+        def not_coverage_stat(stat, route, symbol)
+          macro_key = macro_key(route)
+          micro_key = micro_key(route)
+          stat = default_stat(stat, macro_key)
+          stat[macro_key]['not_cover'].push(micro_key)
+          stat[macro_key]['all'].push("#{symbol} #{route.split(' ')[2..3].join(' ')}")
+          stat
+        end
+
+        def default_stat(stat, macro_key)
+          stat[macro_key] ||= {}
+          stat[macro_key]['cover'] ||= []
+          stat[macro_key]['not_cover'] ||= []
+          stat[macro_key]['all'] ||= []
+          stat
+        end
+
+        def macro_key(route)
+          route.split(' ')[0..1].join(' ')
+        end
+
+        def micro_key(route)
+          route.split(' ')[2..3].join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/fitting/route/requests/lists.rb

@@ -0,0 +1,92 @@
+module Fitting
+  class Route
+    class Requests
+      class Lists
+        def initialize(combine)
+          @full_cover = combine.full_cover
+          @partial_cover = combine.partial_cover
+          @no_cover = combine.no_cover
+          @max = combine.max
+        end
+
+        def to_s
+          @to_s ||=
+            [
+              list_fully_implemented,
+              list_partially_implemented,
+              list_no_implemented
+            ].compact.join("\n\n")
+        end
+
+        def list_fully_implemented
+          return nil if fully_implemented == []
+          ['Fully conforming requests:', fully_implemented].join("\n")
+        end
+
+        def list_partially_implemented
+          return nil if partially_implemented == []
+          ['Partially conforming requests:', partially_implemented].join("\n")
+        end
+
+        def list_no_implemented
+          return nil if no_implemented == []
+          ['Non-conforming requests:', no_implemented].join("\n")
+        end
+
+        def fully_implemented
+          @fully_implemented ||= stat_full_cover.sort do |first, second|
+            first.split("\t")[1] <=> second.split("\t")[1]
+          end
+        end
+
+        def partially_implemented
+          @partially_implemented ||= stat_partial_cover.sort do |first, second|
+            first.split("\t")[1] <=> second.split("\t")[1]
+          end
+        end
+
+        def no_implemented
+          @no_implemented ||= stat_no_cover.sort do |first, second|
+            first.split("\t")[1] <=> second.split("\t")[1]
+          end
+        end
+
+        private
+
+        def stat_full_cover
+          @full_cover.map do |response|
+            cover_request(response)
+          end
+        end
+
+        def stat_partial_cover
+          @partial_cover.map do |response|
+            cover_request(response)
+          end
+        end
+
+        def stat_no_cover
+          @no_cover.map do |response|
+            cover_request(response)
+          end
+        end
+
+        def cover_request(response)
+          "#{cover_method(response)}#{tabulation(response)}#{cover_status(response)}"
+        end
+
+        def cover_method(response)
+          response.first.to_a.first.split(' ').join("\t")
+        end
+
+        def tabulation(response)
+          "\t" * (@max - response.first.to_a.first.split(' ')[1].size / 8)
+        end
+
+        def cover_status(response)
+          response.first.to_a.last['all']
+        end
+      end
+    end
+  end
+end

data/lib/fitting/route/requests/statistics.rb

@@ -0,0 +1,40 @@
+module Fitting
+  class Route
+    class Requests
+      class Statistics
+        def initialize(combine)
+          @full_count = combine.full_cover.size
+          @part_count = combine.partial_cover.size
+          @no_count = combine.no_cover.size
+        end
+
+        def to_s
+          @to_s ||= [
+            "API requests with fully implemented responses: #{@full_count} (#{full_percent}% of #{total_count}).",
+            "API requests with partially implemented responses: #{@part_count} (#{part_percent}% of #{total_count}).",
+            "API requests with no implemented responses: #{@no_count} (#{no_percent}% of #{total_count})."
+          ].join("\n")
+        end
+
+        def total_count
+          @total_count ||= @full_count + @part_count + @no_count
+        end
+
+        def full_percent
+          @full_percentage ||= 0.0 if total_count.zero?
+          @full_percentage ||= (@full_count.to_f / total_count.to_f * 100.0).round(2)
+        end
+
+        def part_percent
+          @part_percentage ||= 0.0 if total_count.zero?
+          @part_percentage ||= (@part_count.to_f / total_count.to_f * 100.0).round(2)
+        end
+
+        def no_percent
+          @no_percentage ||= 0.0 if total_count.zero?
+          @no_percentage ||= (@no_count.to_f / total_count.to_f * 100.0).round(2)
+        end
+      end
+    end
+  end
+end

data/lib/fitting/route/responses.rb

@@ -15,7 +15,8 @@ module Fitting
 
         [
           "API responses conforming to the blueprint: #{valid_count} (#{valid_percentage}% of #{total_count}).",
-          "API responses with validation errors or untested: #{invalid_count} (#{invalid_percentage}% of #{total_count})."
+          'API responses with validation errors or untested: '\
+            "#{invalid_count} (#{invalid_percentage}% of #{total_count})."
         ].join("\n")
       end
     end

data/lib/fitting/statistics.rb

@@ -10,7 +10,7 @@ module Fitting
     end
 
     def save
-      FileUtils::mkdir_p 'fitting'
+      FileUtils.mkdir_p 'fitting'
       File.open('fitting/stats', 'w') { |file| file.write(to_s) }
       File.open('fitting/not_covered', 'w') { |file| file.write(@white_route.errors) }
     end
@@ -20,7 +20,7 @@ module Fitting
         [
           ['[Black list]', @black_route.statistics_with_conformity_lists].join("\n"),
           ['[White list]', @white_route.statistics_with_conformity_lists].join("\n"),
-          ""
+          ''
         ].join("\n\n")
       else
         [@white_route.statistics_with_conformity_lists, "\n\n"].join

data/lib/fitting/storage/documentation.rb

@@ -13,7 +13,7 @@ module Fitting
           Tomograph::Tomogram.new(
             prefix: Fitting.configuration.prefix,
             apib_path: Fitting.configuration.apib_path,
-            drafter_yaml_path: Fitting.configuration.drafter_yaml_path,
+            drafter_yaml_path: Fitting.configuration.drafter_yaml_path
           )
         end
       end

data/lib/fitting/storage/responses.rb

@@ -1,3 +1,5 @@
+require 'fitting/storage/white_list'
+
 module Fitting
   module Storage
     class Responses
@@ -9,18 +11,32 @@ module Fitting
         @responses.push(
           Fitting::Response.new(
             response,
-            Fitting::Storage::Documentation.tomogram))
+            Fitting::Storage::Documentation.tomogram
+          )
+        )
       end
 
       def statistics
+        @white_list = white_list
         Fitting::Statistics.new(
           Fitting::Documentation.new(
             Fitting::Storage::Documentation.tomogram,
-            Fitting.configuration.white_list),
+            @white_list
+          ),
           @responses.uniq,
           Fitting.configuration.strict
         )
       end
+
+      private
+
+      def white_list
+        Fitting::Storage::WhiteList.new(
+          Fitting.configuration.white_list,
+          Fitting.configuration.resource_white_list,
+          Fitting::Storage::Documentation.tomogram.to_resources
+        ).to_a
+      end
     end
   end
 end

data/lib/fitting/storage/white_list.rb

@@ -0,0 +1,51 @@
+require 'tomograph'
+
+module Fitting
+  module Storage
+    class WhiteList
+      def initialize(white_list, resource_white_list, resources)
+        @white_list = white_list
+        @resource_white_list = resource_white_list
+        @resources = resources
+      end
+
+      def to_a
+        return @white_list if @white_list
+        @white_list = transformation
+      end
+
+      def without_group
+        @resource_white_list.inject([]) do |all_requests, asd|
+          if asd[1] == []
+            requests(@resources[asd[0]], all_requests)
+          else
+            requests(asd[1], all_requests)
+          end
+        end.flatten.uniq
+      end
+
+      def requests(resource, all_requests)
+        resource.map do |request|
+          all_requests.push(request_hash(request))
+        end
+        all_requests
+      end
+
+      def transformation
+        result = without_group.group_by { |action| action[:path] }
+        result.inject({}) do |res, group|
+          methods = group.last.map { |gr| gr[:method] }
+          res.merge(group.first => methods)
+        end
+      end
+
+      def request_hash(request)
+        array = request.split(' ')
+        {
+          method: array[0],
+          path: Tomograph::Path.new(array[1]).to_s
+        }
+      end
+    end
+  end
+end

data/lib/fitting/version.rb

@@ -1,3 +1,3 @@
 module Fitting
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitting
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - d.efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -201,10 +201,15 @@ files:
 - lib/fitting/route.rb
 - lib/fitting/route/coverage.rb
 - lib/fitting/route/requests.rb
+- lib/fitting/route/requests/combine.rb
+- lib/fitting/route/requests/coverage.rb
+- lib/fitting/route/requests/lists.rb
+- lib/fitting/route/requests/statistics.rb
 - lib/fitting/route/responses.rb
 - lib/fitting/statistics.rb
 - lib/fitting/storage/documentation.rb
 - lib/fitting/storage/responses.rb
+- lib/fitting/storage/white_list.rb
 - lib/fitting/version.rb
 homepage: https://github.com/funbox/fitting
 licenses: