tdd-attachment_fu 0.9.6

data/test/fixtures/attachment.rb

@@ -0,0 +1,249 @@
+class Attachment < ActiveRecord::Base
+  @@saves = 0
+  cattr_accessor :saves
+  has_attachment :processor => :rmagick
+  validates_as_attachment
+  after_attachment_saved do |record|
+    self.saves += 1
+  end
+end
+
+class LowerQualityAttachment < Attachment
+  set_table_name 'attachments'
+  has_attachment :resize_to => [55,55], :jpeg_quality => 50
+end
+
+class SmallAttachment < Attachment
+  has_attachment :max_size => 1.kilobyte
+end
+
+class BigAttachment < Attachment
+  has_attachment :size => 1.megabyte..2.megabytes
+end
+
+class PdfAttachment < Attachment
+  has_attachment :content_type => 'pdf'
+end
+
+class DocAttachment < Attachment
+  has_attachment :content_type => %w(pdf doc txt)
+end
+
+class ImageAttachment < Attachment
+  has_attachment :content_type => :image, :resize_to => [50,50]
+end
+
+class ImageOrPdfAttachment < Attachment
+  has_attachment :content_type => ['pdf', :image], :resize_to => 'x50'
+end
+
+class ImageWithThumbsAttachment < Attachment
+  has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
+  # after_resize do |record, img|
+  #   record.aspect_ratio = img.columns.to_f / img.rows.to_f
+  # end
+end
+
+class FileAttachment < ActiveRecord::Base
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
+  validates_as_attachment
+end
+
+class FileAttachmentWithStringId < ActiveRecord::Base
+  set_table_name 'file_attachments_with_string_id'
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
+  validates_as_attachment
+  
+  before_validation :auto_generate_id
+  before_save :auto_generate_id
+  @@last_id = 0
+  
+  private
+    def auto_generate_id
+      @@last_id += 1
+      self.id = "id_#{@@last_id}"
+    end
+end
+
+class FileAttachmentWithUuid < ActiveRecord::Base
+  set_table_name 'file_attachments_with_string_id'
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick, :uuid_primary_key => true
+  validates_as_attachment
+  
+  before_validation :auto_generate_id
+  before_save :auto_generate_id
+  @@last_id = 0
+  
+  private
+    def auto_generate_id
+      @@last_id += 1
+      self.id = "%0127dx" % @@last_id
+    end
+end
+
+class ImageFileAttachment < FileAttachment
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+    :content_type => :image, :resize_to => [50,50]
+end
+
+class ImageWithThumbsFileAttachment < FileAttachment
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+    :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
+  # after_resize do |record, img|
+  #   record.aspect_ratio = img.columns.to_f / img.rows.to_f
+  # end
+end
+
+class ImageWithThumbsClassFileAttachment < FileAttachment
+  # use file_system_path to test backwards compatibility
+  has_attachment :file_system_path => 'vendor/plugins/attachment_fu/test/files',
+    :thumbnails => { :thumb => [50, 50] }, :resize_to => [55,55],
+    :thumbnail_class => 'ImageThumbnail'
+end
+
+class ImageThumbnail < FileAttachment
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files/thumbnails'
+end
+
+# no parent
+class OrphanAttachment < ActiveRecord::Base
+  has_attachment :processor => :rmagick
+  validates_as_attachment
+end
+
+# no filename, no size, no content_type
+class MinimalAttachment < ActiveRecord::Base
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
+  validates_as_attachment
+  
+  def filename
+    "#{id}.file"
+  end
+end
+
+begin
+  class ImageScienceAttachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :image_science, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55
+  end
+
+  class ImageScienceLowerQualityAttachment < ActiveRecord::Base
+    set_table_name 'image_science_attachments'
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :image_science, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55,
+      :jpeg_quality => 75
+  end
+rescue MissingSourceFile
+  puts $!.message
+  puts "no ImageScience"
+end
+
+begin
+  class CoreImageAttachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :core_image, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55
+  end
+
+  class LowerQualityCoreImageAttachment < CoreImageAttachment
+    set_table_name 'core_image_attachments'
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :core_image, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55,
+      :jpeg_quality => 50
+  end
+rescue MissingSourceFile
+  puts $!.message
+  puts "no CoreImage"
+end
+
+begin
+  class MiniMagickAttachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55
+  end
+
+  class ImageThumbnailCrop < MiniMagickAttachment
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+    :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"}
+    
+    # TODO this is a bad duplication, this method is in the MiniMagick Processor
+    def self.calculate_offset(image_width,image_height,image_aspect,thumb_width,thumb_height,thumb_aspect)
+    # only crop if image is not smaller in both dimensions
+
+      # special cases, image smaller in one dimension then thumbsize
+      if image_width < thumb_width
+        offset = (image_height / 2) - (thumb_height / 2)
+        command = "#{image_width}x#{thumb_height}+0+#{offset}"
+      elsif image_height < thumb_height
+        offset = (image_width / 2) - (thumb_width / 2)
+        command = "#{thumb_width}x#{image_height}+#{offset}+0"
+
+      # normal thumbnail generation
+      # calculate height and offset y, width is fixed                 
+      elsif (image_aspect <= thumb_aspect or image_width < thumb_width) and image_height > thumb_height
+        height = image_width / thumb_aspect
+        offset = (image_height / 2) - (height / 2)
+        command = "#{image_width}x#{height}+0+#{offset}"
+      # calculate width and offset x, height is fixed
+      else
+        width = image_height * thumb_aspect
+        offset = (image_width / 2) - (width / 2)
+        command = "#{width}x#{image_height}+#{offset}+0"
+      end
+      # crop image
+      command
+    end
+  end
+
+  class LowerQualityMiniMagickAttachment < MiniMagickAttachment
+    set_table_name 'mini_magick_attachments'
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55,
+      :jpeg_quality => 50
+  end
+
+rescue MissingSourceFile
+  puts $!.message
+  puts "no Mini Magick"
+end
+
+begin
+  class GD2Attachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :gd2, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55
+  end
+
+  class LowerQualityGD2Attachment < GD2Attachment
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :gd2, :thumbnails => { :thumb => [50, 51], :geometry => '31>', :aspect => '25x25!' }, :resize_to => 55,
+      :jpeg_quality => 50
+  end
+rescue MissingSourceFile
+  puts $!.message
+  puts "no GD2"
+end
+
+
+begin
+  class S3Attachment < ActiveRecord::Base
+    has_attachment :storage => :s3, :processor => :rmagick, :s3_config_path => File.join(File.dirname(__FILE__), '../amazon_s3.yml')
+    validates_as_attachment
+  end
+  
+  class CloudFilesAttachment < ActiveRecord::Base
+    has_attachment :storage => :cloud_files, :processor => :rmagick, :cloudfiles_config_path => File.join(File.dirname(__FILE__), '../rackspace_cloudfiles.yml')
+    validates_as_attachment
+  end
+
+  class S3WithPathPrefixAttachment < S3Attachment
+    has_attachment :storage => :s3, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
+    validates_as_attachment
+  end
+  
+  class CloudFilesWithPathPrefixAttachment < CloudFilesAttachment
+    has_attachment :storage => :cloud_files, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
+    validates_as_attachment
+  end
+  
+rescue
+  puts "S3 error: #{$!}"
+end

