dynport_tools 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/dynport_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-08-15}
   s.description = %q{Collection of various tools}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [
@@ -24,12 +24,14 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
+    "VERSION",
     "autotest/discover.rb",
-    "lib/differ.rb",
+    "dynport_tools.gemspec",
     "lib/dynport_tools.rb",
+    "lib/dynport_tools/differ.rb",
     "lib/have_attributes.rb",
     "lib/xml_file.rb",
-    "spec/differ_spec.rb",
+    "spec/dynport_tools/differ_spec.rb",
     "spec/dynport_tools_spec.rb",
     "spec/fixtures/file_a.xml",
     "spec/spec_helper.rb",
@@ -38,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tobstarr/dynport_tools}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Collection of various tools}
 
   if s.respond_to? :specification_version then

data/lib/dynport_tools/differ.rb

@@ -0,0 +1,64 @@
+module DynportTools
+  class Differ
+    attr_accessor :diff_all, :use_return
+  
+  
+    def initialize(options = {})
+      self.diff_all = options[:diff_all] != false
+      self.use_return = options[:use_return] == true
+    end
+  
+    def diff(a, b)
+      if both?(a, b, Hash)
+        diff_hash_values(a, b, a.keys + (self.diff_all ? b.keys : []))
+      elsif both?(a, b, Array)
+        diff_hash_values(a, b, all_array_indexes(a, b))
+      else
+        [a, b] if a != b
+      end
+    end
+  
+    def diff_to_message_lines(the_diff, prefix = nil)
+      if the_diff.is_a?(Array)
+        ["expected #{expected_value(the_diff.first)} to be #{expected_value(the_diff.at(1))}"]
+      elsif the_diff.is_a?(Hash)
+        the_diff.map do |key, diff|
+          if diff.is_a?(Array)
+            "expected #{merge_prefixes(prefix, key)} to #{use_return ? "return" : "be"} #{expected_value(diff.first)} but #{use_return ? "did" : "was"} #{expected_value(diff.at(1))}"
+          else
+            diff_to_message_lines(diff, merge_prefixes(prefix, key))
+          end
+        end.flatten
+      else
+        []
+      end
+    end
+  
+  private
+    def expected_value(value)
+      "<#{value.inspect}>"
+    end
+  
+    def all_array_indexes(a, b)
+      0.upto([a.length, b.length].max - 1).to_a
+    end
+  
+    def diff_hash_values(a, b, keys)
+      ret = keys.uniq.inject({}) do |hash, key|
+        if diff = diff(a[key], b[key])
+          hash[key] = diff
+        end
+        hash
+      end
+      ret.empty? ? nil : ret
+    end
+  
+    def both?(a, b, clazz)
+      a.is_a?(clazz) && b.is_a?(clazz)
+    end
+  
+    def merge_prefixes(prefix, key)
+      prefix ? "#{prefix}[#{key}]" : key
+    end
+  end
+end

data/lib/dynport_tools.rb

@@ -0,0 +1,2 @@
+module DynportTools
+end

data/spec/{differ_spec.rb → dynport_tools/differ_spec.rb}

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-require "differ"
+require "dynport_tools/differ"
 
-describe Differ do
-  let(:differ) { Differ.new }
+describe DynportTools::Differ do
+  let(:differ) { DynportTools::Differ.new }
   
   describe "#initialize" do
     it "sets diff_all to true by default" do
-      Differ.new.diff_all.should == true
+      DynportTools::Differ.new.diff_all.should == true
     end
     
     it "sets diff_all to false when initialized with that option" do
-      Differ.new(:diff_all => false).diff_all.should == false
+      DynportTools::Differ.new(:diff_all => false).diff_all.should == false
     end
   end
   
@@ -132,10 +132,10 @@ describe Differ do
     end
     
     it "returns multiple messages" do
