spec/people_image_downloader_spec.rb spec/spec_helper.rb @@ -6,6 +6,8 @@ # website. # For example, Under Mac OS X this is likely to be something like: web_root: "/Library/WebServer/Documents/openaustralia" + + # Under Linux, this is likely to be something like: #web_root: "/var/www/openaustralia-app" configuration.yml @@ -6,33 +6,33 @@ class Configuration :regmem_pdf_path, :base_dir @@conf = nil + # Load the configuration + def global_conf + @@conf ||= YAML.load_file( "#{File.dirname(__FILE__)}/../configuration.yml" ) || {} + end def initialize - if @@conf.nil? - # Load the configuration - @@conf = YAML::load( File.open( "#{File.dirname(__FILE__)}/../configuration.yml" ) ) - @@conf = {} if !@@conf - end - # Load the information from the mysociety configuration require "#{web_root}/rblib/config" + MySociety::Config.set_file("#{web_root}/twfy/conf/general") - @database_host = MySociety::Config.get('DB_HOST') - @database_user = MySociety::Config.get('DB_USER') + + @database_host = MySociety::Config.get('DB_HOST') + @database_user = MySociety::Config.get('DB_USER') @database_password = MySociety::Config.get('DB_PASSWORD') - @database_name = MySociety::Config.get('DB_NAME') - @file_image_path = MySociety::Config.get('FILEIMAGEPATH') - @members_xml_path = MySociety::Config.get('PWMEMBERS') - @xml_path = MySociety::Config.get('RAWDATA') - @regmem_pdf_path = MySociety::Config.get('REGMEMPDFPATH') - @base_dir = MySociety::Config.get('BASEDIR') + @database_name = MySociety::Config.get('DB_NAME') + @file_image_path = MySociety::Config.get('FILEIMAGEPATH') + @members_xml_path = MySociety::Config.get('PWMEMBERS') + @xml_path = MySociety::Config.get('RAWDATA') + @regmem_pdf_path = MySociety::Config.get('REGMEMPDFPATH') + @base_dir = MySociety::Config.get('BASEDIR') end # Ruby magic def method_missing(method_id) name = method_id.id2name - if @@conf.has_key?(name) - @@conf[name] + if global_conf.has_key?(name) + global_conf[name] else super end lib/configuration.rb ecd5caa93c20072ee6acc231e7d4757982dc0ca7 lachie lachiec@gmail.com http://github.com/lachie/openaustralia-parser/commit/25db6fcd776b6c36977d2c33d1b055e346c4f323 25db6fcd776b6c36977d2c33d1b055e346c4f323 2009-06-13T00:11:13-07:00 2009-06-13T00:11:13-07:00 twiddling bits and pieces for spec to run in isolation 9c9d6ac3856954be4397e74b086b2281a9d8d262 lachie lachiec@gmail.com