futuresinc-attachment_fu 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (51) hide show
  1. data/.gitignore +4 -0
  2. data/CHANGELOG +35 -0
  3. data/LICENSE +20 -0
  4. data/README +202 -0
  5. data/Rakefile +37 -0
  6. data/VERSION.yml +4 -0
  7. data/amazon_s3.yml.tpl +17 -0
  8. data/attachment_fu.gemspec +103 -0
  9. data/init.rb +1 -0
  10. data/install.rb +7 -0
  11. data/lib/geometry.rb +93 -0
  12. data/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb +211 -0
  13. data/lib/technoweenie/attachment_fu/backends/db_file_backend.rb +39 -0
  14. data/lib/technoweenie/attachment_fu/backends/file_system_backend.rb +126 -0
  15. data/lib/technoweenie/attachment_fu/backends/s3_backend.rb +394 -0
  16. data/lib/technoweenie/attachment_fu/processors/core_image_processor.rb +59 -0
  17. data/lib/technoweenie/attachment_fu/processors/gd2_processor.rb +54 -0
  18. data/lib/technoweenie/attachment_fu/processors/image_science_processor.rb +61 -0
  19. data/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb +132 -0
  20. data/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb +57 -0
  21. data/lib/technoweenie/attachment_fu.rb +545 -0
  22. data/rackspace_cloudfiles.yml.tpl +14 -0
  23. data/test/backends/db_file_test.rb +16 -0
  24. data/test/backends/file_system_test.rb +143 -0
  25. data/test/backends/remote/cloudfiles_test.rb +102 -0
  26. data/test/backends/remote/s3_test.rb +119 -0
  27. data/test/base_attachment_tests.rb +77 -0
  28. data/test/basic_test.rb +70 -0
  29. data/test/database.yml +18 -0
  30. data/test/extra_attachment_test.rb +67 -0
  31. data/test/fixtures/attachment.rb +226 -0
  32. data/test/fixtures/files/fake/rails.png +0 -0
  33. data/test/fixtures/files/foo.txt +1 -0
  34. data/test/fixtures/files/rails.png +0 -0
  35. data/test/geometry_test.rb +108 -0
  36. data/test/processors/core_image_test.rb +37 -0
  37. data/test/processors/gd2_test.rb +31 -0
  38. data/test/processors/image_science_test.rb +31 -0
  39. data/test/processors/mini_magick_test.rb +103 -0
  40. data/test/processors/rmagick_test.rb +255 -0
  41. data/test/schema.rb +134 -0
  42. data/test/test_helper.rb +157 -0
  43. data/test/validation_test.rb +55 -0
  44. data/vendor/red_artisan/core_image/filters/color.rb +27 -0
  45. data/vendor/red_artisan/core_image/filters/effects.rb +31 -0
  46. data/vendor/red_artisan/core_image/filters/perspective.rb +25 -0
  47. data/vendor/red_artisan/core_image/filters/quality.rb +25 -0
  48. data/vendor/red_artisan/core_image/filters/scale.rb +47 -0
  49. data/vendor/red_artisan/core_image/filters/watermark.rb +32 -0
  50. data/vendor/red_artisan/core_image/processor.rb +123 -0
  51. metadata +119 -0
