add natural number validater

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

diff --git a/app/models/comic.rb b/app/models/comic.rb
index 7e6743d..f4fb836 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -2,17 +2,11 @@ class Comic < ActiveRecord::Base
   has_many :panels, :dependent => :destroy
   belongs_to :author
   
-  class NotZeroValidator < ActiveModel::EachValidator\r
-    def validate_each(record, attribute, value)\r
-      record.errors[attribute] << (options[:message] || "is zero") if value == 0\r
-    end\r
-  end\r
-
   validates :title, :presence => true, :length => {:maximum => 100}\r
-  validates :width, :presence => true, :numericality => true, :not_zero => true
-  validates :height, :presence => true, :numericality => true, :not_zero => true
-  validates :visible, :presence => true, :numericality => true, :inclusion => {:in => 0...4}
-  validates :editable, :presence => true, :numericality => true, :inclusion => {:in => 0...4}
+  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
@@ -28,6 +22,10 @@ class Comic < ActiveRecord::Base
     self.author_id == author.id
   end
   
+  def visible? author
+    self.visible > 0 or self.own?(author)
+  end
+  
   def disp_editable
     editable == 1 ? 'O' : 'X'
   end
@@ -44,13 +42,22 @@ class Comic < ActiveRecord::Base
     100
   end
   
-  def self.list opt = {}, page = 1, page_size = self.default_page_size
+  def self.page prm = nil
+    page = prm.to_i
+    page = 1 if page < 1
+    page
+  end
+  
+  def self.page_size prm = self.default_page_size
+    page_size = prm.to_i
     page_size = self.max_page_size if page_size > self.max_page_size
     page_size = self.default_page_size if page_size < 1
-    page = 1 if page < 1
+    page_size
+  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 = 1'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
-    p opt
+    opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
     Comic.find(:all, opt)
   end
   
@@ -58,8 +65,40 @@ class Comic < ActiveRecord::Base
     {:include => :author}
   end
   
-  def self.json_opt
+  def self.list_json_opt
     {:include => :author}
   end
   
+  def self.show cid, opt = {}
+    Comic.find(cid, :include => self.show_include_opt(opt))
+  end
+  
+  def self.show_include_opt opt = {}
+    res = [: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, 
+        :balloons => :speaches
+      ]
+    ], order: 'panels.t, speaches.t')
+  end
+  
+  def to_json_play
+    self.to_json( :include => {:author => {}, :panels => {:methods => :panel_element}})
+  end
+  
+  def self.visible_count
+    Comic.count 'visible > 0'
+  end
+  
 end