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 90f0518..110a3aa 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -1,4 +1,5 @@
 class Balloon < ActiveRecord::Base
+  include ElementPart
   belongs_to :speech_balloon
   belongs_to :system_picture
   
@@ -10,7 +11,7 @@ class Balloon < ActiveRecord::Base
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :r, :presence => true, :numericality => true
 #  validates :caption, :presence => true
-#  validates :settings, :presence => true
+  validates :settings, :extend_balloon => true
 
   before_validation :valid_encode
   
@@ -21,6 +22,14 @@ class Balloon < ActiveRecord::Base
     end
   end
   
+  def self.colum_structures
+    @@colum_structures ||= {
+      :r => {
+        :helper => 'panels/tail_angle_helper'
+      }
+    }
+  end
+  
   def url
     '/system_pictures/' + self.system_picture.filename
   end
@@ -44,55 +53,18 @@ class Balloon < ActiveRecord::Base
 self.system_picture_id = 1
   end
   
-  def get_speech_balloon
-    self.speech_balloon
-  end
-  
-  def get_panel_id
-    if self.get_speech_balloon == nil or self.get_speech_balloon.panel == nil or self.get_speech_balloon.panel.new_record?
-      0
-    else
-      self.get_speech_balloon.panel.id
-    end
-  end
-  
-  def tag_id c = nil
-    'panel' + tag_panel_id + tag_element_type + tag_element_id + tag_element_part_type + tag_element_part_id + c.to_s
-  end
-  
-  def field_tag_id f
-    self.tag_id + f.to_s
-  end
-  
-  def tag_panel_id
-    self.get_panel_id.to_s
-  end
-  
-  def tag_element_id
-    r = if self.get_speech_balloon == nil or self.get_speech_balloon.new_record?
-      0
-    else
-      self.get_speech_balloon.id
-    end
-    r.to_s
+  def symbol_option
+    self.get_parent.speech_balloon_template.symbol_option
   end
   
-  def tag_element_type
-    'speech_balloon'
-  end
-  
-  def tag_element_part_id
-    self.new_record? ? '0' : self.id.to_s
+  def get_parent
+    self.speech_balloon || @new_parent
   end
   
   def tag_element_part_type
     'balloon'
   end
   
-  def field_tree f
-    'panels-' + self.tag_panel_id + '-speech_balloons_attributes-' + self.tag_element_id + '-balloon_attributes-' + f.to_s
-  end
-  
   def self.default_page_size
     25
   end
@@ -114,16 +86,20 @@ self.system_picture_id = 1
     page_size
   end
   
+  def self.list_where
+    'panels.publish > 0'
+  end
+  
   def self.list page = 1, page_size = self.default_page_size
-    opt = {}
-    opt.merge!(Balloon.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => 'panels.publish > 0', :order => 'balloons.updated_at desc'})
-    Balloon.find(:all, opt)
+    Balloon.where(self.list_where()).includes(Balloon.list_opt).order('balloons.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.list_paginate page = 1, page_size = self.default_page_size
+    Kaminari.paginate_array(Array.new(Balloon.where(self.list_where()).includes(Balloon.list_opt).count, nil)).page(page).per(page_size)
   end
   
   def self.list_opt
-    {:include => {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}}
+    {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}
   end
   
   def self.list_json_opt