t#31085:raise err when input invalid encoding string

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

diff --git a/app/models/picture.rb b/app/models/picture.rb
index fb85714..46a0de4 100644 (file)
--- a/app/models/picture.rb
+++ b/app/models/picture.rb
@@ -17,6 +17,15 @@ class Picture < ActiveRecord::Base
   validates :artist_name, :presence => true
   validates :classname, :presence => true, :length => {:maximum => 50}
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['artist_name', 'classname', 'credit', 'settings'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def supply_default
   end