rabbit_swift 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804ffd4e738e1d57034cb48fb80a41af300bd32f
-  data.tar.gz: 746ea1d0eeecfeb9c604d03dd02550a67af51f81
+  metadata.gz: 39963e45fd183eca61bb3ab443a8ef18c396424c
+  data.tar.gz: 50a027e4738e68276e808ac6e8f4a47d96450253
 SHA512:
-  metadata.gz: bb14f293bc65e9657de5223d91f17c00aa4897d9636893190f2651e67750b602f9ddeff8d11b817f24b719e8fc47a2fe85eafe66428efbc567f36e63f81f2c9a
-  data.tar.gz: 7cb7cc62070f02818aff6fdea47b35b5b881e1db07fa495812cdeb5a1c04fe907fac68071d83f1b5d32897ea324d9b6f9529d8c5da6b1968fcbcdab7b001c4ba
+  metadata.gz: f1644fae715b829e70220ac574243ec3ed3f49aa7eba2dcf678e3ad6f0c053f0d5ace0b1e05e00e649d2c5251667e11613ea7974570d61c6296a12105185d77a
+  data.tar.gz: f5a03d16eff1ffb8e9b8aade26fa3712ac81cfa313fa0a00eb9f1ba023a18c15f6ffc2098e41add1e914c8790731452e6ba9d56f32932946f12f3996930766a8

data/README.md

@@ -47,6 +47,17 @@ Or install it yourself as:
     end 
     
 ### Support Static Large Object
+
+#### When object size 5BG 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
+1. split File
+2. upload split files
+3. upload manifest file
+
+#### SLO Client
     bundle exec ruby -I./lib bin/slo_client.rb -s ~/Downloads/test.zip -d /test -c ../chino/conf/conf.json -l 100MB
 
 ## Contributing

data/RELEASE.md

@@ -1,5 +1,12 @@
 # リリース履歴
 
+## 0.3.1
+
+(2015/02/15)
+
+Static Large Object (α3)
+Auto SLO Mode
+
 ## 0.3.0
 
 (2015/02/15)

data/bin/slo_client.rb

@@ -5,6 +5,7 @@ require 'rabbit_swift'
 #ruby -I./lib/ this.rb
 #bundle exec ruby -I./lib bin/slo_client.rb -s ~/Downloads/test.zip -d /test -c ../chino/conf/conf.json -l 1048576
 #bundle exec ruby -I./lib bin/slo_client.rb -s ~/Downloads/test.zip -d /test -c ../chino/conf/conf.json -l 100MB
+#bundle exec ruby -I./lib bin/slo_client.rb -s ~/MBA_Grahics/mba2/1423672249367.jpg -d /test -c ../chino/conf/conf.json -l 100KB
 
 =begin
 -c conf.json
@@ -25,73 +26,24 @@ Version = '1.0.0'
 src_path = nil
 dest_path = nil
 conf_path = nil
-limit_file_size = nil
+slo_option = {}
+swift_conf_json = {}
 opt.on('-s SRC_PATH', 'src_file_path') {|v| src_path = v}
 opt.on('-d DEST_PATH', 'dest_path') {|v| dest_path = v}
 opt.on('-c CONF_PATH', 'conf_path') {|v| conf_path = v}
-opt.on('-l LIMIT_BYTE', 'limit_file_size') {|v| limit_file_size = v}
+opt.on('-l LIMIT_BYTE', 'limit_file_size') {|v| slo_option['limit_file_size'] = v}
 opt.parse!(ARGV)
 
 
-class Slo_client
-
-  attr_accessor :src_path, :dest_path, :conf_path, :swift, :token, :limit_file_size, :original_dest_path
-
-  def initialize(src_path, dest_path, conf_path, send_timeout: 7200, limit_file_size:  RabbitSwift::LargeObject::StaticLargeObject::LIMIT_FILE_SIZE)
-    @src_path = src_path
-    @dest_path = dest_path
-    @original_dest_path = dest_path
-    @conf_path = conf_path
-    @limit_file_size = limit_file_size
-    File.open conf_path do |file|
-      conf = JSON.load(file.read)
-      @swift = conf['swift']
-
-      if @dest_path =~ /^\//
-        @dest_path = @swift['endPoint'] + dest_path
-      end
-    end
-
-    @swift['send_timeout'] = send_timeout
-  end
-
-  def upload
-    slo = RabbitSwift::LargeObject::StaticLargeObject.new(src_path, dest_path, limit_file_size: @limit_file_size)
-
-    # (指定されたファイルサイズ単位で)ファイルを分割する
-    rabbit_file_split = slo.split
-    # JSONマニフェストファイルをつくる
-    manifest_json = slo.create_manifest_list(rabbit_file_split.file_list)
-    puts manifest_json
-
-    rabbit_swift_client = RabbitSwift::Client.new(@swift)
-    @token = rabbit_swift_client.get_token
-    puts 'token -> ' + token
-
-    #ファイルを全てアップロード(with etag)
-    rabbit_file_split.file_list.each do |file_path|
-      status = rabbit_swift_client.upload(token, dest_path, file_path)
-      puts file_path
-      puts 'http_status -> ' + status.to_s
-      if (status == RabbitSwift::Client::UPLOAD_SUCCESS_HTTP_STATUS_CODE)
-        puts 'upload OK'
-      else
-        puts 'upload NG'
-        return
-      end
-    end
-
-    puts "dest_path->" + dest_path
-    #マニフェストをアップロード
-    rabbit_swift_client.upload_manifest(token, dest_path, @original_dest_path, @src_path, manifest_json)
-
-    #分割したファイルを削除
-    rabbit_file_split.delete_all
+File.open conf_path do |file|
+  conf = JSON.load(file.read)
+  swift_conf_json = conf['swift']
 
