htmlentities 4.3.0 → 4.3.1

data/History.txt

@@ -1,3 +1,7 @@
+== 4.3.1 (2011-11-30)
+* Fix bug when working with Rails 3/Ruby 1.8.7
+* Make character encoding behaviour consistent in Ruby 1.9.2/1.9.3
+
 == 4.3.0 (2011-03-29)
 * Use Ruby 1.9's encoding support where available.
 * Deprecated HTMLEntities.encode_entities/decode_entities interface is now

data/lib/htmlentities/decoder.rb

@@ -7,7 +7,7 @@ class HTMLEntities
     end
 
     def decode(source)
-      prepare(source).gsub(@entity_regexp) {
+      prepare(source).gsub(@entity_regexp){
         if $1 && codepoint = @map[$1]
           [codepoint].pack('U')
         elsif $2

data/lib/htmlentities/encoder.rb

@@ -13,9 +13,11 @@ class HTMLEntities
     end
 
     def encode(source)
-      prepare(source).
-        gsub(basic_entity_regexp){ encode_basic($&) }.
-        gsub(extended_entity_regexp){ encode_extended($&) }
+      post_process(
+        prepare(source).
+          gsub(basic_entity_regexp){ |match| encode_basic(match) }.
+          gsub(extended_entity_regexp){ |match| encode_extended(match) }
+      )
     end
 
   private
@@ -24,21 +26,26 @@ class HTMLEntities
       def prepare(string) #:nodoc:
         string.to_s.encode(Encoding::UTF_8)
       end
+
+      def post_process(string)
+        if string.encoding != Encoding::ASCII && string.match(/\A[\x01-\x7F]*\z/)
+          string.encode(Encoding::ASCII)
+        else
+          string
+        end
+      end
     else
       def prepare(string) #:nodoc:
         string.to_s
       end
+
+      def post_process(string)
+        string
+      end
     end
 
     def basic_entity_regexp
-      @basic_entity_regexp ||= (
-        case @flavor
-        when /^html/
-          /[<>"&]/
-        else
-          /[<>'"&]/
-        end
-      )
+      @basic_entity_regexp ||= @flavor.match(/^html/) ? /[<>"&]/ : /[<>'"&]/
     end
 
     def extended_entity_regexp

data/lib/htmlentities/version.rb

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

data/perf/benchmark.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 $KCODE = 'u' unless "1.9".respond_to?(:encoding)
 
-require File.join(File.dirname(__FILE__), "performance")
+require File.expand_path("../performance", __FILE__)
 require "benchmark"
 
 job = HTMLEntitiesJob.new

data/test/interoperability_test.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+require File.expand_path("../common", __FILE__)
+
+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

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: htmlentities
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
-  segments: 
-  - 4
-  - 3
-  - 0
-  version: 4.3.0
+  prerelease: 
+  version: 4.3.1
 platform: ruby
 authors: 
 - Paul Battley
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +01:00
-default_executable: 
+date: 2011-11-30 00:00:00 Z
 dependencies: []
 
 description: 
@@ -29,31 +23,31 @@ extra_rdoc_files:
 - History.txt
 - COPYING.txt
 files: 
-- lib/htmlentities.rb
-- lib/htmlentities/flavors.rb
-- lib/htmlentities/version.rb
 - lib/htmlentities/encoder.rb
-- lib/htmlentities/mappings/expanded.rb
+- lib/htmlentities/decoder.rb
 - lib/htmlentities/mappings/xhtml1.rb
+- lib/htmlentities/mappings/expanded.rb
 - lib/htmlentities/mappings/html4.rb
-- lib/htmlentities/decoder.rb
-- test/decoding_test.rb
-- test/ruby_1_8_test.rb
-- test/xhtml1_test.rb
+- lib/htmlentities/flavors.rb
+- lib/htmlentities/version.rb
+- lib/htmlentities.rb
 - test/html4_test.rb
+- test/ruby_1_8_test.rb
+- test/roundtrip_test.rb
 - test/encoding_test.rb
-- test/expanded_test.rb
-- test/ruby_1_9_test.rb
 - test/common.rb
-- test/roundtrip_test.rb
+- test/xhtml1_test.rb
+- test/decoding_test.rb
+- test/ruby_1_9_test.rb
+- test/expanded_test.rb
 - test/entities_test.rb
+- test/interoperability_test.rb
+- perf/benchmark.rb
 - perf/performance.rb
 - perf/profile.rb
-- perf/benchmark.rb
 - History.txt
 - COPYING.txt
-has_rdoc: true
-homepage: http://htmlentities.rubyforge.org/
+homepage: https://github.com/threedaymonk/htmlentities
 licenses: []
 
 post_install_message: 
@@ -66,33 +60,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A module for encoding and decoding (X)HTML entities.
 test_files: 
-- test/decoding_test.rb
-- test/ruby_1_8_test.rb
-- test/xhtml1_test.rb
 - test/html4_test.rb
+- test/ruby_1_8_test.rb
+- test/roundtrip_test.rb
 - test/encoding_test.rb
-- test/expanded_test.rb
+- test/xhtml1_test.rb
+- test/decoding_test.rb
 - test/ruby_1_9_test.rb
-- test/roundtrip_test.rb
+- test/expanded_test.rb
 - test/entities_test.rb
+- test/interoperability_test.rb