gf-ralbum 0.0.2 → 0.0.5

data/lib/ralbum/skin_engine.rb

@@ -1,3 +1,6 @@
+# ralbum
+require 'ralbum/image_strategies/scaled_image_strategy'
+
 class SkinEngine
 
   attr_reader :skin
@@ -11,14 +14,14 @@ class SkinEngine
       "default" => ScaledImageStrategy.new( "640x480", 640, 480, 75 ) }
   end
 
-  def copy_skin_res
-    skin_res_dir = File.join( skin.skin_dirname, "res" )
-    album_res_dir = File.join(@album_dirname, "res")
-    if File.directory?( skin_res_dir )
-      copy_dir( skin_res_dir, album_res_dir, /(.gif$)|(.css$)|(.js$)|(.png$)/ )
-    end
+  # might be refined by subclasses
+  def compile
   end
 
+
+  #############################################################################
+  # configuration
+  #
   def configure_skin( xml_skin )
   end
 
@@ -37,6 +40,20 @@ class SkinEngine
 
   end
 
+  #############################################################################
+  # utilities for album creation
+  #
+  def copy_skin_res
+    skin_res_dir = File.join( skin.skin_dirname, "res" )
+    album_res_dir = File.join(@album_dirname, "res")
+    if File.directory?( skin_res_dir )
+      copy_dir( skin_res_dir, album_res_dir, /(.gif$)|(.css$)|(.js$)|(.png$)/ )
+    end
+  end
+
+  #############################################################################
+  # create album
+  #
   def create( albumTree )
     ralbum_verbose(1, "skin create #{skin.skin_name}")
     copy_skin_res
@@ -48,11 +65,9 @@ class SkinEngine
     # visitor = PrintTreeNodeVisitor2.new
     # albumTree.accept( visitor )
 
-    # exit
-
     visitor = CallbackTreeNodeVisitor.new
-    visitor.onEnterTreeNode { |album| self.create_album_page( album ) }
-    visitor.onVisitLeafNode { |image| self.create_image_page( image ) }
+    visitor.on_enter_tree_node { |album| self.create_album_page( album ) }
+    visitor.on_visit_leaf_node { |image| self.create_image_page( image ) }
     albumTree.accept( visitor )
 
     # create_tree_page( album )
@@ -61,9 +76,9 @@ class SkinEngine
   #
   # create album page
   #
-  def create_album_page( albumNode )
-    page = render_album_page( albumNode )
-    album_dirname = File.join( @album_dirname, albumNode.path_from_root )
+  def create_album_page( album_node )
+    page = render_album_page( album_node )
+    album_dirname = File.join( @album_dirname, album_node.path )
     FileUtils.mkpath( album_dirname ) unless File.exist?( album_dirname )
     outpath =  File.join( album_dirname, "index.html" )
     ralbum_verbose(2, "Writing #{album_dirname}" )
@@ -72,10 +87,10 @@ class SkinEngine
     }
   end
 
-  def create_image_page( imagePoolNode )
-    page = render_image_page(imagePoolNode)
-    outpath = File.join( @album_dirname, imagePoolNode.parent.path_from_root, imagePoolNode.defaultImageFile.pageurl )
-    ralbum_verbose( 2, "  Writing #{imagePoolNode.defaultImageFile.pageurl} " )
+  def create_image_page( image_pool_node )
+    page = render_image_page(image_pool_node)
+    outpath = File.join( @album_dirname, image_pool_node.parent.path, image_pool_node.default_image_file.page_url )
+    ralbum_verbose( 2, "  Writing #{image_pool_node.default_image_file.page_url} " )
     File.open( outpath , "w" ) { |f|
       f.puts page
     }

data/lib/ralbum/skin_engines/erb_skin_engine.rb

@@ -1,15 +1,12 @@
 # stdlib
 require 'rubygems'
-require 'tree_visitor'
 require 'erb'
 require 'fileutils'
 
 # ralbum
-# require 'tree_visitor/visitor/print_node_visitor2'
 require 'ralbum/options'
 require 'ralbum/skin'
 require 'ralbum/resource'
-require 'ralbum/image_strategy'
 
 class ErbSkinEngine < SkinEngine
 
@@ -25,10 +22,10 @@ class ErbSkinEngine < SkinEngine
     template.result(binding)
   end
 
