rspec-raml 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff971a245a14b37efeb8b65df683b7934efc1de8
-  data.tar.gz: 4532bec8ccfe0815fa04c505561c9f344b8adc7a
+  metadata.gz: 7de945d07b40d207a1b110b76a995b6c3a552c08
+  data.tar.gz: 10195e8ffcf8b88ba2ac1f0ab398120a3bf811b3
 SHA512:
-  metadata.gz: f207d241cbf7505f24f69fefd1d8fc55e0af85efa551d290ea1b539dfed38fe487a910bb899d686e9a9e121c08571f0e34ed3a897e6827a01bef10c1c2d95aa4
-  data.tar.gz: a53252fab901a64d8f1980bdeb775470c96b427fe499b609399f8907936d3b6d247cf05133383b85fce5d7b2f0ecd4d8f0da90ae8431e2db981760a6507dbd50
+  metadata.gz: 31da8166980933912104a0783a75e577155a8bea07302edf79adb76be2986d1faf61a23d13991bb09a16b5bd99e825705ba9968c7ae32270a46068eba016e6de
+  data.tar.gz: 0a4d867a376e43e8dcc6fdf51724dc183ee910d320b23acd7888e233fa87a579f08b15e1649b2a4b94be82bf2160b4e00cabba527c95df044fafd7e803f60b16

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rspec-raml.gemspec
 gemspec
+gem 'pry'

data/lib/rspec/raml/exclusion_filter.rb

@@ -0,0 +1,49 @@
+module RSpec
+  module Raml
+    class ExclusionFilter
+      ANYTHING = RSpec::Mocks::ArgumentMatchers::AnyArgMatcher::INSTANCE
+
+      def initialize(excludes)
+        @excludes = excludes
+      end
+
+      def filter(object)
+        @excludes.reduce object do |acc, exclude|
+          replace(acc, exclude)
+        end
+      end
+
+      private
+
+      def replace(body, exclude)
+        case exclude
+        when Hash
+          replace_hash(body, exclude)
+        when Array
+          replace_array(body, exclude)
+        when Symbol, String
+          body.merge(exclude.to_s => ANYTHING)
+        else
+          body
+        end
+      end
+
+      def replace_hash(body, exclude)
+        exclude.reduce(body) do |acc, (k, v)|
+          acc.merge(k.to_s => replace(acc[k.to_s], v))
+        end
+      end
+
+      def replace_array(body, exclude)
+        case body
+        when Array
+          body.map { |item| replace(item, exclude) }
+        when Hash
+          exclude.reduce(body) { |acc, key| replace(acc, key) }
+        else
+          body
+        end
+      end
+    end
+  end
+end

data/lib/rspec/raml/matchers/match_raml_body.rb

@@ -1,3 +1,4 @@
+require 'rspec/raml/exclusion_filter'
 require 'rspec/raml/matchers/abstract'
 
 module RSpec
@@ -6,24 +7,22 @@ module RSpec
       class MatchRamlBody < Abstract
         def initialize(*)
           super
-          @except = []
+          @excludes = []
+          @differ   = RSpec::Support::Differ.new(color: true)
         end
 
         def description
           'match RAML body'
         end
 
-        def except(*keys)
-          @except |= keys.map(&:to_s)
+        def exclude(*values)
+          @excludes += values
           self
         end
+        alias except exclude
 
         def failure_message
-          diff = differ.diff_as_object(
-            response_body,
-            raml_body
-          )
-
+          diff = @differ.diff_as_object(actual, expected)
           "expected response bodies to match:#{diff}"
         end
 
@@ -34,34 +33,22 @@ module RSpec
         private
 
         def matches_raml?
-          response_body == raml_body
-        end
-
-        def response_body
-          @response_body ||= comparable(response.body)
+          RSpec::Support::FuzzyMatcher.values_match?(expected, actual)
         end
 
-        def raml_body
-          @raml_body ||= comparable(raml.bodies.fetch(content_type).example)
+        def actual
+          @actual ||= JSON.parse(response.body)
         end
 
-        def differ
-          @differ ||= RSpec::Support::Differ.new(color: true)
-        end
-
-        def comparable(body)
-          remove_exceptions JSON.parse(body)
+        def expected
+          @expected ||= begin
+            example = raml.bodies.fetch(content_type).example
+            exclusion_filter.filter JSON.parse(example)
+          end
         end
 
-        def remove_exceptions(data)
-          case data
-          when Array
-            data.map { |item| remove_exceptions(item) }
-          when Hash
-            data.slice(*(data.keys - @except))
-          else
-            data
-          end
+        def exclusion_filter
+          ExclusionFilter.new(@excludes)
         end
       end
     end

data/lib/rspec/raml/version.rb

@@ -1,5 +1,5 @@
 module Rspec
   module Raml
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-raml
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raml_ruby
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - lib/rspec-raml.rb
 - lib/rspec/raml.rb
+- lib/rspec/raml/exclusion_filter.rb
 - lib/rspec/raml/finder.rb
 - lib/rspec/raml/matchers.rb
 - lib/rspec/raml/matchers/abstract.rb
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for working with RAML.