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

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

diff --git a/app/models/comic_story.rb b/app/models/comic_story.rb
index bcde23a..12213ba 100644 (file)
--- a/app/models/comic_story.rb
+++ b/app/models/comic_story.rb
@@ -6,7 +6,6 @@ class ComicStory < Peta::Leaf
   
   validates :comic_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :story_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
   def supply_default
@@ -16,151 +15,43 @@ class ComicStory < Peta::Leaf
   end
   
   def overwrite operators
-    return false unless operators.author
-    self.author_id = operators.author.id
   end
   
-  def self.public_list_order
-    'comic_stories.updated_at desc'
+  def disp_t
+    self.t + 1
   end
   
-  def self.list_where
-    'comics.visible > 0'
+  def disp_t_by_text
+    I18n.t('comic_stories.show.t', :t => self.disp_t)
   end
   
-  def self.by_author_list_includes
-    {
-      :comic => {
-        :author => {}
-      }
-    }
-  end
-  
-  def self.play_list_where cid
-    ['comic_stories.comic_id = ?', cid]
+  def title
+    self.disp_t_by_text + ':' + self.story.title
   end
   
-  def self.play_list scroll, author, offset = 0, limit = ScrollPanel.default_panel_size
-    ScrollPanel.where(self.play_list_where(scroll.id)).includes(ScrollPanel.list_opt).order('scroll_panels.t').offset(offset).limit(limit)
+  def self.public_list_where list
+    'comics.visible > 0'
   end
   
-  def self.list_opt
+  def self.by_author_list_includes
     {
       :comic => {
-        :author => {}, 
+        :author => {}
       }
     }
   end
   
-  def self.list_json_opt
-    {:include => {
-      :comic => {
-        :author => {}, 
-      }
-    }}
-  end
-  
   def self.show_opt
     {:include => {
       :comic => {
+        :author => {}
       }
     }}
   end
   
-  def self.new_t comic_id
-    r = Story.max_t(comic_id)
-    r.blank? ? 0 : r.to_i + 1
-  end
-  
-  def self.max_t comic_id
-    Story.maximum(:t, :conditions => ['comic_id = ?', comic_id])
-  end
-  
-  def self.find_t comic_id, t
-    Story.find(:first, :conditions => ['comic_id = ? and t = ?', comic_id, t])
-  end
-  
-  def self.collect_t story
-    r = Story.find(:all, :conditions => ['comic_id = ?', story.comic_id], :order => 't')
-    r.map {|s| s.t}
-  end
-  
-  def self.serial? ary
-    i = 0
-    ary.compact.sort.each do |t|
-      break false unless t == i
-      i += 1
-    end
-    ary.compact.size == i
-  end
-  
-  def self.validate_t story
-    Story.serial?(Story.collect_t(story))
-  end
-  
-  def insert_shift
-    Story.update_all('t = t + 1', ['comic_id = ? and t >= ?', self.comic_id, self.t])
-  end
-  
-  def lesser_shift old_t
-    self.t = 0 if self.t < 0
-    Story.update_all('t = t + 1', ['comic_id = ? and (t >= ? and t < ?)', self.comic_id, self.t, old_t])
-  end
-  
-  def higher_shift old_t
-    nf = Story.find_t(self.comic_id, self.t)
-    max_t = Story.max_t(self.comic_id).to_i
-    self.t = max_t if self.t > max_t
-    Story.update_all('t = t - 1', ['comic_id = ? and (t > ? and t <= ?)', self.comic_id, old_t, self.t])
-  end
-  
-  def update_shift old_t
-    if self.t > old_t
-      higher_shift old_t
-    else
-      lesser_shift old_t
-    end
-  end
-  
-  def rotate old_t = nil
-    if self.new_record?
-      if self.t.blank?
-        self.t = Story.new_t self.comic_id
-      else
-        self.insert_shift
-      end
-    else
-      if self.t.blank?
-      else
-        self.update_shift old_t
-      end
-    end
-  end
-  
   def allow? operators
     return nil if self.story_id == nil or self.comic_id == nil
-    self.comic.own?(operators) and self.comic.usable?(operators)
-  end
-  
-  def store operators, old_t = nil
-    res = false
-    ScrollPanel.transaction do
-      case self.allow? operators
-      when true
-        self.rotate old_t
-      when false
-        raise ActiveRecord::Forbidden
-      else
-      end
-      res = self.save
-      raise ActiveRecord::Rollback unless res
-      res = ScrollPanel.validate_t(self.comic_id) 
-      unless res
-        self.errors.add :t, 'unserialized'
-        raise ActiveRecord::Rollback 
-      end
-    end
-    res
+    self.comic.own?(operators) and self.story.own?(operators)
   end
   
 end