v07

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

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 87272e6..367af4a 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -5,39 +5,49 @@ class SpeechBalloon < Peta::Element
   belongs_to :speech_balloon_template
   belongs_to :panel
   
-  accepts_nested_attributes_for :balloon
-  accepts_nested_attributes_for :speech
+  accepts_nested_attributes_for :balloon, :allow_destroy => true
+  accepts_nested_attributes_for :speech, :allow_destroy => true
   
   validates :panel_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 :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
   
-  def self.by_author_list_includes
-    {
-      :panel => {
-        :author => {}
-      }
-    }
+  scope :with_panel, -> do
+    includes(:panel)
   end
   
-  def self.list_opt_for_panel
-    {
-      :speech_balloons => {:balloon => {}, :speech => {}}
-    }
+  scope :with_speech_balloon_template, -> do
+    includes(:speech_balloon_template)
   end
   
-  def self.show_opt_for_panel
-    {
-      :speech_balloons => {:balloon => {}, :speech => {}}
-    }
+  scope :find_index, -> do
+    with_panel.where(Panel.arel_table[:publish].gt 0).references(:panel)
+  end
+  
+  scope :find_private, -> (operators) do 
+    with_panel.where(Panel.arel_table[:author_id].eq operators.author.id).references(:panel)
+  end
+  
+  scope :find_by_panel, -> (panel_id) do 
+    find_index.where(panel_id: panel_id).references(:panel)
+  end
+  
+  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
+  
+  scope :find_by_author, -> (author_id) do 
+    find_index.where(Panel.arel_table[:author_id].eq author_id).references(:panel)
   end
   
-  def self.json_opt_for_panel
+  def self.by_author_list_includes
     {
-      :balloon => {}, :speech => {}
+      :panel => {
+        :author => {}
+      }
     }
   end
   
@@ -60,11 +70,11 @@ class SpeechBalloon < Peta::Element
     self.speech_balloon_template.symbol_option
   end
   
-  def tag_element_type
-    'speech_balloon'
+  def filer_caption
+    self.plain_scenario
   end
   
-  def self.public_list_where
+  def self.public_list_where list
     'panels.publish > 0'
   end
   
@@ -72,35 +82,6 @@ class SpeechBalloon < Peta::Element
     {:include => {:panel => {:author => {}}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end
   
-  def self.show_json_opt
-    {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
-  end
-  
-  def parts
-    @parts ||= [self.balloon, self.speech]
-  end
-  
-  def engine_path_name 
-    self.speech_balloon_template.engine_name + '/'
-  end
-  
-  def path_name with_engine = false
-    (with_engine ? self.engine_path_name : '') + 
-      self.class.path_name
-  end
-  
-  def form_template with_engine = false
-    self.path_name(true) + '/form'
-  end
-  
-  def speech_form_template with_engine = false
-    self.engine_path_name + 'speeches/form'
-  end
-  
-  def balloon_form_template with_engine = false
-    self.engine_path_name + 'balloons/form'
-  end
-  
   def scenario_template with_engine = false
     self.path_name(true) + '/scenario'
   end