-      differ.diff_to_message_lines({ :a => { :b => [3, 4], :c => [nil, 1] } }, "c").should == [
+      differ.diff_to_message_lines({ :a => { :b => [3, 4], :c => [nil, 1] } }, "c").sort.should == [
         "expected c[a][b] to be <3> but was <4>",
         "expected c[a][c] to be <nil> but was <1>",
-      ]
+      ].sort
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-08-15 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: nokogiri
-  prerelease: false
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +46,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id002
-  name: rspec
-  prerelease: false
   type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +62,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
-  name: bundler
-  prerelease: false
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +78,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id004
-  name: jeweler
-  prerelease: false
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rcov
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,12 +92,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rcov
-  prerelease: false
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: ZenTest
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -105,12 +108,12 @@ dependencies:
         - 5
         - 0
         version: 4.5.0
-  version_requirements: *id006
-  name: ZenTest
-  prerelease: false
   type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: autotest
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +122,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
-  name: autotest
-  prerelease: false
   type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: autotest-growl
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,12 +136,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
-  name: autotest-growl
-  prerelease: false
   type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: ruby-debug
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,10 +150,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
-  name: ruby-debug
-  prerelease: false
   type: :development
+  requirement: *id009
 description: Collection of various tools
 email: tobias.schwab@dynport.de
 executables: []
@@ -171,15 +172,16 @@ files:
 - VERSION
 - autotest/discover.rb
 - dynport_tools.gemspec
-- lib/differ.rb
 - lib/dynport_tools.rb
+- lib/dynport_tools/differ.rb
 - lib/have_attributes.rb
 - lib/xml_file.rb
-- spec/differ_spec.rb
+- spec/dynport_tools/differ_spec.rb
 - spec/dynport_tools_spec.rb
 - spec/fixtures/file_a.xml
 - spec/spec_helper.rb
 - spec/xml_file_spec.rb
+has_rdoc: true
 homepage: http://github.com/tobstarr/dynport_tools
 licenses: 
 - MIT
@@ -209,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Collection of various tools

data/lib/differ.rb

@@ -1,62 +0,0 @@
-class Differ
-  attr_accessor :diff_all, :use_return
-  
-  
-  def initialize(options = {})
-    self.diff_all = options[:diff_all] != false
-    self.use_return = options[:use_return] == true
-  end
-  
-  def diff(a, b)
-    if both?(a, b, Hash)
-      diff_hash_values(a, b, a.keys + (self.diff_all ? b.keys : []))
-    elsif both?(a, b, Array)
-      diff_hash_values(a, b, all_array_indexes(a, b))
-    else
-      [a, b] if a != b
-    end
-  end
-  
-  def diff_to_message_lines(the_diff, prefix = nil)
-    if the_diff.is_a?(Array)
-      ["expected #{expected_value(the_diff.first)} to be #{expected_value(the_diff.at(1))}"]
-    elsif the_diff.is_a?(Hash)
-      the_diff.map do |key, diff|
-        if diff.is_a?(Array)
-          "expected #{merge_prefixes(prefix, key)} to #{use_return ? "return" : "be"} #{expected_value(diff.first)} but #{use_return ? "did" : "was"} #{expected_value(diff.at(1))}"
-        else
-          diff_to_message_lines(diff, merge_prefixes(prefix, key))
-        end
-      end.flatten
-    else
-      []
-    end
-  end
-  
-private
-  def expected_value(value)
-    "<#{value.inspect}>"
-  end
-  
-  def all_array_indexes(a, b)
-    0.upto([a.length, b.length].max - 1).to_a
-  end
-  
-  def diff_hash_values(a, b, keys)
-    ret = keys.uniq.inject({}) do |hash, key|
-      if diff = diff(a[key], b[key])
-        hash[key] = diff
-      end
-      hash
-    end
-    ret.empty? ? nil : ret
-  end
-  
-  def both?(a, b, clazz)
-    a.is_a?(clazz) && b.is_a?(clazz)
-  end
-  
-  def merge_prefixes(prefix, key)
-    prefix ? "#{prefix}[#{key}]" : key
-  end
-end