From ec6a92efc4737c74a6b0291d0d6f1382c2c76604 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 17 Oct 2012 11:06:19 +0200 Subject: [PATCH] [api,webui] merge some classes that were all the same: ActiveXML::Base ActiveXML::Node ActiveXML::XMLNode ActiveXML::LibXMLNode new name: ActiveXML::Node --- src/activexml/activexml.rb | 1 - src/activexml/base.rb | 183 ------------- src/activexml/node.rb | 254 +++++++++++++++--- src/api/app/controllers/message_controller.rb | 2 +- src/api/app/controllers/public_controller.rb | 2 +- src/api/app/controllers/request_controller.rb | 8 +- src/api/app/controllers/search_controller.rb | 2 +- src/api/app/controllers/source_controller.rb | 10 +- .../app/controllers/statistics_controller.rb | 2 +- src/api/app/controllers/status_controller.rb | 14 +- src/api/app/controllers/tag_controller.rb | 2 +- src/api/app/helpers/maintenance_helper.rb | 6 +- src/api/app/helpers/status_helper.rb | 4 +- src/api/app/helpers/validation_helper.rb | 4 +- src/api/app/models/collection.rb | 2 +- src/api/app/models/directory.rb | 2 +- src/api/app/models/jobhistory.rb | 2 +- src/api/app/models/project.rb | 2 +- src/api/config/initializers/logging.rb | 4 +- src/api/script/import | 6 +- .../architectures_controller_test.rb | 2 +- src/api/test/functional/attributes_test.rb | 14 +- .../test/functional/build_controller_test.rb | 4 +- src/api/test/functional/interconnect_test.rb | 6 +- src/api/test/functional/maintenance_test.rb | 64 ++--- .../functional/message_controller_test.rb | 4 +- .../functional/release_management_test.rb | 12 +- .../functional/request_controller_test.rb | 84 +++--- .../test/functional/search_controller_test.rb | 4 +- .../test/functional/source_controller_test.rb | 12 +- .../test/functional/source_services_test.rb | 8 +- .../test/functional/status_controller_test.rb | 4 +- src/api/test/test_consistency_helper.rb | 4 +- src/api/test/test_helper.rb | 8 +- src/api/test/unit/attribute_test.rb | 4 +- .../app/controllers/application_controller.rb | 2 +- .../controllers/driver_update_controller.rb | 2 +- .../app/controllers/package_controller.rb | 4 +- .../app/controllers/patchinfo_controller.rb | 6 +- .../app/controllers/project_controller.rb | 8 +- src/webui/app/models/architecture.rb | 2 +- src/webui/app/models/attribute.rb | 2 +- src/webui/app/models/bs_request.rb | 8 +- src/webui/app/models/builddep_info.rb | 2 +- src/webui/app/models/buildresult.rb | 2 +- src/webui/app/models/collection.rb | 2 +- src/webui/app/models/directory.rb | 2 +- src/webui/app/models/distribution.rb | 2 +- src/webui/app/models/downloadcounter.rb | 2 +- src/webui/app/models/fileinfo.rb | 2 +- src/webui/app/models/global_counters.rb | 2 +- src/webui/app/models/group.rb | 2 +- src/webui/app/models/issue.rb | 2 +- src/webui/app/models/issue_tracker.rb | 2 +- src/webui/app/models/jobhislist.rb | 2 +- src/webui/app/models/latest_added.rb | 2 +- src/webui/app/models/latest_updated.rb | 2 +- src/webui/app/models/link.rb | 8 +- src/webui/app/models/most_active_packages.rb | 2 +- src/webui/app/models/most_active_projects.rb | 2 +- src/webui/app/models/package.rb | 8 +- src/webui/app/models/package_attribute.rb | 2 +- src/webui/app/models/patchinfo.rb | 2 +- src/webui/app/models/person.rb | 6 +- src/webui/app/models/person_group.rb | 2 +- src/webui/app/models/project.rb | 8 +- src/webui/app/models/project_status.rb | 2 +- src/webui/app/models/result.rb | 2 +- src/webui/app/models/service.rb | 4 +- src/webui/app/models/sourcediff.rb | 2 +- src/webui/app/models/statusmessage.rb | 4 +- src/webui/app/models/unregisteredperson.rb | 2 +- src/webui/app/models/userchangepasswd.rb | 2 +- src/webui/app/models/wizard.rb | 2 +- src/webui/app/models/workerstatus.rb | 2 +- src/webui/config/initializers/activexml.rb | 2 +- src/webui/config/initializers/logging.rb | 4 +- src/webui/test/functional/spider_test.rb | 2 +- 78 files changed, 431 insertions(+), 447 deletions(-) delete mode 100644 src/activexml/base.rb diff --git a/src/activexml/activexml.rb b/src/activexml/activexml.rb index e4a738becda..f8602df57e8 100644 --- a/src/activexml/activexml.rb +++ b/src/activexml/activexml.rb @@ -6,6 +6,5 @@ end require File.join(File.dirname(__FILE__), 'node') -require File.join(File.dirname(__FILE__), 'base') require File.join(File.dirname(__FILE__), 'transport') require File.join(File.dirname(__FILE__), 'matcher') diff --git a/src/activexml/base.rb b/src/activexml/base.rb deleted file mode 100644 index 85e5f5de54d..00000000000 --- a/src/activexml/base.rb +++ /dev/null @@ -1,183 +0,0 @@ -module ActiveXML - class GeneralError < StandardError; end - class NotFoundError < GeneralError; end - class CreationError < GeneralError; end - class ParseError < GeneralError; end - - class Base < LibXMLNode - - attr_reader :init_options - attr_reader :cache_key - - @default_find_parameter = :name - @@object_cache = {} - - class << self #class methods - - #transport object, gets defined according to configuration when Base is subclassed - attr_reader :transport - - def inherited( subclass ) - # called when a subclass is defined - #logger.debug "Initializing ActiveXML model #{subclass}" - subclass.instance_variable_set "@default_find_parameter", @default_find_parameter - end - private :inherited - - # setup the default parameter for find calls. If the first parameter to .find is a string, - # the value of this string is used as value f - def default_find_parameter( sym ) - @default_find_parameter = sym - end - - def setup(transport_object) - super() - @@transport = transport_object - #logger.debug "--> ActiveXML successfully set up" - true - end - - def error - @error - end - - def prepare_args( args ) - if args[0].kind_of? String - args[1] ||= {} - first_arg = args.shift - hash = args.shift - hash[@default_find_parameter] = first_arg - args.insert(0, hash) - end - if args[0].kind_of? Hash - hash = Hash.new - args[0].each do |key, value| - if key.nil? or value.nil? - logger.debug "nil value given #{args.inspect}" - next - end - if value.kind_of? Array - hash[key.to_sym] = value - else - hash[key.to_sym] = value.to_s - end - end - args[0] = hash - end - - #logger.debug "prepared find args: #{args.inspect}" - return args - end - - def calc_key( args ) - #logger.debug "Cache key for #{args.inspect}" - self.name + "_" + Digest::MD5.hexdigest( "2" + args.to_s ) - end - - def free_object_cache - @@object_cache = {} - end - - def find_priv(cache_time, *args ) - cache_key = calc_key( args ) - if cache_time - obj = @@object_cache[cache_key] - return obj if obj - end - - #FIXME: needs cleanup - #TODO: factor out xml stuff to ActiveXML::Node - #logger.debug "#{self.name}.find( #{cache_time.inspect}, #{args.join(', ')})" - - objhash = nil - begin - if cache_time - objdata, params, objhash = Rails.cache.fetch(cache_key, :expires_in => cache_time) do - objdata, params = ActiveXML::transport.find( self, *(prepare_args(args)) ) - obj = self.new( objdata ) - [objdata, params, obj.to_hash] - end - else - objdata, params = ActiveXML::transport.find( self, *(prepare_args(args)) ) - end - obj = self.new( objdata ) unless obj - obj.instance_variable_set( '@cache_key', cache_key ) if cache_key - obj.instance_variable_set( '@init_options', params ) - obj.instance_variable_set( '@hash_cache', objhash) if objhash - @@object_cache[cache_key] = obj - return obj - rescue ActiveXML::Transport::NotFoundError - logger.debug "#{self.name}.find( #{args.map {|a| a.inspect}.join(', ')} ) did not find anything, return nil" - return nil - end - end - - def find( *args ) - find_priv(nil, *args ) - end - - def find_cached( *args ) - expires_in = 30.minutes - if args.last.kind_of?(Hash) and args.last[:expires_in] - expires_in = args.last[:expires_in] - args.last.delete :expires_in - end - find_priv(expires_in, *args) - end - - def find_hashed( *args ) - ret = find_cached( *args ) - return {} unless ret - ret.to_hash - end - - def free_cache( *args ) - # modify copy of args as it might be still used in the calling method - free_args = args.dup - options = free_args.last if free_args.last.kind_of?(Hash) - if options && options[:expires_in] - free_args[free_args.length-1] = free_args.last.dup - free_args.last.delete :expires_in - end - key = calc_key( free_args ) - @@object_cache.delete key - Rails.cache.delete( key ) - end - - end #class methods - - def initialize( data, opt={} ) - super(data) - opt = data if data.kind_of? Hash and opt.empty? - @init_options = opt - end - - def name - method_missing( :name ) - end - - def marshal_dump - raise "you don't want to put it in cache - never!" - end - - def save(opt={}) - if opt[:create] - @raw_data = ActiveXML::transport.create self, opt - @data = nil - @to_hash = nil - else - ActiveXML::transport.save self, opt - end - Rails.cache.delete @cache_key if @cache_key - return true - end - - def delete(opt={}) - #logger.debug "Delete #{self.class}, opt: #{opt.inspect}" - ActiveXML::transport.delete self, opt - Rails.cache.delete @cache_key if @cache_key - return true - end - - end -end diff --git a/src/activexml/node.rb b/src/activexml/node.rb index f80b2cb7dc5..b551cfb3dc0 100644 --- a/src/activexml/node.rb +++ b/src/activexml/node.rb @@ -18,7 +18,7 @@ def method_missing( symbol, *args, &block ) raise RuntimeError, "das geht zuweit #{symbol.inspect}(#{args.inspect})" end - Rails.logger.debug "method_missing -#{symbol}- #{block.inspect}" + Rails.logger.debug "method_missing -#{symbol}-" return self[symbol.to_s] end end @@ -26,36 +26,48 @@ def method_missing( symbol, *args, &block ) module ActiveXML - class LibXMLNode + class GeneralError < StandardError; end + class NotFoundError < GeneralError; end + class CreationError < GeneralError; end + class ParseError < GeneralError; end + + class Node @@elements = {} @@xml_time = 0 + attr_reader :init_options + attr_reader :cache_key + class << self + def logger + Rails.logger + end + def get_class(element_name) # FIXME: lines below don't work with relations. the related model has to # be pulled in when the relation is defined # - # axbase_subclasses = ActiveXML::Base.subclasses.map {|sc| sc.downcase} + # axbase_subclasses = ActiveXML::Node.subclasses.map {|sc| sc.downcase} # if axbase_subclasses.include?( element_name ) if @@elements.include? element_name return @@elements[element_name] end - return ActiveXML::LibXMLNode + return ActiveXML::Node end #creates an empty xml document # FIXME: works only for projects/packages, or by overwriting it in the model definition # FIXME: could get info somehow from schema, as soon as schema evaluation is built in def make_stub(opt) - #logger.debug "--> creating stub element for #{self.name}, arguments: #{opt.inspect}" + #Rails.logger.debug "--> creating stub element for #{self.name}, arguments: #{opt.inspect}" if opt.nil? raise CreationError, "Tried to create document without opt parameter" end root_tag_name = self.name.downcase - doc = ActiveXML::Base.new("<#{root_tag_name}/>") + doc = ActiveXML::Node.new("<#{root_tag_name}/>") doc.set_attribute('name', opt[:name]) doc.set_attribute('created', opt[:created_at]) if opt[:created_at] doc.set_attribute('updated', opt[:updated_at]) if opt[:updated_at] @@ -64,10 +76,6 @@ def make_stub(opt) doc end - def logger - Rails.logger - end - def handles_xml_element (*elements) elements.each do |elem| @@elements[elem] = self @@ -82,26 +90,158 @@ def reset_runtime @@xml_time = 0 end + #transport object, gets defined according to configuration when Base is subclassed + attr_reader :transport + + def inherited( subclass ) + # called when a subclass is defined + #Rails.logger.debug "Initializing ActiveXML model #{subclass}" + subclass.instance_variable_set "@default_find_parameter", @default_find_parameter + end + private :inherited + + # setup the default parameter for find calls. If the first parameter to .find is a string, + # the value of this string is used as value f + def default_find_parameter( sym ) + @default_find_parameter = sym + end + + def setup(transport_object) + super() + @@transport = transport_object + #Rails.logger.debug "--> ActiveXML successfully set up" + true + end + + def error + @error + end + + def prepare_args( args ) + if args[0].kind_of? String + args[1] ||= {} + first_arg = args.shift + hash = args.shift + hash[@default_find_parameter] = first_arg + args.insert(0, hash) + end + if args[0].kind_of? Hash + hash = Hash.new + args[0].each do |key, value| + if key.nil? or value.nil? + Rails.logger.debug "nil value given #{args.inspect}" + next + end + if value.kind_of? Array + hash[key.to_sym] = value + else + hash[key.to_sym] = value.to_s + end + end + args[0] = hash + end + + #Rails.logger.debug "prepared find args: #{args.inspect}" + return args + end + + def calc_key( args ) + #Rails.logger.debug "Cache key for #{args.inspect}" + self.name + "_" + Digest::MD5.hexdigest( "2" + args.to_s ) + end + + def free_object_cache + @@object_cache = {} + end + + def find_priv(cache_time, *args ) + cache_key = calc_key( args ) + if cache_time + obj = @@object_cache[cache_key] + return obj if obj + end + + #FIXME: needs cleanup + #TODO: factor out xml stuff to ActiveXML::Node + #Rails.logger.debug "#{self.name}.find( #{cache_time.inspect}, #{args.join(', ')})" + + objhash = nil + begin + if cache_time + objdata, params, objhash = Rails.cache.fetch(cache_key, :expires_in => cache_time) do + objdata, params = ActiveXML::transport.find( self, *(prepare_args(args)) ) + obj = self.new( objdata ) + [objdata, params, obj.to_hash] + end + else + objdata, params = ActiveXML::transport.find( self, *(prepare_args(args)) ) + end + obj = self.new( objdata ) unless obj + obj.instance_variable_set( '@cache_key', cache_key ) if cache_key + obj.instance_variable_set( '@init_options', params ) + obj.instance_variable_set( '@hash_cache', objhash) if objhash + @@object_cache[cache_key] = obj + return obj + rescue ActiveXML::Transport::NotFoundError + Rails.logger.debug "#{self.name}.find( #{args.map {|a| a.inspect}.join(', ')} ) did not find anything, return nil" + return nil + end + end + + def find( *args ) + find_priv(nil, *args ) + end + + def find_cached( *args ) + expires_in = 30.minutes + if args.last.kind_of?(Hash) and args.last[:expires_in] + expires_in = args.last[:expires_in] + args.last.delete :expires_in + end + find_priv(expires_in, *args) + end + + def find_hashed( *args ) + ret = find_cached( *args ) + return {} unless ret + ret.to_hash + end + + def free_cache( *args ) + # modify copy of args as it might be still used in the calling method + free_args = args.dup + options = free_args.last if free_args.last.kind_of?(Hash) + if options && options[:expires_in] + free_args[free_args.length-1] = free_args.last.dup + free_args.last.delete :expires_in + end + key = calc_key( free_args ) + @@object_cache.delete key + Rails.cache.delete( key ) + end + end #instance methods def initialize( data ) + @init_options = {} if data.kind_of? Nokogiri::XML::Node @data = data elsif data.kind_of? String self.raw_data = data.clone elsif data.kind_of? Hash #create new + @init_options = data stub = self.class.make_stub(data) if stub.kind_of? String self.raw_data = stub - elsif stub.kind_of? LibXMLNode + elsif stub.kind_of? Node self.raw_data = stub.dump_xml else - raise "make_stub should return LibXMLNode or String, was #{stub.inspect}" + raise "make_stub should return Node or String, was #{stub.inspect}" end - elsif data.kind_of? LibXMLNode + elsif data.kind_of? Node @data = data.internal_data.clone else raise "constructor needs either XML::Node, String or Hash" @@ -113,13 +253,13 @@ def initialize( data ) def parse(data) raise ParseError.new('Empty XML passed!') if data.empty? begin - #puts "parse #{self.class}" + #puts "parse #{self.class}" t0 = Time.now @data = Nokogiri::XML::Document.parse(data.to_str.strip, nil, nil, Nokogiri::XML::ParseOptions::STRICT).root @@xml_time += Time.now - t0 rescue Nokogiri::XML::SyntaxError => e - logger.error "Error parsing XML: #{e}" - logger.error "XML content was: #{data}" + Rails.logger.error "Error parsing XML: #{e}" + Rails.logger.error "XML content was: #{data}" raise ParseError.new e.message end end @@ -208,18 +348,14 @@ def find_first(symbol) end end - def logger - Rails.logger - end - # this function is a simplified version of XML::Simple of cpan fame def to_hash return @hash_cache if @hash_cache - #logger.debug "to_hash #{options.inspect} #{dump_xml}" + #Rails.logger.debug "to_hash #{options.inspect} #{dump_xml}" t0 = Time.now x = Benchmark.measure { @hash_cache = Xmlhash.parse(dump_xml) } @@xml_time += Time.now - t0 - #logger.debug "after to_hash #{JSON.pretty_generate(@hash_cache)}" + #Rails.logger.debug "after to_hash #{JSON.pretty_generate(@hash_cache)}" #puts "to_hash #{self.class} #{x}" @hash_cache end @@ -257,7 +393,7 @@ def dump_xml def to_param if @hash_cache - return @hash_cache["name"] + return @hash_cache["name"] end _data.attributes['name'].value end @@ -267,7 +403,7 @@ def add_node(node) xmlnode = Nokogiri::XML::Document.parse(node, nil, nil, Nokogiri::XML::ParseOptions::STRICT).root _data.add_child(xmlnode) cleanup_cache - LibXMLNode.new(xmlnode) + Node.new(xmlnode) end def add_element ( element, attrs=nil ) @@ -279,7 +415,7 @@ def add_element ( element, attrs=nil ) end if attrs.kind_of? Hash # you never know cleanup_cache - LibXMLNode.new(el) + Node.new(el) end def cleanup_cache @@ -296,7 +432,7 @@ def clone def parent return nil unless _data.parent and _data.parent.element? - LibXMLNode.new(_data.parent) + Node.new(_data.parent) end #tests if a child element exists matching the given query. @@ -330,7 +466,7 @@ def delete_attribute( name ) end def delete_element( elem ) - if elem.kind_of? LibXMLNode + if elem.kind_of? Node raise "NO GOOD IDEA!" unless _data.document == elem.internal_data.document elem.internal_data.remove elsif elem.kind_of? Nokogiri::XML::Node @@ -338,7 +474,7 @@ def delete_element( elem ) elem.remove else s = _data.xpath(elem.to_s) - raise "this was supposed to return sets" unless s.kind_of? Nokogiri::XML::NodeSet + raise "this was supposed to return sets" unless s.kind_of? Nokogiri::XML::NodeSet raise "xpath for delete did not give exactly one node!" unless s.length == 1 s.first.remove end @@ -347,8 +483,8 @@ def delete_element( elem ) end def set_attribute( name, value) - cleanup_cache - _data[name] = value + cleanup_cache + _data[name] = value end def create_node_with_relations( element ) @@ -358,7 +494,7 @@ def create_node_with_relations( element ) opt = {} node = nil node ||= klass.new(element) - #logger.debug "created node: #{node.inspect}" + #Rails.logger.debug "created node: #{node.inspect}" return node end @@ -366,8 +502,8 @@ def value( symbol ) symbols = symbol.to_s if @hash_cache - ret = @hash_cache[symbols] - return ret if ret && ret.kind_of?(String) + ret = @hash_cache[symbols] + return ret if ret && ret.kind_of?(String) end return @value_cache[symbols] if @value_cache.has_key?(symbols) @@ -384,10 +520,10 @@ def value( symbol ) end def find( symbol, &block ) - symbols = symbol.to_s - _data.xpath(symbols).each do |e| - block.call(create_node_with_relations(e)) - end + symbols = symbol.to_s + _data.xpath(symbols).each do |e| + block.call(create_node_with_relations(e)) + end end def method_missing( symbol, *args, &block ) @@ -411,13 +547,13 @@ def method_missing( symbol, *args, &block ) return _data.attributes[symbols].value end -# puts "method_missing bouncing to find_first #{symbols}" + # puts "method_missing bouncing to find_first #{symbols}" find_first(symbols) end def == other - return false unless other - _data == other.internal_data + return false unless other + _data == other.internal_data end def move_after other @@ -445,10 +581,42 @@ def find_matching(conds) def internal_data #nodoc _data end -# protected :internal_data - end - class XMLNode < LibXMLNode + @default_find_parameter = :name + @@object_cache = {} + + + def name + method_missing( :name ) + end + + def marshal_dump + raise "you don't want to put it in cache - never!" + end + + def logger + Rails.logger + end + + def save(opt={}) + if opt[:create] + @raw_data = ActiveXML::transport.create self, opt + @data = nil + @to_hash = nil + else + ActiveXML::transport.save self, opt + end + Rails.cache.delete @cache_key if @cache_key + return true + end + + def delete(opt={}) + #Rails.logger.debug "Delete #{self.class}, opt: #{opt.inspect}" + ActiveXML::transport.delete self, opt + Rails.cache.delete @cache_key if @cache_key + return true + end + end end diff --git a/src/api/app/controllers/message_controller.rb b/src/api/app/controllers/message_controller.rb index eb65f2d6875..08d097fc7f0 100644 --- a/src/api/app/controllers/message_controller.rb +++ b/src/api/app/controllers/message_controller.rb @@ -24,7 +24,7 @@ def index elsif request.put? check_permissions or return - new_msg = ActiveXML::XMLNode.new( request.raw_post ) + new_msg = ActiveXML::Node.new( request.raw_post ) begin msg = Message.new msg.text = new_msg.to_s diff --git a/src/api/app/controllers/public_controller.rb b/src/api/app/controllers/public_controller.rb index 269601a9482..e6db2068dd2 100644 --- a/src/api/app/controllers/public_controller.rb +++ b/src/api/app/controllers/public_controller.rb @@ -143,7 +143,7 @@ def binary_packages check_package_access(params[:project], params[:package], false) @pkg = Package.find_by_project_and_name(params[:project], params[:package]) - distfile = ActiveXML::XMLNode.new(DistributionController.read_distfile) + distfile = ActiveXML::Node.new(DistributionController.read_distfile) begin binaries = Collection.find :id, :what => 'published/binary', :match => "@project='#{params[:project]}' and @package='#{params[:package]}'" rescue diff --git a/src/api/app/controllers/request_controller.rb b/src/api/app/controllers/request_controller.rb index e4c83cd2efc..43c53a35aa0 100644 --- a/src/api/app/controllers/request_controller.rb +++ b/src/api/app/controllers/request_controller.rb @@ -34,7 +34,7 @@ def index params.merge!({ states: states, types: types, review_states: review_states, roles: roles }) rel = BsRequest.collection( params ) - xml = ActiveXML::Base.new "" + xml = ActiveXML::Node.new "" matches=0 rel.includes({ bs_request_actions: :bs_request_action_accept_info }, :bs_request_histories).each do |r| matches = matches+1 @@ -318,7 +318,7 @@ def create_expand_package(action, packages) releaseTargets=nil if pkg.package_kinds.find_by_kind 'patchinfo' answer = Suse::Backend.get("/source/#{URI.escape(pkg.project.name)}/#{URI.escape(pkg.name)}/_patchinfo") - data = ActiveXML::Base.new(answer.body) + data = ActiveXML::Node.new(answer.body) # validate _patchinfo for completeness unless data render_error :status => 400, :errorcode => 'incomplete_patchinfo', @@ -809,7 +809,7 @@ def command_diff action_counter = 0 if params[:view] == 'xml' - xml_request = ActiveXML::Base.new("") + xml_request = ActiveXML::Node.new("") else xml_request = nil end @@ -1669,7 +1669,7 @@ def command_changestate node.summary req.description.split(/\n|\r\n/)[0] # first line only node.description req.description end - data =ActiveXML::Base.new(node.target!) + data =ActiveXML::Node.new(node.target!) xml = update_patchinfo( data, patchinfo, true ) # update issues p={ :user => @http_user.login, :comment => "generated by request id #{req.id} accept call" } patchinfo_path = "/source/#{CGI.escape(patchinfo.project.name)}/patchinfo/_patchinfo" diff --git a/src/api/app/controllers/search_controller.rb b/src/api/app/controllers/search_controller.rb index aeda9367353..cd275214986 100644 --- a/src/api/app/controllers/search_controller.rb +++ b/src/api/app/controllers/search_controller.rb @@ -62,7 +62,7 @@ def search(what, render_all) xe = XpathEngine.new - output = ActiveXML::Base.new '' + output = ActiveXML::Node.new '' matches = 0 begin diff --git a/src/api/app/controllers/source_controller.rb b/src/api/app/controllers/source_controller.rb index d9180505dcf..bb29ecdaa92 100644 --- a/src/api/app/controllers/source_controller.rb +++ b/src/api/app/controllers/source_controller.rb @@ -601,7 +601,7 @@ def attribute_meta # init begin - req = ActiveXML::Base.new(request.body.read) + req = ActiveXML::Node.new(request.body.read) req.element_name # trigger XML parsing rescue ActiveXML::ParseError => e render_error :message => "Invalid XML", @@ -1103,7 +1103,7 @@ def file # verify link if params[:filename] == "_link" - data = ActiveXML::Base.new(request.raw_post.to_s) + data = ActiveXML::Node.new(request.raw_post.to_s) if data tproject_name = data.value("project") || project_name tpackage_name = data.value("package") || package_name @@ -1122,7 +1122,7 @@ def file # verify patchinfo data if params[:filename] == "_patchinfo" - data = ActiveXML::Base.new(request.raw_post.to_s) + data = ActiveXML::Node.new(request.raw_post.to_s) if data and data.packager # bugzilla only knows email adresses, so we support automatic conversion if data.packager.to_s.include? '@' @@ -1575,7 +1575,7 @@ def index_project_createpatchinfo node.summary params[:comment] node.description "" end - data = ActiveXML::Base.new(node.target!) + data = ActiveXML::Node.new(node.target!) xml = update_patchinfo( data, pkg ) p={ :user => @http_user.login, :comment => "generated by createpatchinfo call" } patchinfo_path = "/source/#{CGI.escape(pkg.project.name)}/#{CGI.escape(pkg.name)}/_patchinfo" @@ -1592,7 +1592,7 @@ def index_package_updatepatchinfo # get existing file patchinfo_path = "/source/#{URI.escape(pkg.project.name)}/#{URI.escape(pkg.name)}/_patchinfo" - data = ActiveXML::Base.new(backend_get(patchinfo_path)) + data = ActiveXML::Node.new(backend_get(patchinfo_path)) xml = update_patchinfo( data, pkg ) p={ :user => @http_user.login, :comment => "updated via updatepatchinfo call" } diff --git a/src/api/app/controllers/statistics_controller.rb b/src/api/app/controllers/statistics_controller.rb index 43ff1203725..2b66c30c0ab 100644 --- a/src/api/app/controllers/statistics_controller.rb +++ b/src/api/app/controllers/statistics_controller.rb @@ -48,7 +48,7 @@ def rating # try to get previous rating of this user for this object previous_rating = Rating.where('object_type=? AND object_id=? AND user_id=?', object.class.name, object.id, @http_user.id).first - data = ActiveXML::Base.new( request.raw_post ) + data = ActiveXML::Node.new( request.raw_post ) if previous_rating # update previous rating previous_rating.score = data.to_s.to_i diff --git a/src/api/app/controllers/status_controller.rb b/src/api/app/controllers/status_controller.rb index d07331ea59f..b327df4f83e 100644 --- a/src/api/app/controllers/status_controller.rb +++ b/src/api/app/controllers/status_controller.rb @@ -25,7 +25,7 @@ def messages return end - new_messages = ActiveXML::XMLNode.new( request.raw_post ) + new_messages = ActiveXML::Node.new( request.raw_post ) begin if new_messages.has_element? 'message' @@ -85,7 +85,7 @@ def workerstatus rescue Zlib::GzipFile::Error data = nil end - data=ActiveXML::Base.new(data || update_workerstatus_cache) + data=ActiveXML::Node.new(data || update_workerstatus_cache) data.each_building do |b| prj = Project.find_by_name(b.project) # no prj -> we are not allowed @@ -203,7 +203,7 @@ def bsrequest_repo_list(project, repo, arch) backend.direct_http( uri ) end - repo = ActiveXML::Base.new( data ) + repo = ActiveXML::Node.new( data ) repo.each_binary do |b| name=b.value(:name).sub('.rpm', '') ret[name] = 1 @@ -216,7 +216,7 @@ def bsrequest_repo_file(project, repo, arch, file, version, release) uri = "/build/#{CGI.escape(project)}/#{CGI.escape(repo)}/#{arch}/_repository/#{CGI.escape(file)}.rpm?view=fileinfo_ext" ret = [] key = params[:id] + "-" + Digest::MD5.hexdigest(uri) - fileinfo = ActiveXML::Base.new( Rails.cache.fetch(key, :expires_in => 15.minutes) { backend.direct_http( URI( uri ) ) } ) + fileinfo = ActiveXML::Node.new( Rails.cache.fetch(key, :expires_in => 15.minutes) { backend.direct_http( URI( uri ) ) } ) if fileinfo.version.to_s != version raise NotInRepo, "version #{fileinfo.version}-#{fileinfo.release} (wanted #{version}-#{release})" end @@ -329,7 +329,7 @@ def bsrequest if eversucceeded == 1 uri = URI( "/build/#{CGI.escape(sproj.name)}/#{CGI.escape(srep.name)}/#{CGI.escape(arch.to_s)}/#{CGI.escape(action.source_package.to_s)}/_buildinfo") begin - buildinfo = ActiveXML::Base.new( backend.direct_http( uri ) ) + buildinfo = ActiveXML::Node.new( backend.direct_http( uri ) ) rescue ActiveXML::Transport::Error => e # if there is an error, we ignore message, code, api_exception = ActiveXML::Transport.extract_error_message e @@ -366,7 +366,7 @@ def bsrequest tmp_md = Array.new ownbinaries = Hash.new uri = URI( "/build/#{CGI.escape(sproj.name)}/#{CGI.escape(srep.name)}/#{CGI.escape(arch.to_s)}/#{CGI.escape(action.source_package.to_s)}") - binaries = ActiveXML::Base.new( backend.direct_http( uri ) ) + binaries = ActiveXML::Node.new( backend.direct_http( uri ) ) binaries.each_binary do |f| # match to the repository filename m = re_filename.match(f.value(:filename)) @@ -429,7 +429,7 @@ def bsrequest buildcode="unknown" begin uri = URI( "/build/#{CGI.escape(sproj.name)}/_result?package=#{CGI.escape(action.source_package.to_s)}&repository=#{CGI.escape(srep.name)}&arch=#{CGI.escape(arch.to_s)}" ) - resultlist = ActiveXML::Base.new( backend.direct_http( uri ) ) + resultlist = ActiveXML::Node.new( backend.direct_http( uri ) ) currentcode = nil resultlist.each_result do |r| r.each_status { |s| currentcode = s.value(:code) } diff --git a/src/api/app/controllers/tag_controller.rb b/src/api/app/controllers/tag_controller.rb index f2b0b07dea0..355891a1597 100644 --- a/src/api/app/controllers/tag_controller.rb +++ b/src/api/app/controllers/tag_controller.rb @@ -206,7 +206,7 @@ def tagcloud #packages atm.). Based on this objects the tagcloud will be calculated. request_data = request.raw_post - collection = ActiveXML::XMLNode.new( request_data ) + collection = ActiveXML::Node.new( request_data ) #get the projects projects =[] diff --git a/src/api/app/helpers/maintenance_helper.rb b/src/api/app/helpers/maintenance_helper.rb index af7da3dd59c..e128dd09bf9 100644 --- a/src/api/app/helpers/maintenance_helper.rb +++ b/src/api/app/helpers/maintenance_helper.rb @@ -235,7 +235,7 @@ def release_package(sourcePackage, targetProjectName, targetPackageName, revisio link = Suse::Backend.get "/source/#{URI.escape(sourcePackage.project.name)}/#{URI.escape(sourcePackage.name)}/_link" rescue Suse::Backend::HTTPError end - if link and ret = ActiveXML::XMLNode.new(link.body) and (ret.project.nil? or ret.project == sourcePackage.project.name) + if link and ret = ActiveXML::Node.new(link.body) and (ret.project.nil? or ret.project == sourcePackage.project.name) ret.delete_attribute('project') # its a local link, project name not needed ret.set_attribute('package', ret.package.gsub(/\..*/,'') + targetPackageName.gsub(/.*\./, '.')) # adapt link target with suffix link_xml = ret.dump_xml @@ -653,7 +653,7 @@ def do_branch params if pkg.package_kinds.find_by_kind 'link' # is the package itself a local link ? link = backend_get "/source/#{p[:package].project.name}/#{p[:package].name}/_link" - ret = ActiveXML::XMLNode.new(link) + ret = ActiveXML::Node.new(link) if ret.project.nil? or ret.project == p[:package].project.name pkg = Package.get_by_project_and_name(p[:package].project.name, ret.package) end @@ -850,7 +850,7 @@ def do_branch params Suse::Backend.post "/source/#{tpkg.project.name}/#{tpkg.name}?cmd=copy&oproject=#{CGI.escape(p[:link_target_project].name)}&opackage=#{CGI.escape(p[:package].name)}&user=#{CGI.escape(@http_user.login)}", nil # and fix the link link = backend_get "/source/#{tpkg.project.name}/#{tpkg.name}/_link" - ret = ActiveXML::XMLNode.new(link) + ret = ActiveXML::Node.new(link) ret.delete_attribute('project') # its a local link, project name not needed linked_package = p[:link_target_package] linked_package = params[:target_package] if params[:target_package] and params[:package] == ret.package # user enforce a rename of base package diff --git a/src/api/app/helpers/status_helper.rb b/src/api/app/helpers/status_helper.rb index 811cdc19895..a24185ce167 100644 --- a/src/api/app/helpers/status_helper.rb +++ b/src/api/app/helpers/status_helper.rb @@ -151,7 +151,7 @@ def self.get_xml(backend, uri) d = Rails.cache.fetch(key, :expires_in => 2.hours) do backend.direct_http( URI(uri), :timeout => 1000 ) end - ActiveXML::Base.new(d) + ActiveXML::Node.new(d) end def self.check_md5(proj, backend, packages, mypackages) @@ -251,7 +251,7 @@ def self.fetch_jobhistory(backend, proj, repo, arch, mypackages) Rails.cache.fetch(key) do Rails.cache.write(key + '_last', currentlast) d = backend.direct_http( URI(uri) , :timeout => 1000 ) - data = ActiveXML::Base.new(d) unless d.blank? + data = ActiveXML::Node.new(d) unless d.blank? return nil unless data ret = Hash.new reponame = repo + "/" + arch diff --git a/src/api/app/helpers/validation_helper.rb b/src/api/app/helpers/validation_helper.rb index 500f9397d8a..b2d98a72aff 100644 --- a/src/api/app/helpers/validation_helper.rb +++ b/src/api/app/helpers/validation_helper.rb @@ -29,7 +29,7 @@ def validate_read_access_of_deleted_package(project, name) raise Package::UnknownObjectError, "#{project}/#{name}" end - data = ActiveXML::XMLNode.new(r.body.to_s) + data = ActiveXML::Node.new(r.body.to_s) lastrev = nil data.each_revision {|rev| lastrev = rev} metapath = "/source/#{CGI.escape(project)}/#{name}/_meta" @@ -54,7 +54,7 @@ def validate_visibility_of_deleted_project(project) raise Project::UnknownObjectError, "#{project}" end - data = ActiveXML::XMLNode.new(r.body.to_s) + data = ActiveXML::Node.new(r.body.to_s) lastrev = nil data.each_revision {|rev| lastrev = rev} raise Project::UnknownObjectError, "#{project}" unless lastrev diff --git a/src/api/app/models/collection.rb b/src/api/app/models/collection.rb index 6dbd9899256..21798e29501 100644 --- a/src/api/app/models/collection.rb +++ b/src/api/app/models/collection.rb @@ -1,3 +1,3 @@ -class Collection < ActiveXML::Base +class Collection < ActiveXML::Node default_find_parameter :match end diff --git a/src/api/app/models/directory.rb b/src/api/app/models/directory.rb index c91ac416da9..b9610825edc 100644 --- a/src/api/app/models/directory.rb +++ b/src/api/app/models/directory.rb @@ -1,2 +1,2 @@ -class Directory < ActiveXML::Base +class Directory < ActiveXML::Node end diff --git a/src/api/app/models/jobhistory.rb b/src/api/app/models/jobhistory.rb index 75b8569cb25..a6a4509d36b 100644 --- a/src/api/app/models/jobhistory.rb +++ b/src/api/app/models/jobhistory.rb @@ -1,2 +1,2 @@ -class Jobhistory < ActiveXML::Base +class Jobhistory < ActiveXML::Node end diff --git a/src/api/app/models/project.rb b/src/api/app/models/project.rb index 24173838bd2..0df85ae28a2 100644 --- a/src/api/app/models/project.rb +++ b/src/api/app/models/project.rb @@ -1307,7 +1307,7 @@ def bsrequest_repos_map(project, backend) ret = Hash.new uri = URI( "/getprojpack?project=#{CGI.escape(project.to_s)}&nopackages&withrepos&expandedrepos" ) begin - xml = ActiveXML::Base.new( backend.direct_http( uri ) ) + xml = ActiveXML::Node.new( backend.direct_http( uri ) ) rescue ActiveXML::Transport::Error return ret end diff --git a/src/api/config/initializers/logging.rb b/src/api/config/initializers/logging.rb index becf76aecde..2d5cfba9c38 100644 --- a/src/api/config/initializers/logging.rb +++ b/src/api/config/initializers/logging.rb @@ -33,9 +33,9 @@ module ControllerRuntime def append_info_to_payload(payload) super payload[:backend_runtime] = Suse::Backend.runtime * 1000 - payload[:xml_runtime] = ActiveXML::LibXMLNode.runtime * 1000 + payload[:xml_runtime] = ActiveXML::Node.runtime * 1000 Suse::Backend.reset_runtime - ActiveXML::LibXMLNode.reset_runtime + ActiveXML::Node.reset_runtime runtime = { view: payload[:view_runtime], db: payload[:db_runtime], backend: payload[:backend_runtime], xml: payload[:xml_runtime] } response.headers["X-Opensuse-Runtimes"] = runtime.to_json end diff --git a/src/api/script/import b/src/api/script/import index 9a3ac163815..1936e790274 100755 --- a/src/api/script/import +++ b/src/api/script/import @@ -27,7 +27,7 @@ Rails::Initializer.run do |config| end -ActiveXML::Base.config do |conf| +ActiveXML::Node.config do |conf| conf.lazy_evaluation = true conf.setup_transport do |map| @@ -45,10 +45,10 @@ ActiveXML::Base.config do |conf| end -class Xproject < ActiveXML::Base +class Xproject < ActiveXML::Node end -class Xpackage < ActiveXML::Base +class Xpackage < ActiveXML::Node end diff --git a/src/api/test/functional/architectures_controller_test.rb b/src/api/test/functional/architectures_controller_test.rb index 49994857f93..d22861db91f 100644 --- a/src/api/test/functional/architectures_controller_test.rb +++ b/src/api/test/functional/architectures_controller_test.rb @@ -51,7 +51,7 @@ def test_update get "/architectures/i586" assert_response :success - xml = ActiveXML::Base.new @response.body + xml = ActiveXML::Node.new @response.body xml.available.text = "true" put "/architectures/i586", xml.dump_xml assert_response :success diff --git a/src/api/test/functional/attributes_test.rb b/src/api/test/functional/attributes_test.rb index b3891258c00..cfa0e24a639 100644 --- a/src/api/test/functional/attributes_test.rb +++ b/src/api/test/functional/attributes_test.rb @@ -198,7 +198,7 @@ def test_create_attributes_project assert_response :success get "/source/home:tom/_attribute/OBS:Maintained" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_equal node.has_element?(:attribute), true assert_equal node.attribute.has_attribute?(:binary), false assert_equal node.attribute.namespace, "OBS" @@ -242,7 +242,7 @@ def test_create_attributes_project get "/source/home:tom/_project/_history?meta=1" assert_response :success assert_xml_tag( :tag => "revisionlist" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) revision = node.each_revision.last assert_equal revision.user.text, "tom" srcmd5 = revision.srcmd5.text @@ -268,7 +268,7 @@ def test_create_attributes_project # get current get "/source/home:tom/_attribute/OBS:Maintained" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_equal node.has_element?(:attribute), false end @@ -307,7 +307,7 @@ def test_create_attributes_package assert_response :success get "/source/kde4/kdelibs/_attribute/OBS:Maintained" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_equal node.has_element?(:attribute), true assert_equal node.attribute.has_attribute?(:binary), false assert_equal node.attribute.namespace, "OBS" @@ -316,7 +316,7 @@ def test_create_attributes_package assert_response :success get "/source/kde4/kdelibs/kdelibs-devel/_attribute/OBS:Maintained" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_equal node.attribute.has_attribute?(:binary), true assert_equal node.attribute.binary, "kdelibs-devel" assert_equal node.attribute.namespace, "OBS" @@ -357,7 +357,7 @@ def test_create_attributes_package get "/source/kde4/kdelibs/_history?meta=1" assert_response :success assert_xml_tag( :tag => "revisionlist" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) revision = node.each_revision.last assert_equal revision.user.text, "fred" srcmd5 = revision.srcmd5.text @@ -377,7 +377,7 @@ def test_create_attributes_package assert_response :success get "/source/kde4/kdelibs/_attribute/OBS:Maintained" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_equal node.has_element?(:attribute), false # get old revision diff --git a/src/api/test/functional/build_controller_test.rb b/src/api/test/functional/build_controller_test.rb index 3a93f252229..ca33b003255 100644 --- a/src/api/test/functional/build_controller_test.rb +++ b/src/api/test/functional/build_controller_test.rb @@ -157,7 +157,7 @@ def test_buildinfo get "/source/home:Iggy/TestPack" assert_response :success assert_no_xml_tag :tag => "xsrcmd5" # is no link, srcmd5 is valid - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) srcmd5 = node.srcmd5 # osc local package build call @@ -180,7 +180,7 @@ def test_buildinfo assert_xml_tag :tag => "versrel", :content => "1.0-#{ci_cnt}" assert_xml_tag :tag => "rev", :content => rev assert_xml_tag :tag => "path", :attributes => { :project => "home:Iggy", :repository => "10.2" } - #buildinfo = ActiveXML::XMLNode.new(@response.body) + #buildinfo = ActiveXML::Node.new(@response.body) # find scheduler job and compare it with buildinfo # FIXME: to be implemented, compare scheduler job with rep server job diff --git a/src/api/test/functional/interconnect_test.rb b/src/api/test/functional/interconnect_test.rb index 7f6bd976f4b..9e8e5781c99 100644 --- a/src/api/test/functional/interconnect_test.rb +++ b/src/api/test/functional/interconnect_test.rb @@ -273,7 +273,7 @@ def test_read_and_command_tests prepare_request_with_user "tom", "thunder" get "/source/LocalProject/remotepackage" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body xsrcmd5 = ret.linkinfo.xsrcmd5 assert_not_nil xsrcmd5 post "/source/LocalProject/remotepackage", :cmd => "showlinked" @@ -284,7 +284,7 @@ def test_read_and_command_tests assert_response 404 get "/source/LocalProject/remotepackage/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "RemoteInstance:BaseDistro" assert_equal ret.package, "pack1" get "/source/LocalProject/remotepackage/my_file?rev=#{xsrcmd5}" @@ -324,7 +324,7 @@ def test_submit_requests_from_remote ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') diff --git a/src/api/test/functional/maintenance_test.rb b/src/api/test/functional/maintenance_test.rb index 9c4e8d1eee1..fc3f22ceeef 100644 --- a/src/api/test/functional/maintenance_test.rb +++ b/src/api/test/functional/maintenance_test.rb @@ -43,7 +43,7 @@ def test_branch_package # check source link get "/source/home:tom:branches:BaseDistro:Update/pack1/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "BaseDistro:Update" assert_nil ret.package assert_not_nil ret.baserev @@ -56,7 +56,7 @@ def test_branch_package # check source link get "/source/home:tom:branches:Devel:BaseDistro:Update/pack2/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "Devel:BaseDistro:Update" assert_nil ret.package assert_not_nil ret.baserev @@ -69,7 +69,7 @@ def test_branch_package # check source link get "/source/home:tom:branches:Devel:BaseDistro:Update/pack3/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "Devel:BaseDistro:Update" assert_nil ret.package assert_not_nil ret.baserev @@ -82,7 +82,7 @@ def test_branch_package # check source link get "/source/home:tom:branches:BaseDistro2.0:LinkedUpdateProject/pack2/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "BaseDistro2.0:LinkedUpdateProject" assert_nil ret.package @@ -115,7 +115,7 @@ def test_maintenance_request_from_foreign_project ' assert_response :success assert_xml_tag( :tag => "target", :attributes => { :project => "My:Maintenance", :releaseproject => "BaseDistro2.0:LinkedUpdateProject" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id1 = node.value(:id) @@ -168,7 +168,7 @@ def test_maintenance_request_from_foreign_project assert_response :success # update project extended ? assert_xml_tag( :tag => "target", :attributes => { :project => "My:Maintenance", :releaseproject => "BaseDistro2.0:LinkedUpdateProject" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id2 = node.value(:id) @@ -261,7 +261,7 @@ def test_mbranch_and_maintenance_per_package_request assert_response :success assert_no_xml_tag( :tag => "source", :attributes => { :rev => nil } ) assert_xml_tag( :tag => "target", :attributes => { :project => "My:Maintenance" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id1 = node.value(:id) @@ -311,7 +311,7 @@ def test_mbranch_and_maintenance_per_package_request ' assert_response :success assert_xml_tag( :tag => "target", :attributes => { :project => incidentProject } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id2 = node.value(:id) # ... but do not use it @@ -338,7 +338,7 @@ def test_mbranch_and_maintenance_per_package_request ' assert_response :success assert_xml_tag( :tag => "target", :attributes => { :project => "My:Maintenance" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id2 = node.value(:id) @@ -551,7 +551,7 @@ def test_mbranch_and_maintenance_entire_project_request ' assert_response :success assert_xml_tag( :tag => "target", :attributes => { :project => "My:Maintenance" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) assert_xml_tag( :tag => "request", :children => { :count => 8, :only => { :tag => "action" } }) @@ -568,7 +568,7 @@ def test_mbranch_and_maintenance_entire_project_request # store data for later checks get "/source/home:tom:branches:OBS_Maintained:pack2/_meta" - oprojectmeta = ActiveXML::XMLNode.new(@response.body) + oprojectmeta = ActiveXML::Node.new(@response.body) assert_response :success # accept request @@ -590,7 +590,7 @@ def test_mbranch_and_maintenance_entire_project_request get "/source/#{incidentProject}/_meta" assert_response :success assert_xml_tag( :parent => {:tag => "build"}, :tag => "disable", :content => nil ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_not_nil node.repository.element_name # repository definition must be the same, except for the maintenance trigger node.each_repository do |r| @@ -821,7 +821,7 @@ def test_create_maintenance_project_and_release_packages # add reader role for adrian get "/source/" + incidentProject + "/_meta" assert_response :success - meta = ActiveXML::XMLNode.new( @response.body ) + meta = ActiveXML::Node.new( @response.body ) meta.add_element "person", { :userid => 'adrian', :role => 'reader' } put "/source/" + incidentProject + "/_meta", meta.dump_xml assert_response :success @@ -830,7 +830,7 @@ def test_create_maintenance_project_and_release_packages assert_xml_tag( :tag => "patchinfo", :attributes => { :incident => incidentID } ) #FIXME: add another patchinfo pointing to a third place # add required informations about the update - pi = ActiveXML::Base.new( @response.body ) + pi = ActiveXML::Node.new( @response.body ) pi.summary.text = "if you are bored" pi.description.text = "if you are bored and really want fixes" pi.rating.text = "low" @@ -942,7 +942,7 @@ def test_create_maintenance_project_and_release_packages # block patchinfo build get "/source/#{incidentProject}/patchinfo/_patchinfo" assert_response :success - pi = ActiveXML::Base.new( @response.body ) + pi = ActiveXML::Node.new( @response.body ) pi.add_element "stopped" pi.stopped.text = "The issue is not fixed for real yet" raw_put "/source/#{incidentProject}/patchinfo/_patchinfo", pi.dump_xml @@ -1013,7 +1013,7 @@ def test_create_maintenance_project_and_release_packages assert_xml_tag( :tag => "target", :attributes => { :project => "BaseDistro3", :package => "pack2." + incidentID } ) assert_xml_tag( :tag => "target", :attributes => { :project => "BaseDistro3", :package => "patchinfo." + incidentID } ) assert_xml_tag( :tag => "review", :attributes => { :by_group => "test_group" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) reqid = node.value(:id) @@ -1055,7 +1055,7 @@ def test_create_maintenance_project_and_release_packages ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) nreqid = node.value(:id) prepare_request_with_user "maintenance_coord", "power" @@ -1464,7 +1464,7 @@ def test_try_to_release_without_permissions_binary_permissions ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) reqid = node.value(:id) @@ -1510,7 +1510,7 @@ def test_try_to_release_without_permissions_source_permissions ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) reqid = node.value(:id) @@ -1579,10 +1579,10 @@ def test_copy_project_for_release assert_match %r{Empty project config}, @response.body get "/source/BaseDistro" assert_response :success - opackages = ActiveXML::XMLNode.new(@response.body) + opackages = ActiveXML::Node.new(@response.body) get "/source/CopyOfBaseDistro" assert_response :success - packages = ActiveXML::XMLNode.new(@response.body) + packages = ActiveXML::Node.new(@response.body) assert_equal opackages.dump_xml, packages.dump_xml # compare package meta @@ -1595,7 +1595,7 @@ def test_copy_project_for_release # compare revisions get "/source/BaseDistro/pack2/_history" assert_response :success - history = ActiveXML::XMLNode.new(@response.body) + history = ActiveXML::Node.new(@response.body) srcmd5 = history.each_revision.last.srcmd5.text version = history.each_revision.last.version.text time = history.each_revision.last.time.text @@ -1603,7 +1603,7 @@ def test_copy_project_for_release assert_not_nil srcmd5 get "/source/CopyOfBaseDistro/pack2/_history" assert_response :success - copyhistory = ActiveXML::XMLNode.new(@response.body) + copyhistory = ActiveXML::Node.new(@response.body) copysrcmd5 = copyhistory.each_revision.last.srcmd5.text copyversion = copyhistory.each_revision.last.version.text copytime = copyhistory.each_revision.last.time.text @@ -1640,16 +1640,16 @@ def test_copy_project_with_history_and_binaries assert_response :success get "/source/BaseDistro" assert_response :success - opackages = ActiveXML::XMLNode.new(@response.body) + opackages = ActiveXML::Node.new(@response.body) get "/source/CopyOfBaseDistro" assert_response :success - packages = ActiveXML::XMLNode.new(@response.body) + packages = ActiveXML::Node.new(@response.body) assert_equal opackages.to_s, packages.to_s # compare revisions get "/source/BaseDistro/pack2/_history" assert_response :success - history = ActiveXML::XMLNode.new(@response.body) + history = ActiveXML::Node.new(@response.body) srcmd5 = history.each_revision.last.srcmd5.text version = history.each_revision.last.version.text time = history.each_revision.last.time.text @@ -1657,7 +1657,7 @@ def test_copy_project_with_history_and_binaries assert_not_nil srcmd5 get "/source/CopyOfBaseDistro/pack2/_history" assert_response :success - copyhistory = ActiveXML::XMLNode.new(@response.body) + copyhistory = ActiveXML::Node.new(@response.body) copysrcmd5 = copyhistory.each_revision.last.srcmd5.text copyversion = copyhistory.each_revision.last.version.text copytime = copyhistory.each_revision.last.time.text @@ -1694,7 +1694,7 @@ def test_copy_project_for_release_with_history # store revisions before copy get "/source/BaseDistro/pack2/_history" assert_response :success - originhistory = ActiveXML::XMLNode.new(@response.body) + originhistory = ActiveXML::Node.new(@response.body) originsrcmd5 = originhistory.each_revision.last.srcmd5.text originversion = originhistory.each_revision.last.version.text origintime = originhistory.each_revision.last.time.text @@ -1709,16 +1709,16 @@ def test_copy_project_for_release_with_history assert_response :success get "/source/BaseDistro" assert_response :success - opackages = ActiveXML::XMLNode.new(@response.body) + opackages = ActiveXML::Node.new(@response.body) get "/source/CopyOfBaseDistro" assert_response :success - packages = ActiveXML::XMLNode.new(@response.body) + packages = ActiveXML::Node.new(@response.body) assert_equal opackages.to_s, packages.to_s # compare revisions of source project get "/source/BaseDistro/pack2/_history" assert_response :success - history = ActiveXML::XMLNode.new(@response.body) + history = ActiveXML::Node.new(@response.body) srcmd5 = history.each_revision.last.srcmd5.text version = history.each_revision.last.version.text time = history.each_revision.last.time.text @@ -1734,7 +1734,7 @@ def test_copy_project_for_release_with_history # compare revisions of destination project get "/source/CopyOfBaseDistro/pack2/_history" assert_response :success - copyhistory = ActiveXML::XMLNode.new(@response.body) + copyhistory = ActiveXML::Node.new(@response.body) copysrcmd5 = copyhistory.each_revision.last.srcmd5.text copyversion = copyhistory.each_revision.last.version.text copytime = copyhistory.each_revision.last.time.text diff --git a/src/api/test/functional/message_controller_test.rb b/src/api/test/functional/message_controller_test.rb index cd1935d0849..37c15b7b236 100644 --- a/src/api/test/functional/message_controller_test.rb +++ b/src/api/test/functional/message_controller_test.rb @@ -46,7 +46,7 @@ def test_index get "/message" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body ret.each_message do |m| delete "/message/#{m.msg_id}" assert_response :success @@ -63,7 +63,7 @@ def test_index get "/message" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body ret.each_message do |m| delete "/message/#{m.msg_id}" assert_response :success diff --git a/src/api/test/functional/release_management_test.rb b/src/api/test/functional/release_management_test.rb index 56cb5290169..c6eacea2d41 100644 --- a/src/api/test/functional/release_management_test.rb +++ b/src/api/test/functional/release_management_test.rb @@ -28,12 +28,12 @@ def test_release_project get "/source/BaseDistro" assert_response :success - packages = ActiveXML::XMLNode.new(@response.body) + packages = ActiveXML::Node.new(@response.body) vrevs = {} packages.each_entry do |p| get "/source/BaseDistro/#{p.name}" assert_response :success - files = ActiveXML::XMLNode.new(@response.body) + files = ActiveXML::Node.new(@response.body) vrevs[p.name] = files.vrev end assert_not_equal vrevs.count, 0 @@ -47,7 +47,7 @@ def test_release_project vrevs.each_key do |k| get "/source/BaseDistro/#{k}" assert_response :success - files = ActiveXML::XMLNode.new(@response.body) + files = ActiveXML::Node.new(@response.body) assert_equal "#{vrevs[k].to_i+2}", files.vrev end @@ -55,7 +55,7 @@ def test_release_project vrevs.each_key do |k| get "/source/TEST:BaseDistro/#{k}" assert_response :success - files = ActiveXML::XMLNode.new(@response.body) + files = ActiveXML::Node.new(@response.body) assert_equal "#{vrevs[k].to_i+1}.1", files.vrev end @@ -71,7 +71,7 @@ def test_release_project vrevs.each_key do |k| get "/source/BaseDistro/#{k}" assert_response :success - files = ActiveXML::XMLNode.new(@response.body) + files = ActiveXML::Node.new(@response.body) assert_equal "#{vrevs[k].to_i+4}", files.vrev end @@ -79,7 +79,7 @@ def test_release_project vrevs.each_key do |k| get "/source/TEST:BaseDistro/#{k}" assert_response :success - files = ActiveXML::XMLNode.new(@response.body) + files = ActiveXML::Node.new(@response.body) assert_equal "#{vrevs[k].to_i+3}.1", files.vrev end diff --git a/src/api/test/functional/request_controller_test.rb b/src/api/test/functional/request_controller_test.rb index ae463b8c28b..d1a7b184200 100644 --- a/src/api/test/functional/request_controller_test.rb +++ b/src/api/test/functional/request_controller_test.rb @@ -16,7 +16,7 @@ def test_set_and_get_1 req = load_backend_file('request/1') post "/request?cmd=create", req assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) id = node.value :id put( "/request/#{id}", load_backend_file('request/1')) @@ -56,7 +56,7 @@ def test_submit_request_of_new_package ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') @@ -163,7 +163,7 @@ def test_set_bugowner_request prepare_request_with_user "Iggy", "asdfasdf" post "/request?cmd=create", load_backend_file('request/set_bugowner') assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') @@ -193,7 +193,7 @@ def test_add_role_request prepare_request_with_user "Iggy", "asdfasdf" post "/request?cmd=create", load_backend_file('request/add_role') assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') @@ -216,7 +216,7 @@ def test_create_request_clone_and_superseed_it post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -248,7 +248,7 @@ def test_create_request_review_and_supersede post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -289,7 +289,7 @@ def test_create_request_and_supersede post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -316,7 +316,7 @@ def test_create_request_and_supersede_as_creator post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -332,7 +332,7 @@ def test_create_request_and_decline_review post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -368,7 +368,7 @@ def test_create_request_and_multiple_reviews post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -433,7 +433,7 @@ def test_change_review_state_after_leaving_review_phase post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -476,7 +476,7 @@ def test_search_and_involved_requests req = load_backend_file('request/1') post "/request?cmd=create", req assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) id = node.value :id prepare_request_with_user "king", "sunflower" @@ -573,7 +573,7 @@ def test_process_devel_request post "/request?cmd=create", rq assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -587,7 +587,7 @@ def test_process_devel_request post "/request?cmd=create", rq assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) iddelete = node.value(:id) @@ -683,7 +683,7 @@ def test_old_style_submit_request ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) post "/request/#{id}?cmd=changestate&newstate=revoked" @@ -724,7 +724,7 @@ def test_submit_request_from_hidden_project_and_hidden_source ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) post "/request/#{id}?cmd=changestate&newstate=revoked" @@ -739,7 +739,7 @@ def test_submit_request_from_hidden_project_and_hidden_source ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) post "/request/#{id}?cmd=changestate&newstate=revoked" @@ -758,7 +758,7 @@ def test_auto_revoke_when_source_gets_removed_maintenance_incident ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id1 = node.value(:id) @@ -794,7 +794,7 @@ def test_auto_revoke_when_source_gets_removed_submit ' assert_response :success assert_xml_tag( :tag => "target", :attributes => { :project => "kde4", :package => "kdebase" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id1 = node.value(:id) @@ -808,7 +808,7 @@ def test_auto_revoke_when_source_gets_removed_submit ' assert_response :success assert_xml_tag( :tag => "target", :attributes => { :project => "home:tom:branches:kde4", :package => "kdebase" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) #id2 = node.value(:id) @@ -868,7 +868,7 @@ def test_create_and_revoke_submit_request_permissions assert_response :success assert_xml_tag( :tag => "request" ) assert_xml_tag( :tag => "review", :attributes => { :by_project => "home:Iggy", :by_package => "TestPack" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id_by_package = node.value(:id) @@ -901,7 +901,7 @@ def test_create_and_revoke_submit_request_permissions assert_response :success assert_xml_tag( :tag => "request" ) assert_no_xml_tag( :tag => "review", :attributes => { :by_project => "home:Iggy", :by_package => "TestPack" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1047,7 +1047,7 @@ def test_reopen_a_review_declined_request post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "state", :attributes => { :name => "new" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1099,7 +1099,7 @@ def test_reopen_revoked_and_declined_request post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "state", :attributes => { :name => "new" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1170,7 +1170,7 @@ def test_all_action_types assert_response :success post "/request?cmd=create", req assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) assert_xml_tag( :tag => "review", :attributes => { :by_user => "adrian", :state => "new" } ) @@ -1285,7 +1285,7 @@ def test_submit_with_review # we upload 2 and 2 default reviewers are added assert_xml_tag( children: { only: { tag: "review" }, count: 4 } ) assert_xml_tag( :tag => "state", :attributes => { :name => 'review' }, :parent => { :tag => "request" } ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1356,7 +1356,7 @@ def test_reviewer_added_when_source_maintainer_is_missing post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1382,7 +1382,7 @@ def test_reviewer_added_when_source_maintainer_is_missing post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1411,7 +1411,7 @@ def test_branch_and_submit_request_to_linked_project_and_delete_it_again # check source link get "/source/home:tom:branches:BaseDistro2.0:LinkedUpdateProject/pack2/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "BaseDistro2.0:LinkedUpdateProject" assert_nil ret.package # same package name @@ -1430,7 +1430,7 @@ def test_branch_and_submit_request_to_linked_project_and_delete_it_again post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1473,7 +1473,7 @@ def test_branch_and_submit_request_to_linked_project_and_delete_it_again post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1517,19 +1517,19 @@ def test_branch_and_submit_request_to_linked_project_and_delete_it_again # we explicitly decided to ignore the who, so tom will become creator assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id2 = node.value(:id) post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id3 = node.value(:id) @@ -1609,7 +1609,7 @@ def test_branch_version_update_and_submit_request_back get "/source/home:tom:branches:home:Iggy/TestPack?expand=1" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:vrev) vrev = node.value(:vrev) @@ -1627,7 +1627,7 @@ def test_branch_version_update_and_submit_request_back post "/request?cmd=create", req assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value(:id) @@ -1644,7 +1644,7 @@ def test_branch_version_update_and_submit_request_back # vrev must not get smaller after accept get "/source/home:tom:branches:home:Iggy/TestPack?expand=1" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:vrev) vrev_after_accept = node.value(:vrev) assert vrev <= vrev_after_accept @@ -1665,7 +1665,7 @@ def test_submit_from_source_protected_project post "/request?cmd=create", load_backend_file('request/from_source_protected_valid') assert_response :success assert_xml_tag( :tag => "request" ) - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') @@ -1770,7 +1770,7 @@ def test_try_to_delete_project_without_permissions ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') @@ -1802,7 +1802,7 @@ def test_special_chars post "/request?cmd=create", req assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) id = node.value :id get "/request/#{id}" assert_response :success @@ -1861,7 +1861,7 @@ def test_project_delete_request_with_pending post "/request?cmd=create", rq assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) iddelete = node.value('id') @@ -1911,7 +1911,7 @@ def test_repository_delete_request post "/request?cmd=create", rq assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) iddelete = node.value('id') diff --git a/src/api/test/functional/search_controller_test.rb b/src/api/test/functional/search_controller_test.rb index b8132791dbd..1ca38bd60d9 100644 --- a/src/api/test/functional/search_controller_test.rb +++ b/src/api/test/functional/search_controller_test.rb @@ -117,7 +117,7 @@ def test_search_package_in_hidden_project_as_non_maintainer def get_repos ret = Array.new - col = ActiveXML::Base.new @response.body + col = ActiveXML::Node.new @response.body col.each_repository do |r| ret << "#{r.project}/#{r.name}" end @@ -212,7 +212,7 @@ def test_search_request end def get_package_count - return ActiveXML::Base.new(@response.body).each_package.length + return ActiveXML::Node.new(@response.body).each_package.length end def test_pagination diff --git a/src/api/test/functional/source_controller_test.rb b/src/api/test/functional/source_controller_test.rb index ef7427b1d71..7a354851705 100644 --- a/src/api/test/functional/source_controller_test.rb +++ b/src/api/test/functional/source_controller_test.rb @@ -1408,7 +1408,7 @@ def test_remove_and_undelete_operations assert_response 404 get "/source/kde4/kdelibs/_history", :deleted => 1 assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) srcmd5 = node.each_revision.last.srcmd5.text get "/source/kde4/kdelibs", :deleted => 1, :rev => srcmd5 assert_response :success @@ -1505,7 +1505,7 @@ def test_remove_project_and_verify_repositories # verify the repo is updated get "/source/home:coolo:test/_meta" - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert_equal node.repository.name, "home_coolo" assert_equal node.repository.path.project, "deleted" assert_equal node.repository.path.repository, "deleted" @@ -1799,7 +1799,7 @@ def test_copy_package assert_response :success get "/source/home:Iggy/TestPack/_history" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) revision = node.each_revision.last.value :rev # standard copy @@ -1869,7 +1869,7 @@ def test_source_commits get "/source/home:Iggy/TestPack/_history" assert_response :success assert_no_xml_tag :tag => "revisionlist", :children => { :count => 1 } - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) revision = node.each_revision.last.value :rev revision = revision.to_i + 1 post "/source/home:Iggy/TestPack?cmd=commitfilelist", ' ' @@ -2227,7 +2227,7 @@ def test_branch_package_delete_and_undelete assert_response :success get "/source/home:tom:branches:home:Iggy/_meta" - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.repository.name, "10.2" assert_equal ret.repository.path.repository, "10.2" assert_equal ret.repository.path.project, "home:Iggy" @@ -2235,7 +2235,7 @@ def test_branch_package_delete_and_undelete # check source link get "/source/home:tom:branches:home:Iggy/TestPack/_link" assert_response :success - ret = ActiveXML::XMLNode.new @response.body + ret = ActiveXML::Node.new @response.body assert_equal ret.project, "home:Iggy" assert_nil ret.package assert_not_nil ret.baserev diff --git a/src/api/test/functional/source_services_test.rb b/src/api/test/functional/source_services_test.rb index 17ca9f0d27a..7725b4039b3 100644 --- a/src/api/test/functional/source_services_test.rb +++ b/src/api/test/functional/source_services_test.rb @@ -17,7 +17,7 @@ def test_get_servicelist # not using assert_xml_tag for doing a propper error message on missing # source service packages download_url = set_version = download_files = nil - services = ActiveXML::XMLNode.new(@response.body) + services = ActiveXML::Node.new(@response.body) services.each_service do |s| if s.name == "download_url" download_url = 1 @@ -69,7 +69,7 @@ def wait_for_service( project, package ) while true get "/source/#{project}/#{package}" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) return unless node.has_element? "serviceinfo" return if [ "failed", "succeeded" ].include? node.serviceinfo.code # else "running" i=i+1 @@ -120,7 +120,7 @@ def test_run_source_service ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') @@ -154,7 +154,7 @@ def test_run_source_service ' assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) assert node.has_attribute?(:id) id = node.value('id') # accept diff --git a/src/api/test/functional/status_controller_test.rb b/src/api/test/functional/status_controller_test.rb index 2c18772b7a6..1580dac1147 100644 --- a/src/api/test/functional/status_controller_test.rb +++ b/src/api/test/functional/status_controller_test.rb @@ -28,7 +28,7 @@ def test_new_message # delete it again get "/status/messages" - messages = ActiveXML::XMLNode.new @response.body + messages = ActiveXML::Node.new @response.body prepare_request_valid_user delete "/status/messages", :id => messages.message.value('msg_id') @@ -42,7 +42,7 @@ def test_new_message assert_response 400 get "/status/messages" - messages = ActiveXML::XMLNode.new @response.body + messages = ActiveXML::Node.new @response.body assert_equal 0, messages.each.size end diff --git a/src/api/test/test_consistency_helper.rb b/src/api/test/test_consistency_helper.rb index 3c6b1fe2508..04f31cab972 100644 --- a/src/api/test/test_consistency_helper.rb +++ b/src/api/test/test_consistency_helper.rb @@ -13,7 +13,7 @@ def resubmit_all_fixtures # projects get "/source" assert_response :success - node = ActiveXML::XMLNode.new(@response.body) + node = ActiveXML::Node.new(@response.body) node.each_entry do |e| get "/source/#{e.name}/_meta" assert_response :success @@ -29,7 +29,7 @@ def resubmit_all_fixtures # packages get "/source/#{e.name}" assert_response :success - packages = ActiveXML::XMLNode.new(@response.body) + packages = ActiveXML::Node.new(@response.body) packages.each_entry do |p| get "/source/#{e.name}/#{p.name}/_meta" assert_response :success diff --git a/src/api/test/test_helper.rb b/src/api/test/test_helper.rb index 6ba89c8c9b8..49e9d2f1aaf 100644 --- a/src/api/test/test_helper.rb +++ b/src/api/test/test_helper.rb @@ -104,13 +104,13 @@ def load_backend_file(path) end def assert_xml_tag(conds) - node = ActiveXML::Base.new(@response.body) + node = ActiveXML::Node.new(@response.body) ret = node.find_matching(NodeMatcher::Conditions.new(conds)) raise MiniTest::Assertion.new("expected tag, but no tag found matching #{conds.inspect} in:\n#{node.dump_xml}") unless ret end def assert_no_xml_tag(conds) - node = ActiveXML::Base.new(@response.body) + node = ActiveXML::Node.new(@response.body) ret = node.find_matching(NodeMatcher::Conditions.new(conds)) raise MiniTest::Assertion.new("expected no tag, but found tag matching #{conds.inspect} in:\n#{node.dump_xml}") if ret end @@ -153,13 +153,13 @@ def run_scheduler( arch ) module ActiveSupport class TestCase def assert_xml_tag(data, conds) - node = ActiveXML::Base.new(data) + node = ActiveXML::Node.new(data) ret = node.find_matching(NodeMatcher::Conditions.new(conds)) assert ret, "expected tag, but no tag found matching #{conds.inspect} in:\n#{node.dump_xml}" unless ret end def assert_no_xml_tag(data, conds) - node = ActiveXML::Base.new(data) + node = ActiveXML::Node.new(data) ret = node.find_matching(NodeMatcher::Conditions.new(conds)) assert !ret, "expected no tag, but found tag matching #{conds.inspect} in:\n#{node.dump_xml}" if ret end diff --git a/src/api/test/unit/attribute_test.rb b/src/api/test/unit/attribute_test.rb index c1e052d9743..cd6297d18f8 100644 --- a/src/api/test/unit/attribute_test.rb +++ b/src/api/test/unit/attribute_test.rb @@ -132,7 +132,7 @@ def test_attrib assert_equal "OBS", @at.attrib_namespace.name axml = " " - xml = ActiveXML::Base.new( axml ) + xml = ActiveXML::Node.new( axml ) # store in a project @project = Project.find_by_name( "kde4" ) @@ -164,7 +164,7 @@ def test_attrib axml = " blah " - xml = ActiveXML::Base.new( axml ) + xml = ActiveXML::Node.new( axml ) # store in a project @project = Project.find_by_name( "kde4" ) diff --git a/src/webui/app/controllers/application_controller.rb b/src/webui/app/controllers/application_controller.rb index 64b539b2ded..55d56d8bab4 100644 --- a/src/webui/app/controllers/application_controller.rb +++ b/src/webui/app/controllers/application_controller.rb @@ -433,7 +433,7 @@ def require_admin # After filter to clean up caches def clean_cache - ActiveXML::Base.free_object_cache + ActiveXML::Node.free_object_cache end def require_available_architectures diff --git a/src/webui/app/controllers/driver_update_controller.rb b/src/webui/app/controllers/driver_update_controller.rb index d1bb25d24fd..de9254d170f 100644 --- a/src/webui/app/controllers/driver_update_controller.rb +++ b/src/webui/app/controllers/driver_update_controller.rb @@ -39,7 +39,7 @@ def edit #parse packages, binary packages from dud_packlist.xml file packlist = frontend.get_source( :project => @project.to_s, :package => @package.to_s, :filename => "dud_packlist.xml" ) - xml = ActiveXML::Base.new(packlist) + xml = ActiveXML::Node.new(packlist) @packages = [] @binary_packages = {} xml.each( "//binarylist" ) do |binarylist| diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index 00390676f8a..d26be5224b2 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -366,7 +366,7 @@ def rdiff end end - filenames = BsRequest.sorted_filenames_from_sourcediff(ActiveXML::Base.new(rdiff)) + filenames = BsRequest.sorted_filenames_from_sourcediff(ActiveXML::Node.new(rdiff)) @files = filenames[:files] @filenames = filenames[:filenames] end @@ -465,7 +465,7 @@ def branch valid_http_methods(:post) begin path = "/source/#{CGI.escape(params[:project])}/#{CGI.escape(params[:package])}?cmd=branch" - result = ActiveXML::Base.new(frontend.transport.direct_http( URI(path), :method => "POST", :data => "" )) + result = ActiveXML::Node.new(frontend.transport.direct_http( URI(path), :method => "POST", :data => "" )) result_project = result.find_first( "/status/data[@name='targetproject']" ).text result_package = result.find_first( "/status/data[@name='targetpackage']" ).text rescue ActiveXML::Transport::Error => e diff --git a/src/webui/app/controllers/patchinfo_controller.rb b/src/webui/app/controllers/patchinfo_controller.rb index 7630191e22f..ef9c1291319 100644 --- a/src/webui/app/controllers/patchinfo_controller.rb +++ b/src/webui/app/controllers/patchinfo_controller.rb @@ -281,17 +281,17 @@ def get_issue_sum(issueid, tracker) bug = issueid end path = "/issue_trackers/#{CGI.escape(tracker)}" - tracker_result = ActiveXML::Base.new(frontend.transport.direct_http( URI(path), :method => "GET" )) + tracker_result = ActiveXML::Node.new(frontend.transport.direct_http( URI(path), :method => "GET" )) regexp = "^" regexp += tracker_result.regex.text regexp += "$" regexp = Regexp.new(regexp) if bug =~ regexp path = "/issue_trackers/#{CGI.escape(tracker)}/issues/#{CGI.escape(issueid)}" - result = ActiveXML::Base.new(frontend.transport.direct_http( URI(path), :method => "GET" )) + result = ActiveXML::Node.new(frontend.transport.direct_http( URI(path), :method => "GET" )) if result.summary == nil path = "/issue_trackers/#{CGI.escape(tracker)}/issues/#{CGI.escape(issueid)}?force_update=1" - result = ActiveXML::Base.new(frontend.transport.direct_http( URI(path), :method => "GET" )) + result = ActiveXML::Node.new(frontend.transport.direct_http( URI(path), :method => "GET" )) end @issuesum = result.summary.text if result.summary @issuesum = "" if !result.summary diff --git a/src/webui/app/controllers/project_controller.rb b/src/webui/app/controllers/project_controller.rb index 0a55b307ef6..db0d35aa78e 100644 --- a/src/webui/app/controllers/project_controller.rb +++ b/src/webui/app/controllers/project_controller.rb @@ -188,7 +188,7 @@ def new_incident target_project = '' begin path = "/source/#{CGI.escape(params[:ns])}/?cmd=createmaintenanceincident" - result = ActiveXML::Base.new(frontend.transport.direct_http(URI(path), :method => "POST", :data => "")) + result = ActiveXML::Node.new(frontend.transport.direct_http(URI(path), :method => "POST", :data => "")) result.each("/status/data[@name='targetproject']") { |n| target_project = n.text } rescue ActiveXML::Transport::Error => e message, _, _ = ActiveXML::Transport.extract_error_message e @@ -212,7 +212,7 @@ def incident_request_dialog def new_incident_request begin req = BsRequest.new(:project => params[:project], :type => "maintenance_incident", :description => params[:description]) - req.save(:create => true) + req.save(create: true) flash[:success] = "Created maintenance release request" rescue ActiveXML::Transport::NotFoundError, ActiveXML::Transport::Error => e message, _, _ = ActiveXML::Transport.extract_error_message(e) @@ -230,7 +230,7 @@ def new_release_request else begin req = BsRequest.new(:project => params[:project], :type => "maintenance_release", :description => params[:description]) - req.save(:create => true) + req.save(create: true) flash[:success] = "Created maintenance release request 'show', :id => req.value("id"))}'>#{req.value("id")}" rescue ActiveXML::Transport::NotFoundError => e message, _, _ = ActiveXML::Transport.extract_error_message(e) @@ -557,7 +557,7 @@ def rebuild_time @pngkey = Digest::MD5.hexdigest( params.to_s ) Rails.cache.write("rebuild-%s.png" % @pngkey, png) f=File.open(outdir + "/longest.xml") - longest = ActiveXML::LibXMLNode.new(f.read) + longest = ActiveXML::Node.new(f.read) @timings = Hash.new longest.timings.each_package do |p| @timings[p.value(:name)] = [p.value(:buildtime), p.value(:finished)] diff --git a/src/webui/app/models/architecture.rb b/src/webui/app/models/architecture.rb index 045d9c11309..6be07ae7bd1 100644 --- a/src/webui/app/models/architecture.rb +++ b/src/webui/app/models/architecture.rb @@ -1,2 +1,2 @@ -class Architecture < ActiveXML::Base +class Architecture < ActiveXML::Node end diff --git a/src/webui/app/models/attribute.rb b/src/webui/app/models/attribute.rb index 6f40e052332..d445d61935a 100644 --- a/src/webui/app/models/attribute.rb +++ b/src/webui/app/models/attribute.rb @@ -1,4 +1,4 @@ -class Attribute < ActiveXML::Base +class Attribute < ActiveXML::Node class << self def make_stub( opt ) diff --git a/src/webui/app/models/bs_request.rb b/src/webui/app/models/bs_request.rb index 4ab16df659a..4b74bcf9ab6 100644 --- a/src/webui/app/models/bs_request.rb +++ b/src/webui/app/models/bs_request.rb @@ -1,4 +1,4 @@ -class BsRequest < ActiveXML::Base +class BsRequest < ActiveXML::Node class ListError < Exception; end class ModifyError < Exception; end @@ -175,7 +175,7 @@ def creator(req) login = '' if req.has_element?(:history) #NOTE: 'req' can be a LibXMLNode or not. Depends on code path. - if req.history.class == ActiveXML::LibXMLNode + if req.history.class == ActiveXML::Node login = req.history.who else login = req.history.first[:who] @@ -189,7 +189,7 @@ def creator(req) def created_at(req) if req.has_element?(:history) #NOTE: 'req' can be a LibXMLNode or not. Depends on code path. Also depends on luck and random quantum effects. ActiveXML sucks big time! - return req.history.when if req.history.class == ActiveXML::LibXMLNode + return req.history.when if req.history.class == ActiveXML::Node return req.history[0][:when] else return req.state.when @@ -448,7 +448,7 @@ def actiondiffs actiondiffs = [] begin transport ||= ActiveXML::transport - result = ActiveXML::Base.new(transport.direct_http(URI("/request/#{value('id')}?cmd=diff&view=xml&withissues=1"), :method => "POST", :data => "")) + result = ActiveXML::Node.new(transport.direct_http(URI("/request/#{value('id')}?cmd=diff&view=xml&withissues=1"), :method => "POST", :data => "")) result.each_action do |action| # Parse each action and get the it's diff (per file) sourcediffs = [] action.each_sourcediff do |sourcediff| # Parse earch sourcediff in that action diff --git a/src/webui/app/models/builddep_info.rb b/src/webui/app/models/builddep_info.rb index 42d07fbd70b..7b15a28b18e 100644 --- a/src/webui/app/models/builddep_info.rb +++ b/src/webui/app/models/builddep_info.rb @@ -1,2 +1,2 @@ -class BuilddepInfo < ActiveXML::Base +class BuilddepInfo < ActiveXML::Node end diff --git a/src/webui/app/models/buildresult.rb b/src/webui/app/models/buildresult.rb index 9edc430234a..cfcf36513bc 100644 --- a/src/webui/app/models/buildresult.rb +++ b/src/webui/app/models/buildresult.rb @@ -1,4 +1,4 @@ -class Buildresult < ActiveXML::Base +class Buildresult < ActiveXML::Node @@avail_status_values = ['succeeded', 'failed', 'unresolvable', 'broken', diff --git a/src/webui/app/models/collection.rb b/src/webui/app/models/collection.rb index 13ff2a51d1b..da7fbb51b82 100644 --- a/src/webui/app/models/collection.rb +++ b/src/webui/app/models/collection.rb @@ -1,4 +1,4 @@ -class Collection < ActiveXML::Base +class Collection < ActiveXML::Node def is_empty? return !self.has_elements? end diff --git a/src/webui/app/models/directory.rb b/src/webui/app/models/directory.rb index 1b88b97bd0e..293560ab402 100644 --- a/src/webui/app/models/directory.rb +++ b/src/webui/app/models/directory.rb @@ -1,4 +1,4 @@ -class Directory < ActiveXML::Base +class Directory < ActiveXML::Node end diff --git a/src/webui/app/models/distribution.rb b/src/webui/app/models/distribution.rb index c3b654e6f3f..9d37764df69 100644 --- a/src/webui/app/models/distribution.rb +++ b/src/webui/app/models/distribution.rb @@ -1,4 +1,4 @@ -class Distribution < ActiveXML::Base +class Distribution < ActiveXML::Node def all_vendors ret = Array.new diff --git a/src/webui/app/models/downloadcounter.rb b/src/webui/app/models/downloadcounter.rb index 339a8b766ed..c44d6a76a40 100644 --- a/src/webui/app/models/downloadcounter.rb +++ b/src/webui/app/models/downloadcounter.rb @@ -1,2 +1,2 @@ -class Downloadcounter < ActiveXML::Base +class Downloadcounter < ActiveXML::Node end diff --git a/src/webui/app/models/fileinfo.rb b/src/webui/app/models/fileinfo.rb index 9e61e0e70fd..258cf7d3bd0 100644 --- a/src/webui/app/models/fileinfo.rb +++ b/src/webui/app/models/fileinfo.rb @@ -1,2 +1,2 @@ -class Fileinfo < ActiveXML::Base +class Fileinfo < ActiveXML::Node end diff --git a/src/webui/app/models/global_counters.rb b/src/webui/app/models/global_counters.rb index 59415961f55..7cdc1c59773 100644 --- a/src/webui/app/models/global_counters.rb +++ b/src/webui/app/models/global_counters.rb @@ -1,2 +1,2 @@ -class GlobalCounters < ActiveXML::Base +class GlobalCounters < ActiveXML::Node end diff --git a/src/webui/app/models/group.rb b/src/webui/app/models/group.rb index 8782a5cf5c4..fc047344c38 100644 --- a/src/webui/app/models/group.rb +++ b/src/webui/app/models/group.rb @@ -1,4 +1,4 @@ -class Group < ActiveXML::Base +class Group < ActiveXML::Node default_find_parameter :title handles_xml_element :group diff --git a/src/webui/app/models/issue.rb b/src/webui/app/models/issue.rb index 55a85bc260f..a6773789656 100644 --- a/src/webui/app/models/issue.rb +++ b/src/webui/app/models/issue.rb @@ -1,2 +1,2 @@ -class Issue < ActiveXML::Base +class Issue < ActiveXML::Node end diff --git a/src/webui/app/models/issue_tracker.rb b/src/webui/app/models/issue_tracker.rb index c55fbb2859c..bc9f0d78036 100644 --- a/src/webui/app/models/issue_tracker.rb +++ b/src/webui/app/models/issue_tracker.rb @@ -1,4 +1,4 @@ -class IssueTracker < ActiveXML::Base +class IssueTracker < ActiveXML::Node class ListError < Exception; end class ModifyError < Exception; end diff --git a/src/webui/app/models/jobhislist.rb b/src/webui/app/models/jobhislist.rb index 1e871986ff6..020e2082055 100644 --- a/src/webui/app/models/jobhislist.rb +++ b/src/webui/app/models/jobhislist.rb @@ -1,2 +1,2 @@ -class Jobhislist < ActiveXML::Base +class Jobhislist < ActiveXML::Node end diff --git a/src/webui/app/models/latest_added.rb b/src/webui/app/models/latest_added.rb index 24c18dd7ef4..cf2423c5842 100644 --- a/src/webui/app/models/latest_added.rb +++ b/src/webui/app/models/latest_added.rb @@ -1,2 +1,2 @@ -class LatestAdded < ActiveXML::Base +class LatestAdded < ActiveXML::Node end diff --git a/src/webui/app/models/latest_updated.rb b/src/webui/app/models/latest_updated.rb index 5b280337bfd..8f039c02450 100644 --- a/src/webui/app/models/latest_updated.rb +++ b/src/webui/app/models/latest_updated.rb @@ -1,2 +1,2 @@ -class LatestUpdated < ActiveXML::Base +class LatestUpdated < ActiveXML::Node end diff --git a/src/webui/app/models/link.rb b/src/webui/app/models/link.rb index 92903a5e0c2..07aa94564fd 100644 --- a/src/webui/app/models/link.rb +++ b/src/webui/app/models/link.rb @@ -1,10 +1,10 @@ -class Link < ActiveXML::Base +class Link < ActiveXML::Node # redefine make_stub so that Link.new( :project => 'a', :package => 'b' ) works class << self def make_stub( opt ) logger.debug "make stub params: #{opt.inspect}" - doc = ActiveXML::Base.new "" + doc = ActiveXML::Node.new "" doc.set_attribute('project', opt[:linked_project]) doc.set_attribute('package', opt[:linked_package]) doc @@ -14,7 +14,7 @@ def make_stub( opt ) # an 'add' patch adds the patch file to the package and uses it from the specfile def add_patch filename add_element "patches" if !self.has_element? :patches - patches = ActiveXML::LibXMLNode.new(data.find_first("/link/patches")) + patches = ActiveXML::Node.new(data.find_first("/link/patches")) #TODO: We need to add it a the correct place, but add_element cannot handle that patches.add_element "add", 'name' => filename end @@ -22,7 +22,7 @@ def add_patch filename # an 'apply' patch patches directly the sources of the package before building def apply_patch filename add_element "patches" if !self.has_element? :patches - patches = ActiveXML::LibXMLNode.new(data.find_first("/link/patches")) + patches = ActiveXML::Node.new(data.find_first("/link/patches")) #TODO: We need to add it a the correct place, but add_element cannot handle that patches.add_element "apply", 'name' => filename end diff --git a/src/webui/app/models/most_active_packages.rb b/src/webui/app/models/most_active_packages.rb index 8fb4bd7b3fb..ec631aee8df 100644 --- a/src/webui/app/models/most_active_packages.rb +++ b/src/webui/app/models/most_active_packages.rb @@ -1,2 +1,2 @@ -class MostActivePackages < ActiveXML::Base +class MostActivePackages < ActiveXML::Node end diff --git a/src/webui/app/models/most_active_projects.rb b/src/webui/app/models/most_active_projects.rb index 1a6094311c2..7978dc0c9de 100644 --- a/src/webui/app/models/most_active_projects.rb +++ b/src/webui/app/models/most_active_projects.rb @@ -1,2 +1,2 @@ -class MostActiveProjects < ActiveXML::Base +class MostActiveProjects < ActiveXML::Node end diff --git a/src/webui/app/models/package.rb b/src/webui/app/models/package.rb index d0a471b5ee7..8cd365564f7 100644 --- a/src/webui/app/models/package.rb +++ b/src/webui/app/models/package.rb @@ -1,4 +1,4 @@ -class Package < ActiveXML::Base +class Package < ActiveXML::Node handles_xml_element 'package' @@ -125,7 +125,7 @@ def linking_packages fc = FrontendCompat.new answer = fc.do_post nil, opt - doc = ActiveXML::Base.new(answer) + doc = ActiveXML::Node.new(answer) doc.each("/collection/package") do |e| hash = {} hash[:project] = e.value("project") @@ -139,7 +139,7 @@ def linking_packages end def user_has_role?(user, role) - user = Person.find_cached(user.to_s) if user.class == String or user.class == ActiveXML::LibXMLNode + user = Person.find_cached(user.to_s) if user.class == String or user.class == ActiveXML::Node if user each_person do |p| return true if p.role == role and p.userid == user.to_s @@ -270,7 +270,7 @@ def commit( rev = nil, cacheAll = nil ) end c = {} - doc = ActiveXML::Base.new(answer) + doc = ActiveXML::Node.new(answer) doc.each("/revisionlist/revision") do |s| c[:revision]= s.value("rev") c[:user] = s.find_first("user").text diff --git a/src/webui/app/models/package_attribute.rb b/src/webui/app/models/package_attribute.rb index 8a8c9443b7b..5e7691abd59 100644 --- a/src/webui/app/models/package_attribute.rb +++ b/src/webui/app/models/package_attribute.rb @@ -1,2 +1,2 @@ -class PackageAttribute < ActiveXML::Base +class PackageAttribute < ActiveXML::Node end diff --git a/src/webui/app/models/patchinfo.rb b/src/webui/app/models/patchinfo.rb index efcaf04e000..cad547f28e5 100644 --- a/src/webui/app/models/patchinfo.rb +++ b/src/webui/app/models/patchinfo.rb @@ -1,4 +1,4 @@ -class Patchinfo < ActiveXML::Base +class Patchinfo < ActiveXML::Node class << self def make_stub( opt ) "" diff --git a/src/webui/app/models/person.rb b/src/webui/app/models/person.rb index 98ea8dbd330..d58d9ebe080 100644 --- a/src/webui/app/models/person.rb +++ b/src/webui/app/models/person.rb @@ -1,4 +1,4 @@ -class Person < ActiveXML::Base +class Person < ActiveXML::Node class ListError < Exception; end @@ -21,7 +21,7 @@ def self.make_stub( opt ) if opt.has_key? :email email = opt[:email] end - doc = ActiveXML::Base.new '' + doc = ActiveXML::Node.new '' element = doc.add_element 'login' element.text = opt[:login] element = doc.add_element 'realname' @@ -140,7 +140,7 @@ def running_patchinfos(opts = {}) path = "/source/#{URI.escape(pi.project)}/#{URI.escape(pi.name)}?view=issues&states=OPEN&login=#{CGI.escape(login)}" frontend = ActiveXML::transport answer = frontend.direct_http URI(path), :method => "GET" - doc = ActiveXML::Base.new(answer) + doc = ActiveXML::Node.new(answer) doc.each("/package/issue") do |s| i = {} i[:name]= s.find_first("name").text diff --git a/src/webui/app/models/person_group.rb b/src/webui/app/models/person_group.rb index f1fd526e247..f238965ec15 100644 --- a/src/webui/app/models/person_group.rb +++ b/src/webui/app/models/person_group.rb @@ -1,3 +1,3 @@ -class PersonGroup < ActiveXML::Base +class PersonGroup < ActiveXML::Node default_find_parameter :login end diff --git a/src/webui/app/models/project.rb b/src/webui/app/models/project.rb index 38f7a4ed227..5ee04602005 100644 --- a/src/webui/app/models/project.rb +++ b/src/webui/app/models/project.rb @@ -1,6 +1,6 @@ require 'frontend_compat' -class Project < ActiveXML::Base +class Project < ActiveXML::Node default_find_parameter :name @@ -15,7 +15,7 @@ class Project < ActiveXML::Base handles_xml_element 'project' - class Repository < ActiveXML::XMLNode + class Repository < ActiveXML::Node handles_xml_element 'repository' def archs @@ -255,7 +255,7 @@ def linking_projects begin fc = FrontendCompat.new answer = fc.do_post(nil, {:project => self.name, :cmd => 'showlinked'}) - doc = ActiveXML::Base.new(answer) + doc = ActiveXML::Node.new(answer) doc.each('/collection/project') {|e| result << e.value('name')} rescue ActiveXML::Transport::NotFoundError # No answer is ok, it only means no linking projects... @@ -322,7 +322,7 @@ def is_maintainer?(user) def can_edit?(user) return false if not user - if user.class == String or user.class == ActiveXML::LibXMLNode + if user.class == String or user.class == ActiveXML::Node user = Person.find_cached(user.to_s) return false if not user end diff --git a/src/webui/app/models/project_status.rb b/src/webui/app/models/project_status.rb index a57723b3599..d62b2092524 100644 --- a/src/webui/app/models/project_status.rb +++ b/src/webui/app/models/project_status.rb @@ -1,2 +1,2 @@ -class ProjectStatus < ActiveXML::Base +class ProjectStatus < ActiveXML::Node end diff --git a/src/webui/app/models/result.rb b/src/webui/app/models/result.rb index 353ca0f4007..4fac16cb2ad 100644 --- a/src/webui/app/models/result.rb +++ b/src/webui/app/models/result.rb @@ -1,4 +1,4 @@ -class Result < ActiveXML::Base +class Result < ActiveXML::Node end diff --git a/src/webui/app/models/service.rb b/src/webui/app/models/service.rb index e6373bbc754..e3aa343bb9e 100644 --- a/src/webui/app/models/service.rb +++ b/src/webui/app/models/service.rb @@ -1,4 +1,4 @@ -class Service < ActiveXML::Base +class Service < ActiveXML::Node class << self def make_stub( opt ) @@ -203,7 +203,7 @@ def error begin fc = FrontendCompat.new answer = fc.get_source opt - doc = ActiveXML::Base.new(answer) + doc = ActiveXML::Node.new(answer) doc.each("/directory/serviceinfo/error") do |e| return e.text end diff --git a/src/webui/app/models/sourcediff.rb b/src/webui/app/models/sourcediff.rb index 8bf18a51baa..77f5dceaf34 100644 --- a/src/webui/app/models/sourcediff.rb +++ b/src/webui/app/models/sourcediff.rb @@ -1,3 +1,3 @@ -class Sourcediff < ActiveXML::Base +class Sourcediff < ActiveXML::Node end diff --git a/src/webui/app/models/statusmessage.rb b/src/webui/app/models/statusmessage.rb index e2885bfdd35..2c664a1fe21 100644 --- a/src/webui/app/models/statusmessage.rb +++ b/src/webui/app/models/statusmessage.rb @@ -1,11 +1,11 @@ -class Statusmessage < ActiveXML::Base +class Statusmessage < ActiveXML::Node default_find_parameter :id class << self def make_stub( opt ) - doc = ActiveXML::Base.new "" + doc = ActiveXML::Node.new "" doc.text = opt[:message] doc.set_attribute('severity', opt[:severity]) if opt[:severity] return doc diff --git a/src/webui/app/models/unregisteredperson.rb b/src/webui/app/models/unregisteredperson.rb index 4222370e146..9b7d5306495 100644 --- a/src/webui/app/models/unregisteredperson.rb +++ b/src/webui/app/models/unregisteredperson.rb @@ -1,4 +1,4 @@ -class Unregisteredperson < ActiveXML::Base +class Unregisteredperson < ActiveXML::Node default_find_parameter :login class << self diff --git a/src/webui/app/models/userchangepasswd.rb b/src/webui/app/models/userchangepasswd.rb index 4363eb112bb..226cbc7161a 100644 --- a/src/webui/app/models/userchangepasswd.rb +++ b/src/webui/app/models/userchangepasswd.rb @@ -1,5 +1,5 @@ -class Userchangepasswd < ActiveXML::Base +class Userchangepasswd < ActiveXML::Node class << self def make_stub( opt ) login = "" diff --git a/src/webui/app/models/wizard.rb b/src/webui/app/models/wizard.rb index 9c850771850..41946a656e7 100644 --- a/src/webui/app/models/wizard.rb +++ b/src/webui/app/models/wizard.rb @@ -1,3 +1,3 @@ -class Wizard < ActiveXML::Base +class Wizard < ActiveXML::Node handles_xml_element 'wizard' end diff --git a/src/webui/app/models/workerstatus.rb b/src/webui/app/models/workerstatus.rb index 3705a8ea340..bdd18f303e0 100644 --- a/src/webui/app/models/workerstatus.rb +++ b/src/webui/app/models/workerstatus.rb @@ -1,2 +1,2 @@ -class Workerstatus < ActiveXML::Base +class Workerstatus < ActiveXML::Node end diff --git a/src/webui/config/initializers/activexml.rb b/src/webui/config/initializers/activexml.rb index f618e0ef3b8..77ab05b8c69 100644 --- a/src/webui/config/initializers/activexml.rb +++ b/src/webui/config/initializers/activexml.rb @@ -129,6 +129,6 @@ def add(d) if Rails.env.development? ::Rack::MiniProfiler.profile_method(ActiveXML::Transport, :http_do) { |method,url| "#{method.to_s.upcase} #{url.path}?#{url.query}" } -# ::Rack::MiniProfiler.profile_method(ActiveXML::Base, :find_cached) { "Fetching" } +# ::Rack::MiniProfiler.profile_method(ActiveXML::Node, :find_cached) { "Fetching" } end diff --git a/src/webui/config/initializers/logging.rb b/src/webui/config/initializers/logging.rb index a7f4b11d2d7..63cdc37606f 100644 --- a/src/webui/config/initializers/logging.rb +++ b/src/webui/config/initializers/logging.rb @@ -33,8 +33,8 @@ module ControllerRuntime def append_info_to_payload(payload) super payload[:transport_details] = ActiveXML::transport.details.summary! - payload[:xml_runtime] = ActiveXML::LibXMLNode.runtime * 1000 - ActiveXML::LibXMLNode.reset_runtime + payload[:xml_runtime] = ActiveXML::Node.runtime * 1000 + ActiveXML::Node.reset_runtime runtime = payload[:transport_details].clone runtime[:view] = payload[:view_runtime] runtime[:xml] = payload[:xml_runtime] diff --git a/src/webui/test/functional/spider_test.rb b/src/webui/test/functional/spider_test.rb index 9b2f53d64eb..a151d745b03 100644 --- a/src/webui/test/functional/spider_test.rb +++ b/src/webui/test/functional/spider_test.rb @@ -112,7 +112,7 @@ def spider( body, uri, options ) def consume_page( html, url ) body = nil begin - body = ActiveXML::Base.new html + body = ActiveXML::Node.new html body.internal_data rescue puts "HARDCORE!! #{url}"