yamldiff 0.0.3 → 0.0.5

data/lib/yamldiff/version.rb

@@ -1,3 +1,3 @@
-module Yamldiff
-  VERSION = "0.0.3"
+class Yamldiff
+  VERSION = "0.0.5"
 end

data/lib/yamldiff/yamldiff.rb

@@ -0,0 +1,46 @@
+class Yamldiff
+  class << self
+    # Compare the two yaml files
+    def diff_yaml(first, second, errors_for = {})
+      primary            = YAML.load(File.open(first))
+      secondary          = YAML.load(File.open(second))
+      errors_for[second] = compare_hashes(primary, secondary)
+      errors_for
+    end
+
+    # Iterate through all keys in the first hash, checking each key for
+    #   1. existence
+    #   2. value class equivalence
+    #   3. value type equivalence
+    # in the second hash.
+    #
+    # Adapted from http://stackoverflow.com/a/6274367/91029
+    def compare_hashes(first, second, context = [])
+      errors = []
+
+      first.each do |key, value|
+        unless second.key?(key)
+          errors << YamldiffKeyError.new(key, context) # "Missing key : #{key} in path #{context.join(".")}"
+          next
+        end
+
+        value2 = second[key]
+        if (value.class != value2.class)
+          errors << YamldiffKeyValueTypeError.new(key, context) # "Key value type mismatch : #{key} in path #{context.join(".")}"
+          next
+        end
+
+        if value.is_a?(Hash)
+          errors << compare_hashes(value, second[key], (context << key))
+          next
+        end
+
+        if (value != value2)
+          errors << YamldiffKeyValueError.new(key, context) # "Key value mismatch : #{key} in path #{context.join(".")}"
+        end
+      end
+
+      errors.flatten
+    end
+  end
+end

data/lib/yamldiff.rb

@@ -1,48 +1,3 @@
 require "yamldiff/version"
 require "yamldiff/yamldiff_error"
-
-class Yamldiff
-  class << self
-    # Compare the two yaml files
-    def diff_yaml(first, second, errors_for = {})
-      primary               = YAML.load(File.open(first))
-      secondary             = YAML.load(File.open(second))
-      errors_for[secondary] = compare_hashes(first, second)
-    end
-
-    # Iterate through all keys in the first hash, checking each key for
-    #   1. existence
-    #   2. value class equivalence
-    #   3. value type equivalence
-    # in the second hash.
-    #
-    # Adapted from http://stackoverflow.com/a/6274367/91029
-    def compare_hashes(first, second, context = [])
-      errors = []
-
-      first.each do |key, value|
-        unless second.key?(key)
-          errors << YamldiffKeyError.new(key, context) # "Missing key : #{key} in path #{context.join(".")}"
-          next
-        end
-
-        value2 = second[key]
-        if (value.class != value2.class)
-          errors << YamldiffKeyValueTypeError.new(key, context) # "Key value type mismatch : #{key} in path #{context.join(".")}"
-          next
-        end
-
-        if value.is_a?(Hash)
-          errors << compare_hashes(value, second[key], (context << key))
-          next
-        end
-
-        if (value != value2)
-          errors << YamldiffKeyValueError.new(key, context) # "Key value mismatch : #{key} in path #{context.join(".")}"
-        end
-      end
-
-      errors.flatten
-    end
-  end
-end
+require "yamldiff/yamldiff"

data/spec/lib/yamldiff_spec.rb

@@ -1,45 +1,117 @@
 require "spec_helper"
- 
+
 describe Yamldiff do
+  subject { Yamldiff }
+
   describe ".compare_hashes" do
     it "should be empty for equal hashes" do
       subject.compare_hashes({ a: 1 }, { a: 1 }).should be_empty
-    end 
- 
+    end
+
     it "should be empty for nested hashes" do
-      first  = { a: { b: 2 } } 
-      second = { a: { b: 2 } } 
+      first  = { a: { b: 2 } }
+      second = { a: { b: 2 } }
       subject.compare_hashes(first, second).should be_empty
-    end 
- 
+    end
+
     it "should recognize when a key is missing" do
-      first  = { a: 1, b: 2 } 
-      second = { a: 1 } 
+      first  = { a: 1, b: 2 }
+      second = { a: 1 }
       result = subject.compare_hashes(first, second).first
