test_xml 0.1.2 → 0.1.3

data/CHANGES.md

@@ -0,0 +1,3 @@
+## 0.1.3
+
+* Adding support for `MiniTest::Spec` matchers.

data/lib/test_xml.rb

@@ -1,6 +1,8 @@
 require 'nokogiri'
 require 'test_xml/nokogiri/node'
 require 'test_xml/nokogiri'
+require 'test_xml/assertions'
+require 'test_xml/matcher_methods'
 
 module TestXml
   class << self

data/lib/test_xml/assertions.rb

@@ -0,0 +1,44 @@
+require 'ostruct'
+
+module TestXml
+  class AssertionConfig < OpenStruct
+    def assert_name
+      "assert_#{name}"
+    end
+
+    def assert_not_name
+      "assert_not_#{name}"
+    end
+
+    def expectation
+      "must_#{matcher}"
+    end
+  end
+
+  ASSERTIONS = [
+    AssertionConfig.new(
+      :name       => :xml_contain,
+      :matcher    => :contain_xml,
+      :message_for_should     => lambda { |a,b| "the xml:\n#{a}\nshould contain xml:\n#{b}" },
+      :message_for_should_not => lambda { |a,b| "the xml:\n#{a}\nshould not contain xml:\n#{b} but it does" }
+    ),
+    AssertionConfig.new(
+      :name       => :xml_structure_contain,
+      :matcher    => :contain_xml_structure,
+      :message_for_should     => lambda { |a,b| "the xml:\n#{a}\nshould match xml structure:\n#{b}" },
+      :message_for_should_not => lambda { |a,b| "the xml:\n#{a}\nshould not match xml structure:\n#{b} but it does" }
+    ),
+    AssertionConfig.new(
+      :name       => :xml_equal,
+      :matcher    => :equal_xml,
+      :message_for_should     => lambda { |a,b| "the xml:\n#{a}\nshould exactly match xml:\n#{b}" },
+      :message_for_should_not => lambda { |a,b| "the xml:\n#{a}\nshould not exactly match xml:\n#{b} but it does" }
+    ),
+    AssertionConfig.new(
+      :name       => :xml_structure_equal,
+      :matcher    => :equal_xml_structure,
+      :message_for_should     => lambda { |a,b| "the xml:\n#{a}\nshould exactly match xml structure:\n#{b}" },
+      :message_for_should_not => lambda { |a,b| "the xml:\n#{a}\nshould not exactly match xml structure:\n#{b} but it does" }
+    )
+  ]
+end

data/lib/test_xml/mini_test.rb

@@ -1,6 +1,12 @@
 require "test_xml"
-require 'test_xml/test_unit/assertions'
 
-class MiniTest::Unit::TestCase
+MiniTest::Unit::TestCase.class_eval do
   include TestXml::TestUnit::Assertions
 end
+
+# TODO: should we remove test_xml/spec?
+MiniTest::Expectations.class_eval do
+  TestXml::ASSERTIONS.each do |cfg|
+    infect_an_assertion(cfg.assert_name, cfg.expectation)
+  end
+end

data/lib/test_xml/spec.rb

@@ -1,2 +1,18 @@
 require 'test_xml'
-require 'test_xml/spec/matchers.rb'
+
+# Adds assertions to RSpec.
+TestXml::ASSERTIONS.each do |cfg|
+  RSpec::Matchers.define cfg.matcher do |expected|
+    match do |actual|
+      TestXml::MatcherMethods.send(cfg.name, actual, expected)
+    end
+
+    failure_message_for_should do |actual|
+      cfg.message_for_should.call(expected, actual)
+    end
+
+    failure_message_for_should_not do |actual|
+      cfg.message_for_should_not.call(expected, actual)
+    end
+  end
+end

data/lib/test_xml/test_unit.rb

@@ -1,6 +1,5 @@
 require "test/unit"
 require "test_xml"
-require 'test_xml/test_unit/assertions'
 
 class Test::Unit::TestCase
   include TestXml::TestUnit::Assertions

