update to latest activexml

app/models/appdata.rb

@@ -1,4 +1,4 @@
-class Appdata < ActiveXML::Base
+class Appdata
 
   def self.get dist="factory"
     data = Hash.new

app/models/attribute.rb

@@ -1,2 +1,2 @@
-class Attribute < ActiveXML::Base
+class Attribute < ActiveXML::Node
 end

app/models/pattern.rb

@@ -1,3 +1,3 @@
-class Pattern < ActiveXML::Base
+class Pattern < ActiveXML::Node
   #namespace "http://novell.com/package/metadata/suse/pattern"
 end

app/models/published.rb

@@ -1,2 +1,2 @@
-class Published < ActiveXML::Base
+class Published < ActiveXML::Node
 end

app/models/seeker.rb

@@ -1,6 +1,6 @@
 require 'digest/md5'
 
-class Seeker < ActiveXML::Base
+class Seeker < ActiveXML::Node
 
   def self.prepare_result(query, baseproject=nil, project=nil, exclude_filter=nil, exclude_debug=false)
     cache_key = query

config/initializers/activexml.rb

@@ -1,20 +1,18 @@
 require "activexml/activexml"
 
-ActiveXML::Base.config do |conf|
-  conf.setup_transport do |map|
-    map.default_server :rest, CONFIG['api_host']
-    map.connect :published, 'rest:///published/:project/:repository/:arch/:name?:view'
-    map.connect :seeker, 'rest:///search?match=:match',
-      :project => 'rest:///search/project/id?match=:match',
-      :package => 'rest:///search/package/id?match=:match',
-      :pattern => 'rest:///search/published/pattern/id?match=:match',
-      :binary => 'rest:///search/published/binary/id?match=:match'
-    map.connect :appdata, 'rest:///build/:prj/:repo/:arch/:pkgname/:appdata'
-    map.connect :attribute, 'rest:///source/:prj/_attribute/:attribute'
-  end
-  conf.transport_for( :published ).set_additional_header( "X-Username", CONFIG['api_username'])
-  unless CONFIG['api_password'].blank?
-    conf.transport_for( :published ).login CONFIG['api_username'], CONFIG['api_password']
-  end
-  conf.transport_for( :published ).set_additional_header( "User-Agent", "software.o.o" )
-end
+api = URI(CONFIG['api_host'])
+map = ActiveXML::setup_transport(api.scheme, api.hostname, api.port)
+
+map.connect :published, 'rest:///published/:project/:repository/:arch/:name?:view'
+map.connect :seeker, 'rest:///search?match=:match',
+    :project => 'rest:///search/project/id?match=:match',
+    :package => 'rest:///search/package/id?match=:match',
+    :pattern => 'rest:///search/published/pattern/id?match=:match',
+    :binary => 'rest:///search/published/binary/id?match=:match'
+#map.connect :appdata, 'rest:///build/:prj/:repo/:arch/:pkgname/:appdata'
+map.connect :attribute, 'rest:///source/:prj/_attribute/:attribute'
+map.set_additional_header( "X-Username", CONFIG['api_username'])
+map.login CONFIG['api_username'], CONFIG['api_password']
+map.set_additional_header( "User-Agent", "software.o.o" )
+map.map.set_additional_header("X-opensuse_data", CONFIG['opensuse_cookie']) if CONFIG['opensuse_cookie']
+

config/options.yml → config/options.yml.example

@@ -10,3 +10,6 @@ api_password: test
 #use_static: software.o.o
 
 order_mails_to: promodvds@opensuse.org
+
+#opensuse_cookie: 
+

lib/activexml/activexml.rb

@@ -5,8 +5,6 @@
   gem 'activesupport'
 end
 
-require File.join(File.dirname(__FILE__), 'config')
 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')