swift_client 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f508dc3170899b3d306bf359c0d2df09edf0a694
-  data.tar.gz: a2ec9c73c26ca3ba8d7eb4b374d3d6c92acfb7d2
+  metadata.gz: fccb39365e39660b890e410ee46cf56f7b7bcbe5
+  data.tar.gz: d2aad7789aed1011afcdea3f986c30499254bf06
 SHA512:
-  metadata.gz: 79cdf304996ef393d92c032d0da81ed9cb57c0cb8c17b3262f6854b722140293075202a3b7b6bc1b8d4049d137ab52d1a6dc9ac51504447b1ed44bca7d47d81f
-  data.tar.gz: ad166b66f8aa123e6a8ceda6d5acab0125a50034f20347af008cded08b00e4f0b5e35bf660110ae694bb46364f51bdeddc357b481494f21cad76b548d6307b1d
+  metadata.gz: d7b6aaf0e442f0a1f594333e86c6850d94c3e934746c98e588d5714fdbedaa72e92eae795e0df4389d7d8c5a739830f9be71272e9e73dff562c399f9f575383d
+  data.tar.gz: 27c8cbceabbb49bf1a000f80af014e0b22117e2813829d26dc22ef30cd3a63c4280fd7516cb0f1111ff75f36a80f4f402cd65c112385440c3e5b97ed99bf66e9

data/.travis.yml

@@ -1,9 +1,8 @@
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.7
-  - 2.2.3
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
 
 install:
   - "travis_retry bundle install"

data/README.md

@@ -126,28 +126,28 @@ access the response body and JSON response. Checkout the
 
 SwiftClient offers the following requests:
 
-* head_account -> HTTParty::Response
-* post_account(headers = {}) -> HTTParty::Response
-* head_containers -> HTTParty::Response
-* get_containers(query = {}) -> HTTParty::Response
-* paginate_containers(query = {}) -> Enumerator
-* get_container(container_name, query = {}) -> HTTParty::Response
-* paginate_container(container_name, query = {}) -> Enumerator
-* head_container(container_name) -> HTTParty::Response
-* put_container(container_name, headers = {}) -> HTTParty::Response
-* post_container(container_name, headers = {}) -> HTTParty::Response
-* delete_container(container_name) -> HTTParty::Response
-* put_object(object_name, data_or_io, container_name, headers = {}) -> HTTParty::Response
-* post_object(object_name, container_name, headers = {}) -> HTTParty::Response
-* get_object(object_name, container_name) -> HTTParty::Response
-* get_object(object_name, container_name){|chunk| save chunk } -> HTTParty::Response
-* head_object(object_name, container_name) -> HTTParty::Response
-* delete_object(object_name, container_name) -> HTTParty::Response
-* get_objects(container_name, query = {}) -> HTTParty::Response
-* paginate_objects(container_name, query = {}) -> Enumerator
+* 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) -> entries
+* bulk_delete(entries, options = {}) -> entries
 
 ### 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

@@ -37,61 +37,61 @@ class SwiftClient
     authenticate
   end
 
-  def head_account
-    request :head, "/"
+  def head_account(options = {})
+    request :head, "/", options
   end
 
-  def post_account(headers = {})
-    request :post, "/", :headers => headers
+  def post_account(headers = {}, options = {})
+    request :post, "/", options.merge(:headers => headers)
   end
 
-  def head_containers
-    request :head, "/"
+  def head_containers(options = {})
+    request :head, "/", options
   end
 
-  def get_containers(query = {})
-    request :get, "/", :query => query
+  def get_containers(query = {}, options = {})
+    request :get, "/", options.merge(:query => query)
   end
 
-  def paginate_containers(query = {}, &block)
-    paginate :get_containers, query, &block
+  def paginate_containers(query = {}, options = {}, &block)
+    paginate(:get_containers, query, options, &block)
   end
 
-  def get_container(container_name, query = {})
+  def get_container(container_name, query = {}, options = {})
     raise(EmptyNameError) if container_name.empty?
 
-    request :get, "/#{container_name}", :query => query
+    request :get, "/#{container_name}", options.merge(:query => query)
   end
 
-  def paginate_container(container_name, query = {}, &block)
-    paginate :get_container, container_name, query, &block
+  def paginate_container(container_name, query = {}, options = {}, &block)
+    paginate(:get_container, container_name, query, options, &block)
   end
 
-  def head_container(container_name)
+  def head_container(container_name, options = {})
     raise(EmptyNameError) if container_name.empty?
 
-    request :head, "/#{container_name}"
+    request :head, "/#{container_name}", options
   end
 
-  def put_container(container_name, headers = {})
+  def put_container(container_name, headers = {}, options = {})
     raise(EmptyNameError) if container_name.empty?
 
