carrierwave-upyun 0.1.3 → 0.1.5

data/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+*.gem

data/carrierwave-upyun.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-upyun"
-  s.version     = "0.1.3"
+  s.version     = "0.1.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nowa Zhu"]
   s.email       = ["nowazhu@gmail.com"]

data/lib/carrierwave/storage/upyun.rb

@@ -30,7 +30,9 @@ module CarrierWave
           @upyun_bucket = options[:upyun_bucket]
           @connection_options     = options[:connection_options] || {}
           @host = options[:api_host] || 'http://v0.api.upyun.com'
-          @http = RestClient::Resource.new("#{@host}/#{@upyun_bucket}", @upyun_username, @upyun_password)
+          @http = RestClient::Resource.new("#{@host}/#{@upyun_bucket}", 
+                                            :user => @upyun_username, 
+                                            :password => @upyun_password)
         end
         
         def put(path, payload, headers = {})
@@ -82,7 +84,8 @@ module CarrierWave
         #
         def read
           object = uy_connection.get(@path)
-          object.net_http_res.read_body
+          @headers = object.headers
+          object.net_http_res.body
         end
 
         ##
@@ -113,6 +116,14 @@ module CarrierWave
             nil
           end
         end
+        
+        def content_type
+          headers[:content_type]
+        end
+
+        def content_type=(new_content_type)
+          headers[:content_type] = new_content_type
+        end
 
         ##
         # Writes the supplied data into the object on Cloud Files.
@@ -129,7 +140,11 @@ module CarrierWave
         private
 
           def headers
-            @headers ||= {  }
+            @headers ||= begin
+              uy_connection.get(@path).headers
+            rescue Excon::Errors::NotFound # Don't die, just return no headers
+              {}
+            end
           end
 
           def connection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70363930114080 !ruby/object:Gem::Requirement
+  requirement: &70201535169360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *70363930114080
+  version_requirements: *70201535169360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70363930113580 !ruby/object:Gem::Requirement
+  requirement: &70201535168860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70363930113580
+  version_requirements: *70201535168860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70363930113100 !ruby/object:Gem::Requirement
+  requirement: &70201535168380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70363930113100
+  version_requirements: *70201535168380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70363930112620 !ruby/object:Gem::Requirement
+  requirement: &70201535167900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70363930112620
+  version_requirements: *70201535167900
 description: UpYun Storage support for CarrierWave
 email:
 - nowazhu@gmail.com
@@ -62,6 +62,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -70,7 +71,6 @@ files:
 - lib/carrierwave-upyun.rb
 - lib/carrierwave/storage/upyun.rb
 - lib/carrierwave/upyun/configuration.rb
-- spec/.DS_Store
 - spec/foo.gif
 - spec/foo.jpg
 - spec/spec_helper.rb