gf-ralbum 0.0.2 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (118) hide show
  1. data/VERSION +1 -0
  2. data/bin/{ralbum.rb → ralbum} +1 -1
  3. data/example/example.sh +2 -1
  4. data/example/test_jalbum_phototree/jalbum-settings.jap +321 -0
  5. data/example/test_jalbum_phototree/src/albumfiles.txt +9 -0
  6. data/example/test_jalbum_phototree/src/comments.properties +0 -0
  7. data/example/test_jalbum_phototree/src/flowers/albumfiles.txt +14 -0
  8. data/example/test_jalbum_phototree/src/meta.properties +2 -0
  9. data/example/{test_phototree → test_rubyphoto_phototree}/album.xml +0 -0
  10. data/example/test_rubyphoto_phototree/flowers/IMG_1469.wt.jpg +0 -0
  11. data/example/test_rubyphoto_phototree/flowers/IMG_2291.jpg +0 -0
  12. data/example/test_rubyphoto_phototree/flowers/IMG_2598.jpg +0 -0
  13. data/example/test_rubyphoto_phototree/flowers/IMG_3068.jpg +0 -0
  14. data/example/test_rubyphoto_phototree/flowers/IMG_3323.jpg +0 -0
  15. data/example/test_rubyphoto_phototree/flowers/IMG_3348.jpg +0 -0
  16. data/example/{test_phototree → test_rubyphoto_phototree}/r_photo01.jpg +0 -0
  17. data/example/{test_phototree → test_rubyphoto_phototree}/r_photo01.jpg.xml +0 -0
  18. data/example/{test_phototree/catalog_data → test_rubyphoto_phototree/ralbum}/md5_to_key.yaml +0 -0
  19. data/example/{test_phototree/catalog_data → test_rubyphoto_phototree/ralbum}/md5_to_key.yaml.test +0 -0
  20. data/example/{test_phototree/catalog_data → test_rubyphoto_phototree/ralbum}/project.xml +206 -3
  21. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/album.xml +0 -0
  22. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo01.jpg +0 -0
  23. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo01.jpg.xml +0 -0
  24. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo02.jpg +0 -0
  25. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo02.jpg.xml +0 -0
  26. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo03.jpg +0 -0
  27. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo03.jpg.xml +0 -0
  28. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo04.jpg +0 -0
  29. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum01/subalbum01_photo04.jpg.xml +0 -0
  30. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/album.xml +0 -0
  31. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo01.jpg +0 -0
  32. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo01.jpg.xml +0 -0
  33. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo02.jpg +0 -0
  34. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo02.jpg.xml +0 -0
  35. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo03.jpg +0 -0
  36. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo03.jpg.xml +0 -0
  37. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo04.jpg +0 -0
  38. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo04.jpg.xml +0 -0
  39. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo05.jpg +0 -0
  40. data/example/{test_phototree → test_rubyphoto_phototree}/subalbum02/subalbum02_photo05.jpg.xml +0 -0
  41. data/lib/ralbum.rb +9 -5
  42. data/lib/ralbum/album_tree/album.rb +74 -0
  43. data/lib/ralbum/album_tree/generate_album_tree_node_visitor.rb +73 -0
  44. data/lib/ralbum/album_tree/image_file.rb +88 -0
  45. data/lib/ralbum/{image_pool.rb → album_tree/image_pool.rb} +16 -4
  46. data/lib/ralbum/catalog.rb +7 -7
  47. data/lib/ralbum/cli/cli_ralbum.rb +66 -25
  48. data/lib/ralbum/image_strategies/copy_image_strategy.rb +16 -0
  49. data/lib/ralbum/image_strategies/linked_image_strategy.rb +18 -0
  50. data/lib/ralbum/image_strategies/scaled_image_strategy.rb +52 -0
  51. data/lib/ralbum/image_strategies/sepia_scaled_image_strategy.rb +50 -0
  52. data/lib/{ralbum-common → ralbum}/object_with_properties.rb +0 -0
  53. data/lib/{ralbum-common → ralbum}/object_with_validation.rb +0 -0
  54. data/lib/ralbum/photo_tree/jalbum_photo_tree.rb +83 -0
  55. data/lib/ralbum/photo_tree/photo_file.rb +149 -0
  56. data/lib/ralbum/photo_tree/photo_tree_item.rb +68 -0
  57. data/lib/ralbum/{photo_tree_node.rb → photo_tree/photo_tree_node.rb} +16 -13
  58. data/lib/ralbum/{photo_tree_builder.rb → photo_tree/rubyphoto_photo_tree.rb} +64 -46
  59. data/lib/ralbum/project.rb +48 -12
  60. data/lib/ralbum/skin.rb +34 -27
  61. data/lib/ralbum/skin_engine.rb +32 -17
  62. data/lib/ralbum/skin_engines/erb_skin_engine.rb +2 -5
  63. data/lib/ralbum/skin_engines/kwartz_skin_engine.rb +6 -9
  64. data/lib/ralbum/skin_manager.rb +11 -2
  65. data/lib/ralbum/skins/cgi/cgi_skin.rb +21 -23
  66. data/lib/ralbum/skins/cgi/res/model.rb +30 -32
  67. data/lib/ralbum/skins/gfold/inc/menu_bottom.html +53 -53
  68. data/lib/ralbum/skins/gfold/inc/menu_top.html +71 -71
  69. data/lib/ralbum/skins/gfold/inc/page_footer.html +28 -28
  70. data/lib/ralbum/skins/gfold/out/album_page.rb +316 -316
  71. data/lib/ralbum/skins/gfold/out/image_page.rb +231 -231
  72. data/lib/ralbum/skins/gfold/out/tree_page.rb +96 -96
  73. data/lib/ralbum/skins/gfold/res/prototype.js +3277 -3277
  74. data/lib/ralbum/skins/gfold/template/album_page.html +161 -161
  75. data/lib/ralbum/skins/gfold/template/album_page.plogic +127 -127
  76. data/lib/ralbum/skins/gfold/template/image_page.html +91 -91
  77. data/lib/ralbum/skins/gfold/template/image_page.plogic +70 -70
  78. data/lib/ralbum/skins/gfold/template/tree_page.html +79 -79
  79. data/lib/ralbum/skins/gfold/template/tree_page.plogic +45 -45
  80. data/lib/ralbum/skins/js/out/album_page.rb +2 -2
  81. data/lib/ralbum/skins/js/out/tree_page.rb +18 -17
  82. data/lib/ralbum/skins/js/template/album_page.html +2 -2
  83. data/lib/ralbum/skins/js/template/tree_page.html +1 -1
  84. data/lib/ralbum/skins/test_erb/template/album_page.rhtml +22 -0
  85. data/lib/ralbum/skins/test_erb/template/image_page.rhtml +44 -0
  86. data/lib/ralbum/tasks/compile_skins.rb +8 -0
  87. data/test/ralbum/cli/tc_cli_ralbum.rb +35 -0
  88. data/test/ralbum/image_strategies/tc_scaled_image_strategy.rb +18 -0
  89. data/test/ralbum/image_strategies/tc_sepia_scaled_image_strategy.rb +18 -0
  90. data/test/ralbum/photo_tree/tc_jalbum_photo_tree.rb +39 -0
  91. data/test/ralbum/photo_tree/tc_photo_file.rb +13 -0
  92. data/test/ralbum/{tc_01_photo_tree.rb → photo_tree/tc_photo_tree.rb} +10 -12
  93. data/test/ralbum/photo_tree/tc_rubyalbum_photo_tree.rb +20 -0
  94. data/test/ralbum/tc_album.rb +55 -0
  95. data/test/ralbum/tc_catalog.rb +8 -4
  96. data/test/ralbum/tc_image_pool.rb +37 -0
  97. data/test/ralbum/{tc_05_kwartz_skin_engine.rb → tc_kwartz_skin_engine.rb} +1 -1
  98. data/test/ralbum/{tc_04_skin_manager.rb → tc_skin_manager.rb} +8 -3
  99. data/test/ralbum/test_helper.rb +16 -1
  100. data/test_data/ralbum/test_data/is_test/dummy.txt +0 -0
  101. metadata +78 -81
  102. data/bin/ralbum-JPG2jpg.rb +0 -90
  103. data/bin/ralbum-compile_skins.rb +0 -18
  104. data/bin/ralbum-myconv.rb +0 -81
  105. data/bin/ralbum-readexif.rb +0 -18
  106. data/bin/ralbum-reorder.rb +0 -200
  107. data/lib/ralbum/album.rb +0 -66
  108. data/lib/ralbum/generate_album_tree_node_visitor.rb +0 -60
  109. data/lib/ralbum/image_file.rb +0 -81
  110. data/lib/ralbum/image_strategy.rb +0 -143
  111. data/lib/ralbum/photo_tree_item.rb +0 -89
  112. data/test/ralbum/cli/test_cli_ralbum.rb +0 -13
  113. data/test/ralbum/tc_02_photo_tree_builder.rb +0 -20
  114. data/test/ralbum/tc_03_album.rb +0 -42
  115. data/test/ralbum/tc_06_image_strategy.rb +0 -21
  116. data/test/test_ralbum.rb +0 -14
  117. data/test_data/ralbum/test_data/is_test/r_photo01_scaled.jpg +0 -0
  118. data/test_data/ralbum/test_data/is_test/r_photo01_sepia_scaled.jpg +0 -0
