Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / app / models / speech_balloon_template.rb

diff --git a/app/models/speech_balloon_template.rb b/app/models/speech_balloon_template.rb
index b560c3f..9c27ec5 100644 (file)
--- a/app/models/speech_balloon_template.rb
+++ b/app/models/speech_balloon_template.rb
@@ -8,6 +8,15 @@ class SpeechBalloonTemplate < ActiveRecord::Base
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :settings, :presence => true
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['name', 'classname', 'caption', 'settings'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def supply_default
   end