htmlentities 4.0.0 → 4.1.0

data/lib/htmlentities/{html4.rb → mappings/html4.rb}

@@ -1,5 +1,5 @@
+# encoding: UTF-8
 class HTMLEntities
-  MAPPINGS = {} unless defined? MAPPINGS
   MAPPINGS['html4'] = {
     'Aacute' => 193,
     'aacute' => 225,

data/lib/htmlentities/{xhtml1.rb → mappings/xhtml1.rb}

@@ -1,5 +1,5 @@
+# encoding: UTF-8
 class HTMLEntities
-  MAPPINGS = {} unless defined? MAPPINGS
   MAPPINGS['xhtml1'] = {
     'Aacute' => 193,
     'aacute' => 225,

data/lib/htmlentities/version.rb

@@ -0,0 +1,9 @@
+class HTMLEntities #:nodoc:
+  module VERSION #:nodoc:
+    MAJOR = 4
+    MINOR = 1
+    TINY  = 0
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end

data/test/entities_test.rb

@@ -1,8 +1,9 @@
+# encoding: UTF-8
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'htmlentities'
 require 'test/unit'
+require 'htmlentities'
 
-$KCODE = 'u'
+$KCODE = 'u' unless "1.9".respond_to?(:encoding)
 
 class HTMLEntities::EntitiesTest < Test::Unit::TestCase
 
@@ -21,7 +22,7 @@ class HTMLEntities::EntitiesTest < Test::Unit::TestCase
       @string
     end
   end
-  
+
   def test_should_raise_exception_when_unknown_flavor_specified
     assert_raises(HTMLEntities::UnknownFlavor) do
       HTMLEntities.new('foo')
@@ -52,7 +53,7 @@ class HTMLEntities::EntitiesTest < Test::Unit::TestCase
     assert_encode('&lt;', '<', :basic)
     assert_encode('&lt;', '<')
   end
-  
+
   def test_should_encode_basic_entities_to_decimal
     assert_encode('&#38;', '&', :decimal)
     assert_encode('&#34;', '"', :decimal)

data/test/expanded_test.rb

@@ -0,0 +1,112 @@
+# encoding: UTF-8
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'test/unit'
+require 'htmlentities'
+
+$KCODE = 'u' unless "1.9".respond_to?(:encoding)
+
+class HTMLEntities::ExpandedTest < Test::Unit::TestCase
+
+  attr_reader :html_entities
+
+  def setup
+    @html_entities = HTMLEntities.new(:expanded)
+  end
+
+  TEST_ENTITIES_SET = [
+    ['sub',      0x2282,   "xhtml", nil,      "⊂", ],
+    ['sup',      0x2283,   "xhtml", nil,      "⊃", ],
+    ['nsub',     0x2284,   "xhtml", nil,      "⊄", ],
+    ['subE',     0x2286,   nil,     "skip",   "⊆", ],
+    ['sube',     0x2286,   "xhtml", nil,      "⊆", ],
+    ['supE',     0x2287,   nil,     "skip",   "⊇", ],
+    ['supe',     0x2287,   "xhtml", nil,      "⊇", ],
+    ['bottom',   0x22a5,   nil,     "skip",   "⊥", ],
+    ['perp',     0x22a5,   "xhtml", nil,      "⊥", ],
+    ['models',   0x22a7,   nil,     nil,      "⊧", ],
+    ['vDash',    0x22a8,   nil,     nil,      "⊨", ],
+    ['Vdash',    0x22a9,   nil,     nil,      "⊩", ],
+    ['Vvdash',   0x22aa,   nil,     nil,      "⊪", ],
+    ['nvdash',   0x22ac,   nil,     nil,      "⊬", ],
+    ['nvDash',   0x22ad,   nil,     nil,      "⊭", ],
+    ['nVdash',   0x22ae,   nil,     nil,      "⊮", ],
+    ['nsubE',    0x2288,   nil,     nil,      "⊈", ],
+    ['nsube',    0x2288,   nil,     "skip",   "⊈", ],
+    ['nsupE',    0x2289,   nil,     nil,      "⊉", ],
+    ['nsupe',    0x2289,   nil,     "skip",   "⊉", ],
+    ['subnE',    0x228a,   nil,     nil,      "⊊", ],
+    ['subne',    0x228a,   nil,     "skip",   "⊊", ],
+    ['vsubnE',   0x228a,   nil,     "skip",   "⊊", ],
+    ['vsubne',   0x228a,   nil,     "skip",   "⊊", ],
+    ['nsc',      0x2281,   nil,     nil,      "⊁", ],
+    ['nsup',     0x2285,   nil,     nil,      "⊅", ],
+    ['b.alpha',  0x03b1,   nil,     "skip",   "α", ],
+    ['b.beta',   0x03b2,   nil,     "skip",   "β", ],
+    ['b.chi',    0x03c7,   nil,     "skip",   "χ", ],
+    ['b.Delta',  0x0394,   nil,     "skip",   "Δ", ],
+  ]
+
+  def test_should_encode_apos_entity
+    assert_equal "&apos;", html_entities.encode("'", :named) # note: the normal ' 0x0027, not ʼ 0x02BC
+  end
+
+  def test_should_decode_apos_entity
+    assert_equal "é'", html_entities.decode("&eacute;&apos;")
+  end
+
+  def test_should_decode_dotted_entity
+    assert_equal "Θ", html_entities.decode("&b.Theta;")
+  end
+
+  def test_should_encode_from_test_set
+    TEST_ENTITIES_SET.each do |ent, _, _, skip, decoded|
+      next if skip
+      assert_equal "&#{ent};", html_entities.encode(decoded, :named)
+    end
+  end
+
+  def test_should_decode_from_test_set
+    TEST_ENTITIES_SET.each do |ent, _, _, _, decoded|
+      assert_equal decoded, html_entities.decode("&#{ent};")
+    end
+  end
+
+  def test_should_round_trip_preferred_entities
+    TEST_ENTITIES_SET.each do |ent, _, _, skip, decoded|
+      next if skip
+      assert_equal "&#{ent};", html_entities.encode(html_entities.decode("&#{ent};"), :named)
+      assert_equal decoded,    html_entities.decode(html_entities.encode(decoded, :named))
+    end
+  end
+
+  def test_should_not_round_trip_decoding_skipped_entities
+    TEST_ENTITIES_SET.each do |ent, _, _, skip, decoded|
+      next unless skip
+      assert_not_equal "&#{ent};", html_entities.encode(html_entities.decode("&#{ent};"), :named)
+    end
+  end
+
+  def test_should_round_trip_encoding_skipped_entities
+    TEST_ENTITIES_SET.each do |ent, _, _, skip, decoded|
+      next unless skip
+      assert_equal decoded,        html_entities.decode(html_entities.encode(decoded, :named))
+    end
+  end
+
+  def test_should_treat_all_xhtml1_named_entities_as_xhtml_does
+    xhtml_encoder = HTMLEntities.new(:xhtml1)
+    HTMLEntities::MAPPINGS['xhtml1'].each do |ent, decoded|
+      assert_equal xhtml_encoder.decode("&#{ent};"),      html_entities.decode("&#{ent};")
+      assert_equal xhtml_encoder.encode(decoded, :named), html_entities.encode(decoded, :named)
+    end
+  end
+
+  def test_should_not_agree_with_xhtml1_when_not_in_xhtml
+    xhtml_encoder = HTMLEntities.new(:xhtml1)
+    TEST_ENTITIES_SET.each do |ent, _, xhtml1, skip, decoded|
+      next if xhtml1 || skip
+      assert_not_equal xhtml_encoder.decode("&#{ent};"),         html_entities.decode("&#{ent};")
+      assert_not_equal xhtml_encoder.encode(decoded, :named), html_entities.encode(decoded, :named)
+    end
+  end
+end

data/test/html4_test.rb

@@ -1,10 +1,11 @@
+# encoding: UTF-8
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'htmlentities'
 require 'test/unit'
+require 'htmlentities'
 
-$KCODE = 'u'
+$KCODE = 'u' unless "1.9".respond_to?(:encoding)
 
-class HTMLEntities::HTML4Test < Test::Unit::TestCase
+class HTML4Test < Test::Unit::TestCase
 
   attr_reader :html_entities
 
@@ -21,4 +22,8 @@ class HTMLEntities::HTML4Test < Test::Unit::TestCase
     assert_equal "é&apos;", html_entities.decode("&eacute;&apos;")
   end
 
+  def test_should_not_decode_dotted_entity
+    assert_equal "&b.Theta;", html_entities.decode("&b.Theta;")
+  end
+
 end

data/test/legacy_test.rb

@@ -1,14 +1,15 @@
+# encoding: UTF-8
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'htmlentities'
 require 'test/unit'
+require 'htmlentities'
 
-$KCODE = 'u'
+$KCODE = 'u' unless "1.9".respond_to?(:encoding)
 
 #
 # Test that version 3.x functionality still works
 #
 class HTMLEntities::LegacyTest < Test::Unit::TestCase
-  
+
   def test_should_decode_via_legacy_interface
     assert_decode('&', '&amp;')
     assert_decode('±', '&plusmn;')
@@ -22,7 +23,7 @@ class HTMLEntities::LegacyTest < Test::Unit::TestCase
     assert_encode('&#8230;', '…', :decimal)
     assert_encode('&#x2212;', '−', :hexadecimal)
   end
-  
+
   def assert_encode(expected, *encode_args)
     assert_equal expected, HTMLEntities.encode_entities(*encode_args)
   end
@@ -30,5 +31,5 @@ class HTMLEntities::LegacyTest < Test::Unit::TestCase
   def assert_decode(expected, *decode_args)
     assert_equal expected, HTMLEntities.decode_entities(*decode_args)
   end
-  
-end
+
+end

data/test/roundtrip_test.rb

@@ -1,22 +1,21 @@
+# encoding: UTF-8
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'htmlentities'
 require 'test/unit'
-require 'htmlentities/xhtml1'
-require 'htmlentities/html4'
+require 'htmlentities'
 
 class HTMLEntities::RoundtripTest < Test::Unit::TestCase
-  
+
   attr_reader :xhtml1_entities, :html4_entities
-  
+
   def setup
     @xhtml1_entities = HTMLEntities.new('xhtml1')
     @html4_entities = HTMLEntities.new('html4')
   end
-  
+
   def test_should_roundtrip_xhtml1_entities_via_named_encoding
     each_mapping('xhtml1') do |name, string|
       assert_equal(
-        string, 
+        string,
         xhtml1_entities.decode(xhtml1_entities.encode(string, :named))
       )
     end
@@ -25,34 +24,34 @@ class HTMLEntities::RoundtripTest < Test::Unit::TestCase
   def test_should_roundtrip_xhtml1_entities_via_basic_and_named_encoding
     each_mapping('xhtml1') do |name, string|
       assert_equal(
-        string, 
+        string,
         xhtml1_entities.decode(xhtml1_entities.encode(string, :basic, :named))
       )
     end
   end
-  
+
   def test_should_roundtrip_xhtml1_entities_via_basic_named_and_decimal_encoding
     each_mapping('xhtml1') do |name, string|
       assert_equal(
-        string, 
+        string,
         xhtml1_entities.decode(xhtml1_entities.encode(string, :basic, :named, :decimal))
       )
     end
   end
-  
+
   def test_should_roundtrip_xhtml1_entities_via_hexadecimal_encoding
     each_mapping('xhtml1') do |name, string|
       assert_equal(
-        string, 
+        string,
         xhtml1_entities.decode(xhtml1_entities.encode(string, :hexadecimal))
       )
     end
   end
-  
+
   def test_should_roundtrip_html4_entities_via_named_encoding
     each_mapping('html4') do |name, string|
       assert_equal(
-        string, 
+        string,
         html4_entities.decode(html4_entities.encode(string, :named))
       )
     end
@@ -61,34 +60,34 @@ class HTMLEntities::RoundtripTest < Test::Unit::TestCase
   def test_should_roundtrip_html4_entities_via_basic_and_named_encoding
     each_mapping('html4') do |name, string|
       assert_equal(
-        string, 
+        string,
         html4_entities.decode(html4_entities.encode(string, :basic, :named))
       )
     end
   end
-  
+
   def test_should_roundtrip_html4_entities_via_basic_named_and_decimal_encoding
     each_mapping('html4') do |name, string|
       assert_equal(
-        string, 
+        string,
         html4_entities.decode(html4_entities.encode(string, :basic, :named, :decimal))
       )
     end
   end
-  
+
   def test_should_roundtrip_html4_entities_via_hexadecimal_encoding
     each_mapping('html4') do |name, string|
       assert_equal(
-        string, 
+        string,
         html4_entities.decode(html4_entities.encode(string, :hexadecimal))
       )
     end
   end
-  
+
   def each_mapping(flavor)
     HTMLEntities::MAPPINGS[flavor].each do |name, codepoint|
       yield name, [codepoint].pack('U')
     end
   end
-  
-end
+
+end

data/test/test_all.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 Dir[File.dirname(__FILE__)+'/*_test.rb'].each do |test|
   require test
-end
+end

data/test/xhtml1_test.rb

@@ -1,8 +1,9 @@
+# encoding: UTF-8
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'htmlentities'
 require 'test/unit'
+require 'htmlentities'
 
-$KCODE = 'u'
+$KCODE = 'u' unless "1.9".respond_to?(:encoding)
 
 class HTMLEntities::XHTML1Test < Test::Unit::TestCase
 
@@ -20,4 +21,9 @@ class HTMLEntities::XHTML1Test < Test::Unit::TestCase
     assert_equal "é'", html_entities.decode("&eacute;&apos;")
   end
 
+  def test_should_not_decode_dotted_entity
+    assert_equal "&b.Theta;", html_entities.decode("&b.Theta;")
+  end
+
+
 end

metadata

@@ -1,62 +1,71 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
-specification_version: 1
 name: htmlentities
 version: !ruby/object:Gem::Version 
-  version: 4.0.0
-date: 2007-03-15 00:00:00 +00:00
-summary: A module for encoding and decoding (X)HTML entities.
-require_paths: 
-- lib
-email: pbattley@gmail.com
-homepage: http://htmlentities.rubyforge.org/
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 4.1.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Paul Battley
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-08-15 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: 
+email: pbattley@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.txt
+- History.txt
+- COPYING.txt
 files: 
-- lib/htmlentities.rb
-- lib/htmlentities/html4.rb
+- lib/htmlentities/mappings/html4.rb
+- lib/htmlentities/mappings/expanded.rb
+- lib/htmlentities/mappings/xhtml1.rb
+- lib/htmlentities/flavors.rb
 - lib/htmlentities/legacy.rb
-- lib/htmlentities/string.rb
-- lib/htmlentities/xhtml1.rb
-- test/entities_test.rb
+- lib/htmlentities/version.rb
+- lib/htmlentities.rb
 - test/html4_test.rb
-- test/legacy_test.rb
-- test/roundtrip_test.rb
-- test/string_test.rb
 - test/test_all.rb
 - test/xhtml1_test.rb
+- test/roundtrip_test.rb
+- test/expanded_test.rb
+- test/legacy_test.rb
+- test/entities_test.rb
 - README.txt
 - History.txt
 - COPYING.txt
-test_files: 
-- test/test_all.rb
+has_rdoc: true
+homepage: http://htmlentities.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README.txt
-- History.txt
-- COPYING.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: A module for encoding and decoding (X)HTML entities.
+test_files: 
+- test/test_all.rb