X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fpanel_picture.rb;h=df7df24eefb374edf0cc4e2599fbb004bf8882be;hb=ce831a2081c04cc9f8034ae8a6648088abc539bd;hp=de574a7dc436a5de01c25f7736897a896c10a5eb;hpb=01bd644358713f599c11908152f12b911593b190;p=pettanr%2Fpettanr.git

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index de574a7d..df7df24e 100644
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -1,6 +1,5 @@
-class PanelPicture < ActiveRecord::Base
-  include Element
-  include ElementInspire
+class PanelPicture < Peta::Element
+  load_manifest
   belongs_to :panel
   belongs_to :picture
   
@@ -9,67 +8,23 @@ class PanelPicture < ActiveRecord::Base
   validates :link, :length => {:maximum => 200}, :url => {:allow_blank => true, :message => I18n.t('errors.messages.url')}
   validates :x, :presence => true, :numericality => true
   validates :y, :presence => true, :numericality => true
-  validates :width, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true
-  validates :height, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true
+  validates :width, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :sync_vh => true
+  validates :height, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :sync_vh => true
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
-  before_validation :valid_encode
-  
-  def valid_encode
-    ['link', 'caption'].each do |a|
-      next if attributes[a] == nil
-      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
-    end
-  end
-  
-  def self.colum_structures
-    @@colum_structures ||= {
-      :width => {
-        :helper => 'panels/size_helper'
-      }, 
-      :height => {
-        :helper => 'panels/size_helper'
-      }
-    }
-  end
-  
-  def self.list_opt_for_panel
+  def self.by_author_list_includes
     {
-      :panel_pictures => {
-        :picture => {:artist => {}, :license => {}}
+      :panel => {
+        :author => {}
       }
     }
   end
   
-  def self.show_opt_for_panel
-    {
-      :panel_pictures => {
-        :picture => {:artist => {}, :license => {}}
-      }
-    }
-  end
-  
-  def self.json_opt_for_panel
-    {
-      :picture => {:artist => {}, :license => {}}
-    }
-  end
-  
   def self.has_picture?
     true
   end
   
-  def visible? roles
-    if MagicNumber['run_mode'] == 0
-      return false unless guest_role_check(roles)
-    else
-      return false unless reader_role_check(roles)
-    end
-    return true if self.panel.own?(roles)
-    self.panel.visible? roles
-  end
-  
   def supply_default
     self.x = 0
     self.y = 0
@@ -89,12 +44,13 @@ class PanelPicture < ActiveRecord::Base
   
   def flip
     res = (self.height > 0 ? '' : 'v') + (self.width > 0 ? '' : 'h')
-    res += '/' unless res.empty?
+    res = res # format of /1.png?subdir=v
+    # res += '/' unless res.empty? # format of /v/1.png
     res
   end
   
   def filename
-    self.flip + self.picture.filename
+    self.picture.filename + '?subdir=' + self.flip
   end
   
   def url
@@ -107,10 +63,11 @@ class PanelPicture < ActiveRecord::Base
   
   def opt_img_tag spot = nil, opacity = 20
     o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
-    {:id => self.tag_id(:img), :panel_id => self.tag_panel_id, :element_id => self.tag_element_id, :element_type => self.tag_element_type,
-    :class => "panel-picture", :vPicture => self.id, 
-    :src => self.url, :width => self.width.abs, :height => self.height.abs, :picture_id => self.picture_id, :ext => self.picture.ext, :alt => self.caption, 
-    :style => "#{o}"}
+    self.tag_attributes(:img, {
+      :class => "panel-picture", :vPicture => self.id, 
+      :src => self.url, :width => self.width.abs, :height => self.height.abs, :picture_id => self.picture_id, :ext => self.picture.ext, :alt => self.caption, 
+      :style => "#{o}"
+    })
   end
   
   def tmb_opt_img_tag
@@ -122,113 +79,14 @@ class PanelPicture < ActiveRecord::Base
     self.picture.symbol_option
   end
   
-  def boost
-  end
-  
-  def tag_element_type
-    'panel_picture'
-  end
-  
-  def self.default_page_size
-    25
-  end
-  
-  def self.max_page_size
-    100
-  end
-  
-  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_size
-  end
-  
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end
   
-  def self.mylist_where au
-    ['panels.author_id = ?', au.id]
-  end
-  
-  def self.himlist_where au
-    ['panels.author_id = ? and panels.publish > 0', au.id]
-  end
-  
-  def self.list page = 1, page_size = self.default_page_size
-    PanelPicture.where(self.list_where()).includes(PanelPicture.list_opt).order('panel_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.mylist au, page = 1, page_size = Author.default_panel_picture_page_size
-    PanelPicture.where(self.mylist_where(au)).includes(PanelPicture.list_opt).order('panel_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.himlist au, page = 1, page_size = Author.default_panel_picture_page_size
-    PanelPicture.where(self.himlist_where(au)).includes(PanelPicture.list_opt).order('panel_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.list_paginate page = 1, page_size = self.default_page_size
-    Kaminari.paginate_array(Array.new(PanelPicture.where(self.list_where()).includes(PanelPicture.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.mylist_paginate au, page = 1, page_size = Author.default_panel_picture_page_size
-    Kaminari.paginate_array(Array.new(PanelPicture.where(self.mylist_where(au)).includes(PanelPicture.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.himlist_paginate au, page = 1, page_size = Author.default_panel_picture_page_size
-    Kaminari.paginate_array(Array.new(PanelPicture.where(self.himlist_where(au)).includes(PanelPicture.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.list_opt
-    {:panel => {:author => {}}, :picture => {:artist => {}, :license => {}} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:panel => {:include => {:author => {}}}, :picture => {:include => {:artist => {}, :license => {}}} }}
-  end
-  
-  def self.show cid, au
-    opt = {}
-    opt.merge!(PanelPicture.show_opt)
-    res = PanelPicture.find(cid, opt)
-    raise ActiveRecord::Forbidden unless res.visible?(au)
-    res
-  end
-  
   def self.show_opt
     {:include => {:panel => {:author => {}}, :picture => {:artist => {}, :license => {}}}}
   end
   
-  def self.show_json_opt
-    {:include => {:panel => {:include => {:author => {}}}, :picture => {:include => {:artist => {}, :license => {}}} }}
-  end
-  
-  def store au
-    if self.new_record?
-      self.panel.panel_pictures.build(self.attributes)
-    else
-      self.panel.panel_pictures.each do |panel_picture|
-        next unless panel_picture == self
-        attr = self.attributes
-        attr.delete 'id'
-        panel_picture.attributes = attr
-        break
-      end
-    end
-    self.panel.store({}, au)
-  end
-  
-  def remove au
-    self.panel.remove_element(self, au)
-  end
-  
   def scenario
     if caption.blank?
       ''