carrierwave-aliyun 0.1.1 → 0.1.2

data/Changelogs.md

@@ -1,3 +1,7 @@
+## 0.1.2
+
+* 修正 content_type 的支持，自动用原始文件的 content_type，以免上传 zip 之类的文件以后无法下载.
+
 ## 0.1.1
 
 * 修改 Aliyun OSS 的请求地址.

data/carrierwave-aliyun.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-aliyun"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jason Lee"]
   s.email       = ["huacnlee@gmail.com"]

data/lib/carrierwave-aliyun.rb

@@ -1,6 +1,9 @@
 require "carrierwave/storage/aliyun"
+require 'carrierwave/processing/mime_types'
 require "carrierwave/aliyun/configuration"
 CarrierWave.configure do |config|
   config.storage_engines.merge!({:aliyun => "CarrierWave::Storage::Aliyun"})
 end
-CarrierWave::Uploader::Base.send(:include, CarrierWave::Aliyun::Configuration)
+CarrierWave::Uploader::Base.send(:include, CarrierWave::Aliyun::Configuration)
+CarrierWave::Uploader::Base.send(:include, CarrierWave::MimeTypes)
+CarrierWave::Uploader::Base.send(:process, :set_content_type)

data/lib/carrierwave/storage/aliyun.rb

@@ -18,10 +18,10 @@ module CarrierWave
             @aliyun_host = "oss-internal.aliyuncs.com"
           end
         end
-        
-        def put(path, file)
+
+        def put(path, file, options={})
           content_md5 = Digest::MD5.hexdigest(file)
-          content_type = "image/jpg"
+          content_type = options[:content_type] || "image/jpg"
           date = Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
           path = "#{@aliyun_bucket}/#{path}"
           url = "http://#{@aliyun_host}/#{path}"
@@ -100,8 +100,8 @@ module CarrierWave
           "http://oss.aliyuncs.com/#{@uploader.aliyun_bucket}/#{@path}"
         end
 
-        def store(data)
-          oss_connection.put(@path, data)
+        def store(data, opts = {})
+          oss_connection.put(@path, data, opts)
         end
 
         private
@@ -129,7 +129,7 @@ module CarrierWave
       
       def store!(file)
         f = CarrierWave::Storage::Aliyun::File.new(uploader, self, uploader.store_path)
-        f.store(file.read)
+        f.store(file.read, :content_type => file.content_type)
         f
       end
 

data/spec/upload_spec.rb

@@ -9,6 +9,10 @@ describe "Upload" do
       create_table :photos do |t|
         t.column :image, :string
       end
+      
+      create_table :attachments do |t|
+        t.column :file, :string
+      end
     end
   end
   
@@ -29,11 +33,23 @@ describe "Upload" do
       "photos"
     end
   end
+  
+  class AttachUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MiniMagick
+
+    def store_dir
+      "attachs"
+    end
+  end
 
   class Photo < ActiveRecord::Base
     mount_uploader :image, PhotoUploader
   end
   
+  class Attachment < ActiveRecord::Base
+    mount_uploader :file, AttachUploader
+  end
+  
   
   before :all do
     setup_db
@@ -69,5 +85,22 @@ describe "Upload" do
         open(@photo1.image.small.url).should_not == nil
       end
     end
+    
+    context "should update zip" do
+      before(:all) do
+        @file = load_file("foo.zip")
+        @attachment = Attachment.new(:file => @file)
+      end
+      
+      it "should upload file" do
+        @attachment.save.should be_true
+      end
+      
+      it "should get uploaded file" do
+        attach = open(@attachment.file.url)
+        attach.size.should == @file.size
+      end
+      
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
+    none: false
 - !ruby/object:Gem::Dependency
   name: rest-client
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
+    none: false
 description: Aliyun OSS support for Carrierwave
 email:
 - huacnlee@gmail.com
@@ -62,6 +62,7 @@ files:
 - lib/carrierwave/storage/aliyun.rb
 - spec/foo.gif
 - spec/foo.jpg
+- spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
 homepage: https://github.com/nowa/carrierwave-aliyun
@@ -71,17 +72,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -91,6 +92,6 @@ summary: Aliyun OSS support for Carrierwave
 test_files:
 - spec/foo.gif
 - spec/foo.jpg
+- spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
-has_rdoc: