citrus_test 0.1.1 → 0.1.2

data/lib/citrus_test.rb

@@ -54,26 +54,30 @@ class GrammarTest < Test::Unit::TestCase
 		rule(rule).parse(input).value
 	end
 
-	# Assert that rule parses str into val, returning val (actually, the return
-	# value of parse(rule, str)) if the assertion passed. Additionally, assert
-	# that value has every attribute specified in attributes, and that they have
-	# the value specified.
-	def assert_parses(rule, str, val, attributes={})
-		msg ||= "#{@@grammar}.#{rule} failed to parse #{str.inspect} properly"
+	# If attributes is a Hash, assert that the return value of parse(rule, str)
+	# has every attribute specified in attributes, and that they have the value
+	# specified in attributes. Otherwise, assert that the return value is equal to
+	# attributes. (If you want to actually assert that the result *is* a hash, try
+	# using :to_hash as a key.)
+	def assert_parses(rule, str, attributes={})
+		_ = "#{@@grammar}.#{rule} failed to parse #{str.inspect} properly"
 
 		ret = nil
-		assert_nothing_raised(msg) do
+		assert_nothing_raised(_) do
 			ret = parse(rule, str)
-			assert_equal(ret, val, msg)
 		end
 
-		attributes.each do |attr, expected_val|
-			assert(ret.respond_to?(attr), "#{attr} doesn't exist")
-			_ = "An exception was raised when fetching the #{attr} attribute"
-			assert_nothing_raised(_) do
-				_ = "#{attr} attribute has an unexpected value"
-				assert_equal(expected_val, ret.send(attr), _)
+		if attributes.is_a?(Hash)
+			attributes.each do |attr, expected_val|
+				assert(ret.respond_to?(attr), "#{attr} doesn't exist")
+				_ = "An exception was raised when fetching the #{attr} attribute"
+				assert_nothing_raised(_) do
+					_ = "#{attr} attribute has an unexpected value"
+					assert_equal(expected_val, ret.send(attr), _)
+				end
 			end
+		else
+			assert_equal(attributes, ret, _)
 		end
 
 		ret

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - katmagic
@@ -35,7 +35,7 @@ cert_chain:
   Zn3u2leVae/fJ03zYGArhuJKPgc=
   -----END CERTIFICATE-----
 
-date: 2011-08-22 00:00:00 -04:00
+date: 2011-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency