rabbit_swift 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40453c0bb569cf36739e3e588aa496c8fe592ce4
-  data.tar.gz: 91c5cf152afa701ba8a9b24061aa56ca458cf943
+  metadata.gz: e1e49c09f73b98e10bc709b9cb0db31e84cbefbd
+  data.tar.gz: 96aac88508a67ac50ee2f2e7c6ec219b10f8594f
 SHA512:
-  metadata.gz: 6897f80baf48d5a1b3280f0869e4aa27f01f65e9f58beae0a1ea80caf6470b11de72edfc3b5a8514b141151545bd74bd8387ed3fab8ee614ff9236073ce1acce
-  data.tar.gz: 6021a40edede3fdf5478c853a32f1a611be3c49addf9edc44f1551008fb2e1e50aca75315eef7baf9115a8f0bdb4c74f6087fa3c96955ee2d8c089e230bc983e
+  metadata.gz: dc0c1041288b70f9ac230706514f484fb9372479dce680789c1349878e59565d3456943d725dd736b37e5b6af202627f41ee083bdfb1f4e853e549f1379619cd
+  data.tar.gz: d2246f44b780eacd509780471501570f0ed3be62b8a72ec4e1dd01fda1f74f8368cbfa7be565c776f0fe01301691de41e03ef2499a28782711bf2fbdb17805de

data/README.md

@@ -25,7 +25,8 @@ Or install it yourself as:
 ```
    swift_conf = {
      auth_url: "https://ident-r1nd9999.cnode.jp/v2.0/tokens",
-     tenantName: "1234567",
+     tenantName: "1234567", // Conoha Swift V1
+     tenantId: "1234567", // Conoha Swift V2
      username: "chino",
      password: "password",
      endPoint: "https://objectstore.node.jp/v1/77777777"

data/lib/rabbit_swift/client.rb

@@ -19,6 +19,7 @@ module RabbitSwift
     def initialize(opt)
       @auth_url = opt['auth_url']
       @tenantName = opt['tenantName']
+      @tenantId = opt['tenantId']
       @username = opt['username']
       @password = opt['password']
       @send_timeout = opt['send_timeout'];
@@ -35,6 +36,9 @@ module RabbitSwift
       body =  build_auth_json
 
       http_client = HTTPClient.new
+
+      p @auth_url
+      p body
 	
       response = http_client.post_content(@auth_url, body, 'Content-Type' => 'application/json')
       response_json_body = JSON.load(response)
@@ -224,14 +228,15 @@ module RabbitSwift
 
     def build_auth_json
       auth_json = {
-          auth: {
-              #tenantName: @tenantName,
-              passwordCredentials: {
-                  username: @username,
-                  password: @password
+          'auth' =>  {
+              'passwordCredentials' =>  {
+                  'username' => @username,
+                  'password' =>  @password
               }
           }
       }
+      auth_json['auth']['tenantName'] = @tenantName unless @tenantName.nil?
+      auth_json['auth']['tenantId'] = @tenantId unless @tenantId.nil?
       JSON.dump(auth_json)
     end
 

data/lib/rabbit_swift/version.rb

@@ -1,3 +1,3 @@
 module RabbitSwift
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_swift
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - AKB428
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,3 +134,4 @@ signing_key:
 specification_version: 4
 summary: OpenStack Swift Simple Client
 test_files: []
+has_rdoc: