htmlentities 4.3.4 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 590b99774357fbadd4d8466a5e8bf10ddee988aa
-  data.tar.gz: aefdc96d4d4369cb43b13e429c84f2a11635b997
+SHA256:
+  metadata.gz: cdf361f9de12e40bc9ed28f9bbf3b641865ce8fc6c018e0b6418ea4384af29cf
+  data.tar.gz: 4bb633cdba82e6cad87dd43e9128730dd57ff0a2bf7e702cc2213b280cbe165f
 SHA512:
-  metadata.gz: f7148bccac547feb5f007732a507a8e7b6b71380ab308e0fcfeb3714f97075e78a8bb68adc5121ab8a4376e71f2115628b987ea249bb873e54ccb18e1c244731
-  data.tar.gz: b54acbf19875ec9995f17ef105fa0355927b9a61d484191cedc9e07af28344eb92568a643bca17542095bfbc0436d9ad65857058d4990008b2dc0b6c3498bec1
+  metadata.gz: da22d83a074cd62996861db18f64f80c510d1afb3ef5f4b8298d704749645ac564718ce2997843690cdb1b3fcaf0858aa7dcedd881be68742b893e83cd425550
+  data.tar.gz: 44e7d7e2b64c88a61a70b77370f71f7ff23de779dbf56f7bd38769000aec72edb8fbe39d8477e4dc84f9a0c5294ebdaa8b7c3a9cd03f3d4059366daa9560a310

data/History.txt

