ucloud_storage 0.0.12 → 0.0.13

data/CHANGELOG

@@ -1,3 +1,7 @@
+## v0.0.13
+
+* retry when authorizion expire
+
 ## v0.0.12
 
 * remove fork

data/lib/ucloud_storage/ucloud_storage.rb

@@ -63,39 +63,27 @@ module UcloudStorage
     end
 
     def delete(box_name, destination)
-      raise NotAuthorized if storage_url.nil?
-
-      response = HTTParty.delete(storage_url+ "/#{box_name}/#{destination}",
-                                 headers: { "X-Auth-Token" => auth_token })
-
-      yield response if block_given?
-
-      response.code == 204 ? true : false
+      request(:delete, box_name, destination, [204])
     end
 
     def get(box_name, destination)
-      raise NotAuthorized if storage_url.nil?
-
-      response = HTTParty.get(storage_url+ "/#{box_name}/#{destination}",
-                                 headers: { "X-Auth-Token" => auth_token })
-
-      yield response if block_given?
-
-      [200, 304].include?(response.code) ? true : false
+      request(:get, box_name, destination, [200, 304])
     end
 
     def exist?(box_name, destination)
-      raise NotAuthorized if storage_url.nil?
-
-      response = HTTParty.head(storage_url+ "/#{box_name}/#{destination}",
-                                 headers: { "X-Auth-Token" => auth_token })
-
-      [200, 204].include?(response.code) ? true : false # Adding 200 for Ucloud's way
+      request(:head, box_name, destination, [200, 204])
     end
 
     private
+    def request(method, box_name, destination, success_code = [200])
+      raise NotAuthorized if storage_url.nil?
 
-    private
+      response = HTTParty.send(method, "#{storage_url}/#{box_name}/#{destination}", headers: { "X-Auth-Token" => auth_token })
+      return request(method, box_name, destination, success_code) if response.code == 401 and authorize
+
+      yield response if block_given?
+      success_code.include?(response.code) ? true : false
+    end
 
     #  stolen from http://stackoverflow.com/a/16636012/1802026
     def get_image_extension(local_file_path)
@@ -112,7 +100,11 @@ module UcloudStorage
       when /^#{jpg2}/
         'jpg'
       else
-        nil
+        if local_file_path.end_with? '.txt'
+          'text/plain'
+        else
+          'application/octet-stream'
+        end
         # mime_type = `file #{local_file_path} --mime-type`.gsub("\n", '') # Works on linux and mac
         # raise UnprocessableEntity, "unknown file type" if !mime_type
         # mime_type.split(':')[1].split('/')[1].gsub('x-', '').gsub(/jpeg/, 'jpg').gsub(/text/, 'txt').gsub(/x-/, '')
@@ -120,4 +112,4 @@ module UcloudStorage
     end
 
   end
-end
+end

data/lib/ucloud_storage/version.rb

@@ -1,3 +1,3 @@
 module UcloudStorage
-	VERSION = "0.0.12"
+	VERSION = "0.0.13"
 end

data/spec/ucloud_storage_spec.rb

@@ -161,13 +161,37 @@ describe UcloudStorage do
   end
 
   describe "#exist" do
+    it "should retry to upload if authorization failure response" do
+      VCR.use_cassette('storage/v1/auth') do
+        valid_ucloud.authorize
+      end
+
+      file_path = File.join(File.dirname(__FILE__), "/fixtures/sample_file.txt")
+      box = 'dev'
+      destination = 'cropped_images/'+Pathname(file_path).basename.to_s
+
+      VCR.use_cassette("v1/put_storage_object_04") do
+        valid_ucloud.upload(file_path, box, destination) do |response|
+          response.code.should == 201
+        end
+      end
+
+      valid_ucloud.auth_token += "a"
+
+      VCR.use_cassette("v1/get_storage_object)_04") do
+        valid_ucloud.get(box, destination) do |response|
+          [200, 304].should include(response.code)
+        end.should == true
+      end
+    end
+
     it 'should get updated object' do
       valid_ucloud.authorize
       file_path = File.join(File.dirname(__FILE__), "/fixtures/sample_file.txt")
       box = 'dev_box'
       destination = 'cropped_images/'+Pathname(file_path).basename.to_s
 
-      VCR.use_cassette("v1/put_storage_object_02") do
+      VCR.use_cassette("v1/put_storage_object_03") do
         valid_ucloud.upload(file_path, box, destination)
       end
 
@@ -178,4 +202,4 @@ describe UcloudStorage do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucloud_storage
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70357224523380 !ruby/object:Gem::Requirement
+  requirement: &70267965657920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357224523380
+  version_requirements: *70267965657920
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70357224522960 !ruby/object:Gem::Requirement
+  requirement: &70267965655640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357224522960
+  version_requirements: *70267965655640
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70357224522540 !ruby/object:Gem::Requirement
+  requirement: &70267965652780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357224522540
+  version_requirements: *70267965652780
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70357224538500 !ruby/object:Gem::Requirement
+  requirement: &70267965643900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357224538500
+  version_requirements: *70267965643900
 description: ucloud storage API
 email:
 - wangsy@wangsy.com
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ucloudstorage
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: simple API for authorize, upload/delete files