fix: fetch fail

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

diff --git a/app/models/speech.rb b/app/models/speech.rb
index 963031c..263f6cf 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -6,9 +6,9 @@ class Speech < Peta::Element
   
   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 :speech_balloon_template_module_name, :presence => true, :length => {:maximum => 50}
   validates :writing_format_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :writing_format_classname, :presence => true, :length => {:maximum => 50}
+  validates :writing_format_module_name, :presence => true, :length => {:maximum => 50}
   validates :font_size, :presence => true, :numericality => {:only_integer => false}
   validates :text_align, :presence => true, :numericality => true, :inclusion => { :in => 0..3 }
   validates :fore_color, :presence => true, :numericality => {:greater_than_or_equal_to => 0, :less_than => 0x1000000}
@@ -17,16 +17,57 @@ class Speech < Peta::Element
   validates :width, :presence => true, :numericality => true, :natural_number => true
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :quotes, :length => {:maximum => 15}, :quotes_even => true
-  validates :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template}
+  validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
   #validates :writing_format_settings
   
+  scope :with_panel, -> do
+    includes(speech_balloon: :panel)
+  end
+  
+  scope :with_speech_balloon_template, -> do
+    includes(:speech_balloon_template)
+  end
+  
+  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, -> (speech_balloon_id) do 
+    find_index.where(speech_balloon_id: speech_balloon_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_writing_format, -> (writing_format_id) do 
+    find_index.where(writing_format_id: writing_format_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
+  
   @@text_align_texts = ['left', 'left', 'right', 'center']
   
+  def y
+    self.attributes['y']
+  end
+  
   def supply_default
     self.x = 0
     self.y = 0
     self.width = 100
     self.height = 100
+    self.fore_color = 0
   end
   
   def symbol_option
@@ -35,8 +76,8 @@ class Speech < Peta::Element
   
   def outer_style
     {
-      'top' => self.y, 'left' => self.x, 
-      'width' => self.width, 'height' => self.height
+      'top' => self.y.to_s + '%', 'left' => self.x.to_s + '%', 
+      'width' => self.width.to_s + '%', 'height' => self.height.to_s + '%'
     }
   end
   
@@ -52,14 +93,10 @@ class Speech < Peta::Element
     @@text_align_texts[self.text_align]
   end
   
-  def self.list_where
+  def self.public_list_where list
     'panels.publish > 0'
   end
   
-  def self.list_order
-    'speeches.updated_at desc'
-  end
-  
   def self.by_author_list_includes
     {
       :speech_balloon => {
@@ -70,45 +107,17 @@ class Speech < Peta::Element
     }
   end
   
-  def self.list_opt
-    {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {}} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech_balloon_template => {} }}}}
-  end
-  
   def self.show_opt
     {:include => {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {} }}}
   end
   
-  def self.show_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech_balloon_template => {} }}}}
-  end
-  
-  def copy_attributes
-    r = self.attributes
-    r.delete 'id'
-    r.delete 'speech_balloon_id'
-    r.delete 'created_at'
-    r.delete 'updated_at'
-    r
-  end
-  
-  def self.panelize speech_attributes
-    {'speech_attributes' => speech_attributes}
-  end
-  
-  def writing_format_engine_model
-    self.writing_format.engine_model
-  end
-  
   def scenario
-    self.writing_format_engine_model.render self.content
+    self.boosts 'read'
+    self.render
   end
   
   def plain_scenario
-    self.content + "\n"
+    self.content.to_s + "\n"
   end
   
   def feed