data/lib/test_xml/test_unit/assertions.rb

@@ -1,41 +1,17 @@
-require 'test_xml/matcher_methods'
-
 module TestXml
   module TestUnit
     module Assertions
-
-      def self.assertions_for(name, options)
-        define_method("assert_#{name}") do |subject, pattern|
-          full_message = options[:message_for_should].gsub(/\<pattern\>/, pattern).gsub(/\<subject\>/, subject)
-
-          correct_assert(MatcherMethods.send(name, subject, pattern), full_message)
+      ASSERTIONS.each do |cfg|
+        define_method(cfg.assert_name) do |a, b|
+          correct_assert(MatcherMethods.send(cfg.name, a, b), cfg.message_for_should.call(a, b))
         end
 
-        define_method("assert_not_#{name}") do |subject, pattern|
-          full_message = options[:message_for_should_not].gsub(/\<pattern\>/, pattern).gsub(/\<subject\>/, subject)
-
-          correct_assert(!MatcherMethods.send(name, subject, pattern), full_message)
+        define_method(cfg.assert_not_name) do |a, b|
+          correct_assert(! MatcherMethods.send(cfg.name, a, b), cfg.message_for_should_not.call(a, b))
         end
       end
-      
-      
-      assertions_for :xml_contain,
-                     :message_for_should     => "the xml:\n<subject>\nshould contain xml:\n<pattern>",
-                     :message_for_should_not => "the xml:\n<subject>\nshould not contain xml:\n<pattern> but it does"
-
-      assertions_for :xml_equal,
-                     :message_for_should     => "the xml:\n<subject>\nshould exactly match xml:\n<pattern>",
-                     :message_for_should_not => "the xml:\n<subject>\nshould not exactly match xml:\n<pattern> but it does"
-
-      assertions_for :xml_structure_contain,
-                     :message_for_should     => "the xml:\n<subject>\nshould match xml structure:\n<pattern>",
-                     :message_for_should_not => "the xml:\n<subject>\nshould not match xml structure:\n<pattern> but it does"
-
-      assertions_for :xml_structure_equal,
-                     :message_for_should     => "the xml:\n<subject>\nshould exactly match xml structure:\n<pattern>",
-                     :message_for_should_not => "the xml:\n<subject>\nshould not exactly match xml structure:\n<pattern> but it does"
 
-      private
+    private
       def correct_assert(boolean, message)
         if RUBY_VERSION =~ /1.9.2/ or defined?(MiniTest)
           assert(boolean, message)

data/lib/test_xml/version.rb

@@ -1,3 +1,3 @@
 module TestXml
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/test_unit/test_assertions.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TestAssertions < Test::Unit::TestCase
   def test_assert_xml_contain_message_if_fails
-    begin 
+    begin
       assert_xml_contain("<root><one>1</one><one>2</one></root>", "<root><one>3</one></root>")
     rescue Exception => e
       assert_match %r{the xml:\n<root><one>1</one><one>2</one></root>\nshould contain xml:\n<root><one>3</one></root>}, e.message
@@ -10,14 +10,13 @@ class TestAssertions < Test::Unit::TestCase
   end
 
   def test_assert_xml_not_contain_message_if_fails
-    begin 
+    begin
       assert_not_xml_contain("<root><one>1</one><one>2</one></root>", "<root><one>1</one><one>2</one></root>")
     rescue Exception => e
-      assert_match %r{the xml:\n<root><one>1</one><one>2</one></root>\nshould not contain xml:\n<root><one>1</one><one>2</one></root> but it does}, 
-                   e.message
+      assert_match %r{the xml:\n<root><one>1</one><one>2</one></root>\nshould not contain xml:\n<root><one>1</one><one>2</one></root> but it does}, e.message
     end
   end
-    
+
   def test_assert_xml_contain
     expected = <<-XML
       <root>
@@ -25,13 +24,13 @@ class TestAssertions < Test::Unit::TestCase
         <two>2</two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one id="first">1</one>
       </root>
     XML
-    
+
     assert_xml_contain expected, actual
   end
 
