swift-storage 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77665fc3b1c075760f657ba0c9e192191c2d7f5c
-  data.tar.gz: 52089eaac7b7ca0f42b9c2bc1cdf0bd61e8daca6
+  metadata.gz: 07d3d130ca97b74bc12b9976b8f7c2e79ccc3ffd
+  data.tar.gz: 924eaadbcdd6710d323ed33019c6d00e2f0d735d
 SHA512:
-  metadata.gz: 735a05bc0ca64009df31ec04dc41702d3b17eb030dfdbb8fd2d23824e9e93423c0f9e528252f39b251b246f0e959affc91411cdd548be820c0bc189b2cb600e2
-  data.tar.gz: a6076078bd7adbed2dbf0bb82fb32428ac356715241859c21b63bfcb64fd2a2422152c615046351729fb40b993ef1b414739b416a5c2634572f0e82789e6137c
+  metadata.gz: 763a569994c1e698e78801a7f45b2b80f48e7cb9ec2f0b0a42acbf691289ff3c8c7c28b1912a710778f5bbf7a2d799635403a14168ed5f0af07d6e7e36908af4
+  data.tar.gz: 2157970a98acc0e5cb4d8de0a15d960e5d148fb63dca931153e078812ab002b47b06dc6914c6d011f085569da1ec69c2398fa853e15b2dd2390dd2c5941288a4

data/CHANGELOG.md

@@ -3,10 +3,17 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.12
+
+  * Net::Http `ssl_verify` can be set to `false` (default is `true`)
+  * Create a new Net::Http session for each request
+    [#13](https://github.com/PredicSis/swift-ruby/pull/2)
+    @ArmandPredicSis
+
 ## 0.0.11
 
   * Some refactoring
-    [#11](https://github.com/PredicSis/swift-ruby/pull/1)
+    [#12](https://github.com/PredicSis/swift-ruby/pull/1)
     @ArmandPredicSis
 
 ## 0.0.10

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in swift-ruby.gemspec
 gemspec

data/lib/swift_storage/configuration.rb

@@ -1,10 +1,12 @@
 module SwiftStorage
   class Configuration
-    attr_accessor :auth_version, :tenant, :username, :password, :endpoint, :temp_url_key,
-                  :auth_method, :authtenant_type, :retries
+    attr_accessor :auth_version, :ssl_verify,
+      :tenant, :username, :password, :endpoint, :temp_url_key,
+      :auth_method, :authtenant_type, :retries
 
     def initialize
       @auth_version = ENV['SWIFT_STORAGE_AUTH_VERSION'] || '1.0'
+      @ssl_verify = true
       @tenant = ENV['SWIFT_STORAGE_TENANT']
       @username = ENV['SWIFT_STORAGE_USERNAME']
       @password = ENV['SWIFT_STORAGE_PASSWORD']

data/lib/swift_storage/service.rb

@@ -11,6 +11,7 @@ class SwiftStorage::Service
 
   attr_reader :tenant,
               :endpoint,
+              :ssl_verify,
               :storage_url,
               :auth_token,
               :auth_at,
@@ -27,8 +28,10 @@ class SwiftStorage::Service
                  username: configuration.username,
                  password: configuration.password,
                  endpoint: configuration.endpoint,
+                 ssl_verify: configuration.ssl_verify,
                  temp_url_key: configuration.temp_url_key,
                  retries: configuration.retries)
+    @ssl_verify = ssl_verify
     @temp_url_key = temp_url_key
     @retries = retries
 
@@ -136,16 +139,6 @@ class SwiftStorage::Service
     path = uri.query ? uri.path + '?' + uri.query : uri.path
     uri.path = ''
     uri.query = nil
-    key = uri.to_s
-
-    if sessions[key].nil?
-      s = sessions[key] = Net::HTTP.new(uri.host, uri.port)
-      s.use_ssl = uri.scheme == 'https'
-      #s.set_debug_output($stderr)
-      s.keep_alive_timeout = 30
-      s.start
-    end
-    s = sessions[key]
 
     case method
     when :get
@@ -169,10 +162,6 @@ class SwiftStorage::Service
       raise ArgumentError, "Method #{method} not supported"
     end
 
-    if json_data
-      req.body = JSON.generate(json_data)
-    end
-
     if input_stream
       if String === input_stream
         input_stream = StringIO.new(input_stream)
@@ -189,15 +178,24 @@ class SwiftStorage::Service
       end
     end
 
-    response = s.request(req, &output_proc)
-    check_response!(response)
-    response
+    response = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.use_ssl = uri.scheme == 'https'
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless ssl_verify
+      http.request(req, &output_proc)
+    end
+
+    case response
+    when Net::HTTPSuccess, Net::HTTPRedirection
+      return response
+    else
+      raise_error!(response)
+    end
   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
+  rescue Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError
     # Server closed the connection, retry
     sleep 5
     retry unless (tries -= 1) <= 0
@@ -208,10 +206,8 @@ class SwiftStorage::Service
 
   attr_reader :sessions, :username, :password
 
-  def check_response!(response)
+  def raise_error!(response)
     case response.code
-    when /^2/
-      return true
     when '401'
       raise AuthError, response.body
     when '403'

data/lib/swift_storage/version.rb

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

data/swift-ruby.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1.0"
   spec.add_development_dependency "guard", "~> 2.8.2"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: swift-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
 - Nicolas Goy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Swift storage client.