attacheable 1.2 → 1.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'attacheable'
-  s.version = '1.2'
+  s.version = '1.3'
   s.summary = 'Library to handle image uploads'
   s.autorequire = 'attacheable'
   s.author  = "Max Lapshin"

data/lib/attacheable/uploading.rb

@@ -1,7 +1,7 @@
 module Attacheable
   module Uploading
     def prepare_uploaded_file(file_data)
-      return prepare_merb_uploaded_file(file_data) if file_data.is_a?(Hash) && file_data["content_type"] && file_data["tempfile"]
+      return prepare_merb_uploaded_file(file_data) if file_data.is_a?(Hash) && file_data["tempfile"]
       return nil if file_data.nil? || !file_data.respond_to?(:original_filename) || !respond_to?(:filename=)
       
       self.filename = file_data.original_filename
@@ -21,7 +21,7 @@ module Attacheable
     end
     
     def prepare_merb_uploaded_file(file_data)
-      return nil if file_data["tempfile"].blank? || file_data["filename"].blank? || file_data["content_type"].blank?
+      return nil if file_data["tempfile"].blank? || file_data["filename"].blank?
       self.filename = file_data["filename"]
       self.size = file_data["size"] if respond_to?(:size=)
       @tempfile = file_data["tempfile"]
@@ -33,7 +33,7 @@ module Attacheable
       return unless @tempfile
       self.content_type = @tempfile.content_type if @tempfile.respond_to?(:content_type)
 
-      if content_type.blank? || content_type =~ /image\//
+      if content_type.blank? || content_type =~ /image\// || content_type == "application/octet-stream"
         file_type, width, height = identify_image_properties(@tempfile.path)
         if file_type
           self.width = width if(respond_to?(:width=))

data/test/attacheable_test.rb

@@ -73,9 +73,25 @@ class AttacheableTest < Test::Unit::TestCase
     assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001"), "Directory should be cleaned"
   end
   
+  def test_image_creation_from_flash
+    input = File.open(File.dirname(__FILE__)+"/fixtures/life.jpg")
+    input.extend(TestUploadExtension)
+    input.content_type = "application/octet-stream"
+    assert_equal "life.jpg", input.original_filename, "should look like uploaded file"
+    image = Image.new(:uploaded_data => input)
+    assert_equal "life_medium.jpg", image.send(:thumbnail_name_for, :medium), "should generate right thumbnail filename"
+    assert image.save, "Image should be saved"
+    assert_equal "life", image.attachment_basename
+    assert_equal ".jpg", image.attachment_extname
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life.jpg"), "File should be saved"
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life_medium.jpg"), "Thumbnails should not be generated"
+    image.destroy
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001"), "Directory should be cleaned"
+  end
+  
   def test_merb_image_creation
     path = File.dirname(__FILE__)+"/fixtures/life.jpg"
-    input = {"content_type"=>"image/jpeg", "size"=>File.size(path), "tempfile"=>File.open(path), "filename"=>"life.jpg"}
+    input = {"size"=>File.size(path), "tempfile"=>File.open(path), "filename"=>"life.jpg"}
     image = Image.new(:uploaded_data => input)
     assert image.save, "Image should be saved"
     assert_equal "life", image.attachment_basename

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: attacheable
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Max Lapshin
@@ -9,7 +9,7 @@ autorequire: attacheable
 bindir: bin
 cert_chain: []
 
-date: 2008-04-05 00:00:00 +04:00
+date: 2008-04-08 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -30,8 +30,6 @@ files:
 - lib/attacheable/uploading.rb
 - lib/attacheable.rb
 - MIT-LICENSE
-- pkg
-- pkg/attacheable-1.1.gem
 - Rakefile
 - README
 - README.ru
@@ -64,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: attacheable
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: Library to handle image uploads