ucloud_storage 0.0.10 → 0.0.12

data/.gitignore

@@ -15,6 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
 spec/fixtures/vcr_cassettes/*
-spec/support/auth_info.yml
+spec/support/auth_info.yml
+*.DS_Store

data/CHANGELOG

@@ -1,3 +1,7 @@
+## v0.0.12
+
+* remove fork
+
 ## v0.0.2
 
 * Add runtime_dependency

data/README.md

@@ -18,11 +18,15 @@ Or install it yourself as:
 
 ## Usage
 
-		ucloud = UcloudStorage.new(user: 'email', pass: 'API_KEY')
-
-		ucloud.authoize
-		ucloud.upload(filepath, boxname, destination)
-    ucloud.delte(boxname, destination)
+    ucloud = UcloudStorage.new(user: 'email', pass: 'API_KEY')
+
+    ucloud.authoize
+    # Upload
+    ucloud.upload(filepath, boxname, destination)
+    # Delete
+    ucloud.delete(boxname, destination)
+    # Get
+    ucloud.get(boxname, destination)
 
 ## Configuration
 

data/lib/ucloud_storage/ucloud_storage.rb

@@ -11,6 +11,7 @@ module UcloudStorage
     def initialize(options={})
       @user = options.fetch(:user) { Configuration.user }
       @pass = options.fetch(:pass) { Configuration.pass }
+      @authorized = false
     end
 
     def authorize
@@ -24,27 +25,36 @@ module UcloudStorage
       when 200
         self.storage_url = response.headers["X-Storage-Url"]
         self.auth_token = response.headers["X-Auth-Token"]
-        true
+        @authorized = true
       when 401 then false
       else raise TotalyWrongException
       end
     end
 
+    def is_authorized?
+      @authorized
+    end
+
     def upload(file_path, box_name, destination, &block)
       raise NotAuthorized if storage_url.nil?
 
       file = File.new(file_path)
-      content_type = `file --mime-type #{file_path}`.split(": ").last
+      content_type = get_image_extension(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}",
                               headers: {
                                 "X-Auth-Token" => auth_token,
                                 "Content-Type" => content_type,
-                                "Content-Length" => file.size.to_s },
-                              body: file.read)
+                                "Content-Length" => blob.size.to_s },
+                              body: blob)
 
       if response.code == 401 and authorize
-        return upload(file_path,box_name,destination,&block)
+        return upload_blob(blob, box_name, destination, content_type, &block)
       end
 
       yield response if block_given?
@@ -62,5 +72,52 @@ module UcloudStorage
 
       response.code == 204 ? true : false
     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
+    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
+    end
+
+    private
+
+    private
+
+    #  stolen from http://stackoverflow.com/a/16636012/1802026
+    def get_image_extension(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'
+      when /^#{png}/
+        'png'
+      when /^#{jpg}/
+        'jpg'
+      when /^#{jpg2}/
+        'jpg'
+      else
+        nil
+        # 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-/, '')
+      end
+    end
+
   end
 end

data/lib/ucloud_storage/version.rb

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

data/spec/ucloud_storage_spec.rb

@@ -43,9 +43,11 @@ describe UcloudStorage do
   describe '#authorize' do
     it "can authorize with valid user/pass" do
       VCR.use_cassette("storage/v1/auth") do
+        valid_ucloud.is_authorized?.should_not == true
         valid_ucloud.authorize.should == true
         valid_ucloud.storage_url.should_not be_nil
         valid_ucloud.auth_token.should_not be_nil
+        valid_ucloud.is_authorized?.should == true
       end
     end
 
@@ -157,4 +159,23 @@ describe UcloudStorage do
       end
     end
   end
+
+  describe "#exist" do
+    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
+        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
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucloud_storage
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70267624686700 !ruby/object:Gem::Requirement
+  requirement: &70357224523380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267624686700
+  version_requirements: *70357224523380
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70267624686280 !ruby/object:Gem::Requirement
+  requirement: &70357224522960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267624686280
+  version_requirements: *70357224522960
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70267624685860 !ruby/object:Gem::Requirement
+  requirement: &70357224522540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267624685860
+  version_requirements: *70357224522540
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70267624685440 !ruby/object:Gem::Requirement
+  requirement: &70357224538500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267624685440
+  version_requirements: *70357224538500
 description: ucloud storage API
 email:
 - wangsy@wangsy.com