-    request :put, "/#{container_name}", :headers => headers
+    request :put, "/#{container_name}", options.merge(:headers => headers)
   end
 
-  def post_container(container_name, headers = {})
+  def post_container(container_name, headers = {}, options = {})
     raise(EmptyNameError) if container_name.empty?
 
-    request :post, "/#{container_name}", :headers => headers
+    request :post, "/#{container_name}", options.merge(:headers => headers)
   end
 
-  def delete_container(container_name)
+  def delete_container(container_name, options = {})
     raise(EmptyNameError) if container_name.empty?
 
-    request :delete, "/#{container_name}"
+    request :delete, "/#{container_name}", options
   end
 
-  def put_object(object_name, data_or_io, container_name, headers = {})
+  def put_object(object_name, data_or_io, container_name, headers = {}, options = {})
     raise(EmptyNameError) if object_name.empty? || container_name.empty?
 
     mime_type = MIME::Types.of(object_name).first
@@ -105,41 +105,41 @@ class SwiftClient
 
     extended_headers["Transfer-Encoding"] = "chunked"
 
-    request :put, "/#{container_name}/#{object_name}", :body_stream => data_or_io.respond_to?(:read) ? data_or_io : StringIO.new(data_or_io), :headers => extended_headers
+    request :put, "/#{container_name}/#{object_name}", options.merge(:body_stream => data_or_io.respond_to?(:read) ? data_or_io : StringIO.new(data_or_io), :headers => extended_headers)
   end
 
-  def post_object(object_name, container_name, headers = {})
+  def post_object(object_name, container_name, headers = {}, options = {})
     raise(EmptyNameError) if object_name.empty? || container_name.empty?
 
-    request :post, "/#{container_name}/#{object_name}", :headers => headers
+    request :post, "/#{container_name}/#{object_name}", options.merge(:headers => headers)
   end
 
-  def get_object(object_name, container_name, &block)
+  def get_object(object_name, container_name, options = {}, &block)
     raise(EmptyNameError) if object_name.empty? || container_name.empty?
 
-    request(:get, "/#{container_name}/#{object_name}", block ? { :stream_body => true } : {}, &block)
+    request(:get, "/#{container_name}/#{object_name}", options.merge(block ? { :stream_body => true } : {}), &block)
   end
 
-  def head_object(object_name, container_name)
+  def head_object(object_name, container_name, options = {})
     raise(EmptyNameError) if object_name.empty? || container_name.empty?
 
-    request :head, "/#{container_name}/#{object_name}"
+    request :head, "/#{container_name}/#{object_name}", options
   end
 
-  def delete_object(object_name, container_name)
+  def delete_object(object_name, container_name, options = {})
     raise(EmptyNameError) if object_name.empty? || container_name.empty?
 
-    request :delete, "/#{container_name}/#{object_name}"
+    request :delete, "/#{container_name}/#{object_name}", options
   end
 
-  def get_objects(container_name, query = {})
+  def get_objects(container_name, query = {}, options = {})
     raise(EmptyNameError) if container_name.empty?
 
-    request :get, "/#{container_name}", :query => query
+    request :get, "/#{container_name}", options.merge(:query => query)
   end
 
-  def paginate_objects(container_name, query = {}, &block)
-    paginate :get_objects, container_name, query, &block
+  def paginate_objects(container_name, query = {}, options = {}, &block)
+    paginate(:get_objects, container_name, query, options, &block)
   end
 
   def public_url(object_name, container_name)
@@ -160,9 +160,9 @@ class SwiftClient
     "#{storage_url}/#{container_name}/#{object_name}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
   end
 
-  def bulk_delete(items)
+  def bulk_delete(items, options = {})
     items.each_slice(1_000) do |slice|
-      request :delete, "/?bulk-delete", :body => slice.join("\n"), :headers => { "Content-Type" => "text/plain" }
+      request :delete, "/?bulk-delete", options.merge(:body => slice.join("\n"), :headers => { "Content-Type" => "text/plain" })
     end
 
     items
@@ -341,13 +341,13 @@ class SwiftClient
     swift_endpoint["url"]
   end
 
-  def paginate(method, *args, query)
-    return enum_for(:paginate, method, *args, query) unless block_given?
+  def paginate(method, *args, query, options)
+    return enum_for(:paginate, method, *args, query, options) unless block_given?
 
     marker = nil
 
     loop do
-      response = send(method, *args, marker ? query.merge(:marker => marker) : query)
+      response = send(method, *args, marker ? query.merge(:marker => marker) : query, options)
 
       return if response.parsed_response.empty?
 

data/lib/swift_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift_client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty