From 9307a9e854335738e2bb30a895ec70508a2e3910 Mon Sep 17 00:00:00 2001
From: Jan Varwig <jan@varwig.org>
Date: Wed, 2 Dec 2009 13:30:17 +0100
Subject: [PATCH] Added some robustness to assets and the ISO migration

---
 app/models/asset.rb                                          | 2 +-
 app/models/image.rb                                          | 2 +-
 .../20091111165203_change_iso3_to_iso2_in_languages.rb       | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/asset.rb b/app/models/asset.rb
index 86b1f47..e6a80df 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -26,7 +26,7 @@ class Asset < ActiveRecord::Base
     :styles => lambda { |attachment|
                   returning(HashWithIndifferentAccess.new) do |styles|
                     styles.merge!(attachment.instance.vrame_styles) if attachment.instance.vrame_styles.is_a? Hash
-                    styles.merge!(Vrame.configuration.posterframe_styles)
+                    styles.merge!(Vrame.configuration.posterframe_styles) if Vrame.configuration.posterframe_styles.is_a? Hash
                     styles.merge!(Asset::DEFAULT_STYLES)
                   end
                 }
diff --git a/app/models/image.rb b/app/models/image.rb
index 20c89e8..8bca8bc 100644
--- a/app/models/image.rb
+++ b/app/models/image.rb
@@ -7,7 +7,7 @@ class Image < Asset
     :styles => lambda { |attachment|
                   returning(HashWithIndifferentAccess.new) do |styles|
                     styles.merge!(attachment.instance.vrame_styles) if attachment.instance.vrame_styles.is_a? Hash
-                    styles.merge!(Vrame.configuration.image_styles)
+                    styles.merge!(Vrame.configuration.image_styles) if Vrame.configuration.image_styles.is_a? Hash
                     styles.merge!(Asset::DEFAULT_STYLES)
                   end
                 },
diff --git a/db/migrate/20091111165203_change_iso3_to_iso2_in_languages.rb b/db/migrate/20091111165203_change_iso3_to_iso2_in_languages.rb
index b07341d..66a895b 100644
--- a/db/migrate/20091111165203_change_iso3_to_iso2_in_languages.rb
+++ b/db/migrate/20091111165203_change_iso3_to_iso2_in_languages.rb
@@ -1,9 +1,14 @@
 class ChangeIso3ToIso2InLanguages < ActiveRecord::Migration
+  MAP = {'deu' => 'de', 'eng' => 'en'}
   def self.up
     rename_column :languages, :iso3_code, :iso2_code
+    Language.reset_column_information
+    Language.find_each {|l| l.update_attribute(:iso2_code, MAP[l.iso2_code]) }
   end
 
   def self.down
     rename_column :albums, :iso2_code, :iso3_code
+    Language.reset_column_information
+    Language.find_each {|l| l.update_attribute(:iso2_code, MAP.invert[l.iso2_code]) }
   end
 end