swift_client 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fccb39365e39660b890e410ee46cf56f7b7bcbe5
-  data.tar.gz: d2aad7789aed1011afcdea3f986c30499254bf06
+SHA256:
+  metadata.gz: 49eedca7f2dcfc8e50c6d43042dd3783d756e310ceb57a3a186437f4069dab1f
+  data.tar.gz: 11e6e5fa5e5526aa27534f83fe775d223a3af101aa9a25df1101513e6f388faa
 SHA512:
-  metadata.gz: d7b6aaf0e442f0a1f594333e86c6850d94c3e934746c98e588d5714fdbedaa72e92eae795e0df4389d7d8c5a739830f9be71272e9e73dff562c399f9f575383d
-  data.tar.gz: 27c8cbceabbb49bf1a000f80af014e0b22117e2813829d26dc22ef30cd3a63c4280fd7516cb0f1111ff75f36a80f4f402cd65c112385440c3e5b97ed99bf66e9
+  metadata.gz: cc9489387e34d0f90f0e3af89dd52fe542b2af932bca75cf4144216f881d390e7856287d78c261860396c5df3fdad32d9f076a48b259a1d0c2f1e18e612093ed
+  data.tar.gz: 5385bdf725dd8979ae20d2b4a0018a62099c5991b60b5101b1e86d693779c426491f997268379630a80f9447adec03f72168e23ff782e1c7299fd315b5b2d9d9

data/README.md

@@ -101,7 +101,8 @@ 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"
+  :password => "password",
+  :interface => "internal"
 )
 
 # OR
@@ -126,28 +127,29 @@ access the response body and JSON response. Checkout the
 
 SwiftClient offers the following requests:
 
-* head_account(options = {}) -> HTTParty::Response
-* post_account(headers = {}, options = {}) -> HTTParty::Response
-* head_containers(options = {}) -> HTTParty::Response
-* get_containers(query = {}, options = {}) -> HTTParty::Response
-* paginate_containers(query = {}, options = {}) -> Enumerator
-* get_container(container_name, query = {}, options = {}) -> HTTParty::Response
-* paginate_container(container_name, query = {}, options = {}) -> Enumerator
-* head_container(container_name, options = {}) -> HTTParty::Response
-* put_container(container_name, headers = {}, options = {}) -> HTTParty::Response
-* post_container(container_name, headers = {}, options = {}) -> HTTParty::Response
-* delete_container(container_name, options = {}) -> HTTParty::Response
-* put_object(object_name, data_or_io, container_name, headers = {}, options = {}) -> HTTParty::Response
-* post_object(object_name, container_name, headers = {}, options = {}) -> HTTParty::Response
-* get_object(object_name, container_name, options = {}) -> HTTParty::Response
-* get_object(object_name, container_name, options = {}) { |chunk| save chunk } -> HTTParty::Response
-* head_object(object_name, container_name, options = {}) -> HTTParty::Response
-* delete_object(object_name, container_name, options = {}) -> HTTParty::Response
-* get_objects(container_name, query = {}, options = {}) -> HTTParty::Response
-* paginate_objects(container_name, query = {}, options = {}) -> Enumerator
-* public_url(object_name, container_name) -> HTTParty::Response
-* temp_url(object_name, container_name, options = {}) -> HTTParty::Response
-* bulk_delete(entries, options = {}) -> entries
+* `head_account(options = {}) # => HTTParty::Response`
+* `post_account(headers = {}, options = {}) # => HTTParty::Response`
+* `head_containers(options = {}) # => HTTParty::Response`
+* `get_containers(query = {}, options = {}) # => HTTParty::Response`
+* `paginate_containers(query = {}, options = {}) # => Enumerator`
+* `get_container(container_name, query = {}, options = {}) # => HTTParty::Response`
+* `paginate_container(container_name, query = {}, options = {}) # => Enumerator`
+* `head_container(container_name, options = {}) # => HTTParty::Response`
+* `put_container(container_name, headers = {}, options = {}) # => HTTParty::Response`
+* `post_container(container_name, headers = {}, options = {}) # => HTTParty::Response`
+* `delete_container(container_name, options = {}) # => HTTParty::Response`
+* `put_object(object_name, data_or_io, container_name, headers = {}, options = {}) # => HTTParty::Response`
+* `post_object(object_name, container_name, headers = {}, options = {}) # => HTTParty::Response`
+* `get_object(object_name, container_name, options = {}) -> HTTParty::Response`
+* `get_object(object_name, container_name, options = {}) { |chunk| save chunk } # => HTTParty::Response`
+* `head_object(object_name, container_name, options = {}) # => HTTParty::Response`
+* `delete_object(object_name, container_name, options = {}) # => HTTParty::Response`
+* `get_objects(container_name, query = {}, options = {}) # => HTTParty::Response`
+* `paginate_objects(container_name, query = {}, options = {}) # => Enumerator`
+* `public_url(object_name, container_name) # => HTTParty::Response`
+* `temp_url(object_name, container_name, options = {}) # => HTTParty::Response`
+* `bulk_delete(entries, options = {}) # => entries`
+* `post_head(object_name, container_name, _headers = {}, options = {}) # => HTTParty::Response`
 
 ### Getting large objects
 The `get_object` method with out a block is suitable for small objects that easily fit in memory. For larger objects, specify a block to process chunked data as it comes in.

