0
@@ -1,4 +1,22 @@
0
 class Asset < ActiveRecord::Base
0
+  # used for extra mime types that dont follow the convention
0
+  @@extra_content_types = { :audio => ['application/ogg'] }
0
+  cattr_reader :extra_content_types
0
+
0
+  class << self
0
+    def movie?(content_type)
0
+      content_type.to_s =~ /^video/
0
+    end
0
+    
0
+    def audio?(content_type)
0
+      content_type.to_s =~ /^audio/ || extra_content_types[:audio].include?(content_type)
0
+    end
0
+    
0
+    def document?(content_type)
0
+      !image?(content_type) && !movie?(content_type) && !audio?(content_type)
0
+    end
0
+  end
0
+
0
   belongs_to :site
0
   acts_as_attachment :storage => :file_system, :thumbnails => { :thumb => '120>', :tiny => '50>' }
0
   before_validation_on_create :set_site_from_parent
0
@@ -9,7 +27,11 @@ class Asset < ActiveRecord::Base
0
     file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:file_system_path]
0
     File.join(RAILS_ROOT, 'public/assets', site.host, date_to_permalink, thumbnail_name_for(thumbnail))
0
   end
0
-  
0
+
0
+  [:movie, :audio, :document].each do |content|
0
+    define_method("#{content}?") { self.class.send("#{content}?", content_type) }
0
+  end
0
+
0
   protected
0
     def date_to_permalink
0
       [created_at.year, created_at.month, created_at.day] * '/'

0
@@ -65,6 +65,11 @@ class Test::Unit::TestCase
0
     end
0
   end
0
 
0
+  def assert_file_exists(file, message = nil)
0
+    message ||= "File not found: #{file}"
0
+    assert File.file?(file), message
0
+  end
0
+
0
   # Sets the current user in the session from the user fixtures.
0
   def login_as(user)
0
     @request.session[:user] = user ? users(user).id : nil

0
@@ -4,12 +4,20 @@ ASSET_PATH = File.join(RAILS_ROOT, 'test/fixtures/assets')
0
 class AssetTest < Test::Unit::TestCase
0
   fixtures :sites, :assets
0
 
0
+  def test_should_upload_and_create_asset_records
0
+    assert_difference sites(:first).assets, :count do
0
+      assert_difference Asset, :count, 3 do # asset + 2 thumbnails
0
+        process_upload
0
+      end
0
+    end
0
+  end
0
+
0
   def test_should_upload_file
0
     process_upload
0
     now = Time.now
0
-    assert File.file?(File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo.png'))
0
-    assert File.file?(File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png'))
0
-    assert File.file?(File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png'))
0
+    assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo.png')
0
+    assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png')
0
+    assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png')
0
   end
0
 
0
   def test_should_set_site_id
0
@@ -28,7 +36,31 @@ class AssetTest < Test::Unit::TestCase
0
     a = Asset.new
0
     Technoweenie::ActsAsAttachment.content_types.each do |content_type|
0
       a.content_type = content_type
0
-      assert a.image?
0
+      assert a.image?, "#{content_type} was not an image"
0
+    end
0
+  end
0
+
0
+  def test_should_report_movie_type
0
+    a = Asset.new
0
+    ['video/mpeg', 'video/quicktime'].each do |content_type|
0
+      a.content_type = content_type
0
+      assert a.movie?, "#{content_type} was not a movie"
0
+    end
0
+  end
0
+
0
+  def test_should_report_audio_type
0
+    a = Asset.new
0
+    ['audio/mpeg', 'application/ogg', 'audio/wav'].each do |content_type|
0
+      a.content_type = content_type
0
+      assert a.audio?, "#{content_type} was not audio"
0
+    end
0
+  end
0
+
0
+  def test_should_report_document_type
0
+    a = Asset.new
0
+    ['application/pdf', 'application/msword', 'text/html', 'application/x-gzip'].each do |content_type|
0
+      a.content_type = content_type
0
+      assert a.document?, "#{content_type} was not a document"
0
     end
0
   end
0
 
0
@@ -42,11 +74,7 @@ class AssetTest < Test::Unit::TestCase
0
   
0
   protected
0
     def process_upload
0
-      assert_difference sites(:first).assets, :count do
0
-        assert_difference Asset, :count, 3 do # asset + 2 thumbnails
0
-          sites(:first).assets.create(:filename => 'logo.png', :content_type => 'image/png', 
0
-            :attachment_data => IO.read(File.join(RAILS_ROOT, 'public/images/logo.png')))
0
-        end
0
-      end
0
+      sites(:first).assets.create(:filename => 'logo.png', :content_type => 'image/png', 
0
+        :attachment_data => IO.read(File.join(RAILS_ROOT, 'public/images/logo.png')))
0
     end
0
 end

0
@@ -147,14 +147,14 @@ module Technoweenie # :nodoc:
0
 
0
       # Creates or updates the thumbnail for the current attachment.
0
       def create_or_update_thumbnail(file_name_suffix, *size)
0
-        thumb = thumbnail_class.find_or_create_by_thumbnail_and_parent_id file_name_suffix.to_s, id
0
-        thumb.attributes = {
0
-          :content_type    => content_type, 
0
-          :filename        => thumbnail_name_for(file_name_suffix), 
0
-          :attachment_data => resize_image_to(size)
0
-        }
0
-        thumb.save!
0
-        thumb
0
+        returning thumbnail_class.find_or_initialize_by_thumbnail_and_parent_id(file_name_suffix.to_s, id) do |thumb|
0
+          thumb.attributes = {
0
+            :content_type    => content_type, 
0
+            :filename        => thumbnail_name_for(file_name_suffix), 
0
+            :attachment_data => resize_image_to(size)
0
+          }
0
+          thumb.save!
0
+        end
0
       end
0
 
0
       # This method handles the uploaded file object.  If you set the field name to uploaded_data, you don't need