lib/odania/config/plugin_config.rb in odania-0.0.35 vs lib/odania/config/plugin_config.rb in odania-0.0.36

@@ -1,20 +1,21 @@
 module Odania
 	module Config
 		class PluginConfig
-			attr_accessor :domains, :config, :default_subdomains, :plugin_config
+			attr_accessor :domains, :config, :valid_domains, :default_domains, :plugin_config
 
 			def initialize
 				reset
 			end
 
 			# Load the global configuration
 			def load(data)
 				reset
 				@config = data['config'] unless data['config'].nil?
 				@plugin_config = data['plugin-config'] unless data['plugin-config'].nil?
-				@default_subdomains = data['default_subdomains'] unless data['default_subdomains'].nil?
+				@valid_domains = data['valid_domains'] unless data['valid_domains'].nil?
+				@default_domains = data['default_domains'] unless data['default_domains'].nil?
 				unless data['domains'].nil?
 					data['domains'].each_pair do |name, domain_data|
 						@domains[name].load(domain_data)
 					end
 				end
@@ -28,10 +29,12 @@
 
 			# Reset configuration
 			def reset
 				@config = {}
 				@plugin_config = {}
+				@default_domains = {}
+				@valid_domains = {}
 				@domains = Hash.new { |hash, key| hash[key] = Domain.new(key) }
 			end
 
 			def dump
 				domain_data = {}
@@ -40,10 +43,11 @@
 				end
 
 				{
 					'plugin-config' => plugin_config,
 					'config' => config,
-					'default_subdomains' => @default_subdomains,
+					'default_domains' => @default_domains,
+					'valid_domains' => @valid_domains,
 					'domains' => domain_data
 				}
 			end
 		end
 	end