rabbit_swift 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527be709e835fa8da3431235de1c117f3bbeb11c
-  data.tar.gz: 95c6d1999fe6249eb0f97b9f4151048bd052714f
+  metadata.gz: 310e813c8e2dc70e79b4bf224cbcdd7d99907afd
+  data.tar.gz: da83c59fb0ac14e5d9c96e8d4f9086187c96af48
 SHA512:
-  metadata.gz: 556fea58858f6a5297da232d91e8640bac5fe8a5a6e1694d7fd3d2e1818843d6cb32b7d595e49a9c116ffb822a34954ba0a8c62d15ecc26d3ee63a1e4e215083
-  data.tar.gz: c52235940362a4119f5ea09787e7cec13adfd964e256dab4de56274ed07e490fddfd437b1c7f93de9e78b57e848b780f7f087eaa296d5efa301295587a9c3411
+  metadata.gz: 3c827b038e9d582d1c2474ddf1d700d2804baaf758f78e0fb830b6c0b90491811ea155d98f8cb75b419b6516ede821ec7ceeb57d41d54fc5fcfcdafe24f94e74
+  data.tar.gz: ec60ed8e2800ed2898cd18ea2b240bcbd22019a4b556e6783c0dff5bc6e5099ef2cadb76dd008fab209fa339dafaac321d5f708f17818400efd1696e03650703

data/README.md

@@ -63,10 +63,9 @@ Or install it yourself as:
 #### SLO Upload Flow
 1. split file
 2. upload split files
-3. create manifest file
+3. create manifest json (to memory)
 4. upload manifest file
-5. delete split files
-6. delete manifest file
+5. delete split file
 
 ### bin utils
 

data/RELEASE.md

@@ -1,5 +1,11 @@
 # リリース履歴
 
+## 0.3.7
+
+(2015/02/22)
+
+Check Original meta md5sum
+
 ## 0.3.6
 
 (2015/02/21)

data/bin/get_object.rb

@@ -44,6 +44,9 @@ response.each do |k, v|
 end
 
 original_file_md5 = response['Etag']
+if is_large_object && response.has_key?(RabbitSwift::LargeObject::StaticLargeObject::ORIGINAL_MD5SUM_META_NAME)
+  original_file_md5 = response[RabbitSwift::LargeObject::StaticLargeObject::ORIGINAL_MD5SUM_META_NAME]
+end
 
 save_file_path = rabbit_swift_client.get_object(token, url, dest_path)
 puts save_file_path
@@ -63,8 +66,8 @@ else
 end
 
 
-#when SLO don't check md5. check file size
-if (!is_large_object)
+#when SLO don't check md5.
+if (!is_large_object || response.has_key?(RabbitSwift::LargeObject::StaticLargeObject::ORIGINAL_MD5SUM_META_NAME))
   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'

data/lib/rabbit_swift/client.rb

@@ -192,7 +192,7 @@ module RabbitSwift
       @res.status
     end
 
-    def upload_manifest(token, end_point, dest_container,input_file_path, manifest_json)
+    def upload_manifest(token, end_point, dest_container,input_file_path, manifest_json, original_file_md5sum)
       #相対パスがきた時のために絶対パスに変換
       path_name_obj = Pathname.new(input_file_path);
       file_path = path_name_obj.expand_path.to_s
@@ -208,7 +208,8 @@ module RabbitSwift
             {'X-Auth-Token' => token,
             'X-Object-Manifest' => manifest_path+'_',
             'X-STATIC-LARGE-OBJECT' => true,
-            'Content-Type' => 'application/json'
+            'Content-Type' => 'application/json',
+            LargeObject::StaticLargeObject::ORIGINAL_MD5SUM_META_NAME => original_file_md5sum
             }
       http_client = HTTPClient.new
       url = URI.parse(URI.encode(target_url + '?multipart-manifest=put'))

data/lib/rabbit_swift/large_object/slo_client.rb

@@ -1,9 +1,10 @@
 require 'rabbit_swift'
+require 'digest/md5'
 
 module RabbitSwift::LargeObject
   class Slo_client
 
-    attr_accessor :rabbit_swift_client, :src_path, :dest_path, :original_dest_path, :slo_option
+    attr_accessor :rabbit_swift_client, :src_path, :dest_path, :original_dest_path, :slo_option, :original_file_md5sum
 
     def initialize(rabbit_swift_client, src_path, dest_path, slo_option = {})
       @rabbit_swift_client = rabbit_swift_client
@@ -17,6 +18,7 @@ module RabbitSwift::LargeObject
     end
 
     def upload
+      original_file_md5sum = Digest::MD5.file(src_path).to_s
       if  @slo_option.has_key?('limit_file_size')
         slo = RabbitSwift::LargeObject::StaticLargeObject.new(src_path, dest_path, limit_file_size: @slo_option['limit_file_size'])
       else
@@ -46,7 +48,7 @@ module RabbitSwift::LargeObject
 
       puts "dest_path->" + dest_path
       #マニフェストをアップロード
-      rabbit_swift_client.upload_manifest(token, dest_path, @original_dest_path, @src_path, manifest_json)
+      rabbit_swift_client.upload_manifest(token, dest_path, @original_dest_path, @src_path, manifest_json, original_file_md5sum)
 
       #分割したファイルを削除
       rabbit_file_split.delete_all

data/lib/rabbit_swift/large_object/static_large_object.rb

@@ -6,6 +6,7 @@ module RabbitSwift::LargeObject
   class StaticLargeObject
 
     LIMIT_FILE_SIZE = 5368709120;
+    ORIGINAL_MD5SUM_META_NAME = 'X-Object-Meta-Original-File-Md5sum'
 
     # 参考　http://blog.bit-isle.jp/bird/2013/06/35
     # Swift Server SLO https://github.com/openstack/swift/blob/7a9a0e14b1c6a8f51454379beac95cd594a4193b/swift/common/middleware/slo.py

data/lib/rabbit_swift/version.rb

@@ -1,3 +1,3 @@
 module RabbitSwift
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

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