+  if dest_path =~ /^\//
+    dest_path = swift_conf_json['endPoint'] + dest_path
   end
-
 end
 
+rabbit_swift_client = RabbitSwift::Client.new(swift_conf_json)
 
-slo = Slo_client.new(src_path,dest_path,conf_path, limit_file_size: limit_file_size)
-slo.upload
+RabbitSwift::LargeObject::Slo_client.new(rabbit_swift_client, src_path, dest_path, slo_option).upload

data/lib/rabbit_swift.rb

@@ -1,7 +1,7 @@
 require "rabbit_swift/version"
 require "rabbit_swift/client"
 require "rabbit_swift/large_object/static_large_object"
-
+require "rabbit_swift/large_object/slo_client"
 module RabbitSwift
   # Your code goes here...
 end

data/lib/rabbit_swift/client.rb

@@ -14,6 +14,8 @@ module RabbitSwift
     HEAD_SUCCESS_HTTP_STATUS_CODE = 204
     DELETE_SUCCESS_HTTP_STATUS_CODE = 204
 
+    @token = nil
+
     def initialize(opt)
       @auth_url = opt['auth_url']
       @tenantName = opt['tenantName']
@@ -29,6 +31,7 @@ module RabbitSwift
 
     #curl -i 'https://********.jp/v2.0/tokens' -X POST -H "Content-Type: application/json" -H "Accept: application/json"  -d '{"auth": {"tenantName": "1234567", "passwordCredentials": {"username": "1234567", "password": "************"}}}'
     def get_token
+      return @token if !@token.nil?
       body =  build_auth_json
 
       http_client = HTTPClient.new
@@ -36,7 +39,7 @@ module RabbitSwift
       response = http_client.post_content(@auth_url, body, 'Content-Type' => 'application/json')
       response_json_body = JSON.load(response)
 
-      response_json_body['access']['token']['id']
+      @token = response_json_body['access']['token']['id']
     end
 
     def head(token, url)
@@ -141,9 +144,18 @@ module RabbitSwift
         end
       else
         p auth_header
-        File.open(file_path) do |file|
-          @res = http_client.put(URI.parse(URI.encode(target_url)), file, auth_header)
+
+        if LargeObject::StaticLargeObject.is_over_default_limit_object_size(File.size(file_path))
+          #Auto SLO Mode
+          p File.size(file_path)
+          puts '------ Over limit object size! change Static Large Object Mode. ------- '
+          LargeObject::Slo_client.new(self, input_file_path, end_point).upload
+        else
+          File.open(file_path) do |file|
+            @res = http_client.put(URI.parse(URI.encode(target_url)), file, auth_header)
+          end
         end
+
       end
 
       #p @res

data/lib/rabbit_swift/large_object/slo_client.rb

@@ -0,0 +1,60 @@
+require 'rabbit_swift'
+
+module RabbitSwift::LargeObject
+  class Slo_client
+
+    attr_accessor :rabbit_swift_client, :src_path, :dest_path, :original_dest_path, :slo_option
+
+    def initialize(rabbit_swift_client, src_path, dest_path, slo_option = {})
+      @rabbit_swift_client = rabbit_swift_client
+      @src_path = src_path
+      @dest_path = dest_path
+      #TODO かなり無理があるので改修必要
+      @original_dest_path = dest_path.sub(/https:\/\/.*\/v1\/.*\//, '/')
+
+
+      @slo_option = slo_option
+    end
+
+    def upload
+      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
+        slo = RabbitSwift::LargeObject::StaticLargeObject.new(src_path, dest_path)
+      end
+      # (指定されたファイルサイズ単位で)ファイルを分割する
+      rabbit_file_split = slo.split
+      # JSONマニフェストファイルをつくる
+      manifest_json = slo.create_manifest_list(rabbit_file_split.file_list)
+      puts manifest_json
+
+      token = rabbit_swift_client.get_token
+
+      #TODO with etag
+      #ファイルを全てアップロード
+      rabbit_file_split.file_list.each do |file_path|
+        status = rabbit_swift_client.upload(token, dest_path, file_path)
+        puts file_path
+        puts 'http_status -> ' + status.to_s
+        if (status == RabbitSwift::Client::UPLOAD_SUCCESS_HTTP_STATUS_CODE)
+          puts 'upload OK'
+        else
+          puts 'upload NG'
+          return
+        end
+      end
+
+      puts "dest_path->" + dest_path
+      #マニフェストをアップロード
+      rabbit_swift_client.upload_manifest(token, dest_path, @original_dest_path, @src_path, manifest_json)
+
+      #分割したファイルを削除
+      rabbit_file_split.delete_all
+
+    end
+
+  end
+
+
+
+end

data/lib/rabbit_swift/large_object/static_large_object.rb

@@ -43,7 +43,7 @@ module RabbitSwift::LargeObject
     end
 
     def self.is_over_default_limit_object_size(file_size)
-      LIMIT_FILE_SIZE > file_size
+      LIMIT_FILE_SIZE < file_size
     end
 
   end

data/lib/rabbit_swift/version.rb

@@ -1,3 +1,3 @@
 module RabbitSwift
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_swift
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - AKB428
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - lib/rabbit_swift/account/.gitkeep
 - lib/rabbit_swift/client.rb
 - lib/rabbit_swift/container/.gitkeep
+- lib/rabbit_swift/large_object/slo_client.rb
 - lib/rabbit_swift/large_object/static_large_object.rb
 - lib/rabbit_swift/object/delete.rb
 - lib/rabbit_swift/object/head.rb