htmlentities 4.2.3 → 4.2.4

data/lib/htmlentities/decoder.rb

@@ -3,19 +3,25 @@ class HTMLEntities
     def initialize(flavor)
       @flavor = flavor
       @map = HTMLEntities::MAPPINGS[@flavor]
-      @named_entity_regexp = named_entity_regexp
+      @entity_regexp = entity_regexp
     end
 
     def decode(source)
-      source.to_s.gsub(@named_entity_regexp) {
-        (codepoint = @map[$1]) ? [codepoint].pack('U') : $&
-      }.gsub(/&#(?:([0-9]{1,7})|x([0-9a-f]{1,6}));/i) {
-        $1 ? [$1.to_i].pack('U') : [$2.to_i(16)].pack('U')
+      source.to_s.gsub(@entity_regexp) {
+        if $1 && codepoint = @map[$1]
+          [codepoint].pack('U')
+        elsif $2
+          [$2.to_i(10)].pack('U')
+        elsif $3
+          [$3.to_i(16)].pack('U')
+        else
+          $&
+        end
       }
     end
 
   private
-    def named_entity_regexp
+    def entity_regexp
       key_lengths = @map.keys.map{ |k| k.length }
       entity_name_pattern =
         if @flavor == 'expanded'
@@ -23,7 +29,7 @@ class HTMLEntities
         else
           '[a-z][a-z0-9]'
         end
-      /&(#{ entity_name_pattern }{#{ key_lengths.min - 1 },#{ key_lengths.max - 1 }});/i
+      /&(?:(#{entity_name_pattern}{#{key_lengths.min - 1},#{key_lengths.max - 1}})|#([0-9]{1,7})|#x([0-9a-f]{1,6}));/i
     end
   end
 end

data/lib/htmlentities/version.rb

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

data/test/entities_test.rb

@@ -194,6 +194,13 @@ class HTMLEntities::EntitiesTest < Test::Unit::TestCase
     end
   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
     pseudo_string = PseudoString.new('foo')
     assert_decode('foo', pseudo_string)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: htmlentities
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: false
   segments: 
   - 4
   - 2
-  - 3
-  version: 4.2.3
+  - 4
+  version: 4.2.4
 platform: ruby
 authors: 
 - Paul Battley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +00:00
+date: 2011-01-30 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -30,25 +30,25 @@ extra_rdoc_files:
 - History.txt
 - COPYING.txt
 files: 
-- lib/htmlentities.rb
-- lib/htmlentities/legacy.rb
-- lib/htmlentities/flavors.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/mappings/html4.rb
 - lib/htmlentities/decoder.rb
+- lib/htmlentities.rb
+- test/entities_test.rb
 - test/xhtml1_test.rb
-- test/html4_test.rb
-- test/test_all.rb
+- test/roundtrip_test.rb
 - test/legacy_test.rb
 - test/expanded_test.rb
-- test/roundtrip_test.rb
-- test/entities_test.rb
-- perf/performance.rb
+- test/test_all.rb
+- test/html4_test.rb
 - perf/profile.rb
 - perf/benchmark.rb
+- perf/performance.rb
 - README.rdoc
 - History.txt
 - COPYING.txt