diff options
Diffstat (limited to 'lib/puppet/rails')
| -rw-r--r-- | lib/puppet/rails/database/schema.rb | 22 | ||||
| -rw-r--r-- | lib/puppet/rails/fact.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/rails/host.rb | 23 | ||||
| -rw-r--r-- | lib/puppet/rails/param.rb | 21 | ||||
| -rw-r--r-- | lib/puppet/rails/resource.rb | 25 |
5 files changed, 46 insertions, 49 deletions
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb index 510c94a09..c7941184a 100644 --- a/lib/puppet/rails/database/schema.rb +++ b/lib/puppet/rails/database/schema.rb @@ -40,21 +40,31 @@ class Puppet::Rails::Schema t.column :source_file_id, :integer end - create_table :facts do |t| + create_table :fact_names do |t| t.column :name, :string, :null => false - t.column :value, :text, :null => false t.column :host_id, :integer, :null => false t.column :updated_at, :datetime end - create_table :params do |t| - t.column :name, :string, :null => false + create_table :fact_values do |t| + t.column :value, :text, :null => false + t.column :fact_name_id, :integer, :null => false + t.column :updated_at, :datetime + end + + create_table :param_values do |t| t.column :value, :text, :null => false - t.column :line, :integer + t.column :param_name_id, :integer, :null => false t.column :updated_at, :datetime - t.column :resource_id, :integer end + create_table :param_names do |t| + t.column :name, :string, :null => false + t.column :resource_id, :integer + t.column :line, :integer + t.column :updated_at, :datetime + end + create_table :tags do |t| t.column :name, :string t.column :updated_at, :datetime diff --git a/lib/puppet/rails/fact.rb b/lib/puppet/rails/fact.rb deleted file mode 100644 index 6c44f68e1..000000000 --- a/lib/puppet/rails/fact.rb +++ /dev/null @@ -1,4 +0,0 @@ -class Puppet::Rails::Fact < ActiveRecord::Base - belongs_to :host -end - diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb index e81117c48..c8e46b1a5 100644 --- a/lib/puppet/rails/host.rb +++ b/lib/puppet/rails/host.rb @@ -1,15 +1,17 @@ require 'puppet/rails/resource' -require 'puppet/rails/fact' +require 'puppet/rails/fact_name' +require 'puppet/rails/source_file' require 'puppet/util/rails/collection_merger' class Puppet::Rails::Host < ActiveRecord::Base include Puppet::Util::CollectionMerger - has_many :facts + has_many :fact_values, :through => :fact_names + has_many :fact_names, :dependent => :destroy belongs_to :puppet_classes has_many :source_files has_many :resources, - :include => [ :params ], + :include => [ :param_names, :param_values ], :dependent => :destroy acts_as_taggable @@ -63,18 +65,23 @@ class Puppet::Rails::Host < ActiveRecord::Base # Return the value of a fact. def fact(name) - if f = self.facts.find_by_name(name) - return f.value + if fv = self.fact_values.find(:first, :conditions => "fact_names.name = '#{name}'") + return fv.value else return nil end end def setfacts(facts) - collection_merge(:facts, facts) do |name, value| - f = self.facts.find_by_name(name) || self.facts.build(:name => name, :value => value) + collection_merge(:fact_names, facts) do |name, value| + fn = fact_names.find_by_name(name) || fact_names.build(:name => name) # We're only ever going to have one fact value, at this point. - f + unless fv = fn.fact_values.find_by_value(value) + fv = fn.fact_values.build(:value => value) + end + fn.fact_values = [fv] + + fn end end diff --git a/lib/puppet/rails/param.rb b/lib/puppet/rails/param.rb deleted file mode 100644 index 108bc48d4..000000000 --- a/lib/puppet/rails/param.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'puppet/util/rails/collection_merger' - -class Puppet::Rails::Param < ActiveRecord::Base - include Puppet::Util::CollectionMerger - belongs_to :resource - - def to_resourceparam(source) - hash = {} - hash[:name] = self.name.to_sym - hash[:source] = source - hash[:value] = self.value - if hash[:value].length == 1 - hash[:value] = hash[:value].shift - end - if hash[:value].empty? - hash[:value] = nil - end - Puppet::Parser::Resource::Param.new hash - end -end - diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb index 68f3dba8b..6656c2450 100644 --- a/lib/puppet/rails/resource.rb +++ b/lib/puppet/rails/resource.rb @@ -1,18 +1,18 @@ require 'puppet' -require 'puppet/rails/source_file' require 'puppet/rails/external/tagging/init' -require 'puppet/rails/param' +require 'puppet/rails/param_name' require 'puppet/util/rails/collection_merger' class Puppet::Rails::Resource < ActiveRecord::Base include Puppet::Util::CollectionMerger - has_many :params, :dependent => :destroy + has_many :param_values, :through => :param_names + has_many :param_names, :dependent => :destroy belongs_to :source_file belongs_to :host acts_as_taggable - + def tags=(tags) tags.each do |tag| self.tag_with tag @@ -28,15 +28,20 @@ class Puppet::Rails::Resource < ActiveRecord::Base end def parameter(param) - if p = self.params.find_by_name(param) - return p.value + if pn = param_names.find_by_name(param) + if pv = pn.param_values.find(:first) + return pv.value + else + return nil + end end end def parameters hash = {} - self.params.find(:all).each do |p| - hash.store(p.name, p.value) + self.param_values.find(:all).each do |pvalue| + pname = pvalue.param_name.name + hash.store(pname, pvalue.value) end return hash end @@ -65,8 +70,8 @@ class Puppet::Rails::Resource < ActiveRecord::Base hash[:scope] = scope hash[:source] = scope.source obj = Puppet::Parser::Resource.new(hash) - self.params.each do |p| - obj.set(p.to_resourceparam(scope.source)) + self.param_names.each do |pname| + obj.set(pname.to_resourceparam(scope.source)) end # Store the ID, so we can check if we're re-collecting the same resource. |