data/lib/swift_client.rb

@@ -126,6 +126,12 @@ class SwiftClient
     request :head, "/#{container_name}/#{object_name}", options
   end
 
+  def post_head(object_name, container_name, _headers = {}, options = {})
+    raise(EmptyNameError) if object_name.empty? || container_name.empty?
+
+    request :post, "/#{container_name}/#{object_name}", options.merge(headers: _headers)
+  end
+
   def delete_object(object_name, container_name, options = {})
     raise(EmptyNameError) if object_name.empty? || container_name.empty?
 
@@ -333,7 +339,8 @@ class SwiftClient
 
     return unless swift_services.size == 1
 
-    swift_endpoints = swift_service["endpoints"].select { |endpoint| endpoint["interface"] == "public" }
+    interface = options[:interface] || "public"
+    swift_endpoints = swift_service["endpoints"].select { |endpoint| endpoint["interface"] == interface }
     swift_endpoint = swift_endpoints.first
 
     return unless swift_endpoints.size == 1

data/lib/swift_client/version.rb

@@ -1,4 +1,4 @@
 
 class SwiftClient
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/test/swift_client_test.rb

@@ -77,6 +77,15 @@ class SwiftClientTest < MiniTest::Test
     assert_equal "https://example.com/v1/AUTH_account", @swift_client.storage_url
   end
 
+  def test_v3_authentication_storage_url_from_catalog_with_multiple_endpoints
+    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" => { "catalog"=> [{ "type" => "object-store", "endpoints" => [{ "interface"=>"public", "url"=> "https://example.com/v1/AUTH_account" }, { "interface"=>"internal", "url"=> "https://example.com/v2/AUTH_account" }] }] }), :headers => { "X-Subject-Token" => "Token", "Content-Type" => "application/json" })
+
+    @swift_client = SwiftClient.new(:auth_url => "https://auth.example.com/v3", :username => "username", :user_domain => "example.com", :password => "secret", :interface => "internal")
+
+    assert_equal "Token", @swift_client.auth_token
+    assert_equal "https://example.com/v2/AUTH_account", @swift_client.storage_url
+  end
+
   def test_v3_authentication_without_storage_url_and_multiple_swifts
     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" => { "catalog"=> [{ "type" => "object-store", "endpoints" => [{ "interface"=>"public", "url"=> "https://example.com/v1/AUTH_account" }] }, { "type" => "object-store", "endpoints" => [{ "interface"=>"public", "url"=> "https://example.com/v1/AUTH_account" }] }] }), :headers => { "X-Subject-Token" => "Token", "Content-Type" => "application/json" })
 
@@ -275,6 +284,12 @@ class SwiftClientTest < MiniTest::Test
     assert_equal 201, @swift_client.post_object("object", "container", "X-Object-Meta-Test" => "Test").code
   end
 
+  def test_post_head
+    stub_request(:post, 'https://example.com/v1/AUTH_account/container/object').with(headers: { 'Accept' => 'application/json', 'X-Auth-Token' => 'Token', 'X-Delete-At' => '1553524860' }).to_return(status: 201, body: '', headers: {})
+
+    assert_equal 201, @swift_client.post_head('object', 'container', 'X-Delete-At' => '1553524860').code
+  end
+
   def test_get_object
     stub_request(:get, "https://example.com/v1/AUTH_account/container/object").with(:headers => { "Accept" => "application/json", "X-Auth-Token" => "Token" }).to_return(:status => 200, :body => "Body", :headers => {})
     block_res = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift_client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Small but powerful client to interact with OpenStack Swift