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 efe2ab7..f64b002 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -6,9 +6,9 @@ class Speech < Peta::Element
   
   validates :speech_balloon_id, :numericality => {:allow_blank => true}
   validates :speech_balloon_template_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :speech_balloon_template_classname, :presence => true, :length => {:maximum => 50}
+  validates :speech_balloon_template_module_name, :presence => true, :length => {:maximum => 50}
   validates :writing_format_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :writing_format_classname, :presence => true, :length => {:maximum => 50}
+  validates :writing_format_module_name, :presence => true, :length => {:maximum => 50}
   validates :font_size, :presence => true, :numericality => {:only_integer => false}
   validates :text_align, :presence => true, :numericality => true, :inclusion => { :in => 0..3 }
   validates :fore_color, :presence => true, :numericality => {:greater_than_or_equal_to => 0, :less_than => 0x1000000}
@@ -22,6 +22,10 @@ class Speech < Peta::Element
   
   @@text_align_texts = ['left', 'left', 'right', 'center']
   
+  def attr_y
+    self.attributes['y']
+  end
+  
   def supply_default
     self.x = 0
     self.y = 0
@@ -35,7 +39,7 @@ class Speech < Peta::Element
   
   def outer_style
     {
-      'top' => self.y, 'left' => self.x, 
+      'top' => self.attr_y, 'left' => self.x, 
       'width' => self.width, 'height' => self.height
     }
   end
@@ -70,25 +74,13 @@ class Speech < Peta::Element
     {:include => {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {} }}}
   end
   
-  def copy_attributes
-    r = self.attributes
-    r.delete 'id'
-    r.delete 'speech_balloon_id'
-    r.delete 'created_at'
-    r.delete 'updated_at'
-    r
-  end
-  
   def self.panelize speech_attributes
     {'speech_attributes' => speech_attributes}
   end
   
-  def writing_format_engine_model
-    self.writing_format.engine_model
-  end
-  
   def scenario
-    self.writing_format_engine_model.render self.content
+    self.boosts 'read'
+    self.render
   end
   
   def plain_scenario