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

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

diff --git a/app/models/speech.rb b/app/models/speech.rb
index 726f26d..8184772 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -6,12 +6,13 @@ class Speech < ActiveRecord::Base
   validates :y, :presence => true, :numericality => true
   validates :width, :presence => true, :numericality => true, :natural_number => true
   validates :height, :presence => true, :numericality => true, :natural_number => true
+  validates :quotes, :length => {:maximum => 15}, :quotes_even => true
 #  validates :settings, :presence => true
   
   before_validation :valid_encode
   
   def valid_encode
-    ['content', 'settings'].each do |a|
+    ['content', 'quotes', 'settings'].each do |a|
       next if attributes[a] == nil
       raise Pettanr::BadRequest unless attributes[a].valid_encoding?
     end
@@ -144,4 +145,8 @@ class Speech < ActiveRecord::Base
     self.content + "\n"
   end
   
+  def feed
+    ERB::Util.html_escape(self.content)
+  end
+  
 end