-  def render_image_page(imagePoolNode)
+  def render_image_page(image_pool_node)
     template_filename = File.join($RALBUM_HOME, "lib/ralbum/skins/#{skin.skin_name}/template/image_page.rhtml" )
     template = ERB.new( File.read(template_filename) )
-    image = imagePoolNode.image("default")
+    image = image_pool_node.image("default")
     template.result(binding)
   end
 

data/lib/ralbum/skin_engines/kwartz_skin_engine.rb

@@ -1,25 +1,22 @@
 # stdlib
 require 'rubygems'
-require 'tree_visitor'
-require 'erb'
 require 'fileutils'
+require 'erb'
 
 # ralbum
-require 'gf_utility/kwartzhelper'
-# require 'tree_visitor/visitor/print_node_visitor2'
 require 'ralbum/options'
 require 'ralbum/skin'
 require 'ralbum/resource'
-require 'ralbum/image_strategy'
 
 class KwartzSkinEngine < SkinEngine
 
   def initialize( skin )
     super( skin )
-    compile_skin
+    compile
   end
   
-  def compile_skin
+  def compile
+    require 'gf_utilities/kwartzhelper'
     ralbum_verbose(1, "compile kwartz skin #{skin.skin_name}")
     skin_template_dir     = File.join( skin.skin_dirname, "template" )
     skin_template_include = File.join( skin.skin_dirname, "inc" )
@@ -43,10 +40,10 @@ class KwartzSkinEngine < SkinEngine
     View.expand_album_page( args )
   end
 
-  def render_image_page(imagePoolNode)
+  def render_image_page(image_pool_node)
     require "ralbum/skins/#{skin.skin_name}/out/image_page"
     args = {
-      :image           => imagePoolNode.image("default"),
+      :image           => image_pool_node.image("default"),
     }
     View.expand_image_page( args )
   end

data/lib/ralbum/skin_manager.rb

@@ -11,7 +11,7 @@ class SkinManager
     if skins_dirname
       @skins_dirname = skins_dirname
     else
-      @skins_dirname = File.join( $RALBUM_HOME, "lib", "ralbum", "skins" )
+      @skins_dirname = File.expand_path(File.join(File.dirname(__FILE__), "skins"))
     end
 
     @skins = {}
@@ -20,7 +20,12 @@ class SkinManager
       @skins[dir] = Skin.new(dir, File.expand_path(File.join(@skins_dirname, dir)) )
     }
   end
-    
+
+  # iterate over skin
+  def each(&block)
+    @skins.each_value(&block)
+  end
+
   def has_skin?( skin_name )
     @skins.has_key?( skin_name )
   end
@@ -32,6 +37,10 @@ class SkinManager
     @skins[skin_name]
   end
 
+  def skins_with_engine(engine)
+    @skins.find_all{ |skin| skin.engine.class == engine}
+  end
+
   # TODO: better format
   def describe_skins
     str = ""

data/lib/ralbum/skins/cgi/cgi_skin.rb

@@ -1,27 +1,25 @@
-module Generator
-  class CGISkin < Skin
+class CgiSkinEngine < SkinEngine
     
-    def initialize
-      super( "cgi" )
-      # compile htmlskin
-      HTMLTheme.new
-    end
-
-    def copy_skin_res( albums_dir )
-      skin_data_dir = File.join( $RUBYALBUM_HOME, "inc", "skins_data", @skin_name )
-      outdir = albums_dir + File::Separator + "cgi"
-      copy_dir( skin_data_dir, outdir, /.cgi$|.rb$/ )
-      html_skin_dir = File.join( $RUBYALBUM_HOME, "inc", "skins", "html" )
-      copy_dir( html_skin_dir, outdir, /.rb$/ )
-      copy_dir( Catalog.instance.catalog_dir, outdir, /.txt$/ )
-      # res = File.join( $RUBYALBUM_HOME, "inc", "generator", "resource.rb" )
-      # copy_file( res, outdir )
-    end
+  def initialize
+    super( "cgi" )
+    # compile htmlskin
+    HTMLTheme.new
+  end
 
-    def create( albums_dir, album )
-      copy_skin_res( albums_dir )
-      # nothing!
-    end
+  def copy_skin_res( albums_dir )
+    skin_data_dir = File.join( $RUBYALBUM_HOME, "inc", "skins_data", @skin_name )
+    outdir = albums_dir + File::Separator + "cgi"
+    copy_dir( skin_data_dir, outdir, /.cgi$|.rb$/ )
+    html_skin_dir = File.join( $RUBYALBUM_HOME, "inc", "skins", "html" )
+    copy_dir( html_skin_dir, outdir, /.rb$/ )
+    copy_dir( Catalog.instance.catalog_dir, outdir, /.txt$/ )
+    # res = File.join( $RUBYALBUM_HOME, "inc", "generator", "resource.rb" )
+    # copy_file( res, outdir )
+  end
 
