rabbit_swift 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c37548a68abd10e6c91148b593fd63cdb86ca6
-  data.tar.gz: 3152c7bfa55fa4afac0fdb60bdff9c23033f751e
+  metadata.gz: 1ecd97e29955444c2365dc1500a1078253454efc
+  data.tar.gz: e36ef4e5bc5a2c7c53eb029d1886806df7a9221e
 SHA512:
-  metadata.gz: 1fb9190cc15001876e1834118d6ca607e655a2cf88dfbf920fb95ce52160bf77a2ff9505cd62fc66f7f5d3f6d8b0e45bbf91d8561542275051542cc342a3d2ff
-  data.tar.gz: efe1acf209767db3abf169a8e79590e7ce194847b3e22e5b150ce3d93caa47ad5d5cb84f96944b6365ba473ec9c65979e6587b8057a5ad6601fd9c855be4185e
+  metadata.gz: 9db3dd8e17ae2cd2be533ee9d788dcc68aaed1446c38115af9eb590840fcc2a92d93f244d98babc0498f40a766de423691a1906c57e3065ada9a57325712b7e4
+  data.tar.gz: 8d19c17c4efac7fe87771cc307430ea9835459a93f5a5bcd3b235e3d17edbdc9ea168af5fcc8246c31d9722c69e54156484e330163b2cc2c87248e04d8736199

data/README.md

@@ -1,6 +1,6 @@
 # RabbitSwift
 
-OpenStack Swift Simple Client
+OpenStack Object Storage (Swift) Client
 
 ## Installation
 
@@ -52,11 +52,14 @@ Or install it yourself as:
 
 ### Support Static Large Object
 
-#### When upload object size 5BG over. Auto change mode SLO
+#### SLO Object Download Support
+    rabbit_swift_client.get_object(token, url) --> enable SLO object download
+
+#### When upload object size 5GB over. Auto change mode SLO
     rabbit_swift_client.upload(token, dest_url, 5GB_under_file.zip) --> normal upload
     rabbit_swift_client.upload(token, dest_url, 5GB_over_file.zip) --> static large object upload
 
-#### SLO Flow
+#### SLO Upload Flow
 1. split file
 2. upload split files
 3. upload manifest file

data/RELEASE.md

@@ -1,5 +1,11 @@
 # リリース履歴
 
+## 0.3.4
+
+(2015/02/20)
+
+Support SLO Download
+
 ## 0.3.3
 
 (2015/02/19)

data/bin/get_object.rb

@@ -27,10 +27,18 @@ File.open conf_path do |file|
   end
 end
 
+# TODO
+def decode_large_object_md5(encode_md5)
+  encode_md5.gsub(/\"/,'')
+end
+
 rabbit_swift_client = RabbitSwift::Client.new(swift_conf_json)
 token = rabbit_swift_client.get_token
 response = rabbit_swift_client.head(token, url)
 
+is_large_object = response.has_key?('X-Static-Large-Object') ? true : false
+original_file_size = response['Content-Length']
+
 response.each do |k, v|
   puts k + ' = '+ v
 end
@@ -39,13 +47,32 @@ original_file_md5 = response['Etag']
 
 save_file_path = rabbit_swift_client.get_object(token, url, dest_path)
 puts save_file_path
-save_file_md5 = Digest::MD5.file(save_file_path).to_s
 
-puts original_file_md5 + ' --> original_file_md5'
-puts save_file_md5 + ' --> save_file_md5'
+#ref SLO md5 https://github.com/openstack/python-swiftclient/blob/06c73c6020e5af873e3ce245a27035da3448de7b/swiftclient/service.py#L330
+# self._expected_etag: ヘッダーのEtag
+# 保存したファイルのmd5 self._actual_md5
 
-if original_file_md5 == save_file_md5
-  puts 'OK! MD5 checksum'
+save_file_size = File.size(save_file_path)
+puts original_file_size + ' --> original_file_size'
+puts save_file_size.to_s + ' --> save_file_size'
+
+if original_file_size.to_i == save_file_size
+  puts 'OK! file size'
 else
-  puts 'BAD MD5 checksum  ><'
-end
+  puts 'BAD file size  ><'
+end
+
+
+#when SLO don't check md5. check file size
+if (!is_large_object)
+  save_file_md5 = Digest::MD5.file(save_file_path).to_s
+  puts original_file_md5 + ' --> original_file_md5'
+  puts save_file_md5 + ' --> save_file_md5'
+
+  if original_file_md5 == save_file_md5
+    puts 'OK! MD5 checksum'
+  else
+    puts 'BAD MD5 checksum  ><'
+  end
+end
+

data/lib/rabbit_swift/client.rb

@@ -10,8 +10,8 @@ module RabbitSwift
 
   class Client
 
-    UPLOAD_SUCCESS_HTTP_STATUS_CODE = 201
     HEAD_SUCCESS_HTTP_STATUS_CODE = 200
+    UPLOAD_SUCCESS_HTTP_STATUS_CODE = 201
     DELETE_SUCCESS_HTTP_STATUS_CODE = 204
 
     @token = nil
@@ -80,28 +80,6 @@ module RabbitSwift
       dest_file
     end
 
-    # TODO
-    def get_static_large_object(token, url, dest_folder = nil)
-      auth_header = {
-          'X-Auth-Token' => token
-      }
-      query = {
-          'format' => 'json'
-      }
-    end
-
-    def list(token, url)
-      auth_header = {
-          'X-Auth-Token' => token
-      }
-      query = {
-          'format' => 'json'
-      }
-      http_client = HTTPClient.new
-      response = http_client.get(URI.parse(URI.encode(url)), query, auth_header)
-      JSON.load(response.body)
-    end
-
     def get_meta_data(token, url)
       response = head(token, url)
       meta_data = {}

data/lib/rabbit_swift/version.rb

@@ -1,3 +1,3 @@
 module RabbitSwift
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_swift
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - AKB428