condo 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee92183ae24774b0f9c5fda025f9632bb3560e7
-  data.tar.gz: f589c67b56e83ff7252f06bad73ec7067e6ecf3e
+  metadata.gz: 210fbade1f7f9fabb2b484117634f51fa5771615
+  data.tar.gz: 73dda5a151c0eae1a37ba01c781bfc0cac187e27
 SHA512:
-  metadata.gz: 9fe6c8701d1cb6ddcfc2e6ecd48c9f0dd9a7290fb651af2bac719f264cd91f55ed94496329d12920df90c5583dba7b5fafa28f9818d1e6229273b9f9520b54b0
-  data.tar.gz: c8eb497535c733525785e9d1b2705af97bfcc1646a205f154a63a6636c3f65acd578d54c3b9241e954332f173a4b32df64fe1edb294d4437df359fbcad108f9f
+  metadata.gz: 02c7ba13bf57927c48b83fec81585f47c6e20980fc00a9ba72a4271ddebc54085cb0ab7464fd373ae70c9578d2092f88e5c1d18a8350273fb9f9cf11e7dd6454
+  data.tar.gz: f4fa3bb10f423e8ba5b9a66c1a97568401be249a51167474e8cd959cdaa91629ed3e8f23428bf2add82623ecc4bb04919690e4742ad35e20fcba3205b60ed02c

data/lib/condo/strata/open_stack_swift.rb

@@ -13,31 +13,40 @@ class Condo::Strata::OpenStackSwift
     def initialize(options)
         @options = {
             :name => :OpenStackSwift,
-            :location => :dfw,            # dallas or chicago    - this is set at bucket creation time
+            :location => :dfw,
             :fog => {
-                :provider => 'Rackspace',
-                :rackspace_username => options[:username],
-                :rackspace_api_key => options[:secret_key],
-                :rackspace_cdn_url => options[:rackspace_cdn_url],
-                :rackspace_temp_url_key => options[:temp_url_key],
-                :rackspace_auth_url => options[:auth_url] || 'https://identity.api.rackspacecloud.com/v2.0' # is US and UK is 'lon.auth.api.rackspacecloud.com'
+                :provider => 'OpenStack',
+                :openstack_username => options[:username],
+                :openstack_api_key => options[:secret_key],
+                :openstack_temp_url_key => options[:temp_url_key],
+                :openstack_auth_url => options[:auth_url] || 'https://identity.api.rackspacecloud.com/v2.0/tokens' # is US and UK is 'lon.auth.api.rackspacecloud.com'
             }
         }.merge!(options)
 
         case @options[:location]
             when :dfw, :dallas, :DFW
-                @options[:location] = 'storage101.dfw1.clouddrive.com'
-                @options[:fog][:rackspace_region] = :dfw
+                @options[:location] = 'https://storage101.dfw1.clouddrive.com'
+                @options[:fog][:openstack_region] = 'DFW'
             when :ord, :chicago, :ORD
-                @options[:location] = 'storage101.ord1.clouddrive.com'
-                @options[:fog][:rackspace_region] = :ord
-            else @options[:location]
+                @options[:location] = 'https://storage101.ord1.clouddrive.com'
+                @options[:fog][:openstack_region] = 'ORD'
+            when :iad, :virginia, :IAD
+                @options[:location] = 'https://storage101.iad1.clouddrive.com'
+                @options[:fog][:openstack_region] = 'IAD'
+            when :lon, :london, :LON
+                @options[:location] = 'https://storage101.lon1.clouddrive.com'
+                @options[:fog][:openstack_region] = 'LON'
+            when :syd, :sydney, :SYD
+                @options[:location] = 'https://storage101.syd1.clouddrive.com'
+                @options[:fog][:openstack_region] = 'SYD'
+            when :hkg, :hong_kong, :HKG
+                @options[:location] = 'https://storage101.hkg1.clouddrive.com'
+                @options[:fog][:openstack_region] = 'HKG'
+            else
+                @options[:fog][:openstack_management_url] = "#{@options[:location]}/v1/#{@options[:storage_url]}"
         end
 
 
-        #raise ArgumentError, 'Rackspace Username missing' if @options[:username].nil?
-        #raise ArgumentError, 'Rackspace Secret Key missing' if @options[:secret_key].nil?
-
         raise ArgumentError, 'Swift Storage URL missing' if @options[:storage_url].nil?
         raise ArgumentError, 'Swift Temp URL Key missing' if @options[:temp_url_key].nil?
 
@@ -203,8 +212,14 @@ class Condo::Strata::OpenStackSwift
         directory = connection.directories.get(upload.bucket_name)    # it is assumed this exists - if not then the upload wouldn't have taken place
 
         if upload.resumable
-            directory.files.all({'prefix' => upload.object_key}).each do |file|
-                return false unless file.destroy
+            begin
+                directory.files.all({'prefix' => upload.object_key}).each do |file|
+                    begin
+                        return false unless file.destroy
+                    rescue ::Fog::Storage::OpenStack::NotFound => e
+                    end
+                end
+            rescue ::Fog::Storage::OpenStack::NotFound => e
             end
         end
 
@@ -234,7 +249,7 @@ class Condo::Strata::OpenStackSwift
         # Finish building the request
         return {
             :verb => options[:object_options][:verb].to_s.upcase,
-            :url => "#{options[:http_only] ? 'http' : 'https'}://#{@options[:location]}#{url}?#{param}temp_url_sig=#{signature}&temp_url_expires=#{options[:object_options][:expires]}",
+            :url => "#{@options[:location]}#{url}?#{param}temp_url_sig=#{signature}&temp_url_expires=#{options[:object_options][:expires]}",
             :headers => options[:object_options][:headers]
         }
     end

data/lib/condo/version.rb

@@ -1,3 +1,3 @@
 module Condo
-    VERSION = "2.0.2"
+    VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails