Improved API.

app/models/package.rb

@@ -2,13 +2,15 @@ require 'rexml/document'
 class Package < ApplicationModel
   @@root = Rails.root.to_s
 
-  def self.build_file(file)
+  def self.build(data)
-    xml = self._read_file(file, true)
+
-    package = self._parse(xml)
+    if data[:file]
-    self.build(package)
+      xml     = self._read_file( data[:file], true )
-  end
+      package = self._parse(xml)
+    elsif data[:string]
+      package = self._parse( data[:string] )
+    end
 
-  def self.build(package)
     build_date = REXML::Element.new("build_date")
     build_date.text = Time.now.utc.iso8601
     build_host = REXML::Element.new("build_host")
@@ -25,21 +27,16 @@ class Package < ApplicationModel
     return package.to_s
   end
 
-  def self.install_file(file)
+  def self.install(data)
-    xml = self._read_file( file, true )
+    if data[:file]
-    package = self._parse(xml)
+      xml     = self._read_file( data[:file], true )
-    self.install(package)
+      package = self._parse(xml)
-  end
+    elsif data[:string]
-
+      package = self._parse( data[:string] )
-  def self.install_string(xml)
+    end
-    package = self._parse(xml)
-    self.install(package)
-  end
-
-  def self.install(package)
 
     # package meta data
-    data = {
+    meta = {
       :name           => package.elements["zpm/name"].text,
       :version        => package.elements["zpm/version"].text,
       :vendor         => package.elements["zpm/vendor"].text,
@@ -49,36 +46,40 @@ class Package < ApplicationModel
     }
 
     # verify if package can get installed
-    package_db = Package.where( :name => data[:name] ).first
+    package_db = Package.where( :name => meta[:name] ).first
     if package_db
-      if Gem::Version.new( package_db.version ) == Gem::Version.new( data[:version] )
+      if Gem::Version.new( package_db.version ) == Gem::Version.new( meta[:version] )
-        raise "Package '#{data[:name]}' already installed!"
+        raise "Package '#{meta[:name]}-#{meta[:version]}' already installed!"
       end
-      if Gem::Version.new( package_db.version ) > Gem::Version.new( data[:version] )
+      if Gem::Version.new( package_db.version ) > Gem::Version.new( meta[:version] )
-        raise "Newer version (#{package_db.version}) of package '#{data[:name]}-#{data[:version]}' already installed!"
+        raise "Newer version (#{package_db.version}) of package '#{meta[:name]}-#{meta[:version]}' already installed!"
       end
 
       # uninstall old package
-      self.uninstall_name( package_db.name, package_db.version, false )
+      self.uninstall({
+        :name               => package_db.name,
+        :version            => package_db.version,
+        :migration_not_down => true,
+      })
     end
 
     # store package
-    record = Package.create( data )
+    record = Package.create( meta )
     Store.add(
       :object      => 'Package',
       :o_id        => record.id,
       :data        => package.to_s,
-      :filename    => data[:name] + '-' + data[:version] + '.zpm',
+      :filename    => meta[:name] + '-' + meta[:version] + '.zpm',
       :preferences => {},
     )
 
     # write files
     package.elements.each('zpm/filelist/file') do |element|
-      location = element.attributes['location']
+      location   = element.attributes['location']
       permission = element.attributes['permission'] || '644'
-      base64 = element.text
+      base64     = element.text
-      content  = Base64.decode64(base64)
+      content    = Base64.decode64(base64)
-      content = self._write_file(location, permission, content)
+      content    = self._write_file(location, permission, content)
     end
 
     # update package state
@@ -86,51 +87,47 @@ class Package < ApplicationModel
     record.save
 
     # up migrations
-    Package::Migration.migrate( data[:name] )
+    Package::Migration.migrate( meta[:name] )
 
     # prebuild assets
 
     return true
   end
 
-  def self.uninstall_name( name, version, migration_down = true )
+  def self.uninstall( data )
-    file = self._get_bin( name, version )
-    package = self._parse(file)
-    self.uninstall( package, migration_down )
-  end
 
-  def self.uninstall_string(xml)
+    if data[:string]
-    package = self._parse(xml)
+      package = self._parse( data[:string] )
-    self.uninstall(package)
+    else
-  end
+      file    = self._get_bin( data[:name], data[:version] )
-
+      package = self._parse(file)
-  def self.uninstall( package, migration_down = true )
+    end
 
     # package meta data
-    data = {
+    meta = {
       :name           => package.elements["zpm/name"].text,
       :version        => package.elements["zpm/version"].text,
     }
 
     # down migrations
-    if migration_down
+    if !data[:migration_not_down]
-      Package::Migration.migrate( data[:name], 'reverse' )
+      Package::Migration.migrate( meta[:name], 'reverse' )
     end
 
     package.elements.each('zpm/filelist/file') do |element|
-      location = element.attributes['location']
+      location   = element.attributes['location']
       permission = element.attributes['permission'] || '644'
-      base64 = element.text
+      base64     = element.text
-      content  = Base64.decode64(base64)
+      content    = Base64.decode64(base64)
-      content = self._delete_file(location, permission, content)
+      content    = self._delete_file(location, permission, content)
     end
 
     # prebuild assets
 
     # delete package
     record = Package.where(
-      :name     => data[:name],
+      :name     => meta[:name],
-      :version  => data[:version],
+      :version  => meta[:version],
     ).first
     record.destroy
 
@@ -240,7 +237,7 @@ class Package < ApplicationModel
   class Migration < ApplicationModel
     @@root = Rails.root.to_s
 
-    def self.migrate(package, direction = 'normal')
+    def self.migrate( package, direction = 'normal' )
       location = @@root + '/db/addon/' + package.underscore
 
       return true if !File.exists?( location )

test/unit/package_test.rb

@@ -159,7 +159,7 @@ X3RhYmxlIDpzYW1wbGVfdGFibGVzDQogIGVuZA0KZW5k</file>
     tests.each { |test|
       if test[:action] == 'install'
         begin
-          success = Package.install_string( test[:zpm] )
+          success = Package.install( :string => test[:zpm] )
         rescue => e
           puts 'ERROR: ' + e.inspect
           success = false
@@ -172,13 +172,13 @@ X3RhYmxlIDpzYW1wbGVfdGFibGVzDQogIGVuZA0KZW5k</file>
       elsif test[:action] == 'uninstall'
         if test[:zpm]
           begin
-            success = Package.uninstall_string( test[:zpm] )
+            success = Package.uninstall( :string => test[:zpm] )
           rescue
             success = false
           end
         else
           begin
-            success = Package.uninstall_name( test[:name], test[:version] )
+            success = Package.uninstall( :name => test[:name], :version => test[:version] )
           rescue
             success = false
           end