htmlentities 4.2.0 → 4.2.1

data/History.txt

@@ -1,3 +1,7 @@
+== 4.2.1 (2010-04-05)
+* Fixed error on Ruby 1.8.x when $KCODE was not set to "UTF8". Thanks to
+  Benoit Larroque for the bug report.
+
 == 4.2.0 (2009-08-24)
 * Added benchmarking code and improved performance.
 

data/lib/htmlentities/encoder.rb

@@ -33,13 +33,15 @@ class HTMLEntities
 
     def extended_entity_regexp
       @extended_entity_regexp ||= (
+        regexp_options = [nil]
         if encoding_aware?
           regexp = '[^\u{20}-\u{7E}]'
         else
           regexp = '[^\x20-\x7E]'
+          regexp_options << "U"
         end
         regexp += "|'" if @flavor == 'html4'
-        Regexp.new(regexp)
+        Regexp.new(regexp, *regexp_options)
       )
     end
 

data/lib/htmlentities/version.rb

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

data/test/entities_test.rb

@@ -182,6 +182,18 @@ class HTMLEntities::EntitiesTest < Test::Unit::TestCase
     assert_decode([948].pack('U'), '&delta;')
   end
 
+  if RUBY_VERSION =~ /^1\.8\./
+    # Reported by Benoit Larroque
+    def test_should_encode_without_error_when_KCODE_is_not_UTF_8
+      kcode = $KCODE
+      $KCODE = "n"
+      coder = HTMLEntities.new;
+      text = [8212].pack('U')
+      assert_equal "&#8212;", coder.encode(text, :decimal)
+      $KCODE = kcode
+    end
+  end
+
   def test_should_ducktype_parameter_to_string_before_encoding
     pseudo_string = PseudoString.new('foo')
     assert_decode('foo', pseudo_string)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: htmlentities
 version: !ruby/object:Gem::Version 
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors: 
 - Paul Battley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +01:00
+date: 2010-04-06 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -24,25 +24,25 @@ extra_rdoc_files:
 - History.txt
 - COPYING.txt
 files: 
-- lib/htmlentities/decoder.rb
+- lib/htmlentities/version.rb
+- lib/htmlentities/flavors.rb
+- lib/htmlentities/encoder.rb
+- lib/htmlentities/legacy.rb
 - lib/htmlentities/mappings/html4.rb
 - lib/htmlentities/mappings/expanded.rb
 - lib/htmlentities/mappings/xhtml1.rb
-- lib/htmlentities/encoder.rb
-- lib/htmlentities/flavors.rb
-- lib/htmlentities/legacy.rb
-- lib/htmlentities/version.rb
+- lib/htmlentities/decoder.rb
 - lib/htmlentities.rb
-- test/html4_test.rb
-- test/test_all.rb
+- test/entities_test.rb
 - test/xhtml1_test.rb
 - test/roundtrip_test.rb
-- test/expanded_test.rb
 - test/legacy_test.rb
-- test/entities_test.rb
+- test/expanded_test.rb
+- test/test_all.rb
+- test/html4_test.rb
+- perf/profile.rb
 - perf/benchmark.rb
 - perf/performance.rb
-- perf/profile.rb
 - setup.rb
 - README.txt
 - History.txt