upgrade rails 3.2

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index ad9bbe4..bce4d6a 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -1,9 +1,12 @@
-class Balloon < Peta::Content
-  include Peta::ElementPart
+class Balloon < Peta::Element
+  load_manifest
   belongs_to :speech_balloon
+  belongs_to :speech_balloon_template
   belongs_to :system_picture
   
   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 :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :x, :presence => true, :numericality => true
   validates :y, :presence => true, :numericality => true
@@ -11,33 +14,16 @@ class Balloon < Peta::Content
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :r, :presence => true, :numericality => true
 #  validates :caption, :presence => true
-  validates :settings, :extend_balloon => true
+  validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
 
-  def owner_model
-    self.speech_balloon.panel
-  end
-  
-  def self.valid_encode_columns
-    super + ['settings']
-  end
-  
-  def self.colum_structures
-    @@colum_structures ||= {
-      :r => {
-        :helper => 'panels/tail_angle_helper'
-      }
-    }
+  def _y
+    self.attributes['y']
   end
   
   def url
     '/system_pictures/' + self.system_picture.filename
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def supply_default
     self.x = 0
     self.y = 0
@@ -48,39 +34,32 @@ self.system_picture_id = 1
   end
   
   def symbol_option
-    self.get_parent.speech_balloon_template.symbol_option
-  end
-  
-  def get_parent
-    self.speech_balloon || @new_parent
+    self.speech_balloon.speech_balloon_template.symbol_option
   end
   
-  def tag_element_part_type
-    'balloon'
-  end
-  
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end
   
-  def self.list_order
-    'balloons.updated_at desc'
-  end
-  
-  def self.list_opt
-    {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}
-  end
-  
-  def self.list_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
+  def self.by_author_list_includes
+    {
+      :speech_balloon => {
+        :panel => {
+          :author => {}
+        }
+      }
+    }
   end
   
   def self.show_opt
     {:include => {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}}
   end
   
-  def self.show_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
+  def style
+    {
+      'width' => self.width.to_s + 'px','height' => self.height.to_s + 'px',
+      'top' => self._y.to_s + 'px','left' => self.x.to_s + 'px'
+    }
   end
   
   def copy_attributes