+  def create( albums_dir, album )
+    copy_skin_res( albums_dir )
+    # nothing!
   end
-end
+
+end

data/lib/ralbum/skins/cgi/res/model.rb

@@ -3,7 +3,7 @@ require "singleton"
 #----------------------------------------
 #
 
-class Album
+class CgiAlbum
   attr_accessor :title, :description
   attr_accessor :photos
   
@@ -17,13 +17,13 @@ class Album
   end
 end
 
-class Photo
+class CgiPhoto
   attr_accessor :title, :description
   attr_accessor :thumb, :default
   attr_accessor :album
 end
 
-class Image
+class CgiImage
   attr_accessor :photo, :filename
   attr_accessor :size, :width, :height
   attr_accessor :url
@@ -33,14 +33,14 @@ class Image
   end
 end
 
-class Albums
+class CgiAlbums
  
   include Singleton
 
   attr_reader :albums
  
   def model
-    album = Album.new
+    album = CgiAlbum.new
     album.title = "Monte Mario"
     album.description = "Una passeggiata in un tardo pomeriggio"
     
@@ -48,16 +48,16 @@ class Albums
     #----------------------------------------
     # 1
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Torre dell'osservatorio"
     photo.description = "Descrizione"
     
-    thumb = Image.new( photo, "../images_100x100/img_0000.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0000.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
     
-    default = Image.new( photo, "../images_640x480/img_0000.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0000.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -71,15 +71,15 @@ class Albums
     #----------------------------------------
     # 2
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Seconda foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0001.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0001.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
     
-    default = Image.new( photo, "../images_640x480/img_0001.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0001.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -93,15 +93,15 @@ class Albums
     #----------------------------------------
     # 3
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Terza foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0002.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0002.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
     
-    default = Image.new( photo, "../images_640x480/img_0002.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0002.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -114,16 +114,16 @@ class Albums
     #----------------------------------------
     # 4
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Terza foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0003.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0003.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
 
     
-    default = Image.new( photo, "../images_640x480/img_0003.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0003.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -136,16 +136,16 @@ class Albums
     #----------------------------------------
     # 5
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Terza foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0004.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0004.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
     
     
-    default = Image.new( photo, "../images_640x480/img_0004.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0004.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -158,16 +158,16 @@ class Albums
     #----------------------------------------
     # 6
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Terza foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0005.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0005.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
     
     
-    default = Image.new( photo, "../images_640x480/img_0005.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0005.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -180,16 +180,16 @@ class Albums
     #----------------------------------------
     # 7
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Settima foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0006.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0006.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
 
     
-    default = Image.new( photo, "../images_640x480/img_0006.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0006.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -202,16 +202,16 @@ class Albums
     #----------------------------------------
     # 8
     
-    photo = Photo.new
+    photo = CgiPhoto.new
     photo.title = "Ottava foto"
     
-    thumb = Image.new( photo, "../images_100x100/img_0007.jpg" )
+    thumb = CgiImage.new( photo, "../images_100x100/img_0007.jpg" )
     thumb.size = 10
     thumb.width = 100
     thumb.height = 100
 
     
-    default = Image.new( photo, "../images_640x480/img_0007.jpg" )
+    default = CgiImage.new( photo, "../images_640x480/img_0007.jpg" )
     default.size = 20
     default.width = 640
     default.height = 480    
@@ -230,6 +230,4 @@ class Albums
 
 end
 
-Albums.instance.model
-
-
+CgiAlbums.instance.model

data/lib/ralbum/skins/gfold/inc/menu_bottom.html

@@ -1,53 +1,53 @@
-<tr id="mark:row_menu">
-   <td align="center" colspan="2">
-      <span class="menusel" kw:d="if pagename=='index'">Home</span>
-      <a class="menu" href="/index.html" kw:d="if:pagename!='index'">Home</a>
-      |
-      <span class="menusel" kw:d="if pagename=='albums'">Albums</span>
-      <a class="menu" href="/foto_rubyalbum_gf/static_html/" kw:d="if:pagename!='albums'">Albums</a>
-      |
-      <!--
-    <span class="menusel" id="if:pagename=='projects'">Projects</span>
-    <a class="menu" href="/projects.html" id="if:pagename!='projects'">Projects</a>
-    |
-    -->
-      <span class="menusel" kw:d="if:pagename=='guestbook'">Guestbook</span>
-      <a class="menu" href="/guestbook_kwartz/gb.cgi?act=view" kw:d="if pagename!='guestbook'">
-         Guestbook
-      </a>
-      |
-      <span class="menusel" kw:d="if pagename=='cv'">Curriculum Vitae</span>
-      <a class="menu" href="/cv_it.html" kw:d="if:pagename!='cv'">Curriculum Vitae</a>
-      |
-      <span class="menusel" kw:d="if pagename=='contactme'">Contact Me</span>
-      <a class="menu" href="/contactme/contactme.cgi" kw:d="if:pagename!='contactme'">Contact Me</a>
-   </td>
-</tr>
-
-<tr id="mark:row_language">
-   <td align="left">
-      <!--
-    <span class="menutext"> style: </span>
-    -->
-      <script language="javascript" type="text/javascript">
-         <!--
-         writemenu(style);
-         // -->
-      </script>
-   </td>
-   <td align="right" kw:d="if language!=null">
-      <span class="menutext"> language: </span>
-      <span class="menusel" kw:d="if language=='it'">it</span>
-      <a class="menu" href="@{pagename}@_it.html" kw:d="if language!='it'">it</a>
-      |
-      <span class="menusel" kw:d="if:language=='en'">en</span>
-      <a class="menu" href="@{pagename}@_en.html" kw:d="if language!='en'">en</a>
-   </td>
-</tr>
-
-<!-- begin bottom menu -->
-<table id="mark:menu_bottom" align="center" summary="">
-   <span kw:d="replace_element_with_element:row_menu"></span>
-   <span kw:d="replace_element_with_element:row_language"></span>
-</table>
-<!-- end bottom menu -->
+<tr id="mark:row_menu">
+   <td align="center" colspan="2">
+      <span class="menusel" kw:d="if pagename=='index'">Home</span>
+      <a class="menu" href="/index.html" kw:d="if:pagename!='index'">Home</a>
+      |
+      <span class="menusel" kw:d="if pagename=='albums'">Albums</span>
+      <a class="menu" href="/foto_rubyalbum_gf/static_html/" kw:d="if:pagename!='albums'">Albums</a>
+      |
+      <!--
+    <span class="menusel" id="if:pagename=='projects'">Projects</span>
+    <a class="menu" href="/projects.html" id="if:pagename!='projects'">Projects</a>
+    |
+    -->
+      <span class="menusel" kw:d="if:pagename=='guestbook'">Guestbook</span>
+      <a class="menu" href="/guestbook_kwartz/gb.cgi?act=view" kw:d="if pagename!='guestbook'">
+         Guestbook
+      </a>
+      |
+      <span class="menusel" kw:d="if pagename=='cv'">Curriculum Vitae</span>
+      <a class="menu" href="/cv_it.html" kw:d="if:pagename!='cv'">Curriculum Vitae</a>
+      |
+      <span class="menusel" kw:d="if pagename=='contactme'">Contact Me</span>
+      <a class="menu" href="/contactme/contactme.cgi" kw:d="if:pagename!='contactme'">Contact Me</a>
+   </td>
+</tr>
+
+<tr id="mark:row_language">
+   <td align="left">
+      <!--
+    <span class="menutext"> style: </span>
+    -->
+      <script language="javascript" type="text/javascript">
+         <!--
+         writemenu(style);
+         // -->
+      </script>
+   </td>
+   <td align="right" kw:d="if language!=null">
+      <span class="menutext"> language: </span>
+      <span class="menusel" kw:d="if language=='it'">it</span>
+      <a class="menu" href="@{pagename}@_it.html" kw:d="if language!='it'">it</a>
+      |
+      <span class="menusel" kw:d="if:language=='en'">en</span>
+      <a class="menu" href="@{pagename}@_en.html" kw:d="if language!='en'">en</a>
+   </td>
+</tr>
+
+<!-- begin bottom menu -->
+<table id="mark:menu_bottom" align="center" summary="">
+   <span kw:d="replace_element_with_element:row_menu"></span>
+   <span kw:d="replace_element_with_element:row_language"></span>
+</table>
+<!-- end bottom menu -->