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

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

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 825eeb3..c4a7273 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -14,6 +14,15 @@ class SpeechBalloon < ActiveRecord::Base
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
 #  validates :settings, :presence => true
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['classname', 'settings'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def visible? roles
     if MagicNumber['run_mode'] == 0
       return false unless guest_role_check(roles)