gf-ralbum 0.0.2 → 0.0.5

data/test/ralbum/tc_album.rb

@@ -0,0 +1,55 @@
+require File.join( File.dirname(__FILE__), "test_helper")
+
+# ralbum
+require 'ralbum/album_tree/album'
+require 'ralbum/album_tree/image_pool'
+require 'ralbum/album_tree/image_file'
+
+class TestAlbum < Test::Unit::TestCase
+
+  def setup
+    @root        = Album.new( nil,       "key_root",        "title_root",        "descr_root")
+    @subalbum    = Album.new( @root,     "key_subalbum",    "title_subalbum",    "descr_subalbum")
+    @subsubalbum = Album.new( @subalbum, "key_subsubalbum", "title_subsubalbum", "descr_subsubalbum")
+  end
+
+  def test_breadcrumbs      
+    breadcrumbs = @subalbum.breadcrumbs
+    
+    # breadcrumb " (index.html) > (/title_b/index.html)"
+    assert_equal 2,                            breadcrumbs.length 
+    assert_equal "title_root/index.html",      breadcrumbs[0][:path]
+    assert_equal "title_root",                 breadcrumbs[0][:title]
+    assert_equal "title_root/title_subalbum/index.html", breadcrumbs[1][:path]
+    assert_equal "title_subalbum",             breadcrumbs[1][:title]
+
+    @root.prefix_path = "skin"
+    breadcrumbs = @subalbum.breadcrumbs
+
+    # breadcrumb " (skin/index.html) > (skin/title_b/index.html)"
+    assert_equal 2,                                breadcrumbs.length 
+    # assert_equal "skin/index.html",                breadcrumbs[0][:path]
+    # assert_equal "skin/title_subalbum/index.html", breadcrumbs[1][:path]
+    assert_equal "title_subalbum",                 breadcrumbs[1][:title]
+  end
+  
+  def test_relroot
+    assert_equal 2, @subalbum.depth 
+    assert_equal "../../", @subalbum.relroot
+    assert_equal "../../", @subalbum.relroot_with_prefix
+
+    @subalbum.root.prefix_path = "skin/"
+    assert_equal "../../", @subalbum.relroot
+    assert_equal "skin/../../", @subalbum.relroot_with_prefix
+  end
+  
+  def test_page_url
+    assert_equal 3, @subsubalbum.depth
+    assert_equal "title_subsubalbum/index.html", @subsubalbum.page_url
+    assert_equal "title_root/title_subalbum/title_subsubalbum/index.html", @subsubalbum.page_url_from_root
+
+    @subalbum.root.prefix_path = "skin/"
+    assert_equal "title_subsubalbum/index.html", @subsubalbum.page_url
+    # assert_equal "title_root/skin/title_subalbum/title_subsubalbum/index.html", @subsubalbum.page_url_from_root
+  end
+end

data/test/ralbum/tc_catalog.rb

@@ -8,13 +8,11 @@ require 'ralbum/catalog'
 
 class CatalogTest < Test::Unit::TestCase
 
-  def setup
-    @data_dir = File.join($PHOTOTREE_DIRECTORY, "catalog_data")
+  def test_new_catalog
+    @data_dir = File.join($PHOTOTREE_DIRECTORY, "ralbum")
     @md5_to_key_file = @data_dir + File::Separator + "md5_to_key.yaml"
     @md5_to_key_file_test = @data_dir + File::Separator + "md5_to_key.yaml.test"
-  end
 
-  def testNewCatalog
     cat = Catalog.new( @data_dir )
     key = cat.register_photo( "md5_0" )    
     assert_equal( 0, key )
@@ -27,5 +25,11 @@ class CatalogTest < Test::Unit::TestCase
     assert_equal( 0, $? )
   end
 
+  def test_no_ralbum_dir
+    assert_raise RAlbumException do
+      Catalog.new("not_existent_dir")
+    end
+  end
+
 end
 

data/test/ralbum/tc_image_pool.rb

