Changeset 156

Timestamp:

11/12/2007 10:16:46 (13 months ago)

Author:

why

Message:

* Rakefile: build fast_xs, along with hpricot_scan.
* lib/hpricot: use String.fast_xs in place of Hpricot.xs.

Location:

trunk

Files:

• Rakefile (modified) (5 diffs)
• lib/hpricot/builder.rb (modified) (3 diffs)
• lib/hpricot/traverse.rb (modified) (1 diff)

trunk/Rakefile

@@ -13 +13 @@
 BIN = "*.{bundle,jar,so,obj,pdb,lib,def,exp}"
 ARCHLIB = "lib/#{::Config::CONFIG['arch']}"
-CLEAN.include ["ext/hpricot_scan/#{BIN}", "lib/**/#{BIN}", 'ext/hpricot_scan/Makefile', 
+CLEAN.include ["ext/hpricot_scan/#{BIN}", "ext/fast_xs/#{BIN}", "lib/**/#{BIN}", 
+               'ext/fast_xs/Makefile', 'ext/hpricot_scan/Makefile', 
                '**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', 'The Hpricot Reference', '--main', 'README', '--inline-source']
@@ -67 +68 @@
 end
 
-extension = "hpricot_scan"
-ext = "ext/hpricot_scan"
-ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
-ext_files = FileList[
-  "#{ext}/*.c",
-  "#{ext}/*.h",
-  "#{ext}/*.rl",
-  "#{ext}/extconf.rb",
-  "#{ext}/Makefile",
-  "lib"
-] 
+['hpricot_scan', 'fast_xs'].each do |extension|
+  ext = "ext/#{extension}"
+  ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
+  ext_files = FileList[
+    "#{ext}/*.c",
+    "#{ext}/*.h",
+    "#{ext}/*.rl",
+    "#{ext}/extconf.rb",
+    "#{ext}/Makefile",
+    "lib"
+  ] 
+
+  desc "Builds just the #{extension} extension"
+  task extension.to_sym => ["#{ext}/Makefile", ext_so ]
+
+  file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
+    Dir.chdir(ext) do ruby "extconf.rb" end
+  end
+
+  file ext_so => ext_files do
+    Dir.chdir(ext) do
+      sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
+    end
+    mkdir_p ARCHLIB
+    cp ext_so, ARCHLIB
+  end
+end
 
 task "lib" do
@@ -84 +101 @@
 
 desc "Compiles the Ruby extension"
-task :compile => [:hpricot_scan] do
+task :compile => [:hpricot_scan, :fast_xs] do
   if Dir.glob(File.join(ARCHLIB,"hpricot_scan.*")).length == 0
     STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@@ -95 +112 @@
 task :hpricot_scan => [:ragel]
 
-desc "Builds just the #{extension} extension"
-task extension.to_sym => ["#{ext}/Makefile", ext_so ]
-
-file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
-  Dir.chdir(ext) do ruby "extconf.rb" end
-end
-
-file ext_so => ext_files do
-  Dir.chdir(ext) do
-    sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
-  end
-  mkdir_p ARCHLIB
-  cp ext_so, ARCHLIB
-end
-
 desc "returns the ragel version"
 task :ragel_version do
@@ -129 +131 @@
 Win32Spec = SPEC.dup
 Win32Spec.platform = Gem::Platform::WIN32
-Win32Spec.files = PKG_FILES + ["#{ARCHLIB}/hpricot_scan.so"]
+Win32Spec.files = PKG_FILES + ["#{ARCHLIB}/hpricot_scan.so", "#{ARCHLIB}/fast_xs.so"]
 Win32Spec.extensions = []
   

trunk/lib/hpricot/builder.rb

@@ -1 +1 @@
 require 'hpricot/tags'
-require 'hpricot/xchar'
+require 'fast_xs'
 require 'hpricot/blankslate'
 
 module Hpricot
+  PREDEFINED = {
+    34 => '"', # quotation mark
+    38 => '&',  # ampersand
+    60 => '<',   # left angle bracket
+    62 => '>'    # right angle bracket
+  }
+  PREDEFINED_U = PREDEFINED.inject({}) { |hsh, (k, v)| hsh[v] = k; hsh }
+
+  # XML unescape
+  def self.uxs(str)
+    str.to_s.
+        gsub(/\&\w+;/) { |x| (PREDEFINED_U[x] || ??).chr }.
+        gsub(/\&\#(\d+);/) { [$1.to_i].pack("U*") }
+  end
+
   def self.build(ele = Doc.new, assigns = {}, &blk)
     ele.extend Builder
@@ -33 +48 @@
     # Write a +string+ to the HTML stream, making sure to escape it.
     def text!(string)
-      @children << Text.new(Hpricot.xs(string))
+      @children << Text.new(string.fast_xs)
     end
 
@@ -80 +95 @@
           Hpricot.make(x.to_html)
         elsif x
-          Text.new(Hpricot.xs(x))
+          Text.new(x.fast_xs)
         end
       end.flatten)
       attrs = attrs.inject({}) do |hsh, ath|
         ath.each do |k, v|
-          hsh[k] = Hpricot.xs(v.to_s) if v
+          hsh[k] = v.to_s.fast_xs if v
         end
         hsh

trunk/lib/hpricot/traverse.rb

@@ -817 +817 @@
       altered!
       self.raw_attributes ||= {}
-      self.raw_attributes[name.to_s] = Hpricot.xs(val)
+      self.raw_attributes[name.to_s] = val.fast_xs
     end
     alias_method :[]=, :set_attribute