@@ -1,45 +1,45 @@
1
- #albumstree {
2
- logic: {
3
- stack = array.new
4
- album = rootalbum
5
- // @elem_tree
6
- }
7
- }
8
-
9
- /**
10
- // :elem(albumstree)
11
- // :set( stack = array.new )
12
- // :set( album = rootalbum )
13
- // #@elem_tree
14
- // :end
15
- **/
16
-
17
- #tree {
18
- logic: {
19
- _stag
20
- // @stag(treenode);
21
- // @cont(treenode);
22
- album = album.childs;
23
- while album
24
- // @elem_tree
25
- end
26
- // @etag(treenode);
27
- _etag;
28
- }
29
- }
30
-
31
- /**
32
- //:elem( tree )
33
- // @stag
34
- // @stag_treenode
35
- // @cont_treenode
36
- // :set( album = album.subalbums )
37
- // :while( album )
38
- // # @elem_tree
39
- // :end
40
- // @etag_treenode
41
- // @etag
42
- //:end
43
- **/
44
-
45
-
1
+ #albumstree {
2
+ logic: {
3
+ stack = array.new
4
+ album = rootalbum
5
+ // @elem_tree
6
+ }
7
+ }
8
+
9
+ /**
10
+ // :elem(albumstree)
11
+ // :set( stack = array.new )
12
+ // :set( album = rootalbum )
13
+ // #@elem_tree
14
+ // :end
15
+ **/
16
+
17
+ #tree {
18
+ logic: {
19
+ _stag
20
+ // @stag(treenode);
21
+ // @cont(treenode);
22
+ album = album.childs;
23
+ while album
24
+ // @elem_tree
25
+ end
26
+ // @etag(treenode);
27
+ _etag;
28
+ }
29
+ }
30
+
31
+ /**
32
+ //:elem( tree )
33
+ // @stag
34
+ // @stag_treenode
35
+ // @cont_treenode
36
+ // :set( album = album.subalbums )
37
+ // :while( album )
38
+ // # @elem_tree
39
+ // :end
40
+ // @etag_treenode
41
+ // @etag
42
+ //:end
43
+ **/
44
+
45
+
@@ -126,7 +126,7 @@ _buf << "
126
126
  <table border=\"0\" cellspacing=\"5\" cellpadding=\"2\" width=\"650\">
