Prevent application error when config/asset_packages.yml is missing

kennon · Jan 14, 2009 · a267165 · a267165
1 parent e6a0303
commit a267165
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/synthesis/asset_package.rb b/lib/synthesis/asset_package.rb
@@ -3,7 +3,7 @@ class AssetPackage
 
     # class variables
     @@asset_packages_yml = $asset_packages_yml || 
-      (File.exists?("#{RAILS_ROOT}/config/asset_packages.yml") ? YAML.load_file("#{RAILS_ROOT}/config/asset_packages.yml") : nil)
+      (File.exists?("#{RAILS_ROOT}/config/asset_packages.yml") ? YAML.load_file("#{RAILS_ROOT}/config/asset_packages.yml") : {})
 
     # singleton methods
     class << self
@@ -25,7 +25,7 @@ def find_by_type(asset_type)
       end
 
       def find_by_target(asset_type, target)
-        package_hash = @@asset_packages_yml[asset_type].find {|p| p.keys.first == target }
+        package_hash = @@asset_packages_yml[asset_type].find {|p| p.keys.first == target } unless @@asset_packages_yml[asset_type].nil?
         package_hash ? self.new(asset_type, package_hash) : nil
       end
 
@@ -34,7 +34,7 @@ def find_by_source(asset_type, source)
         package_hash = @@asset_packages_yml[asset_type].find do |p|
           key = p.keys.first
           p[key].include?(path_parts[2]) && (parse_path(key)[1] == path_parts[1])
-        end
+        end unless @@asset_packages_yml[asset_type].nil?
         package_hash ? self.new(asset_type, package_hash) : nil
       end