swift_client 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 44973422875ba91bde545267d984f7ad5ce67f5f
+  data.tar.gz: 044594bc8d651dde398221808252ba417a1292bf
+SHA512:
+  metadata.gz: 51f7033388ebd75a8f83d62900880cd5de518ad08e94fd9c64e8420a8ca0d24eb3e41fc29fa96d4dff4001c2b88ed79831f733fb2b1da80245cc01ceb446c5a1
+  data.tar.gz: 5a5199435b62f2b318aacf1728150894d0a242adc8030a167d22b25656c5a925a5472242768b633164359133a346de9d26852b6f221bc551ab4e402d0f259e6c

data/README.md

@@ -28,17 +28,64 @@ Or install it yourself as:
 First, connect to a Swift cluster:
 
 ```ruby
-swift_client = SwiftClient.new(:auth_url => "https://example.com/auth/v1.0", :username => "account:username", :api_key => "api key", :temp_url_key => "temp url key", :storage_url => "https://example.com/v1/AUTH_account")
+swift_client = SwiftClient.new(
+  :auth_url => "https://example.com/auth/v1.0",
+  :username => "account:username",
+  :api_key => "api key",
+  :temp_url_key => "temp url key",
+  :storage_url => "https://example.com/v1/AUTH_account"
+)
 ```
 
 To connect via v2 you have to add version and method specific details:
 
 ```ruby
-swift_client = SwiftClient.new(:auth_url => "https://auth.example.com/v2.0", :storage_url => "https://storage.example.com/v1/AUTH_account", :tenant_name => "tenant", :username => "username", :password => "password")
+swift_client = SwiftClient.new(
+  :auth_url => "https://auth.example.com/v2.0",
+  :storage_url => "https://storage.example.com/v1/AUTH_account",
+  :tenant_name => "tenant",
+  :username => "username",
+  :password => "password"
+)
 
 # OR
 
-swift_client = SwiftClient.new(:auth_url => "https://auth.example.com/v2.0", :storage_url => "https://storage.example.com/v1/AUTH_account", :tenant_name => "tenant", :access_key => "access key", :secret_key => "secret key")
+swift_client = SwiftClient.new(
+  :auth_url => "https://auth.example.com/v2.0",
+  :storage_url => "https://storage.example.com/v1/AUTH_account",
+  :tenant_name => "tenant",
+  :access_key => "access key",
+  :secret_key => "secret key"
+)
+```
+
+To connect via v3:
+
+```ruby
+swift_client = SwiftClient.new(
+  :auth_url => "https://auth.example.com/v3",
+  :storage_url => "https://storage.example.com/v1/AUTH_account",
+  :username => "username",
+  :password => "password",
+  :domain => "example.com" # :domain_id => "..." is valid as well
+)
+
+# OR
+
+swift_client = SwiftClient.new(
+  :auth_url => "https://auth.example.com/v3",
+  :storage_url => "https://storage.example.com/v1/AUTH_account",
+  :user_id => "user id",
+  :password => "password"
+)
+
+# OR
+
+swift_client = SwiftClient.new(
+  :auth_url => "https://auth.example.com/v3",
+  :storage_url => "https://storage.example.com/v1/AUTH_account",
+  :token => "token"
+)
 ```
 
 where `temp_url_key` and `storage_url` are optional.

data/lib/swift_client.rb

@@ -185,7 +185,10 @@ class SwiftClient
   end
 
   def authenticate
-    options[:auth_url] =~ /v2/ ? authenticate_v2 : authenticate_v1
+    return authenticate_v3 if options[:auth_url] =~ /v3/
+    return authenticate_v2 if options[:auth_url] =~ /v2/
+
+    authenticate_v1
   end
 
   def authenticate_v1
@@ -230,6 +233,35 @@ class SwiftClient
     self.storage_url = options[:storage_url]
   end
 
+  def authenticate_v3
+    [:auth_url, :storage_url].each do |key|
+      raise(AuthenticationError, "#{key} missing") unless options[key]
+    end
+
+    auth = { "auth" => { "identity" => {} } }
+
+    if options[:username] && options[:password] && (options[:domain] || options[:domain_id])
+      auth["auth"]["identity"]["methods"] = ["password"]
+      auth["auth"]["identity"]["password"] = { "user" => { "name" => options[:username], "password" => options[:password] } }
+      auth["auth"]["identity"]["password"]["user"]["domain"] = options[:domain] ? { "name" => options[:domain] } : { "id" => options[:domain_id] }
+    elsif options[:user_id] && options[:password]
+      auth["auth"]["identity"]["methods"] = ["password"]
+      auth["auth"]["identity"]["password"] = { "user" => { "id" => options[:user_id], "password" => options[:password] } }
+    elsif options[:token]
+      auth["auth"]["identity"]["methods"] = ["token"]
+      auth["auth"]["identity"]["token"] = { "id" => options[:token] }
+    else
+      raise AuthenticationError, "Unknown authentication method"
+    end
+
+    response = HTTParty.post("#{options[:auth_url].gsub(/\/+$/, "")}/auth/tokens", :body => JSON.dump(auth), :headers => { "Content-Type" => "application/json" })
+
+    raise(AuthenticationError, "#{response.code}: #{response.message}") unless response.success?
+
+    self.auth_token = response.headers["X-Subject-Token"]
+    self.storage_url = options[:storage_url]
+  end
+
   def paginate(method, *args, query)
     return enum_for(:paginate, method, *args, query) unless block_given?
 

data/lib/swift_client/version.rb

@@ -1,5 +1,5 @@
 
 class SwiftClient
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 

data/test/swift_client_test.rb

@@ -11,6 +11,24 @@ class SwiftClientTest < MiniTest::Test
     assert_equal "https://example.com/v1/AUTH_account", @swift_client.storage_url
   end
 
+  def test_v3_authentication_with_password
+    stub_request(:post, "https://auth.example.com/v3/auth/tokens").with(:body => JSON.dump("auth" => { "identity" => { "methods" => ["password"], "password" => { "user" => { "name" => "username", "password" => "secret", "domain" => { "name" => "example.com" }}}}})).to_return(:status => 200, :body => JSON.dump("token" => "..."), :headers => { "X-Subject-Token" => "Token", "Content-Type" => "application/json" })
+
+    @swift_client = SwiftClient.new(:storage_url => "https://example.com/v1/AUTH_account", :auth_url => "https://auth.example.com/v3", :username => "username", :domain => "example.com", :password => "secret")
+
+    assert_equal "Token", @swift_client.auth_token
+    assert_equal "https://example.com/v1/AUTH_account", @swift_client.storage_url
+  end
+
+  def test_v3_authentication_with_token
+    stub_request(:post, "https://auth.example.com/v3/auth/tokens").with(:body => JSON.dump("auth" => { "identity" => { "methods" => ["token"], "token" => { "id" => "Token" }}})).to_return(:status => 200, :body => JSON.dump("token" => "..."), :headers => { "X-Subject-Token" => "Token", "Content-Type" => "application/json" })
+
+    @swift_client = SwiftClient.new(:storage_url => "https://example.com/v1/AUTH_account", :auth_url => "https://auth.example.com/v3", :token => "Token")
+
+    assert_equal "Token", @swift_client.auth_token
+    assert_equal "https://example.com/v1/AUTH_account", @swift_client.storage_url
+  end
+
   def test_v2_authentication_with_password
     stub_request(:post, "https://auth.example.com/v2.0/tokens").with(:body => JSON.dump("auth" => { "tenantName" => "Tenant", "passwordCredentials" => { "username" => "Username", :password => "Password"  }})).to_return(:status => 200, :body => JSON.dump("access" => { "token" => { "id" => "Token" }}), :headers => { "Content-Type" => "application/json" })
 

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: swift_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Small but powerful client to interact with OpenStack Swift
@@ -114,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,27 +115,26 @@ files:
 homepage: https://github.com/mrkamel/swift_client
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Small but powerful client to interact with OpenStack Swift
 test_files:
 - test/swift_client_test.rb