127
127
  <tr id=\"Foreach:subalbum=album.subalbums\">
128
128
  <td class=\"indexthumb\">
129
- <a href=\"#{relroot + subalbum.pageurl}#\"
129
+ <a href=\"#{relroot + subalbum.page_url}#\"
130
130
  title=\"#{subalbum.title}#\"><img
131
131
  src=\"#{relroot + subalbum.defaultphoto.thumb.url}#\"
132
132
  alt=\"#{subalbum.defaultphoto.title}#\"
@@ -136,7 +136,7 @@ _buf << "
136
136
  <table width=\"100%\">
137
137
  <tr>
138
138
  <td>
139
- <a href=\"#{relroot + subalbum.pageurl}#\">#{subalbum.title}#</a>
139
+ <a href=\"#{relroot + subalbum.page_url}#\">#{subalbum.title}#</a>
140
140
  </td>
141
141
  <td align=\"right\" width=\"40%\">
142
142
  #{subalbum.num_photos}#&nbsp;photos
@@ -1,6 +1,6 @@
1
- module View
2
-
3
- (@@proc_table ||= {})['tree_page'] = proc do
1
+ module View
2
+
3
+ (@@proc_table ||= {})['tree_page'] = proc do
4
4
  _buf = ""; _buf << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">
5
5
  <html>
6
6
  <head>
@@ -20,6 +20,7 @@ _buf = ""; _buf << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http:/
20
20
 
21
21
  <tr>
22
22
  <td>\n";
23
+
23
24
  stack = Array.new;
24
25
  @element(tree);
25
26
  _buf << " </td>
@@ -118,17 +119,17 @@ _buf << " </td>
118
119
  </html>
