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

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

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 63764dd..88073cd 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -1,6 +1,5 @@
-class SpeechBalloon < Pettanr::Content
-  include Element
-  include ElementInspire
+class SpeechBalloon < Peta::Element
+  load_manifest
   has_one :balloon, :dependent => :destroy
   has_one :speech, :dependent => :destroy
   belongs_to :speech_balloon_template
@@ -11,17 +10,17 @@ class SpeechBalloon < Pettanr::Content
   
   validates :panel_id, :numericality => {:allow_blank => true}
   validates :speech_balloon_template_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :classname, :presence => true, :length => {:maximum => 50}
+  validates :speech_balloon_template_classname, :presence => true, :length => {:maximum => 50}
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
-  validates :settings, :extend_speech_balloon => true
+  validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
   
-  def self.owner_model
-    Panel
-  end
-  
-  def self.valid_encode_columns
-    super + ['caption', 'classname', 'settings']
+  def self.by_author_list_includes
+    {
+      :panel => {
+        :author => {}
+      }
+    }
   end
   
   def self.list_opt_for_panel
@@ -46,10 +45,6 @@ class SpeechBalloon < Pettanr::Content
     false
   end
   
-  def extend_column
-    'classname'
-  end
-  
   def supply_default
     if self.panel
       self.t = self.panel.new_t 
@@ -61,87 +56,15 @@ class SpeechBalloon < Pettanr::Content
     self.panel_id = pid
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def symbol_option
     self.speech_balloon_template.symbol_option
   end
   
-  def new_balloon
-    @new_balloon
-  end
-  
-  def new_balloon= v
-    @new_balloon = v
-  end
-  
-  def get_balloon
-    self.balloon || @new_balloon
-  end
-  
-  def new_speech
-    @new_speech
-  end
-  
-  def new_speech= v
-    @new_speech = v
-  end
-  
-  def get_speech
-    self.speech || @new_speech
-  end
-  
-  def boost
-    self.extend self.speech_balloon_template.engine_speech_balloon_module
-    if self.balloon
-    else
-      self.new_balloon = self.build_balloon 
-      self.new_speech = self.build_speech 
-    end
-    self.balloon.extend self.speech_balloon_template.engine_balloon_module
-    self.speech.extend self.speech_balloon_template.engine_speech_module
-    self.balloon.new_parent = self
-    self.speech.new_parent = self
-    self.extend_speech_balloon = if self.settings.blank?
-      {}
-    else
-      JSON.parse(self.settings)
-    end
-    self.balloon.extend_balloon = if self.balloon.settings.blank?
-      {}
-    else
-      JSON.parse(self.get_balloon.settings)
-    end
-    self.speech.extend_speech = if self.speech.settings.blank?
-      {}
-    else
-      JSON.parse(self.get_speech.settings)
-    end
-  end
-  
-  def self.fold_extend_settings params
-    speech_balloon_settings = params[:speech_balloon][:settings]
-    if speech_balloon_settings.is_a?(Hash)
-      params[:speech_balloon][:settings] = speech_balloon_settings.to_json
-    end
-    balloon_settings = params[:speech_balloon][:balloon_attributes][:settings]
-    if balloon_settings.is_a?(Hash)
-      params[:speech_balloon][:balloon_attributes][:settings] = balloon_settings.to_json
-    end
-    speech_settings = params[:speech_balloon][:speech_attributes][:settings]
-    if speech_settings.is_a?(Hash)
-      params[:speech_balloon][:speech_attributes][:settings] = speech_settings.to_json
-    end
-  end
-  
   def tag_element_type
     'speech_balloon'
   end
   
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end
   
@@ -149,10 +72,6 @@ class SpeechBalloon < Pettanr::Content
     'speech_balloons.updated_at desc'
   end
   
-  def self.list_opt
-    {:panel => {:author => {}}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }
-  end
-  
   def self.list_json_opt
     {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end
@@ -165,7 +84,7 @@ class SpeechBalloon < Pettanr::Content
     {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end
   
-  def store au, attr
+  def store operators, attr
     if self.new_record?
       sb = self.panel.speech_balloons.build
       sb.attributes = attr
@@ -177,7 +96,7 @@ class SpeechBalloon < Pettanr::Content
         break
       end
     end
-    self.panel.store({}, au)
+    self.panel.store({}, operators)
   end
   
   def remove au