data/test/fixtures/files/foo.txt

@@ -0,0 +1 @@
+foo

data/test/geometry_test.rb

@@ -0,0 +1,114 @@
+require 'test/unit'
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/geometry')) unless Object.const_defined?(:Geometry)
+
+class GeometryTest < Test::Unit::TestCase
+  def test_should_resize
+    assert_geometry 50, 64,
+      "50x50"   => [39, 50],
+      "60x60"   => [47, 60],
+      "100x100" => [78, 100]
+  end
+  
+  def test_should_resize_no_width
+    assert_geometry 50, 64,
+      "x50"  => [39, 50],
+      "x60"  => [47, 60],
+      "x100" => [78, 100]
+  end
+  
+  def test_should_resize_no_height
+    assert_geometry 50, 64,
+      "50"  => [50, 64],
+      "60"  => [60, 77],
+      "100" => [100, 128]
+  end
+  
+  def test_should_resize_no_height_with_x
+    assert_geometry 50, 64,
+      "50x"  => [50, 64],
+      "60x"  => [60, 77],
+      "100x" => [100, 128]
+  end
+  
+  def test_should_resize_with_percent
+    assert_geometry 50, 64,
+      "50x50%"   => [25, 32],
+      "60x60%"   => [30, 38],
+      "120x112%" => [60, 72]
+  end
+  
+  def test_should_resize_with_percent_and_no_width
+    assert_geometry 50, 64,
+      "x50%"  => [50, 32],
+      "x60%"  => [50, 38],
+      "x112%" => [50, 72]
+  end
+  
+  def test_should_resize_with_percent_and_no_height
+    assert_geometry 50, 64,
+      "50%"  => [25, 32],
+      "60%"  => [30, 38],
+      "120%" => [60, 77]
+  end
+  
+  def test_should_resize_with_less
+    assert_geometry 50, 64,
+      "50x50<"   => [50, 64],
+      "60x60<"   => [50, 64],
+      "100x100<" => [78, 100],
+      "100x112<" => [88, 112],
+      "40x70<"   => [50, 64]
+  end
+  
+  def test_should_resize_with_less_and_no_width
+    assert_geometry 50, 64,
+      "x50<"  => [50, 64],
+      "x60<"  => [50, 64],
+      "x100<" => [78, 100]
+  end
+  
+  def test_should_resize_with_less_and_no_height
+    assert_geometry 50, 64,
+      "50<"  => [50, 64],
+      "60<"  => [60, 77],
+      "100<" => [100, 128]
+  end
+
+  def test_should_resize_with_greater
+    assert_geometry 50, 64,
+      "50x50>"   => [39, 50],
+      "60x60>"   => [47, 60],
+      "100x100>" => [50, 64],
+      "100x112>" => [50, 64],
+      "40x70>"   => [40, 51]
+  end
+  
+  def test_should_resize_with_greater_and_no_width
+    assert_geometry 50, 64,
+      "x40>"  => [31, 40],
+      "x60>"  => [47, 60],
+      "x100>" => [50, 64]
+  end
+  
+  def test_should_resize_with_greater_and_no_height
+    assert_geometry 50, 64,
+      "40>"  => [40, 51],
+      "60>"  => [50, 64],
+      "100>" => [50, 64]
+  end
+
+  def test_should_resize_with_aspect
+    assert_geometry 50, 64,
+      "35x35!" => [35, 35],
+      "70x70!" => [70, 70]
+  end
+
+  protected
+    def assert_geometry(width, height, values)
+      values.each do |geo, result|
+        # run twice to verify the Geometry string isn't modified after a run
+        geo = Geometry.from_s(geo)
+        2.times { assert_equal result, [width, height] / geo }
+      end
+    end
+end

