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

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

diff --git a/app/models/color.rb b/app/models/color.rb
index 3144ad2..e06d68b 100644 (file)
--- a/app/models/color.rb
+++ b/app/models/color.rb
@@ -5,6 +5,15 @@ class Color < ActiveRecord::Base
   validates :code, :presence => true, :numericality => {:greater_than_or_equal_to => 0, :less_than => 0x1000000}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['name'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def supply_default
     self.name = 'no name' if self.name.blank?
   end