ucloud_storage 0.0.14 → 0.0.15

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d303cb69666f5c64756360a01a70a6f361ef97f
+  data.tar.gz: 268a5bebec78662393ec8e825e910eb39efe4391
+SHA512:
+  metadata.gz: beb96c80c80a0aaccde84472692b27fa9c449f139e8ee9407575ee621c339487ba286aa8157218affed5d2cfa27c26f54e8849aea9789335e94cbede93c4bda3
+  data.tar.gz: e99b54106c7728d65cda37db9a2c4929ad66793c9cb0bb13625c971ce1e87241bf985cc53661d0b855f0e307b05f483b3a4a9fc7713e9fdc9b63406f803375d7

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.0.15
+
+* support ucloud lite authentication
+* fix uploaded to double slashed destination url (http://ucloud.com/box_name//destination)
+* refactor specs
+* remove uploaded file after test
+
 ## v0.0.14
 
 * fix bug - block not called

data/README.md

@@ -35,6 +35,7 @@ Set default user/pass info
     UcloudStorage.configure do |config|
       config.user = 'email'
       config.pass = 'API KEY'
+      # config.type = 'standard'
     end
 
 ## Response block

data/lib/ucloud_storage.rb

@@ -6,7 +6,7 @@ require 'forwardable'
 module UcloudStorage
   class << self
     extend Forwardable
-    def_delegators Configuration, :user, :pass, :configure
+    def_delegators Configuration, :user, :pass, :type, :configure
   end
 
 	def self.new(options={})

data/lib/ucloud_storage/configuration.rb

@@ -5,6 +5,7 @@ module UcloudStorage
     class << self
       attr_accessor :user
       attr_accessor :pass
+      attr_accessor :type
     end
 
     def self.configure

data/lib/ucloud_storage/ucloud_storage.rb

@@ -6,18 +6,18 @@ module UcloudStorage
   class NotAuthorized < StandardError; end
 
   class UcloudStorage
-    attr_accessor :user, :pass, :storage_url, :auth_token
+    attr_accessor :user, :pass, :type, :storage_url, :auth_token
 
     def initialize(options={})
       @user = options.fetch(:user) { Configuration.user }
       @pass = options.fetch(:pass) { Configuration.pass }
+      @type = options.fetch(:type) { Configuration.type || 'standard' }
       @authorized = false
     end
 
     def authorize
-      response = HTTParty.get("https://api.ucloudbiz.olleh.com/storage/v1/auth/",
-                              headers: { "X-Storage-User" => user,
-                                         "X-Storage-Pass" => pass })
+      response = HTTParty.get(auth_url, headers: { "X-Storage-User" => user,
+                                                   "X-Storage-Pass" => pass })
 
       yield response if block_given?
 
@@ -39,14 +39,15 @@ module UcloudStorage
       raise NotAuthorized if storage_url.nil?
 
       file = File.new(file_path)
-      content_type = get_image_extension(file_path)
+      content_type = get_content_type(file_path)
       upload_blob(file.read, box_name, destination, content_type, &block)
     end
 
     def upload_blob(blob, box_name, destination, content_type, &block)
       raise NotAuthorized if storage_url.nil?
 
-      response = HTTParty.put(storage_url+ "/#{box_name}/#{destination}",
+      target_url = File.join(storage_url, box_name, destination).to_s
+      response = HTTParty.put(target_url,
                               headers: {
                                 "X-Auth-Token" => auth_token,
                                 "Content-Type" => content_type,
@@ -75,10 +76,23 @@ module UcloudStorage
     end
 
     private
+
+    def auth_url
+      case type
+      when "standard"
+        "https://api.ucloudbiz.olleh.com/storage/v1/auth"
+      when 'standard-jpn'
+        "https://api.ucloudbiz.olleh.com/storage/v1/authjp"
+      when "lite"
+        "https://api.ucloudbiz.olleh.com/storage/v1/authlite"
+      end
+    end
+
     def request(method, box_name, destination, success_code = [200], &block)
       raise NotAuthorized if storage_url.nil?
 
-      response = HTTParty.send(method, "#{storage_url}/#{box_name}/#{destination}", headers: { "X-Auth-Token" => auth_token })
+      target_url = File.join(storage_url, box_name, destination)
+      response = HTTParty.send(method, target_url, 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?
@@ -86,19 +100,19 @@ module UcloudStorage
     end
 
     #  stolen from http://stackoverflow.com/a/16636012/1802026
-    def get_image_extension(local_file_path)
+    def get_content_type(local_file_path)
       png = Regexp.new("\x89PNG".force_encoding("binary"))
       jpg = Regexp.new("\xff\xd8\xff\xe0\x00\x10JFIF".force_encoding("binary"))
       jpg2 = Regexp.new("\xff\xd8\xff\xe1(.*){2}Exif".force_encoding("binary"))
       case IO.read(local_file_path, 10)
       when /^GIF8/
-        'gif'
+        'image/gif'
       when /^#{png}/
-        'png'
+        'image/png'
       when /^#{jpg}/
-        'jpg'
+        'image/jpeg'
       when /^#{jpg2}/
-        'jpg'
+        'image/jpeg'
       else
         if local_file_path.end_with? '.txt'
           'text/plain'

data/lib/ucloud_storage/version.rb

@@ -1,3 +1,3 @@
 module UcloudStorage
-	VERSION = "0.0.14"
+	VERSION = "0.0.15"
 end

data/spec/ucloud_storage_spec.rb

@@ -33,6 +33,14 @@ describe UcloudStorage do
                                pass: auth_info["valid_user"]["pass"])
   end
 
+  let(:valid_ucloud_lite) do
+    file = File.open(File.join(File.dirname(__FILE__), "/support/auth_info.yml"))
+    auth_info = YAML.load(file)
+    ucloud = UcloudStorage.new(user: auth_info["valid_user"]["user"],
+                               pass: auth_info["valid_user"]["pass"],
+                               type: 'lite')
+  end
+
   let(:invalid_ucloud) do
     invlaid_ucloud = UcloudStorage.new
     invlaid_ucloud.user = "invalid_user@mintshop.com"
@@ -40,6 +48,10 @@ describe UcloudStorage do
     invlaid_ucloud
   end
 
+  let(:file_path) { File.join(File.dirname(__FILE__), "/fixtures/sample_file.txt") }
+  let(:box) { 'dev_box' }
+  let(:destination) { 'cropped_images/'+Pathname(file_path).basename.to_s }
+
   describe '#authorize' do
     it "can authorize with valid user/pass" do
       VCR.use_cassette("storage/v1/auth") do
@@ -51,6 +63,16 @@ describe UcloudStorage do
       end
     end
 
+    it 'should be authorize with lite storage' do
+      VCR.use_cassette("storage/v1/authlite") do
+        valid_ucloud_lite.is_authorized?.should_not == true
+        valid_ucloud_lite.authorize.should == true
+        valid_ucloud_lite.storage_url.should_not be_nil
+        valid_ucloud_lite.auth_token.should_not be_nil
+        valid_ucloud_lite.is_authorized?.should == true
+      end
+    end
+
     it "cannot authorize with invalid user/pass" do
       VCR.use_cassette("storage/v1/auth_fail") do
         invalid_ucloud.authorize.should == false
@@ -70,115 +92,90 @@ describe UcloudStorage do
 
   describe "#upload" do
     it "can upload a file" do
-      VCR.use_cassette('storage/v1/auth') do
+      VCR.use_cassette("v1/put_storage_object") do
         valid_ucloud.authorize
+        valid_ucloud.upload(file_path, box, destination).should be_true
+        uploaded_url = "https://ssproxy.ucloudbiz.olleh.com/v1/AUTH_f46e842e-c688-460e-a70b-e6a4d30e9885/dev_box/cropped_images/sample_file.txt"
+        HTTParty.get(uploaded_url).header.code_type.should == Net::HTTPOK
+        valid_ucloud.delete(box, destination)
       end
+    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") do
-        valid_ucloud.upload(file_path, box, destination).should be_true
+    it "can upload a file with proper url" do
+      VCR.use_cassette("v1/put_storage_object_02") do
+        valid_ucloud.authorize
+        destination_with_slash = "/" + destination
+        valid_ucloud.upload(file_path, box, destination_with_slash).should be_true
+        uploaded_url = "https://ssproxy.ucloudbiz.olleh.com/v1/AUTH_f46e842e-c688-460e-a70b-e6a4d30e9885/dev_box/cropped_images/sample_file.txt"
+        HTTParty.get(uploaded_url).header.code_type.should == Net::HTTPOK
+        valid_ucloud.delete(box, destination)
       end
     end
 
     it "should fail to upload with invalid file path" do
       VCR.use_cassette('storage/v1/auth') do
         valid_ucloud.authorize
+        invalid_file_path = File.join(File.dirname(__FILE__), "/fixtures/no_sample_file.txt")
+        expect {
+          valid_ucloud.upload(invalid_file_path, box, destination)
+        }.to raise_error(Errno::ENOENT)
       end
-
-      file_path = File.join(File.dirname(__FILE__), "/fixtures/no_sample_file.txt")
-      box = 'dev'
-      destination = 'cropped_images/'+Pathname(file_path).basename.to_s
-
-      expect {
-        valid_ucloud.upload(file_path, box, destination)
-      }.to raise_error(Errno::ENOENT)
     end
 
     it "should fail to upload without authorization" do
-      file_path = File.join(File.dirname(__FILE__), "/fixtures/sample_file.txt")
-      box = 'dev'
-      destination = 'cropped_images/'+Pathname(file_path).basename.to_s
-
       expect {
         valid_ucloud.upload(file_path, box, destination).should be_true
       }.to raise_error(UcloudStorage::NotAuthorized)
     end
 
     it "should retry to upload if authorization failure response" do
-      VCR.use_cassette('storage/v1/auth') do
+      VCR.use_cassette("v1/put_storage_object_with_auth_fail") 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
-      valid_ucloud.auth_token += "a"
+        valid_ucloud.auth_token += "a"
 
-      VCR.use_cassette("v1/put_storage_object_with_auth_fail") do
         valid_ucloud.upload(file_path, box, destination) do |response|
           response.code.should == 201
         end
+        valid_ucloud.delete(box, destination)
       end
     end
 
     it 'yields 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") do
+        valid_ucloud.authorize
         valid_ucloud.upload(file_path, box, destination) do |response|
           response.code.should == 201
         end
+        valid_ucloud.delete(box, destination)
       end
     end
   end
 
   describe "#delete" do
     it 'should delete 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/delete_storage_object_02") do
+        valid_ucloud.authorize
         valid_ucloud.upload(file_path, box, destination)
-      end
 
-      VCR.use_cassette("v1/delete_storage_object_02") do
         valid_ucloud.delete(box, destination) do |response|
           response.code.should == 204
         end.should == true
+        uploaded_url = "https://ssproxy.ucloudbiz.olleh.com/v1/AUTH_f46e842e-c688-460e-a70b-e6a4d30e9885/dev_box/cropped_images/sample_file.txt"
+        HTTParty.get(uploaded_url).header.code_type.should == Net::HTTPNotFound
       end
     end
   end
 
   describe "#exist" do
     it "should retry to upload if authorization failure response" do
-      VCR.use_cassette('storage/v1/auth') do
+      VCR.use_cassette("v1/object_exists") 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"
+        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
@@ -186,39 +183,17 @@ describe UcloudStorage do
     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_03") do
+      VCR.use_cassette("v1/get_updated_object") do
+        valid_ucloud.authorize
         valid_ucloud.upload(file_path, box, destination)
-      end
 
-      VCR.use_cassette("v1/get_storage_object") do
         result = false
         valid_ucloud.get(box, destination) do |response|
           result = true
-          #[200, 304].should include(response.code)
+          [200, 304].should include(response.code)
         end
         result.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_03") do
-        valid_ucloud.upload(file_path, box, destination)
-      end
-
-      VCR.use_cassette("v1/get_storage_object") do
-        valid_ucloud.get(box, destination) do |response|
-          [200, 304].should include(response.code)
-        end.should == true
+        valid_ucloud.delete(box, destination)
       end
     end
   end

data/ucloud_storage.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |gem|
 	gem.add_dependency "httparty"
 
 	gem.rubyforge_project = "ucloudstorage"
+
+  gem.license = 'MIT'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucloud_storage
 version: !ruby/object:Gem::Version
-  version: 0.0.14
-  prerelease: 
+  version: 0.0.15
 platform: ruby
 authors:
 - Sooyong Wang
@@ -10,52 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70275416528180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275416528180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70275416526860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275416526860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70275416526240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275416526240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70275416523320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275416523320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ucloud storage API
 email:
 - wangsy@wangsy.com
@@ -80,28 +91,28 @@ files:
 - spec/ucloud_storage_spec.rb
 - ucloud_storage.gemspec
 homepage: https://github.com/wangsy/ucloud-storage
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 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
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ucloudstorage
-rubygems_version: 1.8.10
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: simple API for authorize, upload/delete files
 test_files:
 - spec/fixtures/sample_file.txt