@@ -0,0 +1,226 @@
1
+ class Attachment < ActiveRecord::Base
2
+ @@saves = 0
3
+ cattr_accessor :saves
4
+ has_attachment :processor => :rmagick
5
+ validates_as_attachment
6
+ after_attachment_saved do |record|
7
+ self.saves += 1
8
+ end
9
+ end
10
+
11
+ class SmallAttachment < Attachment
12
+ has_attachment :max_size => 1.kilobyte
13
+ end
14
+
15
+ class BigAttachment < Attachment
16
+ has_attachment :size => 1.megabyte..2.megabytes
17
+ end
18
+
19
+ class PdfAttachment < Attachment
20
+ has_attachment :content_type => 'pdf'
21
+ end
22
+
23
+ class DocAttachment < Attachment
24
+ has_attachment :content_type => %w(pdf doc txt)
25
+ end
26
+
27
+ class ImageAttachment < Attachment
28
+ has_attachment :content_type => :image, :resize_to => [50,50]
29
+ end
30
+
31
+ class ImageOrPdfAttachment < Attachment
32
+ has_attachment :content_type => ['pdf', :image], :resize_to => 'x50'
33
+ end
34
+
35
+ class ImageWithThumbsAttachment < Attachment
36
+ has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
37
+ after_resize do |record, img|
38
+ record.aspect_ratio = img.columns.to_f / img.rows.to_f
39
+ end
40
+ end
41
+
42
+ class FileAttachment < ActiveRecord::Base
43
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
44
+ validates_as_attachment
45
+ end
46
+
47
+ class FileAttachmentWithStringId < ActiveRecord::Base
48
+ set_table_name 'file_attachments_with_string_id'
49
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
50
+ validates_as_attachment
51
+
52
+ before_validation :auto_generate_id
53
+ before_save :auto_generate_id
54
+ @@last_id = 0
55
+
56
+ private
57
+ def auto_generate_id
58
+ @@last_id += 1
59
+ self.id = "id_#{@@last_id}"
60
+ end
61
+ end
62
+
63
+ class FileAttachmentWithUuid < ActiveRecord::Base
64
+ set_table_name 'file_attachments_with_string_id'
65
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick, :uuid_primary_key => true
66
+ validates_as_attachment
67
+
68
+ before_validation :auto_generate_id
69
+ before_save :auto_generate_id
70
+ @@last_id = 0
71
+
72
+ private
73
+ def auto_generate_id
74
+ @@last_id += 1
75
+ self.id = "%0127dx" % @@last_id
76
+ end
77
+ end
78
+
79
+ class ImageFileAttachment < FileAttachment
80
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
81
+ :content_type => :image, :resize_to => [50,50]
82
+ end
83
+
84
+ class ImageWithThumbsFileAttachment < FileAttachment
85
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
86
+ :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
87
+ after_resize do |record, img|
88
+ record.aspect_ratio = img.columns.to_f / img.rows.to_f
89
+ end
90
+ end
91
+
92
+ class ImageWithThumbsClassFileAttachment < FileAttachment
93
+ # use file_system_path to test backwards compatibility
94
+ has_attachment :file_system_path => 'vendor/plugins/attachment_fu/test/files',
95
+ :thumbnails => { :thumb => [50, 50] }, :resize_to => [55,55],
96
+ :thumbnail_class => 'ImageThumbnail'
97
+ end
98
+
99
+ class ImageThumbnail < FileAttachment
100
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files/thumbnails'
101
+ end
102
+
103
+ # no parent
104
+ class OrphanAttachment < ActiveRecord::Base
105
+ has_attachment :processor => :rmagick
106
+ validates_as_attachment
107
+ end
108
+
109
+ # no filename, no size, no content_type
110
+ class MinimalAttachment < ActiveRecord::Base
111
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
112
+ validates_as_attachment
113
+
114
+ def filename
115
+ "#{id}.file"
116
+ end
117
+ end
118
+
119
+ begin
120
+ class ImageScienceAttachment < ActiveRecord::Base
121
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
122
+ :processor => :image_science, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
123
+ end
124
+ rescue MissingSourceFile
125
+ puts $!.message
126
+ puts "no ImageScience"
127
+ end
128
+
129
+ begin
130
+ class CoreImageAttachment < ActiveRecord::Base
131
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
132
+ :processor => :core_image, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
133
+ end
134
+ rescue MissingSourceFile
135
+ puts $!.message
136
+ puts "no CoreImage"
137
+ end
138
+
139
+ begin
140
+ class MiniMagickAttachment < ActiveRecord::Base
141
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
142
+ :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
143
+ end
144
+ rescue MissingSourceFile
145
+ puts $!.message
146
+ puts "no Mini Magick"
147
+ end
148
+
149
+ begin
150
+ class GD2Attachment < ActiveRecord::Base
151
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
152
+ :processor => :gd2, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
153
+ end
154
+ rescue MissingSourceFile
155
+ puts $!.message
156
+ puts "no GD2"
157
+ end
158
+
159
+
160
+ begin
161
+ class MiniMagickAttachment < ActiveRecord::Base
162
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
163
+ :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
164
+ end
165
+ class ImageThumbnailCrop < MiniMagickAttachment
166
+ has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
167
+ :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"}
168
+
169
+ # TODO this is a bad duplication, this method is in the MiniMagick Processor
170
+ def self.calculate_offset(image_width,image_height,image_aspect,thumb_width,thumb_height,thumb_aspect)
171
+ # only crop if image is not smaller in both dimensions
172
+
173
+ # special cases, image smaller in one dimension then thumbsize
174
+ if image_width < thumb_width
175
+ offset = (image_height / 2) - (thumb_height / 2)
176
+ command = "#{image_width}x#{thumb_height}+0+#{offset}"
177
+ elsif image_height < thumb_height
178
+ offset = (image_width / 2) - (thumb_width / 2)
179
+ command = "#{thumb_width}x#{image_height}+#{offset}+0"
180
+
181
+ # normal thumbnail generation
182
+ # calculate height and offset y, width is fixed
183
+ elsif (image_aspect <= thumb_aspect or image_width < thumb_width) and image_height > thumb_height
184
+ height = image_width / thumb_aspect
185
+ offset = (image_height / 2) - (height / 2)
186
+ command = "#{image_width}x#{height}+0+#{offset}"
187
+ # calculate width and offset x, height is fixed
188
+ else
189
+ width = image_height * thumb_aspect
190
+ offset = (image_width / 2) - (width / 2)
191
+ command = "#{width}x#{image_height}+#{offset}+0"
192
+ end
193
+ # crop image
194
+ command
195
+ end
196
+ end
197
+
198
+ rescue MissingSourceFile
199
+ end
200
+
201
+
202
+
203
+ begin
204
+ class S3Attachment < ActiveRecord::Base
205
+ has_attachment :storage => :s3, :processor => :rmagick, :s3_config_path => File.join(File.dirname(__FILE__), '../amazon_s3.yml')
206
+ validates_as_attachment
207
+ end
208
+
209
+ class CloudFilesAttachment < ActiveRecord::Base
210
+ has_attachment :storage => :cloud_files, :processor => :rmagick, :cloudfiles_config_path => File.join(File.dirname(__FILE__), '../rackspace_cloudfiles.yml')
211
+ validates_as_attachment
212
+ end
213
+
214
+ class S3WithPathPrefixAttachment < S3Attachment
215
+ has_attachment :storage => :s3, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
216
+ validates_as_attachment
217
+ end
218
+
219
+ class CloudFilesWithPathPrefixAttachment < CloudFilesAttachment
220
+ has_attachment :storage => :cloud_files, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
221
+ validates_as_attachment
222
+ end
223
+
224
+ rescue
225
+ puts "S3 error: #{$!}"
226
+ end
Binary file
@@ -0,0 +1 @@
1
+ foo
Binary file
@@ -0,0 +1,108 @@
1
+ require 'test/unit'
2
+ require File.expand_path(File.join(File.dirname(__FILE__), '../lib/geometry')) unless Object.const_defined?(:Geometry)
3
+
4
+ class GeometryTest < ActiveSupport::TestCase
5
+ def test_should_resize
6
+ assert_geometry 50, 64,
7
+ "50x50" => [39, 50],
8
+ "60x60" => [47, 60],
9
+ "100x100" => [78, 100]
10
+ end
11
+
12
+ def test_should_resize_no_width
13
+ assert_geometry 50, 64,
14
+ "x50" => [39, 50],
15
+ "x60" => [47, 60],
16
+ "x100" => [78, 100]
17
+ end
18
+
19
+ def test_should_resize_no_height
20
+ assert_geometry 50, 64,
21
+ "50" => [50, 64],
22
+ "60" => [60, 77],
23
+ "100" => [100, 128]
24
+ end
25
+
26
+ def test_should_resize_no_height_with_x
27
+ assert_geometry 50, 64,
28
+ "50x" => [50, 64],
29
+ "60x" => [60, 77],
30
+ "100x" => [100, 128]
31
+ end
32
+
33
+ def test_should_resize_with_percent
34
+ assert_geometry 50, 64,
35
+ "50x50%" => [25, 32],
36
+ "60x60%" => [30, 38],
37
+ "120x112%" => [60, 72]
38
+ end
39
+
40
+ def test_should_resize_with_percent_and_no_width
41
+ assert_geometry 50, 64,
42
+ "x50%" => [50, 32],
43
+ "x60%" => [50, 38],
44
+ "x112%" => [50, 72]
45
+ end
46
+
47
+ def test_should_resize_with_percent_and_no_height
48
+ assert_geometry 50, 64,
49
+ "50%" => [25, 32],
50
+ "60%" => [30, 38],
51
+ "120%" => [60, 77]
52
+ end
53
+
54
+ def test_should_resize_with_less
55
+ assert_geometry 50, 64,
56
+ "50x50<" => [50, 64],
57
+ "60x60<" => [50, 64],
58
+ "100x100<" => [78, 100],
59
+ "100x112<" => [88, 112],
60
+ "40x70<" => [50, 64]
61
+ end
62
+
63
+ def test_should_resize_with_less_and_no_width
64
+ assert_geometry 50, 64,
65
+ "x50<" => [50, 64],
66
+ "x60<" => [50, 64],
67
+ "x100<" => [78, 100]
68
+ end
69
+
70
+ def test_should_resize_with_less_and_no_height
71
+ assert_geometry 50, 64,
72
+ "50<" => [50, 64],
73
+ "60<" => [60, 77],
74
+ "100<" => [100, 128]
75
+ end
76
+
77
+ def test_should_resize_with_greater
78
+ assert_geometry 50, 64,
79
+ "50x50>" => [39, 50],
80
+ "60x60>" => [47, 60],
81
+ "100x100>" => [50, 64],
82
+ "100x112>" => [50, 64],
83
+ "40x70>" => [40, 51]
84
+ end
85
+
86
+ def test_should_resize_with_greater_and_no_width
87
+ assert_geometry 50, 64,
88
+ "x40>" => [31, 40],
89
+ "x60>" => [47, 60],
90
+ "x100>" => [50, 64]
91
+ end
92
+
93
+ def test_should_resize_with_greater_and_no_height
94
+ assert_geometry 50, 64,
95
+ "40>" => [40, 51],
96
+ "60>" => [50, 64],
97
+ "100>" => [50, 64]
98
+ end
99
+
100
+ protected
101
+ def assert_geometry(width, height, values)
102
+ values.each do |geo, result|
103
+ # run twice to verify the Geometry string isn't modified after a run
104
+ geo = Geometry.from_s(geo)
105
+ 2.times { assert_equal result, [width, height] / geo }
106
+ end
107
+ end
108
+ end
@@ -0,0 +1,37 @@
1
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
2
+
3
+ class CoreImageTest < ActiveSupport::TestCase
4
+ attachment_model CoreImageAttachment
5
+
6
+ if Object.const_defined?(:OSX)
7
+ def test_should_resize_image
8
+ attachment = upload_file :filename => '/files/rails.png'
9
+ assert_valid attachment
10
+ assert attachment.image?
11
+ # test core image thumbnail
12
+ assert_equal 42, attachment.width
13
+ assert_equal 55, attachment.height
14
+
15
+ thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
+ geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
+
18
+ # test exact resize dimensions
19
+ assert_equal 50, thumb.width
20
+ assert_equal 51, thumb.height
21
+
22
+ # test geometry string
23
+ assert_equal 31, geo.width
24
+ assert geo.height > 31
25
+
26
+ # This makes sure that we didn't overwrite the original file
27
+ # and will end up with a thumbnail instead of the original
28
+ assert_equal 42, attachment.width
29
+ assert_equal 55, attachment.height
30
+
31
+ end
32
+ else
33
+ def test_flunk
34
+ puts "CoreImage not loaded, tests not running"
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,31 @@
1
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
2
+
3
+ class GD2Test < ActiveSupport::TestCase
4
+ attachment_model GD2Attachment
5
+
6
+ if Object.const_defined?(:GD2)
7
+ def test_should_resize_image
8
+ attachment = upload_file :filename => '/files/rails.png'
9
+ assert_valid attachment
10
+ assert attachment.image?
11
+ # test gd2 thumbnail
12
+ assert_equal 43, attachment.width
13
+ assert_equal 55, attachment.height
14
+
15
+ thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
+ geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
+
18
+ # test exact resize dimensions
19
+ assert_equal 50, thumb.width
20
+ assert_equal 51, thumb.height
21
+
22
+ # test geometry string
23
+ assert_equal 31, geo.width
24
+ assert_equal 40, geo.height
25
+ end
26
+ else
27
+ def test_flunk
28
+ puts "GD2 not loaded, tests not running"
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,31 @@
1
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
2
+
3
+ class ImageScienceTest < ActiveSupport::TestCase
4
+ attachment_model ImageScienceAttachment
5
+
6
+ if Object.const_defined?(:ImageScience)
7
+ def test_should_resize_image
8
+ attachment = upload_file :filename => '/files/rails.png'
9
+ assert_valid attachment
10
+ assert attachment.image?
11
+ # test image science thumbnail
12
+ assert_equal 42, attachment.width
13
+ assert_equal 55, attachment.height
14
+
15
+ thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
+ geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
+
18
+ # test exact resize dimensions
19
+ assert_equal 50, thumb.width
20
+ assert_equal 51, thumb.height
21
+
22
+ # test geometry string
23
+ assert_equal 31, geo.width
24
+ assert_equal 41, geo.height
25
+ end
26
+ else
27
+ def test_flunk
28
+ puts "ImageScience not loaded, tests not running"
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,103 @@
1
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
2
+
3
+ class MiniMagickTest < ActiveSupport::TestCase
4
+ attachment_model MiniMagickAttachment
5
+
6
+ if Object.const_defined?(:MiniMagick)
7
+ def test_should_resize_image
8
+ attachment = upload_file :filename => '/files/rails.png'
9
+ assert_valid attachment
10
+ assert attachment.image?
11
+ # test MiniMagick thumbnail
12
+ assert_equal 43, attachment.width
13
+ assert_equal 55, attachment.height
14
+
15
+ thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
+ geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
+
18
+ # test exact resize dimensions
19
+ assert_equal 50, thumb.width
20
+ assert_equal 51, thumb.height
21
+
22
+ # test geometry string
23
+ assert_equal 31, geo.width
24
+ assert_equal 40, geo.height
25
+ end
26
+
27
+ def test_should_crop_image(klass = ImageThumbnailCrop)
28
+ attachment_model klass
29
+ attachment = upload_file :filename => '/files/rails.png'
30
+ assert_valid attachment
31
+ assert attachment.image?
32
+ # has_attachment :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"}
33
+
34
+ square = attachment.thumbnails.detect { |t| t.filename =~ /_square/ }
35
+ vertical = attachment.thumbnails.detect { |t| t.filename =~ /_vertical/ }
36
+ horizontal = attachment.thumbnails.detect { |t| t.filename =~ /_horizontal/ }
37
+
38
+ # test excat resize
39
+ assert_equal 50, square.width
40
+ assert_equal 50, square.height
41
+
42
+ assert_equal 30, vertical.width
43
+ assert_equal 60, vertical.height
44
+
45
+ assert_equal 60, horizontal.width
46
+ assert_equal 30, horizontal.height
47
+ end
48
+
49
+ # tests the first step in resize, crop the image in original size to right format
50
+ def test_should_crop_image_right(klass = ImageThumbnailCrop)
51
+ @@testcases.collect do |testcase|
52
+ image_width, image_height, thumb_width, thumb_height = testcase[:data]
53
+ image_aspect, thumb_aspect = image_width/image_height, thumb_width/thumb_height
54
+ crop_comand = klass.calculate_offset(image_width, image_height, image_aspect, thumb_width, thumb_height,thumb_aspect)
55
+ # pattern matching on crop command
56
+ if testcase.has_key?(:height)
57
+ assert crop_comand.match(/^#{image_width}x#{testcase[:height]}\+0\+#{testcase[:yoffset]}$/)
58
+ else
59
+ assert crop_comand.match(/^#{testcase[:width]}x#{image_height}\+#{testcase[:xoffset]}\+0$/)
60
+ end
61
+ end
62
+ end
63
+
64
+ else
65
+ def test_flunk
66
+ puts "MiniMagick not loaded, tests not running"
67
+ end
68
+ end
69
+
70
+ @@testcases = [
71
+ # image_aspect <= 1 && thumb_aspect >= 1
72
+ {:data => [10.0,40.0,2.0,1.0], :height => 5.0, :yoffset => 17.5}, # 1b
73
+ {:data => [10.0,40.0,1.0,1.0], :height => 10.0, :yoffset => 15.0}, # 1b
74
+
75
+ # image_aspect < 1 && thumb_aspect < 1
76
+ {:data => [10.0,40.0,1.0,2.0], :height => 20.0, :yoffset => 10.0}, # 1a
77
+ {:data => [2.0,3.0,1.0,2.0], :width => 1.5, :xoffset => 0.25}, # 1a
78
+
79
+ # image_aspect = thumb_aspect
80
+ {:data => [10.0,10.0,1.0,1.0], :height => 10.0, :yoffset => 0.0}, # QUADRAT 1c
81
+
82
+ # image_aspect >= 1 && thumb_aspect > 1 && image_aspect < thumb_aspect
83
+ {:data => [6.0,3.0,4.0,1.0], :height => 1.5, :yoffset => 0.75}, # 2b
84
+ {:data => [6.0,6.0,4.0,1.0], :height => 1.5, :yoffset => 2.25}, # 2b
85
+
86
+ # image_aspect > 1 && thumb_aspect > 1 && image_aspect > thumb_aspect
87
+ {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 2a
88
+
89
+ # image_aspect > 1 && thumb_aspect < 1 && image_aspect < thumb_aspect
90
+ {:data => [10.0,5.0,0.1,2.0], :width => 0.25, :xoffset => 4.875}, # 4
91
+ {:data => [10.0,5.0,1.0,2.0], :width => 2.5, :xoffset => 3.75}, # 4
92
+
93
+ # image_aspect > 1 && thumb_aspect > 1 && image_aspect > thumb_aspect
94
+ {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 3a
95
+ # image_aspect > 1 && thumb_aspect > 1 && image_aspect < thumb_aspect
96
+ {:data => [9.0,3.0,5.0,1.0], :height => 1.8, :yoffset => 0.6} # 3a
97
+ ]
98
+
99
+
100
+
101
+
102
+
103
+ end