swift-storage 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da14f122449c3a28046bdde2a55627d9786063b5
-  data.tar.gz: 7c3d4bbdb737640d475d0d5f23c9749db619abb3
+  metadata.gz: 77665fc3b1c075760f657ba0c9e192191c2d7f5c
+  data.tar.gz: 52089eaac7b7ca0f42b9c2bc1cdf0bd61e8daca6
 SHA512:
-  metadata.gz: 445875d4a6c9b8a2bae8723ee8f181a8bf07bc4ad6fe81d6229ca6d69c756a12e893a1580c3a0069f899e6ef7428865d644f29c604b8dbe34c0ab4a03ff8b24b
-  data.tar.gz: 472938b6204624e0ba9797b150f39025ce56a625d2f3e94be781ca51e8f2cbef7f568591c96a0dc123ba212001749b7701cfbc33c4e1d68d26231ac978070670
+  metadata.gz: 735a05bc0ca64009df31ec04dc41702d3b17eb030dfdbb8fd2d23824e9e93423c0f9e528252f39b251b246f0e959affc91411cdd548be820c0bc189b2cb600e2
+  data.tar.gz: a6076078bd7adbed2dbf0bb82fb32428ac356715241859c21b63bfcb64fd2a2422152c615046351729fb40b993ef1b414739b416a5c2634572f0e82789e6137c

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.11
+
+  * Some refactoring
+    [#11](https://github.com/PredicSis/swift-ruby/pull/1)
+    @ArmandPredicSis
+
 ## 0.0.10
 
   * Retry on connection error before giving up

data/lib/swift_storage/account.rb

@@ -1,7 +1,5 @@
 class SwiftStorage::Account < SwiftStorage::Node
-
-  parent_node          :service
-
+  parent_node :service
 
   # Write account meta data
   #
@@ -12,7 +10,7 @@ class SwiftStorage::Account < SwiftStorage::Node
   #
   def write(temp_url_key: nil)
     h = {}
-    h[H::ACCOUNT_TEMP_URL_KEY] = temp_url_key if temp_url_key
+    h[ACCOUNT_TEMP_URL_KEY] = temp_url_key if temp_url_key
 
     request(relative_path, :method => :post, :headers => h)
   end

data/lib/swift_storage/container.rb

@@ -1,16 +1,11 @@
 class SwiftStorage::Container < SwiftStorage::Node
-
-  parent_node          :service
-
+  parent_node :service
+  header_attributes :bytes_used, :object_count
 
   def relative_path
     name
   end
 
-  header_attributes          :bytes_used,
-                             :object_count
-
-
   # Returns the object collection for this container
   #
   # @return [SwiftStorage::ObjectCollection]
@@ -45,8 +40,8 @@ class SwiftStorage::Container < SwiftStorage::Node
     read_acl = read_acl.join(',') if read_acl.respond_to?(:to_ary)
     write_acl = write_acl.join(',') if write_acl.respond_to?(:to_ary)
 
-    h[H::CONTAINER_READ] = read_acl
-    h[H::CONTAINER_WRITE] = write_acl
+    h[CONTAINER_READ] = read_acl
+    h[CONTAINER_WRITE] = write_acl
 
     request(relative_path, :method => :post, :headers => h)
   end
@@ -61,7 +56,4 @@ class SwiftStorage::Container < SwiftStorage::Node
     w = headers.write.split(',') rescue nil
     struct(:read => r, :write => w)
   end
-
-
 end
-

data/lib/swift_storage/container_collection.rb

@@ -1,7 +1,5 @@
 class SwiftStorage::ContainerCollection < SwiftStorage::Node
-
-  parent_node          :service
-
+  parent_node :service
 
   # Return all containers
   #
@@ -28,7 +26,4 @@ class SwiftStorage::ContainerCollection < SwiftStorage::Node
   def [](name)
     SwiftStorage::Container.new(service, name) if name
   end
-
 end
-
-

data/lib/swift_storage/errors.rb

@@ -1,5 +1,4 @@
 module SwiftStorage::Errors
-
   class AuthError < StandardError
   end
 
@@ -11,5 +10,4 @@ module SwiftStorage::Errors
 
   class ForbiddenError < StandardError
   end
-
 end

data/lib/swift_storage/headers.rb

@@ -1,5 +1,4 @@
 module SwiftStorage
-
   module Headers
     STORAGE_URL = 'X-Storage-Url'.freeze
     AUTH_TOKEN = 'X-Auth-Token'.freeze
@@ -20,5 +19,4 @@ module SwiftStorage
     ACCOUNT_TEMP_URL_KEY = 'X-Account-Meta-Temp-URL-Key'.freeze
     DESTINATION = 'Destination'.freeze
   end
-
 end

data/lib/swift_storage/node.rb

@@ -1,9 +1,8 @@
 class SwiftStorage::Node
-
   include SwiftStorage::Utils
+  include SwiftStorage::Headers
 
-  attr_accessor          :parent,
-                         :name
+  attr_accessor :parent, :name
 
   def initialize(parent, name=nil)
     @parent = parent
@@ -90,14 +89,7 @@ class SwiftStorage::Node
   end
 
   def delete
-    # We try a few times, as the swift cluster might need time to get ready
-    3.times do |i|
-      begin
-        return request(relative_path, :method => :delete)
-      rescue SwiftStorage::Errors::ServerError
-        sleep(i**2)
-      end
-    end
+    request(relative_path, :method => :delete)
   end
 
   def delete_if_exists
@@ -106,7 +98,6 @@ class SwiftStorage::Node
     false
   end
 
-
   private
 
   def self.header_name
@@ -138,10 +129,4 @@ class SwiftStorage::Node
       headers[full_key] = v.to_s
     end
   end
-
-  private
-  H = SwiftStorage::Headers
-
 end
-
-

data/lib/swift_storage/object.rb

@@ -13,15 +13,11 @@ require "time"
 #  Object cache control header.
 #
 class SwiftStorage::Object < SwiftStorage::Node
-
-
-  parent_node                :container
-
-
-  header_attributes          :content_length,
-                             :content_type,
-                             :expires,
-                             :cache_control
+  parent_node :container
+  header_attributes :content_length,
+                    :content_type,
+                    :expires,
+                    :cache_control
 
   # Read the object data
   #
@@ -130,16 +126,16 @@ class SwiftStorage::Object < SwiftStorage::Node
       cache_control = "public, max_age=4000000000"
     end
 
-    h[H::CONTENT_DISPOSITION] = attachment ? 'attachment' : 'inline'
-    h[H::OBJECT_MANIFEST] = object_manifest if object_manifest
-    h[H::CONTENT_TYPE] = content_type if content_type
-    h[H::EXPIRES] = expires.httpdate if expires
-    h[H::CACHE_CONTROL] = cache_control if cache_control
+    h[CONTENT_DISPOSITION] = attachment ? 'attachment' : 'inline'
+    h[OBJECT_MANIFEST] = object_manifest if object_manifest
+    h[CONTENT_TYPE] = content_type if content_type
+    h[EXPIRES] = expires.httpdate if expires
+    h[CACHE_CONTROL] = cache_control if cache_control
 
     if delete_at
-      h[H::DELETE_AT] = delete_at.to_i.to_s
+      h[DELETE_AT] = delete_at.to_i.to_s
     elsif delete_after
-      h[H::DELETE_AFTER] = delete_after.to_i.to_s
+      h[DELETE_AFTER] = delete_after.to_i.to_s
     end
 
     merge_metadata(h, metadata)
@@ -175,7 +171,7 @@ class SwiftStorage::Object < SwiftStorage::Node
       raise ArgumentError.new('Invalid source type')
     end
 
-    request(path + '?multipart-manifest=get', method: :copy, headers: optional_headers.merge(H::DESTINATION => relative_path))
+    request(path + '?multipart-manifest=get', method: :copy, headers: optional_headers.merge(DESTINATION => relative_path))
     self
   end
 
@@ -191,9 +187,9 @@ class SwiftStorage::Object < SwiftStorage::Node
   #  A temporary URL to the object.
   #
   # @!parse def temp_url(expires=Time.now + 3600, method: :get);end
-  def temp_url(expires=nil, method: :get)
+  def temp_url(expires = nil, ssl: true, method: :get, params: {})
     expires ||= Time.now + 3600
-    service.create_temp_url(container.name, name, expires, method)
+    service.create_temp_url(container.name, name, expires, method, ssl, params)
   end
 
   # Returns the object's URL

data/lib/swift_storage/object_collection.rb

@@ -1,7 +1,5 @@
 class SwiftStorage::ObjectCollection < SwiftStorage::Node
-
-  parent_node          :container
-
+  parent_node :container
 
   # Return all objects
   #
@@ -37,7 +35,4 @@ class SwiftStorage::ObjectCollection < SwiftStorage::Node
   def get_objects(prefix=nil)
     get_lines(container.name, :prefix => prefix).map { |name| SwiftStorage::Object.new(container, name)}
   end
-
 end
-
-

data/lib/swift_storage/service.rb

@@ -9,19 +9,19 @@ class SwiftStorage::Service
   extend Forwardable
   def_delegators SwiftStorage, :configuration
 
-  attr_reader          :tenant,
-                       :endpoint,
-                       :storage_url,
-                       :auth_token,
-                       :auth_at,
-                       :expires,
-                       :storage_token,
-                       :storage_scheme,
-                       :storage_host,
-                       :storage_port,
-                       :storage_path,
-                       :temp_url_key,
-                       :retries
+  attr_reader :tenant,
+              :endpoint,
+              :storage_url,
+              :auth_token,
+              :auth_at,
+              :expires,
+              :storage_token,
+              :storage_scheme,
+              :storage_host,
+              :storage_port,
+              :storage_path,
+              :temp_url_key,
+              :retries
 
   def initialize(tenant: configuration.tenant,
                  username: configuration.username,
@@ -69,13 +69,12 @@ class SwiftStorage::Service
     @storage_path = uri.path
   end
 
-  def create_temp_url(container, object, expires, method, options = {})
-
-    scheme = options[:scheme] || storage_scheme
+  def create_temp_url(container, object, expires, method, ssl = true, params = {})
+    scheme = ssl ? 'https' : 'http'
 
     method = method.to_s.upcase
     # Limit methods
-    %w{GET PUT HEAD}.include?(method) or raise ArgumentError, 'Only GET, PUT, HEAD supported'
+    %w{GET POST PUT HEAD}.include?(method) or raise ArgumentError, 'Only GET, POST, PUT, HEAD supported'
 
     expires = expires.to_i
     object_path_escaped = File.join(storage_path, escape(container), escape(object, '/'))
@@ -85,7 +84,7 @@ class SwiftStorage::Service
 
     sig = sig_to_hex(hmac('sha1', temp_url_key, string_to_sign))
 
-    klass = scheme == 'http' ? URI::HTTP : URI::HTTPS
+    klass = (scheme == 'http') ? URI::HTTP : URI::HTTPS
 
     temp_url_options = {
       scheme: scheme,
@@ -93,8 +92,9 @@ class SwiftStorage::Service
       port: storage_port,
       path: object_path_escaped,
       query: URI.encode_www_form(
-        temp_url_sig: sig,
-        temp_url_expires: expires
+        params.merge(
+          temp_url_sig: sig,
+          temp_url_expires: expires)
       )
     }
     klass.build(temp_url_options).to_s
@@ -113,12 +113,12 @@ class SwiftStorage::Service
   end
 
   def request(path_or_url,
-      method: :get,
-      headers: nil,
-      params: nil,
-      json_data: nil,
-      input_stream: nil,
-      output_stream: nil)
+              method: :get,
+              headers: nil,
+              params: nil,
+              json_data: nil,
+              input_stream: nil,
+              output_stream: nil)
 
     tries = retries
 
@@ -189,34 +189,24 @@ class SwiftStorage::Service
       end
     end
 
-    begin
-      response = s.request(req, &output_proc)
-    rescue Errno::EPIPE, Errno::EAGAIN, Errno::EWOULDBLOCK, Timeout::Error, Errno::EINVAL, EOFError
-      # Server closed the connection, retry
-      sleep 5
-      retry unless (tries -= 1) <= 0
-      raise OpenStack::Exception::Connection, "Unable to connect to OpenStack::Swift after #{retries} retries"
-    end
-
-    begin
-      check_response!(response)
-    rescue AuthError
-      # If token is at least 60 second old, we try to get a new one
-      if @auth_at && (Time.now - @auth_at).to_i > 60
-        authenticate!
-        response = s.request(req, &output_proc)
-      else
-        raise
-      end
-    end
+    response = s.request(req, &output_proc)
+    check_response!(response)
     response
+  rescue AuthError => e
+    # If token is at least 60 second old, we try to get a new one
+    raise e unless @auth_at && (Time.now - @auth_at).to_i > 60
+    authenticate!
+    retry
+  rescue ServerError, Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError
+    # Server closed the connection, retry
+    sleep 5
+    retry unless (tries -= 1) <= 0
+    raise SwiftStorage::Errors::ServerError, "Unable to connect to OpenStack::Swift after #{retries} retries"
   end
 
   private
 
-  attr_reader          :sessions,
-                       :username,
-                       :password
+  attr_reader :sessions, :username, :password
 
   def check_response!(response)
     case response.code
@@ -232,5 +222,4 @@ class SwiftStorage::Service
       raise ServerError, response.body
     end
   end
-
 end

data/lib/swift_storage/version.rb

@@ -1,3 +1,3 @@
 module SwiftStorage
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/swift/temp_url_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe 'Temporary URL' do
 
     # This has been computed manually and checked with openstack
     # Only server port vary, not actual host
-    url = "http://127.0.0.1:#{server.port}/v1/AUTH_test/testbucket/test.html?temp_url_sig=4db4c16c859fdddca2e629a0a1e6b81c15a42cbd&temp_url_expires=50000"
+    url = "https://127.0.0.1:#{server.port}/v1/AUTH_test/testbucket/test.html?temp_url_sig=4db4c16c859fdddca2e629a0a1e6b81c15a42cbd&temp_url_expires=50000"
     expect(subject.create_temp_url('testbucket', 'test.html', 50000, 'GET')).to eq(url)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nicolas Goy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Swift storage client.