@@ -41,13 +40,13 @@ class TestAssertions < Test::Unit::TestCase
         <one>1</one>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>2</one>
       </root>
     XML
-    
+
     assert_not_xml_contain expected, actual
   end
 
@@ -60,7 +59,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>2</one>
@@ -69,7 +68,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     assert_xml_structure_contain expected, actual
   end
 
@@ -82,7 +81,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>2</one>
@@ -91,7 +90,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     assert_not_xml_structure_contain expected, actual
   end
 
@@ -102,17 +101,17 @@ class TestAssertions < Test::Unit::TestCase
         <two>2</two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>1</one>
         <two>2</two>
       </root>
     XML
-    
+
     assert_xml_equal expected, actual
   end
-  
+
   def test_assert_xml_equal_with_attributes
     expected = <<-XML
       <root>
@@ -120,14 +119,14 @@ class TestAssertions < Test::Unit::TestCase
         <two b="second" a="first" />
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one a="first" b="second">1</one>
         <two b="second" a="first" />
       </root>
     XML
-    
+
     assert_xml_equal expected, actual
   end
 
@@ -138,47 +137,47 @@ class TestAssertions < Test::Unit::TestCase
         <two/>
       </root>
     XML
-    
+
     actual = <<-XML
       <root type="test">
         <one>1</one>
         <two/>
       </root>
     XML
-    
+
     assert_xml_equal expected, actual
   end
-  
+
   def test_assert_not_xml_equal_with_attributes
     expected = <<-XML
       <root>
         <one b="second" a="first">1</one>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one a="whoops, wrong" b="second">1</one>
       </root>
     XML
-    
+
     assert_not_xml_equal expected, actual
   end
 
-  
+
   def test_assert_not_xml_equal_with_attributes_and_no_text
     expected = <<-XML
       <root>
         <one b="second" a="first" />
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one a="whoops, wrong" b="second" />
       </root>
     XML
-    
+
     assert_not_xml_equal expected, actual
   end
 
@@ -189,14 +188,14 @@ class TestAssertions < Test::Unit::TestCase
         <two/>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>1</one>
         <two/>
       </root>
     XML
-    
+
     assert_not_xml_equal expected, actual
   end
 
@@ -207,16 +206,16 @@ class TestAssertions < Test::Unit::TestCase
         <two>2</two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>1</one>
       </root>
     XML
-    
+
     assert_not_xml_equal expected, actual
   end
-  
+
   def test_assert_xml_structure_equal
     expected = <<-XML
       <root>
@@ -226,7 +225,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>2</one>
@@ -235,7 +234,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     assert_xml_structure_equal expected, actual
   end
 
@@ -248,7 +247,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     actual = <<-XML
       <root>
         <one>2</one>
@@ -258,7 +257,7 @@ class TestAssertions < Test::Unit::TestCase
         </two>
       </root>
     XML
-    
+
     assert_not_xml_structure_equal expected, actual
   end
 end

metadata

@@ -1,90 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: test_xml
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Pavel Gabriel
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-21 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.2"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
-  version_requirements: *id004
-description: "Test your XML with Test::Unit, MiniTest, RSpec, or Cucumber using handy assertions like #assert_xml_equal or #assert_xml_structure_contain."
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+description: ! 'Test your XML with Test::Unit, MiniTest, RSpec, or Cucumber using
+  handy assertions like #assert_xml_equal or #assert_xml_structure_contain.'
+email:
 - alovak@gmail.com
 - apotonick@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
+- CHANGES.md
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/test_xml.rb
+- lib/test_xml/assertions.rb
 - lib/test_xml/matcher_methods.rb
 - lib/test_xml/mini_test.rb
 - lib/test_xml/nokogiri.rb
 - lib/test_xml/nokogiri/node.rb
 - lib/test_xml/spec.rb