119
120
  \n";
120
121
  ; _buf
121
- end#proc
122
-
123
- module_function
124
- def expand_tree_page(context={})
125
- if context.is_a?(Hash)
126
- hash = context
127
- context = Object.new
128
- hash.each { |key, val| context.instance_variable_set("@#{key}", val) }
129
- end
130
- proc_obj = @@proc_table['tree_page']
131
- context.instance_eval(&proc_obj)
132
- end
133
-
134
- end
122
+ end#proc
123
+
124
+ module_function
125
+ def expand_tree_page(context={})
126
+ if context.is_a?(Hash)
127
+ hash = context
128
+ context = Object.new
129
+ hash.each { |key, val| context.instance_variable_set("@#{key}", val) }
130
+ end
131
+ proc_obj = @@proc_table['tree_page']
132
+ context.instance_eval(&proc_obj)
133
+ end
134
+
135
+ end
@@ -127,7 +127,7 @@
127
127
  <table border="0" cellspacing="5" cellpadding="2" width="650">
128
128
  <tr id="Foreach:subalbum=album.subalbums">
129
129
  <td class="indexthumb">
130
- <a href="#{relroot + subalbum.pageurl}#"
130
+ <a href="#{relroot + subalbum.page_url}#"
131
131
  title="#{subalbum.title}#"><img
132
132
  src="#{relroot + subalbum.defaultphoto.thumb.url}#"
133
133
  alt="#{subalbum.defaultphoto.title}#"
@@ -137,7 +137,7 @@
137
137
  <table width="100%">
138
138
  <tr>
139
139
  <td>
140
- <a href="#{relroot + subalbum.pageurl}#">#{subalbum.title}#</a>
140
+ <a href="#{relroot + subalbum.page_url}#">#{subalbum.title}#</a>
141
141
  </td>
142
142
  <td align="right" width="40%">
143
143
  #{subalbum.num_photos}#&nbsp;photos
@@ -18,7 +18,7 @@
18
18
  <tr>
19
19
  <td>
20
20
  <span id="mark:albumstree">
21
- <li id="mark:treenode"><a href="#{album.pageurl}#">#{album.title}#</a></li>
21
+ <li id="mark:treenode"><a href="#{album.page_url}#">#{album.title}#</a></li>
22
22
  <ul id="mark:tree"></ul>
23
23
  </span>
24
24
  </td>
