json-deep-compare 0.2.1 → 0.2.2

data/lib/json-deep-compare/document_comparison.rb

@@ -6,6 +6,10 @@ module JsonDeepCompare
       else
         options[:exclusions] = []
       end
+      if substitute_with = options[:substitute_with]
+        options[:substitutions] = 
+          SubstitutionsBuilder.new(substitute_with).result
+      end
       @root_comparisons = []
       @root_comparisons << NodeComparison.new(
         lval, rval, ":root", options.merge(direction: :left)
@@ -32,5 +36,58 @@ module JsonDeepCompare
     def equal?
       @root_comparisons.all?(&:equal?)
     end
+
+    class SubstitutionsBuilder
+      attr_reader :result
+
+      def initialize(proc)
+        @proc = proc
+        @result = {}
+        root = Node.new(":root")
+        proc.call root
+        root.rules.each do |rule|
+          @result[rule.selector] = rule.value
+        end
+      end
+
+      class Node
+        def initialize(selector)
+          @selector = selector
+          @sub_nodes = []
+        end
+
+        def method_missing(meth, *args, &block)
+          if block_given?
+            if args.size == 1
+              sub_node = Node.new(
+                @selector + " > .#{meth} :nth-child(#{args.first})"
+              )
+            else
+              sub_node = Node.new(@selector + " > .#{meth}")
+            end
+            yield sub_node
+          elsif args.size == 2
+            sub_node = Node.new(
+              @selector + " > .#{meth} :nth-child(#{args.first})"
+            )
+            sub_node.value = args.last
+          else
+            sub_node = Node.new(@selector + " > .#{meth}")
+            sub_node.value = args.first
+          end
+          @sub_nodes << sub_node
+        end
+
+        def rules
+          @sub_nodes.map { |sn| sn.rules }.flatten.concat([@rule]).compact
+        end
+
+        def value=(v)
+          @rule = Rule.new(@selector, v)
+        end
+      end
+
+      Rule = Struct.new(:selector, :value)
+    end
   end
 end

data/lib/json-deep-compare/node_comparison.rb

@@ -49,7 +49,8 @@ module JsonDeepCompare
           else
             [Difference.new(
               @selector, "expected to be :lval but was :rval",
-              lval: value_inspect(@lval), rval: value_inspect(@rval)
+              lval: value_inspect(lval_for_equality), 
+              rval: value_inspect(rval_for_equality)
             )]
           end
         else

data/lib/json-deep-compare/version.rb

@@ -1,3 +1,3 @@
 module JsonDeepCompare
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/json_deep_compare_test.rb

@@ -222,4 +222,64 @@ class DocumentComparisonTestCase < Test::Unit::TestCase
     )
     assert comparison.equal?
   end
+
+  def test_failure_while_substituting
+    lval = {'one' => 'raw_value'}
+    rval = {'one' => 'actual_value'}
+    comparison = JsonDeepCompare::DocumentComparison.new(
+      lval, rval, substitutions: {":root > .one" => 'expected_value'}
+    )
+    assert !comparison.equal?
+    assert_match(
+      /":root > .one" expected to be "expected_value" but was "actual_value"/, 
+      comparison.difference_messages
+    )
+  end
+
+  def test_substitute_with_block
+    lval = {
+      'one' => 1, 
+      'two' => {
+        'three' => 3, 
+        'four' => 'four', 
+        'five' => [
+          {'six' => 'six'}, {'seven' => 7}
+        ],
+        'eight' => [
+          'nine',
+          10,
+          'eleven'
+        ]
+      }
+    }
+    rval = {
+      'one' => 'one', 
+      'two' => {
+        'three' => 'three', 
+        'four' => 'four', 
+        'five' => [
+          {'six' => 'six'}, {'seven' => 'seven'}
+        ],
+        'eight' => [
+          'nine',
+          'ten',
+          'eleven'
+        ]
+      }
+    }
+    comparison = JsonDeepCompare::DocumentComparison.new(
+      lval, rval,
+      substitute_with: Proc.new { |root|
+        root.one 'one'
+        root.two do |two|
+          two.three 'three'
+          two.five(2) do |five|
+            five.seven 'seven'
+          end
+          two.eight(2, 'ten')
+        end
+      }
+    )
+    assert comparison.equal?
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-deep-compare
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2669003529915222280
+      hash: -2413287472773223774
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2669003529915222280
+      hash: -2413287472773223774
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23