-- lib/test_xml/spec/matchers.rb
-- lib/test_xml/spec/matchers/contain_xml.rb
-- lib/test_xml/spec/matchers/contain_xml_structure.rb
-- lib/test_xml/spec/matchers/equal_xml.rb
-- lib/test_xml/spec/matchers/equal_xml_structure.rb
 - lib/test_xml/test_unit.rb
 - lib/test_xml/test_unit/assertions.rb
 - lib/test_xml/version.rb
@@ -97,41 +110,30 @@ files:
 - test/test_helper.rb
 - test/test_unit/test_assertions.rb
 - test_xml.gemspec
-has_rdoc: true
 homepage: http://github.com/alovak/test_xml
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Test your XML with Test::Unit, MiniTest, RSpec, or Cucumber.
-test_files: 
-- spec/matchers/contain_xml_spec.rb
-- spec/matchers/contain_xml_structure_spec.rb
-- spec/matchers/equal_xml_spec.rb
-- spec/matchers/equal_xml_structure_spec.rb
-- spec/spec_helper.rb
-- test/nokogiri/test_node.rb
-- test/test_helper.rb
-- test/test_unit/test_assertions.rb
+test_files: []

data/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test_xml (0.1.1)
-      nokogiri (>= 1.3.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    nokogiri (1.4.4)
-    rake (0.8.7)
-    rdoc (3.5.3)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  rdoc
-  rspec (>= 2.2)
-  rspec-core (~> 2.2)
-  test_xml!

data/lib/test_xml/spec/matchers.rb

@@ -1,5 +0,0 @@
-require 'test_xml/matcher_methods'
-require 'test_xml/spec/matchers/contain_xml'
-require 'test_xml/spec/matchers/contain_xml_structure'
-require 'test_xml/spec/matchers/equal_xml_structure'
-require 'test_xml/spec/matchers/equal_xml'

data/lib/test_xml/spec/matchers/contain_xml.rb

@@ -1,13 +0,0 @@
-RSpec::Matchers.define :contain_xml do |expected|
-  match do |actual|
-    TestXml::MatcherMethods.xml_contain(actual, expected)
-  end
-
-  failure_message_for_should do |actual|
-    "the xml:\n#{actual}\nshould match xml:\n#{expected}"
-  end
-
-  failure_message_for_should_not do |actual|
-    "the xml:\n#{actual}\nshould not match xml:\n#{expected}\nbut it does"
-  end
-end

data/lib/test_xml/spec/matchers/contain_xml_structure.rb

@@ -1,13 +0,0 @@
-RSpec::Matchers.define :contain_xml_structure do |expected|
-  match do |actual|
-    TestXml::MatcherMethods.xml_structure_contain(actual, expected)
-  end
-
-  failure_message_for_should do |actual|
-    "the xml:\n#{actual}\nshould match xml structure:\n#{expected}"
-  end
-
-  failure_message_for_should_not do |actual|
-    "the xml:\n#{actual}\nshould not match xml structure:\n#{expected}\nbut it does"
-  end
-end

data/lib/test_xml/spec/matchers/equal_xml.rb

@@ -1,13 +0,0 @@
-RSpec::Matchers.define :equal_xml do |expected|
-  match do |actual|
-    TestXml::MatcherMethods.xml_equal(actual, expected)
-  end
-
-  failure_message_for_should do |actual|
-    "the xml:\n#{actual}\nshould exactly match xml:\n#{expected}"
-  end
-
-  failure_message_for_should_not do |actual|
-    "the xml:\n#{actual}\nshould not exactly match xml:\n#{expected}\nbut it does"
-  end
-end

data/lib/test_xml/spec/matchers/equal_xml_structure.rb

@@ -1,13 +0,0 @@
-RSpec::Matchers.define :equal_xml_structure do |expected|
-  match do |actual|
-    TestXml::MatcherMethods.xml_structure_equal(actual, expected)
-  end
-
-  failure_message_for_should do |actual|
-    "the xml:\n#{actual}\nshould exactly match xml structure:\n#{expected}"
-  end
-
-  failure_message_for_should_not do |actual|
-    "the xml:\n#{actual}\nshould not exactly match xml structure:\n#{expected}\nbut it does"
-  end
-end