[etch-devel] SF.net SVN: etch:[292] trunk/server/lib/etch.rb

[<jh...@us...>]

Revision: 292
          http://etch.svn.sourceforge.net/etch/?rev=292&view=rev
Author:   jheiss
Date:     2011-06-01 16:39:39 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
Make nokogiri the default XML library instead of libxml

Modified Paths:
--------------
    trunk/server/lib/etch.rb

Modified: trunk/server/lib/etch.rb
===================================================================
--- trunk/server/lib/etch.rb	2011-06-01 16:39:16 UTC (rev 291)
+++ trunk/server/lib/etch.rb	2011-06-01 16:39:39 UTC (rev 292)
@@ -27,14 +27,14 @@
 # or the other, mostly for testing purposes.
 Silently.silently do
   begin
-    if !ENV['xmllib'] || ENV['xmllib'] == 'libxml'
+    if !ENV['xmllib'] || ENV['xmllib'] == 'nokogiri'
+      require 'rubygems'  # nokogiri is a gem
+      require 'nokogiri'
+      Etch.xmllib = :nokogiri
+    elsif ENV['xmllib'] == 'libxml'
       require 'rubygems'  # libxml is a gem
       require 'libxml'
       Etch.xmllib = :libxml
-    elsif ENV['xmllib'] == 'nokogiri'
-      require 'rubygems'  # nokogiri is a gem
-      require 'nokogiri'
-      Etch.xmllib = :nokogiri
     else
       raise LoadError
     end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.