@@ -0,0 +1,22 @@
1
+ <html>
2
+ <head>
3
+ </head>
4
+ <body>
5
+ <% symbols = [:name, :description, :relroot ] %>
6
+
7
+ <h1>Variables in album page</h1>
8
+ <table border="1">
9
+ <% symbols.each do |symbol| %>
10
+ <tr>
11
+ <td>
12
+ <pre>album.<%= symbol.to_s %></pre>
13
+ </td>
14
+ <td>
15
+ <%= album.__send__(symbol) %>
16
+ </td>
17
+ </tr>
18
+ <% end %>
19
+ </table>
20
+
21
+ </body>
22
+ </html>
@@ -0,0 +1,44 @@
1
+ <html>
2
+ <head>
3
+ </head>
4
+ <body>
5
+
6
+ <% symbols = [:name, :description, :src_url, :page_url, :page_url_from_root, :relroot, :relroot_with_prefix ] %>
7
+
8
+ <h1>Variable in image page</h1>
9
+
10
+ <table>
11
+ <tr>
12
+ <td>
13
+ previous page:<br/>
14
+ <a href="<%= image.prev_page_url %>"><%= image.prev_page_url %></a>
15
+ </td>
16
+
17
+ <td>
18
+ <table border="1">
19
+ <% symbols.each do |symbol| %>
20
+ <tr>
21
+ <td>
22
+ <pre>image.<%= symbol.to_s %></pre>
23
+ </td>
24
+ <td>
25
+ <% if symbol.to_s.match(/url/) %>
26
+ <a href="<%= image.__send__(symbol) %>"> <%= image.__send__(symbol) %> </a>
27
+ <% else %>
28
+ <%= image.__send__(symbol) %>
29
+ <% end %>
30
+ </td>
31
+ </tr>
32
+ <% end %>
33
+ </table>
34
+ </td>
35
+
36
+ <td>
37
+ next page <br/>
38
+ <a href="<%= image.next_page_url %>"><%= image.next_page_url %></a>
39
+ </td>
40
+ </tr>
41
+ </table>
42
+
43
+ </body>
44
+ </html>
@@ -0,0 +1,8 @@
1
+ namespace :ralbum do
2
+ desc "Compile skins with engine kwartz"
3
+ task :compile_skins do
4
+ require "ralbum/skin_manager"
5
+ skin_manager = SkinManager.new
6
+ skin_manager.each {|skin| skin.compile }
7
+ end
8
+ end
@@ -0,0 +1,35 @@
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
+
3
+ # ralbum
4
+ require 'ralbum/cli/cli_ralbum'
5
+
6
+ class TestCliRAlbum < Test::Unit::TestCase
7
+
8
+ def test_list_skins
9
+ out = with_stdout_captured do
10
+ args = "-l"
11
+ CliRAlbum.new.parse_args( args.split )
12
+ end
13
+ # puts out
14
+
15
+ msg =<<EOS
16
+ Available skins:
17
+ cgi by 'gf' cgi skin description
18
+ gfold by 'gf' gfold skin description
19
+ js by 'gf' js skin description
20
+ test_erb by 'gf' skin used only for test erb skin_engine
21
+ test_kwartz by 'gf' skin used only for test kwartz skin engine
22
+ EOS
23
+ assert_equal msg, out
24
+ end
25
+
26
+ def test_version
27
+ out = with_stdout_captured do
28
+ args = %w{--version}
29
+ CliRAlbum.new.parse_args(args)
30
+ end
31
+ version = File.open( File.join($RALBUM_HOME, "VERSION") ).read
32
+ assert_match version, out
33
+ end
34
+
35
+ end
@@ -0,0 +1,18 @@
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
+
3
+ # ralbum
4
+ require 'ralbum'
5
+ require 'ralbum/image_strategies/scaled_image_strategy'
6
+
7
+ class TestScaledImageStrategy < Test::Unit::TestCase
8
+
9
+ def test_scaled_image_strategy
10
+ is = ScaledImageStrategy.new("test", 200, 200, 75)
11
+ img_inpath = File.join( $PHOTOTREE_DIRECTORY, "r_photo01.jpg" )
12
+ img_outpath = File.join( $TEST_DATA, "is_test", "r_photo01_scaled.jpg")
13
+ is.build( img_inpath, img_outpath )
14
+ assert File.exists?(img_outpath)
15
+ FileUtils.rm(img_outpath)
16
+ end
17
+
18
+ end
@@ -0,0 +1,18 @@
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
+
3
+ # ralbum
4
+ require 'ralbum'
5
+ require 'ralbum/image_strategies/sepia_scaled_image_strategy'
6
+
7
+ class TestSepiaScaledImageStrategy < Test::Unit::TestCase
8
+
9
+ def test_sepia_scaled_image_strategy
10
+ is = SepiaScaledImageStrategy.new("test", 400, 400, 75)
11
+ img_inpath = File.join( $PHOTOTREE_DIRECTORY, "r_photo01.jpg" )
12
+ img_outpath = File.join( $TEST_DATA, "is_test", "r_photo01_sepia_scaled.jpg")
13
+ is.build( img_inpath, img_outpath )
14
+ assert File.exists?(img_outpath)
15
+ FileUtils.rm( img_outpath )
16
+ end
17
+
18
+ end
@@ -0,0 +1,39 @@
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
+
3
+ # ralbum
4
+ require 'ralbum/photo_tree/jalbum_photo_tree'
5
+
6
+ class TestJalbumPhotoTreeBuilder < Test::Unit::TestCase
7
+
8
+ def test_simple
9
+ builder = JalbumPhotoTreeBuilder.new
10
+ photo_tree = builder.build_photo_tree_from_directory( $JALBUM_PHOTOTREE_DIRECTORY )
11
+
12
+ # treevisitor
13
+
14
+ out =<<EOS
15
+ 'test_jalbum_phototree'
16
+ `-- 'src'
17
+ `-- 'flowers'
18
+ |-- 'IMG_1469.wt.jpg'
19
+ |-- 'IMG_2291.jpg'
20
+ |-- 'IMG_2598.jpg'
21
+ |-- 'IMG_3068.jpg'
22
+ |-- 'IMG_3323.jpg'
23
+ `-- 'IMG_3348.jpg'
24
+ EOS
25
+
26
+ # puts photo_tree.to_str
27
+ assert_equal out, photo_tree.to_str
28
+
29
+
30
+ # assert_equal( 3, photoTree.nr_childs )
31
+ # assert_equal( 16, photoTree.nr_leaves )
32
+
33
+ # builder.read_meta_info_old_format( photoTree )
34
+ # photoTreeItem = photoTree.find( "r_photo01.jpg" )
35
+ # assert_equal( "descrizione di r_photo01.jpg", photoTreeItem["description"] )
36
+ # assert_equal( "100", photoTreeItem["iso_speed"])
37
+ end
38
+
39
+ end
@@ -0,0 +1,13 @@
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
+
3
+ # ralbum
4
+ require 'ralbum'
5
+ require 'ralbum/photo_tree/photo_file'
6
+
7
+ class TestPhotoFile < Test::Unit::TestCase
8
+ def test_simple
9
+ photo_filename = File.join($PHOTOTREE_DIRECTORY, "flowers", "IMG_3068.jpg")
10
+ photo_file = PhotoFile.new( photo_filename )
11
+ assert_equal "1024 X 1536", photo_file.geometry
12
+ end
13
+ end
@@ -1,8 +1,8 @@
1
- require File.join( File.dirname(__FILE__), "test_helper")
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
2
 
3
3
  # ralbum
4
- require 'ralbum/photo_tree_node'
5
- require 'ralbum/photo_tree_item'
4
+ require 'ralbum/photo_tree/photo_tree_node'
5
+ require 'ralbum/photo_tree/photo_tree_item'
6
6
 
7
7
  class TestPhotoTree < Test::Unit::TestCase
8
8
 
@@ -14,24 +14,22 @@ class TestPhotoTree < Test::Unit::TestCase
14
14
  @r_photo01 = PhotoTreeItem.new( "r_photo01.jpg", @r )
15
15
  @subalbum01_photo01 = PhotoTreeItem.new( "subalbum01_photo01.jpg", @subalbum01 )
16
16
  @subalbum01_photo02 = PhotoTreeItem.new( "subalbum01_photo02.jpg", @subalbum01 )
17
- @subalbum02_photo01 = PhotoTreeItem.new( "subalbum02_photo01.jgp", @subalbum02 )
17
+ @subalbum02_photo01 = PhotoTreeItem.new( "subalbum02_photo01.jpg", @subalbum02 )
18
18
  @subalbum02_photo02 = PhotoTreeItem.new( "subalbum02_photo02.jpg", @subalbum02 )
19
19
  end
20
20
 
21
21
  def test_photo_tree
22
- assert_equal( $PHOTOTREE_DIRECTORY, @r.name )
22
+ assert_equal( $PHOTOTREE_DIRECTORY, @r.name )
23
23
  assert_equal( "subalbum01", @subalbum01.name )
24
24
 
25
- assert_equal( "r_photo01.jpg", @r_photo01.name )
25
+ assert_equal( "r_photo01.jpg", @r_photo01.basename )
26
+ assert_equal( File.join($PHOTOTREE_DIRECTORY,"r_photo01.jpg"), @r_photo01.name )
26
27
  end
27
28
 
28
-
29
29
  def test_photo_tree_item
30
- assert_nil( @r_photo01.md5 )
31
- @r_photo01.force_read_metainfo
32
- assert_not_nil( @r_photo01.md5 )
33
- assert_equal(2560, @r_photo01['width'])
34
- assert_equal(1920, @r_photo01['height'])
30
+ assert_not_nil( @r_photo01.photo_file.md5 )
31
+ assert_equal(2560, @r_photo01.photo_file.width)
32
+ assert_equal(1920, @r_photo01.photo_file.height)
35
33
  end
36
34
 
37
35
  end
@@ -0,0 +1,20 @@
1
+ require File.join( File.dirname(__FILE__), "..", "test_helper")
2
+
3
+ # ralbum
4
+ require 'ralbum/photo_tree/rubyphoto_photo_tree'
5
+
6
+ class TestPhotoTreeBuilder < Test::Unit::TestCase
7
+
8
+ def test_simple
9
+ builder = PhotoTreeBuilder.new
10
+ photo_tree = builder.build_photo_tree_from_directory( $PHOTOTREE_DIRECTORY )
11
+ assert_equal( 3, photo_tree.nr_children )
12
+ assert_equal( 16, photo_tree.nr_leaves )
13
+
14
+ builder.read_meta_info_old_format( photo_tree )
15
+ # photo_tree_item = photo_tree.find( "r_photo01.jpg" )
16
+ # assert_equal( "descrizione di r_photo01.jpg", photo_tree_item.description )
17
+ # assert_equal( "100", photoTreeItem["iso_speed"])
18
+ end
19
+
20
+ end