- 
+
       result.should be_an_instance_of(YamldiffKeyError)
       result.key.should eql :b
       result.context.should be_empty
-    end 
- 
+    end
+
     it "should recognize when two keys' values are of a different type" do
       first  = { a:  1  }
       second = { a: "1" }
- 
+
       result = subject.compare_hashes(first, second).first
       result.should be_an_instance_of(YamldiffKeyValueTypeError)
       result.key.should eql :a
       result.context.should be_empty
-    end 
- 
+    end
+
     it "should recognize when two keys' values are not equal" do
-      first  = { a: { b: 2 } } 
-      second = { a: { b: 1 } } 
- 
+      first  = { a: { b: 2 } }
+      second = { a: { b: 1 } }
+
       result = subject.compare_hashes(first, second).first
       result.should be_an_instance_of(YamldiffKeyValueError)
       result.key.should eql :b
       result.context.should == [:a]
-    end 
-  end 
+    end
+  end
+
+  describe ".diff_yaml" do
+    it "returns no errors when the files have the same YAML structure", fakefs: true do
+      File.open("./en.yml", "w") do |f|
+        f.puts("en: ")
+        f.puts("  app_name: 'Verbosefish'")
+        f.puts("blah: 'Hello'")
+      end
+      File.open("./es.yml", "w") do |f|
+        f.puts("blah: 'Hello'")
+        f.puts("en: ")
+        f.puts("  app_name: 'Verbosefish'")
+      end
+
+      subject.diff_yaml("./en.yml", "./es.yml").values.all? {|e| e.should eql([])}
+    end
+
+    it "returns one top level error", fakefs: true do
+      first  = "./en.yml"
+      second = "./es.yml"
+      File.open(first, "w") do |f|
+        f.puts("en: ")
+        f.puts("  app_name: 'Verbosefish'")
+      end
+      File.open(second, "w") do |f|
+        f.puts("es: ")
+        f.puts("  app_name: 'Verboszefish'")
+      end
+
+      result = subject.diff_yaml(first, second)
+      result[second].first.key.should eql("en")
+    end
+
+    it "returns second level error", fakefs: true do
+      first  = "./en.yml"
+      second = "./es.yml"
+      File.open(first, "w") do |f|
+        f.puts("en: ")
+        f.puts("  app_name: 'Verbosefish'")
+      end
+      File.open(second, "w") do |f|
+        f.puts("en: ")
+        f.puts("  app_name: 'Verboszefish'")
+      end
+
+      result = subject.diff_yaml(first, second)
+      result[second].first.key.should eql("app_name")
+      result[second].first.context.should eql(["en"])
+    end
+
+    it "returns third level error", fakefs: true do
+      first  = "./en.yml"
+      second = "./es.yml"
+
+      File.open(first, "w") do |f|
+        f.puts("en:")
+        f.puts("  app_name:")
+        f.puts("    foo: 'Verbosefish'")
+      end
+      File.open(second, "w") do |f|
+        f.puts("en:")
+        f.puts("  app_name:")
+        f.puts("    foo: 'Something completely different'")
+      end
+
+      result = subject.diff_yaml(first, second)
+      result[second].first.key.should eql("foo")
+      result[second].first.context.should eql(["en", "app_name"])
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamldiff
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70135348136260 !ruby/object:Gem::Requirement
+  requirement: &70330118996640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135348136260
+  version_requirements: *70330118996640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70135348135260 !ruby/object:Gem::Requirement
+  requirement: &70330118996040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135348135260
+  version_requirements: *70330118996040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135352244060 !ruby/object:Gem::Requirement
+  requirement: &70330118995380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135352244060
+  version_requirements: *70330118995380
 description: Shows the difference yaml keys
 email:
 - jonathan.wallace@gmail.com
@@ -58,6 +58,7 @@ files:
 - Rakefile
 - lib/yamldiff.rb
 - lib/yamldiff/version.rb
+- lib/yamldiff/yamldiff.rb
 - lib/yamldiff/yamldiff_error.rb
 - spec/lib/yamldiff_spec.rb
 - spec/spec_helper.rb