@@ -0,0 +1,37 @@
+require File.join( File.dirname(__FILE__), "test_helper")
+
+# ralbum
+require 'ralbum'
+require 'ralbum/album_tree/album'
+require 'ralbum/album_tree/image_pool'
+require 'ralbum/album_tree/image_file'
+
+class TestImagePool < Test::Unit::TestCase
+
+  def test_image_pool
+    album = Album.new(nil, "key", "title", "description")
+    ipool = ImagePool.new(album, "md5", "key", "title", "description" )
+
+
+    thumb_local_path  = File.join($PHOTOTREE_DIRECTORY, "r_photo01.jpg" )
+    thumb_src_url     = ""
+    thumb_imagefile   = ImageFile.new(ipool, thumb_local_path, "r_photo01.jpg", thumb_src_url )
+    thumb   = ipool.image( "thumb",   thumb_imagefile )
+
+    default_local_path = File.join($PHOTOTREE_DIRECTORY, "r_photo01.jpg" )
+    default_src_url = ""
+    default_imagefile  = ImageFile.new(ipool, default_local_path,  "r_photo01.jpg", default_src_url )
+    default = ipool.image( "default", default_imagefile )
+
+    assert_equal thumb,   ipool.thumb
+    # assert_equal "", thumb.url
+    # assert_equal "r_photo01.jpg", thumb.page_url
+    # assert_equal "r_photo01.jpg", thumb.url
+
+    assert_equal default, ipool.default_image_file
+    # assert_equal "", default.url
+    # assert_equal "r_photo01.jpg", default.page_url
+    # assert_equal "r_photo01.jpg", default.url
+  end
+
+end

data/test/ralbum/{tc_05_kwartz_skin_engine.rb → tc_kwartz_skin_engine.rb}

@@ -19,7 +19,7 @@ class TestKwartzSkinEngine < Test::Unit::TestCase
       path = File.join( skin_engine.skin.skin_dirname, "out", f )
       FileUtils.rm( path ) if File.exist?(path)
     } 
