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

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index d759dad..bf3d7f4 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -1,10 +1,12 @@
-class Balloon < Peta::Content
+class Balloon < Peta::Element
   load_manifest
-  include Peta::ElementPart
   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_module_name, :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
@@ -12,81 +14,88 @@ 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 self.colum_structures
-    @@colum_structures ||= {
-      :r => {
-        :helper => 'panels/tail_angle_helper'
-      }
-    }
+  scope :with_panel, -> do
+    includes(speech_balloon: :panel)
   end
   
-  def url
-    '/system_pictures/' + self.system_picture.filename
+  scope :with_speech_balloon_template, -> do
+    includes(:speech_balloon_template)
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
+  scope :find_index, -> do
+    with_panel.where(Panel.arel_table[:publish].gt 0).references(:panel)
   end
   
-  def supply_default
-    self.x = 0
-    self.y = 0
-    self.width = 100
-    self.height = 100
-    self.r = 0
-self.system_picture_id = 1
+  scope :find_private, -> (operators) do 
+    with_panel.where(Panel.arel_table[:author_id].eq operators.author.id).references(:panel)
   end
   
-  def symbol_option
-    self.get_parent.speech_balloon_template.symbol_option
+  scope :find_by_panel, -> (panel_id) do 
+    find_index.where(panel_id: panel_id).references(:panel)
   end
   
-  def get_parent
-    self.speech_balloon || @new_parent
+  scope :find_by_speech_balloon, -> (speech_balloon_id) do 
+    find_index.where(speech_balloon_id: speech_balloon_id).references(:panel)
   end
   
-  def tag_element_part_type
-    'balloon'
+  scope :find_by_speech_balloon_template, -> (speech_balloon_template_id) do 
+    find_index.where(speech_balloon_template_id: speech_balloon_template_id).references(:panel)
   end
   
-  def self.list_where
-    'panels.publish > 0'
+  scope :find_by_system_picture, -> (system_picture_id) do 
+    find_index.where(system_picture_id: system_picture_id).references(:panel)
   end
   
-  def self.list_order
-    'balloons.updated_at desc'
+  scope :find_by_author, -> (author_id) do 
+    find_index.where(Panel.arel_table[:author_id].eq author_id).references(:panel)
   end
   
-  def self.list_opt
-    {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}
+  def y
+    self.attributes['y']
   end
   
-  def self.list_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
+  def url
+    '/system_pictures/' + self.system_picture.filename
   end
   
-  def self.show_opt
-    {:include => {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}}
+  def supply_default
+    self.x = 0
+    self.y = 0
+    self.width = 100
+    self.height = 100
+    self.r = 0
+self.system_picture_id = 1
   end
   
-  def self.show_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
+  def symbol_option
+    self.speech_balloon.speech_balloon_template.symbol_option
   end
   
-  def copy_attributes
-    r = self.attributes
-    r.delete 'id'
-    r.delete 'speech_balloon_id'
-    r.delete 'created_at'
-    r.delete 'updated_at'
-    r
+  def self.public_list_where list
+    'panels.publish > 0'
   end
   
-  def self.panelize balloon_attributes
-    {'balloon_attributes' => balloon_attributes}
+  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 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 scenario