data/test/processors/core_image_test.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class CoreImageTest < Test::Unit::TestCase
+  attachment_model CoreImageAttachment
+
+  if Object.const_defined?(:OSX)
+    def test_should_resize_image
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.image?
+      # test core image thumbnail
+      assert_equal 42, attachment.width
+      assert_equal 55, attachment.height
+      
+      thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+      geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+      aspect     = attachment.thumbnails.detect { |t| t.filename =~ /_aspect/ }
+      
+      # test exact resize dimensions
+      assert_equal 50, thumb.width
+      assert_equal 51, thumb.height
+      
+      # test geometry strings
+      assert_equal 31, geo.width
+      assert_equal 41, geo.height
+      assert_equal 25, aspect.width
+      assert_equal 25, aspect.height
+      
+      # This makes sure that we didn't overwrite the original file
+      # and will end up with a thumbnail instead of the original
+      assert_equal 42, attachment.width
+      assert_equal 55, attachment.height
+      
+    end
+
+    def test_should_handle_jpeg_quality
+      attachment_model CoreImageAttachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      full_size = attachment.size
+      attachment_model LowerQualityCoreImageAttachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      lq_size = attachment.size
+      assert lq_size <= full_size * 0.9, 'Lower-quality JPEG filesize should be congruently smaller'
+    end
+  else
+    def test_flunk
+      puts "CoreImage not loaded, tests not running"
+    end
+  end
+end

