rabbit_swift 0.0.10 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b42ed9e980fd09c329392326aab8701273a6059
-  data.tar.gz: ef8f99157a20b4f50410487154b2d53bd838d3eb
+  metadata.gz: 9a931fba1da7d6d3395b7d1ba340e42f32d4c965
+  data.tar.gz: c3c3429f8a926f5ac06573ca881054fab6abe416
 SHA512:
-  metadata.gz: bbe71465ee11813dc788cb4a4cfaa77daecc4407814b070e5b5e9e787c1eaf2feb3c89e95e7b142d80f93c8d76da3ec3c6969a0a39aa023fde61aa9dc80571ef
-  data.tar.gz: 3c62cf5c6802706ff930863ac4d342af01d253ece14304e31c1c4398b9b3adcb5a19cabbc31b8cac5b5f1a7974cf6a636e90ae22fa9f11a75f0afe17e6cd7d82
+  metadata.gz: ee1d0ea09abf06eb4bbd3ae093fbde449508a40164120bc3caade604183cec73cd9702228c011deffa48fc76da9c10f98a0a74159a18d3667ba3f672b35a716c
+  data.tar.gz: 1906a96b09bef23f71cfc26a3b4623cb0bd9a3dc980280488c6e3525e584f12c851179d5132b8df7c32ccab3658aaa28a17f1bfa06bf2f96251044706f1b4723

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rabbit_swift.gemspec
 gemspec
+gem 'httpclient'
+gem 'mime-types'

data/lib/rabbit_swift/client.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'json'
 require 'httpclient'
 require 'pathname'
+require 'mime/types'
 
 module RabbitSwift
 
@@ -33,13 +34,14 @@ module RabbitSwift
 
     # curl -i -X PUT -H "X-Auth-Token: トークン" オブジェクトストレージエンドポイント/コンテナ名/ -T オブジェクトへのパス
     def upload(token, end_point, input_file_path)
-      auth_header = {
-          'X-Auth-Token' => token
-      }
-      auth_header['X-Web-Mode'] = 'true' if @web_mode
       #相対パスがきた時のために絶対パスに変換
       path_name_obj = Pathname.new(input_file_path);
       file_path = path_name_obj.expand_path.to_s
+      auth_header = {
+          'X-Auth-Token' => token,
+          'Content-Type' => MIME::Types.type_for(file_path)[0].to_s
+      }
+      auth_header['X-Web-Mode'] = 'true' if @web_mode
 
       http_client = HTTPClient.new
       http_client.send_timeout = @send_timeout.to_i unless(@send_timeout.nil?)
@@ -49,9 +51,14 @@ module RabbitSwift
       puts 'upload_url -> ' + target_url
 
       if File::ftype(file_path) == 'directory'
-        auth_header['Content-Type'] = 'application/directory'
         auth_header['Content-Length'] = 0
+        if @web_mode
+          auth_header['X-Container-Read'] = '.r:*,.rlistings'
+          auth_header['X-Container-Meta-Web-Listings-CSS'] = 'listing.css'
+        end
+        
         @res = http_client.put(URI.parse(URI.encode(target_url)), file_path, auth_header)
+        p @res
         if @res.status == UPLOAD_SUCCESS_HTTP_STATUS_CODE
           Dir::foreach(file_path) {|f|
             next if (f == '.' || f == '..')
@@ -66,6 +73,7 @@ module RabbitSwift
         end
       else
         File.open(file_path) do |file|
+          p auth_header
           @res = http_client.put(URI.parse(URI.encode(target_url)), file, auth_header)
         end
       end

data/lib/rabbit_swift/version.rb

@@ -1,3 +1,3 @@
 module RabbitSwift
-  VERSION = "0.0.10"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_swift
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.1
 platform: ruby
 authors:
 - AKB428
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler