Merging the changes from the override-refactor branch. This is a significant rewrite of the parser, but it has little affect on the rest of the code tree.

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

1 files changed, 0 insertions, 42 deletions

diff --git a/lib/puppet/rails/rails_object.rb b/lib/puppet/rails/rails_object.rb
deleted file mode 100644
index d1e58e453..000000000
--- a/lib/puppet/rails/rails_object.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'puppet'
-require 'puppet/rails/rails_parameter'
-
-#RailsParameter = Puppet::Rails::RailsParameter
-class Puppet::Rails::RailsObject < ActiveRecord::Base
-    has_many :rails_parameters, :dependent => :delete_all
-    serialize :tags, Array
-
-    belongs_to :host
-
-    # Add a set of parameters.
-    def addparams(params)
-        params.each do |pname, pvalue|
-            rails_parameters.build(
-                :name => pname,
-                :value => pvalue
-            )
-
-            #self.rails_parameters << pobj
-        end
-    end
-
-    # Convert our object to a trans_object.  Do not retain whether the object
-    # is collectable, though, since that would cause it to get stripped
-    # from the configuration.
-    def to_trans
-        obj = Puppet::TransObject.new(name(), ptype())
-
-        [:file, :line, :tags].each do |method|
-            if val = send(method)
-                obj.send(method.to_s + "=", val)
-            end
-        end
-        rails_parameters.each do |param|
-            obj[param.name] = param.value
-        end
-
-        return obj
-    end
-end
-
-# $Id$