Go back to restype and remove STI classes, they were more trouble than they were worth.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1940 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 2 insertions, 8 deletions

diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb
index 68a784d9d..423b227ad 100644
--- a/lib/puppet/rails/resource.rb
+++ b/lib/puppet/rails/resource.rb
@@ -10,12 +10,6 @@ class Puppet::Rails::Resource < ActiveRecord::Base
 
     acts_as_taggable
 
-    Puppet::Type.loadall
-    Puppet::Type.eachtype do |type|
-        klass = Class.new(Puppet::Rails::Resource)
-        Object.const_set("Puppet%s" % type.name.to_s.capitalize, klass)
-    end
-
     def parameters
         hash = {}
         self.param_values.find(:all).each do |pvalue|
@@ -30,14 +24,14 @@ class Puppet::Rails::Resource < ActiveRecord::Base
     # from the configuration.
     def to_resource(scope)
         hash = self.attributes
-        hash.delete("type")
+        hash["type"] = hash["restype"]
+        hash.delete("restype")
         hash.delete("host_id")
         hash.delete("source_file_id")
         hash.delete("id")
         hash.each do |p, v|
             hash.delete(p) if v.nil?
         end
-        hash[:type] = self.class.to_s.gsub(/Puppet/,'').downcase
         hash[:scope] = scope
         hash[:source] = scope.source
         obj = Puppet::Parser::Resource.new(hash)