-    skin_engine.compile_skin
+    skin_engine.compile
     outputfiles.each { |f|
       path = File.join( skin_engine.skin.skin_dirname, "out", f )
       assert File.exist?( path ) 

data/test/ralbum/{tc_04_skin_manager.rb → tc_skin_manager.rb}

@@ -21,10 +21,15 @@ class TestSkinManager < Test::Unit::TestCase
 
   def test_skin_engine
     skin_manager = SkinManager.new
-
-    # test use default skin_engine
     skin = skin_manager.get_skin("test_kwartz")
-    assert_equal KwartzSkinEngine, skin.skin_engine.class
+    assert_equal KwartzSkinEngine, skin.engine.class
+  end
+
+  def test_each_skin
+    skin_manager = SkinManager.new
+    nr_skins = 0
+    skin_manager.each{ |s| nr_skins += 1}
+    assert_equal 5, nr_skins
   end
 
 end

data/test/ralbum/test_helper.rb

@@ -1,4 +1,5 @@
 # stdlib
+require 'rubygems'
 require 'test/unit'
 
 # ralbum
@@ -9,5 +10,19 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
 $:.unshift test_dir unless $:.include?( test_dir )
 
 $TEST_DATA = File.join( $RALBUM_HOME, "test_data", "ralbum", "test_data" )
-$PHOTOTREE_DIRECTORY = File.join( $RALBUM_HOME, "example", "test_phototree")
+$PHOTOTREE_DIRECTORY = File.join( $RALBUM_HOME, "example", "test_rubyphoto_phototree")
+$JALBUM_PHOTOTREE_DIRECTORY = File.join( $RALBUM_HOME, "example", "test_jalbum_phototree")
 
+
+require "stringio"
+def with_stdout_captured
+  old_stdout = $stdout
+  out = StringIO.new
+  $stdout = out
+  begin
+    yield
+  ensure
+    $stdout = old_stdout
+  end
+  out.string
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gf-ralbum
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors: 
 - gf
@@ -9,31 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
-default_executable: 
+date: 2009-06-07 00:00:00 -07:00
+default_executable: ralbum
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: tree_visitor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: imagesize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: kwartz
+  name: treevisitor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -52,64 +32,78 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: 
+description: Another boring and skinnable photo album generator
 email: giovanni.ferro@gmail.com
 executables: 
-- ralbum-readexif.rb
-- ralbum-reorder.rb
-- ralbum-JPG2jpg.rb
-- ralbum-myconv.rb
-- ralbum-compile_skins.rb
-- ralbum.rb
+- ralbum
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
+- LICENSE
+- README.rdoc
+- VERSION
 - example/README.txt
 - example/example.sh
 - example/httpd.rb
-- example/test_phototree/album.xml
-- example/test_phototree/catalog_data/md5_to_key.yaml
-- example/test_phototree/catalog_data/md5_to_key.yaml.test
-- example/test_phototree/catalog_data/project.xml
-- example/test_phototree/r_photo01.jpg
-- example/test_phototree/r_photo01.jpg.xml
-- example/test_phototree/subalbum01/album.xml
-- example/test_phototree/subalbum01/subalbum01_photo01.jpg
-- example/test_phototree/subalbum01/subalbum01_photo01.jpg.xml
-- example/test_phototree/subalbum01/subalbum01_photo02.jpg
-- example/test_phototree/subalbum01/subalbum01_photo02.jpg.xml
-- example/test_phototree/subalbum01/subalbum01_photo03.jpg
-- example/test_phototree/subalbum01/subalbum01_photo03.jpg.xml
-- example/test_phototree/subalbum01/subalbum01_photo04.jpg
-- example/test_phototree/subalbum01/subalbum01_photo04.jpg.xml
-- example/test_phototree/subalbum02/album.xml
-- example/test_phototree/subalbum02/subalbum02_photo01.jpg
-- example/test_phototree/subalbum02/subalbum02_photo01.jpg.xml
-- example/test_phototree/subalbum02/subalbum02_photo02.jpg
-- example/test_phototree/subalbum02/subalbum02_photo02.jpg.xml
-- example/test_phototree/subalbum02/subalbum02_photo03.jpg
-- example/test_phototree/subalbum02/subalbum02_photo03.jpg.xml
-- example/test_phototree/subalbum02/subalbum02_photo04.jpg
-- example/test_phototree/subalbum02/subalbum02_photo04.jpg.xml
-- example/test_phototree/subalbum02/subalbum02_photo05.jpg
-- example/test_phototree/subalbum02/subalbum02_photo05.jpg.xml
-- lib/ralbum-common/object_with_properties.rb
-- lib/ralbum-common/object_with_validation.rb
+- example/test_jalbum_phototree/jalbum-settings.jap
+- example/test_jalbum_phototree/src/albumfiles.txt
+- example/test_jalbum_phototree/src/comments.properties
+- example/test_jalbum_phototree/src/flowers/albumfiles.txt
+- example/test_jalbum_phototree/src/meta.properties
+- example/test_rubyphoto_phototree/album.xml
+- example/test_rubyphoto_phototree/flowers/IMG_1469.wt.jpg
+- example/test_rubyphoto_phototree/flowers/IMG_2291.jpg
+- example/test_rubyphoto_phototree/flowers/IMG_2598.jpg
+- example/test_rubyphoto_phototree/flowers/IMG_3068.jpg
+- example/test_rubyphoto_phototree/flowers/IMG_3323.jpg
+- example/test_rubyphoto_phototree/flowers/IMG_3348.jpg
+- example/test_rubyphoto_phototree/r_photo01.jpg
+- example/test_rubyphoto_phototree/r_photo01.jpg.xml
+- example/test_rubyphoto_phototree/ralbum/md5_to_key.yaml
+- example/test_rubyphoto_phototree/ralbum/md5_to_key.yaml.test
+- example/test_rubyphoto_phototree/ralbum/project.xml
+- example/test_rubyphoto_phototree/subalbum01/album.xml
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo01.jpg
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo01.jpg.xml
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo02.jpg
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo02.jpg.xml
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo03.jpg
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo03.jpg.xml
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo04.jpg
+- example/test_rubyphoto_phototree/subalbum01/subalbum01_photo04.jpg.xml
+- example/test_rubyphoto_phototree/subalbum02/album.xml
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo01.jpg
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo01.jpg.xml
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo02.jpg
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo02.jpg.xml
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo03.jpg
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo03.jpg.xml
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo04.jpg
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo04.jpg.xml
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo05.jpg
+- example/test_rubyphoto_phototree/subalbum02/subalbum02_photo05.jpg.xml
 - lib/ralbum.rb
-- lib/ralbum/album.rb
+- lib/ralbum/album_tree/album.rb
+- lib/ralbum/album_tree/generate_album_tree_node_visitor.rb
+- lib/ralbum/album_tree/image_file.rb
+- lib/ralbum/album_tree/image_pool.rb
 - lib/ralbum/catalog.rb
 - lib/ralbum/cli/cli_ralbum.rb
-- lib/ralbum/generate_album_tree_node_visitor.rb
-- lib/ralbum/image_file.rb
-- lib/ralbum/image_pool.rb
-- lib/ralbum/image_strategy.rb
+- lib/ralbum/image_strategies/copy_image_strategy.rb
+- lib/ralbum/image_strategies/linked_image_strategy.rb
+- lib/ralbum/image_strategies/scaled_image_strategy.rb
+- lib/ralbum/image_strategies/sepia_scaled_image_strategy.rb
+- lib/ralbum/object_with_properties.rb
+- lib/ralbum/object_with_validation.rb
 - lib/ralbum/options.rb
-- lib/ralbum/photo_tree_builder.rb
-- lib/ralbum/photo_tree_item.rb
-- lib/ralbum/photo_tree_node.rb
+- lib/ralbum/photo_tree/jalbum_photo_tree.rb
+- lib/ralbum/photo_tree/photo_file.rb
+- lib/ralbum/photo_tree/photo_tree_item.rb
+- lib/ralbum/photo_tree/photo_tree_node.rb
+- lib/ralbum/photo_tree/rubyphoto_photo_tree.rb
 - lib/ralbum/project.rb
 - lib/ralbum/ralbum_exception.rb
 - lib/ralbum/resource.rb
@@ -170,11 +164,14 @@ files:
 - lib/ralbum/skins/test_erb/info.yml
 - lib/ralbum/skins/test_erb/out/album_page.rb
 - lib/ralbum/skins/test_erb/out/image_page.rb
+- lib/ralbum/skins/test_erb/template/album_page.rhtml
+- lib/ralbum/skins/test_erb/template/image_page.rhtml
 - lib/ralbum/skins/test_kwartz/info.yml
 - lib/ralbum/skins/test_kwartz/out/album_page.rb
 - lib/ralbum/skins/test_kwartz/out/image_page.rb
 - lib/ralbum/skins/test_kwartz/template/album_page.html
 - lib/ralbum/skins/test_kwartz/template/image_page.html
+- lib/ralbum/tasks/compile_skins.rb
 - test_data/ralbum/test_data/albums_directory/gfold/album_1/img_0004.jpg.html
 - test_data/ralbum/test_data/albums_directory/gfold/album_1/img_0005.jpg.html
 - test_data/ralbum/test_data/albums_directory/gfold/album_1/img_0006.jpg.html
@@ -233,10 +230,7 @@ files:
 - test_data/ralbum/test_data/albums_directory/test/album_2/index.html
 - test_data/ralbum/test_data/albums_directory/test/img_0003.jpg.html
 - test_data/ralbum/test_data/albums_directory/test/index.html
-- test_data/ralbum/test_data/is_test/r_photo01_scaled.jpg
-- test_data/ralbum/test_data/is_test/r_photo01_sepia_scaled.jpg
-- LICENSE
-- README.rdoc
+- test_data/ralbum/test_data/is_test/dummy.txt
 has_rdoc: true
 homepage: http://github.com/gf/ralbum
 post_install_message: 
@@ -261,16 +255,19 @@ requirements: []
 rubyforge_project: ralbum
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: another boring and skinnable photo album generator
+specification_version: 3
+summary: Another boring and skinnable photo album generator
 test_files: 
-- test/ralbum/tc_01_photo_tree.rb
-- test/ralbum/tc_02_photo_tree_builder.rb
-- test/ralbum/tc_03_album.rb
-- test/ralbum/tc_04_skin_manager.rb
-- test/ralbum/cli/test_cli_ralbum.rb
-- test/ralbum/tc_06_image_strategy.rb
+- test/ralbum/tc_album.rb
+- test/ralbum/tc_skin_manager.rb
+- test/ralbum/tc_kwartz_skin_engine.rb
+- test/ralbum/photo_tree/tc_rubyalbum_photo_tree.rb
+- test/ralbum/photo_tree/tc_photo_file.rb
+- test/ralbum/photo_tree/tc_photo_tree.rb
+- test/ralbum/photo_tree/tc_jalbum_photo_tree.rb
+- test/ralbum/cli/tc_cli_ralbum.rb
 - test/ralbum/tc_catalog.rb
 - test/ralbum/test_helper.rb
-- test/ralbum/tc_05_kwartz_skin_engine.rb
-- test/test_ralbum.rb
+- test/ralbum/image_strategies/tc_scaled_image_strategy.rb
+- test/ralbum/image_strategies/tc_sepia_scaled_image_strategy.rb
+- test/ralbum/tc_image_pool.rb

data/bin/ralbum-JPG2jpg.rb

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-$RALBUM_HOME = File.expand_path( File.join( File.dirname( __FILE__), ".." ) )
-$:.unshift( File.join($GALLERIES_HOME, "lib" ) )
-
-# ruby
-require 'fileutils'
-require 'optparse'
-require 'ostruct'
-
-# rubyalbum
-require "ralbum/config"
-require "ralbum/recursive_run"
-
-
-def mymove( srcpath, destpath )
-  if $options.usetempfile
-    # find a best name for tempfile
-    temppath = File.dirname( destpath ) + File::Separator + "tempfile"
-    FileUtils::move( srcpath, temppath )
-    FileUtils::move( temppath, destpath )
-  else
-    FileUtils::move( srcpath, destpath )
-  end
-end
-
-def run( dir )
-  begin
-    Dir.entries( dir ).each { |filename|
-      next unless filename =~ /\.JPG$/
-      new_filename = filename.gsub( /\.JPG$/, ".jpg" )
-      inpath = dir + File::Separator + filename;
-      newpath = dir + File::Separator + new_filename
-      mymove( inpath, newpath )
-      puts "in #{dir}: #{filename} -> #{new_filename}"
-    }
-  rescue ArgumentError => e
-    puts "ERROR : " + e
-    puts "If you are using a fat32 filesystem try options -t"
-  rescue Errno::ENOENT => e
-    puts "ERROR : " + e
-  end
-end
-
-###################################################################################
-# Main
-
-$config = Config.new
-
-$options = OpenStruct.new
-$options.force = false
-$options.verbose = 0
-$options.recursive = false
-$options.usetempfile = false
-
-opts = OptionParser.new do |opts|
-  opts.banner =
-       "Usage: #{File.basename($0)} <directory>\n" +
-       "Rename file.JPG in file.jpg"
-   opts.on("-v", "--verbose [NUM]", Integer, "verbosity level") { |num|
-    if num.nil?
-      $options.verbose = 1
-    else
-      $options.verbose = num
-    end
-  }
-  opts.on("-r", "--recursive", "recusive in subdirectories") {
-    $options.recursive = true
-  }
-  opts.on("-t", "--usetempfile", "rename first to temp file and then to dest file") {
-    $options.usetempfile = true
-  }
-  opts.on("--help", "-h", "help!") {
-    puts opts
-    exit 0
-  }
-end
-opts.parse!(ARGV)
-
-unless ARGV[0]
-  puts opts
-  exit 1
-end
-
-input_dir = ARGV[0]
-if $options.recursive
-  recursive_run( input_dir ) { |d| run d }
-else
-  run input_dir
-end