lib/rfm.rb in ginjo-rfm-3.0.4 vs lib/rfm.rb in ginjo-rfm-3.0.5

@@ -57,48 +57,51 @@
 	def info_short
 		"Using ginjo-rfm version #{::Rfm::VERSION} with #{SaxParser::Handler.get_backend}"
 	end
 	
 	def_delegators 'Rfm::Factory', :servers, :server, :db, :database, :layout
-	def_delegators 'Rfm::SaxParser', :backend, :backend=
-	def_delegators 'Rfm::SaxParser::Handler', :get_backend
 	def_delegators 'Rfm::Config', :config, :get_config, :config_clear
 	def_delegators 'Rfm::Resultset', :load_data
-	alias_method		:parser, :backend
-	alias_method		:parser=, :backend=
 	
 	def models(*args)
 		Rfm::Base
 		Rfm::Factory.models(*args)
 	end
 	
 	def modelize(*args)
 		Rfm::Base
 		Rfm::Factory.modelize(*args)
 	end
-	
-	#attr_accessor :log
-	
+		
 	def logger
 		@@logger ||= get_config[:logger] || Logger.new(STDOUT).tap {|l| l.formatter = proc {|severity, datetime, progname, msg| "#{datetime}: Rfm-#{severity} #{msg}\n"}}
 	end
 	
 	alias_method :log, :logger
 	
 	def logger=(obj)
 		@@logger = obj
 	end
 	
+	# 	DEFAULT_CLASS = CaseInsensitiveHash
+	# 	TEMPLATE_PREFIX = File.join(File.dirname(__FILE__), 'rfm/utilities/sax/')
+	# 	TEMPLATES = {
+	# 		:fmpxmllayout => 'fmpxmllayout.yml',
+	# 		:fmresultset => 'fmresultset.yml',
+	# 		:fmpxmlresult => 'fmpxmlresult.yml',
+	# 		:none => nil
+	# 	}
 	
+	PARSER_DEFAULTS = {
+		:default_class => CaseInsensitiveHash,
+		:template_prefix => File.join(File.dirname(__FILE__), 'rfm/utilities/sax/'),
+		:templates => {
+			:fmpxmllayout => 'fmpxmllayout.yml',
+			:fmresultset => 'fmresultset.yml',
+			:fmpxmlresult => 'fmpxmlresult.yml',
+			:none => nil
+		}
+	}	
 	
 	extend self
 	
-	SaxParser.default_class = CaseInsensitiveHash
-	SaxParser.template_prefix = File.join(File.dirname(__FILE__), 'rfm/utilities/sax/')
-	SaxParser.templates.merge!({
-		:fmpxmllayout => 'fmpxmllayout.yml',
-		:fmresultset => 'fmresultset.yml',
-		:fmpxmlresult => 'fmpxmlresult.yml',
-		:none => nil
-	})
-
 end # Rfm