merge v04

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

diff --git a/app/models/comic.rb b/app/models/comic.rb
index b280dd3..7c937b1 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -1,12 +1,11 @@
 class Comic < ActiveRecord::Base
-  has_many :panels, :dependent => :destroy
+  has_many :stories
   belongs_to :author
   
-  validates :title, :presence => true, :length => {:maximum => 100}\r
+  validates :title, :presence => true, :length => {:maximum => 100}
   validates :width, :presence => true, :numericality => true, :natural_number => true
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :visible, :presence => true, :numericality => true, :inclusion => {:in => 0..3}
-  validates :editable, :presence => true, :numericality => true, :inclusion => {:in => 0..3}
   
   before_save do |r|
     r.supply_default
@@ -14,7 +13,6 @@ class Comic < ActiveRecord::Base
   
   def supply_default
     self.visible = 0 if self.visible.blank?
-    self.editable= 0 if self.editable.blank?
   end
   
   def own? author
@@ -26,10 +24,6 @@ class Comic < ActiveRecord::Base
     self.visible > 0 or self.own?(author)
   end
   
-  def disp_editable
-    editable == 1 ? 'O' : 'X'
-  end
-  
   def disp_visible
     visible == 1 ? 'O' : 'X'
   end
@@ -63,21 +57,6 @@ class Comic < ActiveRecord::Base
     page_size
   end
   
-  def self.offset cnt, prm = nil
-    offset = prm.to_i
-    offset = cnt - 1 if offset >= cnt
-    offset = cnt - offset.abs if offset < 0
-    offset = 0 if offset < 0
-    offset
-  end
-  
-  def self.panel_count cnt, prm = self.default_panel_size
-    count = prm.to_i
-    count = self.max_panel_size if count > self.max_panel_size
-    count = self.default_panel_size if count < 1
-    count
-  end
-  
   def self.list opt = {}, page = 1, page_size = self.default_page_size
     opt.merge!(self.list_opt) unless opt[:include]
     opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
@@ -85,11 +64,11 @@ class Comic < ActiveRecord::Base
   end
   
   def self.list_opt
-    {:include => :author}
+    {:include => {:stories => {:panel => {}}, :author => {}}}
   end
   
   def self.list_json_opt
-    {:include => :author}
+    {:include => {:stories => {:panel => {}}, :author => {}}}
   end
   
   def self.show cid, au, opt = {}
@@ -99,27 +78,13 @@ class Comic < ActiveRecord::Base
   end
   
   def self.show_include_opt opt = {}
-    res = [:author]
+    res = {:stories => {:panel => {}}, :author => {}}
     res.push(opt[:include]) if opt[:include]
     res
   end
   
   def self.show_json_include_opt
-    {:include => :author}
-  end
-  
-  def self.play cid, opt = {}
-    Comic.find(cid, include: [
-      :author, 
-      :panels => [
-        :panel_pictures => :resource_picture, 
-        :speech_balloons =>{:balloons => {}, :speeches => {}}
-      ]
-    ], order: 'panels.t')
-  end
-  
-  def to_json_play
-    self.to_json( :include => {:author => {}, :panels => {:methods => :panel_element}})
+    {:include => {:stories => {:panel => {}}, :author => {}}}
   end
   
   def self.visible_count