@@ -1,3 +1,8 @@
+== 4.4.0 (2025-11-17)
+* Make a few small optimisations.
+* Allow decoding of entities without semicolons at end of line.
+* Remove support for old unsupported Ruby versions (below 3.2).
+
 == 4.3.4 (2015-07-05)
 * Remove erroneous 'Iodot' entity (a typo'd duplicate of Idot).
 

data/lib/htmlentities/decoder.rb

@@ -9,11 +9,11 @@ class HTMLEntities
     def decode(source)
       prepare(source).gsub(@entity_regexp){
         if $1 && codepoint = @map[$1]
-          [codepoint].pack('U')
+          codepoint.chr(Encoding::UTF_8)
         elsif $2
-          [$2.to_i(10)].pack('U')
+          $2.to_i(10).chr(Encoding::UTF_8)
         elsif $3
-          [$3.to_i(16)].pack('U')
+          $3.to_i(16).chr(Encoding::UTF_8)
         else
           $&
         end
@@ -32,7 +32,7 @@ class HTMLEntities
       else
         entity_name_pattern = '[a-z][a-z0-9]'
       end
-      /&(?:(#{entity_name_pattern}{#{key_lengths.min - 1},#{key_lengths.max - 1}})|#([0-9]{1,7})|#x([0-9a-f]{1,6}));/i
+      /&(?:(#{entity_name_pattern}{#{key_lengths.min - 1},#{key_lengths.max - 1}})|#([0-9]{1,7})|#x([0-9a-f]{1,6}))(;|(?=\n|<))/i
     end
   end
 end

data/lib/htmlentities/encoder.rb

@@ -34,11 +34,11 @@ class HTMLEntities
     end
 
     def contains_only_ascii?(string)
-      string.match(/\A[\x01-\x7F]*\z/)
+      string.match?(/\A[\x01-\x7F]*\z/)
     end
 
     def basic_entity_regexp
-      @basic_entity_regexp ||= @flavor.match(/^html/) ? /[<>"&]/ : /[<>'"&]/
+      @basic_entity_regexp ||= @flavor.match?(/^html/) ? /[<>"&]/ : /[<>'"&]/
     end
 
     def extended_entity_regexp
@@ -99,16 +99,16 @@ class HTMLEntities
     end
 
     def encode_named(char)
-      cp = char.unpack('U')[0]
+      cp = char.codepoints.first
       (e = reverse_map[cp]) && "&#{e};"
     end
 
     def encode_decimal(char)
-      "&##{char.unpack('U')[0]};"
+      "&##{char.codepoints.first};"
     end
 
     def encode_hexadecimal(char)
-      "&#x#{char.unpack('U')[0].to_s(16)};"
+      "&#x#{char.codepoints.first.to_s(16)};"
     end
 
     def reverse_map

data/lib/htmlentities/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: htmlentities
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.4.0
 platform: ruby
 authors:
 - Paul Battley
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,12 +15,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A module for encoding and decoding (X)HTML entities.
@@ -29,8 +70,8 @@ email: pbattley@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- History.txt
 - COPYING.txt
+- History.txt
 files:
 - COPYING.txt
 - History.txt
@@ -42,24 +83,10 @@ files:
 - lib/htmlentities/mappings/html4.rb
 - lib/htmlentities/mappings/xhtml1.rb
 - lib/htmlentities/version.rb
-- perf/benchmark.rb
-- perf/performance.rb
-- perf/profile.rb
-- test/decoding_test.rb
-- test/encoding_test.rb
-- test/entities_test.rb
-- test/expanded_test.rb
-- test/html4_test.rb
-- test/interoperability_test.rb
-- test/roundtrip_test.rb
-- test/string_encodings_test.rb
-- test/test_helper.rb
-- test/xhtml1_test.rb
 homepage: https://github.com/threedaymonk/htmlentities
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -67,25 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Encode/decode HTML entities
-test_files:
-- test/interoperability_test.rb
-- test/encoding_test.rb
-- test/string_encodings_test.rb
-- test/entities_test.rb
-- test/html4_test.rb
-- test/xhtml1_test.rb
-- test/expanded_test.rb
-- test/decoding_test.rb
-- test/roundtrip_test.rb
+test_files: []

data/perf/benchmark.rb

@@ -1,13 +0,0 @@
-# encoding: UTF-8
-$KCODE = 'u' unless "1.9".respond_to?(:encoding)
-
-require File.expand_path("../performance", __FILE__)
-require "benchmark"
-
-job = HTMLEntitiesJob.new
-job.all(100) # Warm up to give JRuby a fair shake.
-
-Benchmark.benchmark do |b|
-  b.report("Encoding"){ job.encode(100) }
-  b.report("Decoding"){ job.decode(100) }
-end

data/perf/performance.rb

@@ -1,31 +0,0 @@
-# encoding: UTF-8
-$KCODE = 'u' unless "1.9".respond_to?(:encoding)
-
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require "htmlentities"
-
-class HTMLEntitiesJob
-  def initialize
-    @coder = HTMLEntities.new
-    @decoded = File.read(File.join(File.dirname(__FILE__), "sample"))
-    @encoded = @coder.encode(@decoded, :basic, :named, :hexadecimal)
-  end
-
-  def encode(cycles)
-    cycles.times do
-      @coder.encode(@decoded, :basic, :named, :hexadecimal)
-      @coder.encode(@decoded, :basic, :named, :decimal)
-    end
-  end
-
-  def decode(cycles)
-    cycles.times do
-      @coder.decode(@encoded)
-    end
-  end
-
-  def all(cycles)
-    encode(cycles)
-    decode(cycles)
-  end
-end

data/perf/profile.rb

@@ -1,17 +0,0 @@
-# encoding: UTF-8
-$KCODE = 'u' unless "1.9".respond_to?(:encoding)
-
-require File.expand_path("../performance", __FILE__)
-require "profiler"
-
-job = HTMLEntitiesJob.new
-
-puts "Encoding"
-Profiler__::start_profile
-job.encode(1)
-Profiler__::print_profile($stdout)
-
-puts "Decoding"
-Profiler__::start_profile
-job.decode(1)
-Profiler__::print_profile($stdout)

data/test/decoding_test.rb

@@ -1,101 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-class HTMLEntities::DecodingTest < Test::Unit::TestCase
-
-  def setup
-    @entities = [:xhtml1, :html4, :expanded].map{ |a| HTMLEntities.new(a) }
-  end
-
-  def assert_decode(expected, input)
-    @entities.each do |coder|
-      assert_equal expected, coder.decode(input)
-    end
-  end
-
-  def test_should_decode_basic_entities
-    assert_decode '&', '&amp;'
-    assert_decode '<', '&lt;'
-    assert_decode '"', '&quot;'
-  end
-
-  def test_should_decode_extended_named_entities
-    assert_decode '±', '&plusmn;'
-    assert_decode 'ð', '&eth;'
-    assert_decode 'Œ', '&OElig;'
-    assert_decode 'œ', '&oelig;'
-  end
-
-  def test_should_decode_decimal_entities
-    assert_decode '“', '&#8220;'
-    assert_decode '…', '&#8230;'
-    assert_decode ' ', '&#32;'
-  end
-
-  def test_should_decode_hexadecimal_entities
-    assert_decode '−', '&#x2212;'
-    assert_decode '—', '&#x2014;'
-    assert_decode '`', '&#x0060;'
-    assert_decode '`', '&#x60;'
-  end
-
-  def test_should_not_mutate_string_being_decoded
-    original = "&lt;&#163;"
-    input = original.dup
-    HTMLEntities.new.decode(input)
-
-    assert_equal original, input
-  end
-
-  def test_should_decode_text_with_mix_of_entities
-    # Just a random headline - I needed something with accented letters.
-    assert_decode(
-      'Le tabac pourrait bientôt être banni dans tous les lieux publics en France',
-      'Le tabac pourrait bient&ocirc;t &#234;tre banni dans tous les lieux publics en France'
-    )
-    assert_decode(
-      '"bientôt" & 文字',
-      '&quot;bient&ocirc;t&quot; &amp; &#25991;&#x5b57;'
-    )
-  end
-
-  def test_should_decode_empty_string
-    assert_decode '', ''
-  end
-
-  def test_should_skip_unknown_entity
-    assert_decode '&bogus;', '&bogus;'
-  end
-
-  def test_should_decode_double_encoded_entity_once
-    assert_decode '&amp;', '&amp;amp;'
-  end
-
-  # Faults found and patched by Moonwolf
-  def test_should_decode_full_hexadecimal_range
-    (0..127).each do |codepoint|
-      assert_decode [codepoint].pack('U'), "&\#x#{codepoint.to_s(16)};"
-    end
-  end
-
-  # Reported by Dallas DeVries and Johan Duflost
-  def test_should_decode_named_entities_reported_as_missing_in_3_0_1
-    assert_decode  [178].pack('U'), '&sup2;'
-    assert_decode [8226].pack('U'), '&bull;'
-    assert_decode  [948].pack('U'), '&delta;'
-  end
-
-  # Reported by ckruse
-  def test_should_decode_only_first_element_in_masked_entities
-    input = '&amp;#3346;'
-    expected = '&#3346;'
-    assert_decode expected, input
-  end
-
-  def test_should_ducktype_parameter_to_string_before_encoding
-    obj = Object.new
-    def obj.to_s; "foo"; end
-    assert_decode "foo", obj
-  end
-
-end

data/test/encoding_test.rb

@@ -1,106 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-class HTMLEntities::EncodingTest < Test::Unit::TestCase
-
-  def setup
-    @entities = [:xhtml1, :html4, :expanded].map{ |a| HTMLEntities.new(a) }
-  end
-
-  def assert_encode(expected, input, *args)
-    @entities.each do |coder|
-      assert_equal expected, coder.encode(input, *args)
-    end
-  end
-
-  def test_should_encode_basic_entities
-    assert_encode '&amp;',  '&', :basic
-    assert_encode '&quot;', '"'
-    assert_encode '&lt;',   '<', :basic
-    assert_encode '&lt;',   '<'
-  end
-
-  def test_should_encode_basic_entities_to_decimal
-    assert_encode '&#38;', '&', :decimal
-    assert_encode '&#34;', '"', :decimal
-    assert_encode '&#60;', '<', :decimal
-    assert_encode '&#62;', '>', :decimal
-    assert_encode '&#39;', "'", :decimal
-  end
-
-  def test_should_encode_basic_entities_to_hexadecimal
-    assert_encode '&#x26;', '&', :hexadecimal
-    assert_encode '&#x22;', '"', :hexadecimal
-    assert_encode '&#x3c;', '<', :hexadecimal
-    assert_encode '&#x3e;', '>', :hexadecimal
-    assert_encode '&#x27;', "'", :hexadecimal
-  end
-
-  def test_should_encode_extended_named_entities
-    assert_encode '&plusmn;', '±', :named
-    assert_encode '&eth;',    'ð', :named
-    assert_encode '&OElig;',  'Œ', :named
-    assert_encode '&oelig;',  'œ', :named
-  end
-
-  def test_should_encode_decimal_entities
-    assert_encode '&#8220;', '“', :decimal
-    assert_encode '&#8230;', '…', :decimal
-  end
-
-  def test_should_encode_hexadecimal_entities
-    assert_encode '&#x2212;', '−', :hexadecimal
-    assert_encode '&#x2014;', '—', :hexadecimal
-  end
-
-  def test_should_encode_text_using_mix_of_entities
-    assert_encode(
-      '&quot;bient&ocirc;t&quot; &amp; &#x6587;&#x5b57;',
-      '"bientôt" & 文字', :basic, :named, :hexadecimal
-    )
-    assert_encode(
-      '&quot;bient&ocirc;t&quot; &amp; &#25991;&#23383;',
-      '"bientôt" & 文字', :basic, :named, :decimal
-    )
-  end
-
-  def test_should_sort_commands_when_encoding_using_mix_of_entities
-    assert_encode(
-      '&quot;bient&ocirc;t&quot; &amp; &#x6587;&#x5b57;',
-      '"bientôt" & 文字', :named, :hexadecimal, :basic
-    )
-    assert_encode(
-      '&quot;bient&ocirc;t&quot; &amp; &#25991;&#23383;',
-      '"bientôt" & 文字', :decimal, :named, :basic
-    )
-  end
-
-  def test_should_detect_illegal_encoding_command
-    assert_raise HTMLEntities::InstructionError do
-      HTMLEntities.new.encode('foo', :bar, :baz)
-    end
-  end
-
-  def test_should_not_encode_normal_ASCII
-    assert_encode '`', '`'
-    assert_encode ' ', ' '
-  end
-
-  def test_should_double_encode_existing_entity
-    assert_encode '&amp;amp;', '&amp;'
-  end
-
-  def test_should_not_mutate_string_being_encoded
-    original = "<£"
-    input = original.dup
-    HTMLEntities.new.encode(input, :basic, :decimal)
-
-    assert_equal original, input
-  end
-
-  def test_should_ducktype_parameter_to_string_before_encoding
-    obj = Object.new
-    def obj.to_s; "foo"; end
-    assert_encode "foo", obj
-  end
-end

data/test/entities_test.rb

@@ -1,24 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-class HTMLEntities::EntitiesTest < Test::Unit::TestCase
-
-  def test_should_raise_exception_when_unknown_flavor_specified
-    assert_raises HTMLEntities::UnknownFlavor do
-      HTMLEntities.new('foo')
-    end
-  end
-
-  def test_should_allow_symbol_for_flavor
-    assert_nothing_raised do
-      HTMLEntities.new(:xhtml1)
-    end
-  end
-
-  def test_should_allow_upper_case_flavor
-    assert_nothing_raised do
-      HTMLEntities.new('XHTML1')
-    end
-  end
-
-end

data/test/expanded_test.rb

@@ -1,109 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-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,25 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-class HTML4Test < Test::Unit::TestCase
-
-  attr_reader :html_entities
-
-  def setup
-    @html_entities = HTMLEntities.new('html4')
-  end
-
-  # Found by Marcos Kuhns
-  def test_should_not_encode_apos_entity
-    assert_equal "'", html_entities.encode("'", :basic)
-  end
-
-  def test_should_not_decode_apos_entity
-    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/interoperability_test.rb

@@ -1,15 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-if ENV["RUN_INTEROPERABILITY_TESTS"]
-  class HTMLEntities::InteroperabilityTest < Test::Unit::TestCase
-
-    def test_should_encode_active_support_safe_buffer
-      require 'active_support'
-      string = "<p>This is a test</p>"
-      buffer = ActiveSupport::SafeBuffer.new(string)
-      coder = HTMLEntities.new
-      assert_equal coder.encode(string, :named), coder.encode(buffer, :named)
-    end
-  end
-end

data/test/roundtrip_test.rb

@@ -1,67 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-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, xhtml1_entities.decode(xhtml1_entities.encode(string, :named))
-    end
-  end
-
-  def test_should_roundtrip_xhtml1_entities_via_basic_and_named_encoding
-    each_mapping 'xhtml1' do |name, string|
-      assert_equal 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, 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, 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, html4_entities.decode(html4_entities.encode(string, :named))
-    end
-  end
-
-  def test_should_roundtrip_html4_entities_via_basic_and_named_encoding
-    each_mapping 'html4' do |name, string|
-      assert_equal 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, 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, 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

data/test/string_encodings_test.rb

@@ -1,68 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-class HTMLEntities::StringEncodingsTest < Test::Unit::TestCase
-
-  def test_should_encode_ascii_to_ascii
-    s = "<elan>".encode(Encoding::US_ASCII)
-    assert_equal Encoding::US_ASCII, s.encoding
-
-    t = HTMLEntities.new.encode(s)
-    assert_equal "&lt;elan&gt;", t
-    assert_equal Encoding::US_ASCII, t.encoding
-  end
-
-  def test_should_encode_utf8_to_utf8_if_needed
-    s = "<élan>"
-    assert_equal Encoding::UTF_8, s.encoding
-
-    t = HTMLEntities.new.encode(s)
-    assert_equal "&lt;élan&gt;", t
-    assert_equal Encoding::UTF_8, t.encoding
-  end
-
-  def test_should_encode_utf8_to_ascii_if_possible
-    s = "<elan>"
-    assert_equal Encoding::UTF_8, s.encoding
-
-    t = HTMLEntities.new.encode(s)
-    assert_equal "&lt;elan&gt;", t
-    assert_equal Encoding::US_ASCII, t.encoding
-  end
-
-  def test_should_encode_other_encoding_to_utf8
-    s = "<élan>".encode(Encoding::ISO_8859_1)
-    assert_equal Encoding::ISO_8859_1, s.encoding
-
-    t = HTMLEntities.new.encode(s)
-    assert_equal "&lt;élan&gt;", t
-    assert_equal Encoding::UTF_8, t.encoding
-  end
-
-  def test_should_decode_ascii_to_utf8
-    s = "&lt;&eacute;lan&gt;".encode(Encoding::US_ASCII)
-    assert_equal Encoding::US_ASCII, s.encoding
-
-    t = HTMLEntities.new.decode(s)
-    assert_equal "<élan>", t
-    assert_equal Encoding::UTF_8, t.encoding
-  end
-
-  def test_should_decode_utf8_to_utf8
-    s = "&lt;&eacute;lan&gt;".encode(Encoding::UTF_8)
-    assert_equal Encoding::UTF_8, s.encoding
-
-    t = HTMLEntities.new.decode(s)
-    assert_equal "<élan>", t
-    assert_equal Encoding::UTF_8, t.encoding
-  end
-
-  def test_should_decode_other_encoding_to_utf8
-    s = "&lt;&eacute;lan&gt;".encode(Encoding::ISO_8859_1)
-    assert_equal Encoding::ISO_8859_1, s.encoding
-
-    t = HTMLEntities.new.decode(s)
-    assert_equal "<élan>", t
-    assert_equal Encoding::UTF_8, t.encoding
-  end
-end

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'test/unit'
-require 'htmlentities'

data/test/xhtml1_test.rb

@@ -1,24 +0,0 @@
-# encoding: UTF-8
-require_relative "./test_helper"
-
-class HTMLEntities::XHTML1Test < Test::Unit::TestCase
-
-  attr_reader :html_entities
-
-  def setup
-    @html_entities = HTMLEntities.new('xhtml1')
-  end
-
-  def test_should_encode_apos_entity
-    assert_equal "&apos;", html_entities.encode("'", :basic)
-  end
-
-  def test_should_decode_apos_entity
-    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