data/test/processors/gd2_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class GD2Test < Test::Unit::TestCase
+  attachment_model GD2Attachment
+
+  if Object.const_defined?(:GD2)
+    def test_should_resize_image
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.image?
+      # test gd2 thumbnail
+      assert_equal 43, attachment.width
+      assert_equal 55, attachment.height
+      
+      thumb   = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+      geo     = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+      aspect  = attachment.thumbnails.detect { |t| t.filename =~ /_aspect/ }
+      
+      # test exact resize dimensions
+      assert_equal 50, thumb.width
+      assert_equal 51, thumb.height
+      
+      # test geometry strings
+      assert_equal 31, geo.width
+      assert_equal 40, geo.height
+      assert_equal 25, aspect.width
+      assert_equal 25, aspect.height
+    end
+
+    def test_should_handle_jpeg_quality
+      attachment_model GD2Attachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      full_size = attachment.size
+      attachment_model LowerQualityGD2Attachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      lq_size = attachment.size
+      assert lq_size <= full_size * 0.9, 'Lower-quality JPEG filesize should be congruently smaller'
+    end
+  else
+    def test_flunk
+      puts "GD2 not loaded, tests not running"
+    end
+  end
+end

data/test/processors/image_science_test.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class ImageScienceTest < Test::Unit::TestCase
+  attachment_model ImageScienceAttachment
+
+  if Object.const_defined?(:ImageScience)
+    def test_should_resize_image
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.image?
+      # test image science thumbnail
+      assert_equal 42, attachment.width
+      assert_equal 55, attachment.height
+      
+      thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+      geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+      aspect     = attachment.thumbnails.detect { |t| t.filename =~ /_aspect/ }
+      
+      # test exact resize dimensions
+      assert_equal 50, thumb.width
+      assert_equal 51, thumb.height
+      
+      # test geometry strings
+      assert_equal 31, geo.width
+      assert_equal 41, geo.height
+      assert_equal 25, aspect.width
+      assert_equal 25, aspect.height
+    end
+    
+    def test_should_handle_jpeg_quality
+      attachment = upload_file :filename => '/files/rails.jpg'
+      full_size = attachment.size
+      attachment_model ImageScienceLowerQualityAttachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      lq_size = attachment.size
+      if ImageScience.instance_method(:save).arity == -2 # tdd-image_science: JPEG quality processing
+        assert lq_size <= full_size * 0.75, 'Lower-quality JPEG filesize should be congruently smaller'
+      else
+        assert_equal full_size, lq_size, 'Unsupported lower-quality JPEG should yield exact same file size'
+      end
+    end
+  else
+    def test_flunk
+      puts "ImageScience not loaded, tests not running"
+    end
+  end
+end

data/test/processors/mini_magick_test.rb

