fast_xs 0.7.3 → 0.8.0

data/GNUmakefile

@@ -1,16 +1,27 @@
 all: test
 ext := fast_xs fast_xs_extra
-ruby = ruby
-DLEXT := $(shell $(ruby) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
+RUBY = ruby
+DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
 
 libs := $(addsuffix .$(DLEXT),$(addprefix lib/,$(ext)))
 build: $(libs)
 
+makefiles = $(addsuffix /Makefile,$(addprefix ext/,$(ext)))
+
 %/Makefile: %/extconf.rb
-	cd $(@D) && $(ruby) extconf.rb
-lib/fast_xs.$(DLEXT): ext/fast_xs/Makefile
-lib/fast_xs_extra.$(DLEXT): ext/fast_xs_extra/Makefile
-%.$(DLEXT):
+	cd $(@D) && $(RUBY) extconf.rb
+
+deps := ext/fast_xs/Makefile $(wildcard ext/fast_xs/*.[ch])
+extra_deps := ext/fast_xs_extra/Makefile $(wildcard ext/fast_xs_extra/*.[ch])
+
+ext/fast_xs/fast_xs.$(DLEXT): $(deps)
+	$(MAKE) -C $(@D)
+ext/fast_xs_extra/fast_xs_extra.$(DLEXT): $(extra_deps)
+	$(MAKE) -C $(@D)
+
+lib/fast_xs.$(DLEXT): ext/fast_xs/fast_xs.$(DLEXT)
+lib/fast_xs_extra.$(DLEXT): ext/fast_xs_extra/fast_xs_extra.$(DLEXT)
+lib/%.$(DLEXT):
 	$(MAKE) -C $(<D)
 	install -m 644 $(<D)/$(@F) $@
 %/clean:
@@ -23,6 +34,6 @@ T := $(wildcard test/test_*.rb)
 test:
 	$(MAKE) $(T)
 $(T): $(libs)
-	$(ruby) -w -Ilib $@
+	$(RUBY) -w -Ilib $@
 
 .PHONY: test doc build all $(T)

data/{History.txt → History.rdoc}

@@ -1,3 +1,12 @@
+=== 0.8.0 / 2011-01-26
+
+* preserve encoding of original string under Ruby 1.9
+* avoid warnings when monkey patching
+* internal cleanups
+
+Browse gitweb for full history:
+  http://fast-xs.rubyforge.org/git?p=fast-xs.git
+
 === 0.7.3 / 2009-07-31
 
 * 1 bug fix:

data/Manifest.txt

@@ -1,8 +1,8 @@
 .gitignore
 GNUmakefile
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 ext/fast_xs/extconf.rb
 ext/fast_xs/fast_xs.c
@@ -15,4 +15,6 @@ lib/fast_xs_monkey_patcher.rb
 setup.rb
 test/test_cgi_class_overrides.rb
 test/test_erb_util_module_overrides.rb
+test/test_mongrel_overrides.rb
+test/test_rack_util_overrides.rb
 test/test_xml_escaping.rb

data/{README.txt → README.rdoc}

@@ -50,7 +50,7 @@ Rubinius project.
 
 (The MIT License)
 
-Copyright (c) Eric Wong
+Copyright (c) all contributors (see logs in git)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,18 +1,21 @@
 require 'hoe'
-begin
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new('fast_xs')
-  Rake::ExtensionTask.new('fast_xs_extra')
-rescue LoadError
-  warn "rake-compiler not available, cross compiling disabled"
-end
-
-Hoe.spec('fast_xs') do
-  self.version = '0.7.3'
-  self.author = 'Eric Wong'
+hoe = Hoe.spec('fast_xs') do
+  self.version = '0.8.0'
+  self.author = 'fast_xs hackers'
   self.email = 'fast-xs-general@rubyforge.org'
   self.url = 'http://fast-xs.rubyforge.org/'
+  self.history_file = 'History.rdoc'
+  self.readme_file = 'README.rdoc'
   self.remote_rdoc_dir = ''
   self.rubyforge_name = 'fast-xs'
   self.spec_extras = { :extensions => Dir.glob('ext/*/extconf.rb') }
 end
+
+# optional rake-compiler support in case somebody needs to cross compile
+begin
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new('fast_xs', hoe.spec)
+  Rake::ExtensionTask.new('fast_xs_extra', hoe.spec)
+rescue LoadError
+  warn "rake-compiler not available, cross compiling disabled"
+end

data/ext/fast_xs/fast_xs.c

@@ -163,7 +163,7 @@ static VALUE fast_xs(VALUE self)
 			s_len += bytes_for(n) - 1;
 	}
 
-	rv = rb_str_new(NULL, s_len);
+	rv = fast_xs_buf_new(self, s_len);
 	c = RSTRING_PTR(rv);
 
 	for (tmp = RARRAY_PTR(array), i = RARRAY_LEN(array); --i >= 0; tmp++)

data/ext/fast_xs/ruby_1_9_compat.h

@@ -12,3 +12,18 @@
 #  define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+static VALUE fast_xs_buf_new(VALUE orig, long len)
+{
+	rb_encoding *enc = rb_enc_get(orig);
+	VALUE str = rb_str_new(NULL, len);
+
+	return rb_enc_associate(str, enc);
+}
+#else /* ! HAVE_RUBY_ENCODING_H */
+static VALUE fast_xs_buf_new(VALUE orig, long len)
+{
+	return rb_str_new(NULL, len);
+}
+#endif /* ! HAVE_RUBY_ENCODING_H */

data/ext/fast_xs_extra/fast_xs_extra.c

@@ -4,6 +4,10 @@
 #include "fast_xs_type.h"
 #include "gcc.h"
 
+#define APPEND_CONST(buf, x) do { \
+	buf = (char *)memcpy(buf, x, sizeof(x) - 1) + sizeof(x) - 1; \
+} while (0)
+
 /*
  * This is coding agnostic, and works on each byte, so some multibyte
  * character sets may not be fully supported (but UTF-8 should be).
@@ -27,28 +31,22 @@ static VALUE fast_xs_html(VALUE self)
 			new_len += (sizeof(""") - 2);
 	}
 
-	rv = rb_str_new(NULL, new_len);
+	rv = fast_xs_buf_new(self, new_len);
 	new_str = RSTRING_PTR(rv);
 
-#define append_const(buf, x) do { \
-	buf = memcpy(buf, x, sizeof(x) - 1) + sizeof(x) - 1; \
-} while (0)
-
 	for (s = RSTRING_PTR(self), i = RSTRING_LEN(self); --i >= 0; ++s) {
 		if (unlikely(*s == '&'))
-			append_const(new_str, "&");
+			APPEND_CONST(new_str, "&");
 		else if (unlikely(*s == '<'))
-			append_const(new_str, "&lt;");
+			APPEND_CONST(new_str, "&lt;");
 		else if (unlikely(*s == '>'))
-			append_const(new_str, "&gt;");
+			APPEND_CONST(new_str, "&gt;");
 		else if (unlikely(*s == '"'))
-			append_const(new_str, "&quot;");
+			APPEND_CONST(new_str, "&quot;");
 		else
 			*new_str++ = *s;
 	}
 
-#undef append_const
-
 	return rv;
 }
 
@@ -72,7 +70,7 @@ static inline VALUE _xs_uri_encode(VALUE self, const unsigned int space_to_plus)
 		new_len += 2;
 	}
 
-	rv = rb_str_new(NULL, new_len);
+	rv = fast_xs_buf_new(self, new_len);
 	new_str = RSTRING_PTR(rv);
 
 	for (s = RSTRING_PTR(self), i = RSTRING_LEN(self); --i >= 0; ++s) {
@@ -132,7 +130,7 @@ static VALUE _uxs_uri(VALUE self, const unsigned int plus_to_space)
 		}
 	}
 
-	rv = rb_str_new(NULL, new_len);
+	rv = fast_xs_buf_new(self, new_len);
 	new_str = RSTRING_PTR(rv);
 
 	for (s = RSTRING_PTR(self), i = RSTRING_LEN(self);

data/lib/fast_xs_monkey_patcher.rb

@@ -2,13 +2,22 @@ require 'fast_xs'
 require 'fast_xs_extra'
 
 class CGI # :nodoc:
-  def CGI::escapeHTML(value); value.fast_xs_html; end
-  def CGI::escape(value); value.fast_xs_cgi; end
-  def CGI::unescape(value); value.fast_uxs_cgi; end
+  class << self
+    undef_method :escapeHTML
+    undef_method :escape
+    undef_method :unescape
+    def escapeHTML(value); value.fast_xs_html; end
+    def escape(value); value.fast_xs_cgi; end
+    def unescape(value); value.fast_uxs_cgi; end
+  end
 end if defined?(CGI)
 
 class ERB # :nodoc:
   module Util # :nodoc:
+    undef_method :html_escape
+    undef_method :h
+    undef_method :url_encode
+    undef_method :u
 
     def html_escape(value); value.to_s.fast_xs_html; end
     alias h html_escape
@@ -24,16 +33,22 @@ end if defined?(ERB::Util)
 
 module Mongrel # :nodoc:
   class HttpRequest # :nodoc:
-    def self.unescape(s); s.fast_uxs_cgi; end
-    def self.escape(s); s.to_s.fast_xs_cgi; end
+    class << self
+      undef_method :unescape
+      undef_method :escape
+      def unescape(s); s.fast_uxs_cgi; end
+      def escape(s); s.to_s.fast_xs_cgi; end
+    end
   end
 end if defined?(Mongrel::HttpRequest)
 
 module Rack # :nodoc:
   module Utils # :nodoc:
+    undef_method :unescape
     def unescape(s); s.fast_uxs_cgi; end
     module_function :unescape
 
+    undef_method :escape
     def escape(s); s.to_s.fast_xs_cgi; end
     module_function :escape
   end

data/test/test_cgi_class_overrides.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'test/unit'
 require 'cgi'
 require 'fast_xs_monkey_patcher'
@@ -56,6 +57,21 @@ class TestCgiClassOverrides < Test::Unit::TestCase
     end
   end
 
+  def test_default_encoding_preserved
+    amp = "&"
+    assert_equal Encoding::UTF_8, amp.encoding
+    res = CGI.escapeHTML(amp)
+    assert_equal "&amp;", res
+    assert_equal Encoding::UTF_8, res.encoding
+  end if defined?(Encoding)
 
+  def test_forced_encoding_preserved
+    amp = "&"
+    assert_nothing_raised {
+      amp.force_encoding Encoding::US_ASCII
+    }
+    res = CGI.escapeHTML(amp)
+    assert_equal "&amp;", res
+    assert_equal Encoding::US_ASCII, res.encoding
+  end if defined?(Encoding)
 end
-

data/test/test_erb_util_module_overrides.rb

@@ -33,6 +33,21 @@ class TestErbUtilModuleOverrides < Test::Unit::TestCase
     assert_equal 'H3LL0%20W0RLD', url_encode('H3LL0 W0RLD')
   end
 
+  def test_preserve_encoding
+    foo = "foo"
+    foo.force_encoding Encoding::US_ASCII
+    assert_equal Encoding::US_ASCII, url_encode(foo).encoding
+    assert_equal Encoding::US_ASCII, html_escape(foo).encoding
+    assert_equal Encoding::US_ASCII, u(foo).encoding
+    assert_equal Encoding::US_ASCII, h(foo).encoding
+
+    foo.force_encoding Encoding::BINARY
+    assert_equal Encoding::BINARY, url_encode(foo).encoding
+    assert_equal Encoding::BINARY, html_escape(foo).encoding
+    assert_equal Encoding::BINARY, u(foo).encoding
+    assert_equal Encoding::BINARY, h(foo).encoding
+  end if defined?(Encoding)
+
   def test_large_strings
     if ENV['LARGE_STRING_TEST']
       assert u('&' * (8192 * 1024))

data/test/test_mongrel_overrides.rb

@@ -0,0 +1,20 @@
+begin
+  require 'mongrel'
+  $orig_escape = Mongrel::HttpRequest.method(:escape)
+  $orig_unescape = Mongrel::HttpRequest.method(:unescape)
+rescue SyntaxError,LoadError => e
+  warn "skipping Mongrel test, Mongrel not available or broken under 1.9.2"
+end
+
+require 'test/unit'
+require 'fast_xs_monkey_patcher'
+
+class TestMongrelHttpOverrides < Test::Unit::TestCase
+  def test_escape
+    assert_equal "%2B", Mongrel::HttpRequest.escape("+")
+  end
+
+  def test_unescape
+    assert_equal "+", Mongrel::HttpRequest.unescape("%2B")
+  end
+end if defined?(Mongrel::HttpRequest)

data/test/test_rack_util_overrides.rb

@@ -0,0 +1,43 @@
+require 'rack'
+$orig_escape = Rack::Utils.method(:escape)
+$orig_unescape = Rack::Utils.method(:unescape)
+require 'test/unit'
+require 'fast_xs_monkey_patcher'
+
+# copied and translated to Test::Unit from test/spec_utils.rb in rack
+
+class TestRackUtilModuleOverrides < Test::Unit::TestCase
+
+  def test_overidden
+    assert $orig_escape != Rack::Utils.method(:escape)
+    assert $orig_unescape != Rack::Utils.method(:unescape)
+  end
+
+  def test_escape_html_predefined
+    assert_equal "fo%3Co%3Ebar", Rack::Utils.escape("fo<o>bar")
+    assert_equal "a+space", Rack::Utils.escape("a space")
+    assert_equal "q1%212%22%27w%245%267%2Fz8%29%3F%5C",
+                  Rack::Utils.escape("q1!2\"'w$5&7/z8)?\\")
+
+    matz_name = # Matsumoto
+      "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0]
+    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    assert_equal '%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8',
+                 Rack::Utils.escape(matz_name)
+
+    matz_name_sep = # Matsu moto
+      "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0]
+    matz_name_sep.respond_to?(:force_encoding) and
+        matz_name_sep.force_encoding("UTF-8")
+    assert_equal '%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8',
+                 Rack::Utils.escape(matz_name_sep)
+  end
+
+  def test_unescape
+    assert_equal "fo<o>bar", Rack::Utils.unescape("fo%3Co%3Ebar")
+    assert_equal "a space", Rack::Utils.unescape("a+space")
+    assert_equal "a space", Rack::Utils.unescape("a%20space")
+    assert_equal "q1!2\"'w$5&7/z8)?\\",
+                 Rack::Utils.unescape("q1%212%22%27w%245%267%2Fz8%29%3F%5C")
+  end
+end

data/test/test_xml_escaping.rb

@@ -37,6 +37,30 @@ class TestXmlEscaping < Test::Unit::TestCase
     assert_equal '&#169;',  "\xC2\xA9".fast_xs     # copy
   end
 
+  def test_iso_8859_1_encoding_preserved
+    copyright = "\xA9"
+    copyright.force_encoding Encoding::ISO_8859_1
+    assert_equal '&#169;', copyright.fast_xs
+    assert copyright.fast_xs.valid_encoding?
+    assert_equal Encoding::ISO_8859_1, copyright.fast_xs.encoding
+  end if defined?(Encoding)
+
+  def test_win_1252_encoding_preserved
+    euro = "\x80"
+    euro.force_encoding Encoding::CP1252
+    assert_equal '&#8364;', euro.fast_xs
+    assert euro.fast_xs.valid_encoding?
+    assert_equal Encoding::CP1252, euro.fast_xs.encoding
+  end if defined?(Encoding)
+
+  def test_utf8_encoding_preserved
+    copy = "\xC2\xA9"
+    copy.force_encoding Encoding::UTF_8
+    assert_equal '&#169;',  copy.fast_xs
+    assert_equal Encoding::UTF_8,  copy.fast_xs.encoding
+    assert copy.fast_xs.valid_encoding?
+  end if defined?(Encoding)
+
   def test_large_document
     if ENV['LARGE_STRING_TEST']
       assert(('&' * (8192 * 1024)).fast_xs)

metadata

@@ -1,27 +1,39 @@
 --- !ruby/object:Gem::Specification 
 name: fast_xs
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  hash: 63
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
-- Eric Wong
+- fast_xs hackers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -07:00
+date: 2011-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id001
 description: |-
   fast_xs provides C extensions for escaping text.
   
@@ -49,15 +61,13 @@ extensions:
 - ext/fast_xs/extconf.rb
 - ext/fast_xs_extra/extconf.rb
 extra_rdoc_files: 
-- History.txt
 - Manifest.txt
-- README.txt
 files: 
 - .gitignore
 - GNUmakefile
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - ext/fast_xs/extconf.rb
 - ext/fast_xs/fast_xs.c
@@ -70,6 +80,8 @@ files:
 - setup.rb
 - test/test_cgi_class_overrides.rb
 - test/test_erb_util_module_overrides.rb
+- test/test_mongrel_overrides.rb
+- test/test_rack_util_overrides.rb
 - test/test_xml_escaping.rb
 has_rdoc: true
 homepage: http://fast-xs.rubyforge.org/
@@ -78,30 +90,37 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: fast-xs
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: fast_xs provides C extensions for escaping text
 test_files: 
-- test/test_cgi_class_overrides.rb
 - test/test_xml_escaping.rb
+- test/test_mongrel_overrides.rb
+- test/test_rack_util_overrides.rb
+- test/test_cgi_class_overrides.rb
 - test/test_erb_util_module_overrides.rb