@@ -0,0 +1,116 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class MiniMagickTest < Test::Unit::TestCase
+  attachment_model MiniMagickAttachment
+
+  if Object.const_defined?(:MiniMagick)
+    def test_should_resize_image
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.image?
+      # test MiniMagick thumbnail
+      assert_equal 43, attachment.width
+      assert_equal 55, attachment.height
+      
+      thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+      geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+      aspect     = attachment.thumbnails.detect { |t| t.filename =~ /_aspect/ }
+      
+      # test exact resize dimensions
+      assert_equal 50, thumb.width
+      assert_equal 51, thumb.height
+      
+      # test geometry strings
+      assert_equal 31, geo.width
+      assert_equal 40, geo.height
+      assert_equal 25, aspect.width
+      assert_equal 25, aspect.height
+    end
+
+    def test_should_crop_image(klass = ImageThumbnailCrop)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert  attachment.image?
+    #  has_attachment :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"}
+
+      square      = attachment.thumbnails.detect { |t| t.filename =~ /_square/ }
+      vertical    = attachment.thumbnails.detect { |t| t.filename =~ /_vertical/ }
+      horizontal  = attachment.thumbnails.detect { |t| t.filename =~ /_horizontal/ }
+      
+      # test excat resize
+      assert_equal 50, square.width
+      assert_equal 50, square.height
+
+      assert_equal 30, vertical.width
+      assert_equal 60, vertical.height
+
+      assert_equal 60, horizontal.width
+      assert_equal 30, horizontal.height
+    end
+    
+    # tests the first step in resize, crop the image in original size to right format
+    def test_should_crop_image_right(klass = ImageThumbnailCrop)      
+      @@testcases.collect do |testcase| 
+        image_width, image_height, thumb_width, thumb_height = testcase[:data]
+        image_aspect, thumb_aspect = image_width/image_height, thumb_width/thumb_height
+        crop_comand = klass.calculate_offset(image_width, image_height, image_aspect, thumb_width, thumb_height,thumb_aspect)
+        # pattern matching on crop command
+        if testcase.has_key?(:height) 
+          assert crop_comand.match(/^#{image_width}x#{testcase[:height]}\+0\+#{testcase[:yoffset]}$/)
+        else 
+          assert crop_comand.match(/^#{testcase[:width]}x#{image_height}\+#{testcase[:xoffset]}\+0$/)
+        end
+      end
+    end
+
+    def test_should_handle_jpeg_quality
+      attachment_model MiniMagickAttachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      full_size = attachment.size
+      attachment_model LowerQualityMiniMagickAttachment
+      attachment = upload_file :filename => '/files/rails.jpg'
+      lq_size = attachment.size
+      puts "FULL: #{full_size} - LQ: #{lq_size}"
+      assert lq_size <= full_size * 0.9, 'Lower-quality JPEG filesize should be congruently smaller'
+    end
+  else
+    def test_flunk
+      puts "MiniMagick not loaded, tests not running"
+    end
+  end
+
+  @@testcases = [
+    # image_aspect <= 1 && thumb_aspect >= 1  
+    {:data => [10.0,40.0,2.0,1.0], :height => 5.0, :yoffset => 17.5}, #   1b
+    {:data => [10.0,40.0,1.0,1.0], :height => 10.0, :yoffset => 15.0}, #  1b
+
+    # image_aspect < 1 && thumb_aspect < 1
+    {:data => [10.0,40.0,1.0,2.0], :height => 20.0, :yoffset => 10.0}, # 1a
+    {:data => [2.0,3.0,1.0,2.0], :width => 1.5, :xoffset => 0.25}, # 1a
+
+    # image_aspect = thumb_aspect
+    {:data => [10.0,10.0,1.0,1.0], :height => 10.0, :yoffset => 0.0}, # QUADRAT 1c
+
+    # image_aspect >= 1 && thumb_aspect > 1     && image_aspect < thumb_aspect
+    {:data => [6.0,3.0,4.0,1.0], :height => 1.5, :yoffset => 0.75}, # 2b  
+    {:data => [6.0,6.0,4.0,1.0], :height => 1.5, :yoffset => 2.25}, # 2b  
+
+    # image_aspect > 1 && thumb_aspect > 1     && image_aspect > thumb_aspect
+    {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 2a
+
+    # image_aspect > 1 && thumb_aspect < 1 && image_aspect < thumb_aspect
+    {:data => [10.0,5.0,0.1,2.0], :width => 0.25, :xoffset => 4.875}, # 4
+    {:data => [10.0,5.0,1.0,2.0], :width => 2.5, :xoffset => 3.75}, # 4
+
+    # image_aspect > 1 && thumb_aspect > 1     && image_aspect > thumb_aspect
+    {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 3a    
+    # image_aspect > 1 && thumb_aspect > 1     && image_aspect < thumb_aspect
+    {:data => [9.0,3.0,5.0,1.0], :height => 1.8, :yoffset => 0.6} # 3a
+  ]
+
+
+
+
+
+end