condo 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1827a85ce98d40fd5de3f69857aeaa3944f29d3
-  data.tar.gz: f55839e3df14e84e133d949c101598283341ab0b
+  metadata.gz: 8ee92183ae24774b0f9c5fda025f9632bb3560e7
+  data.tar.gz: f589c67b56e83ff7252f06bad73ec7067e6ecf3e
 SHA512:
-  metadata.gz: 56bdd19a5ccc8c1873038c60d37d373a62a6ec19d5617bae731fa9f2e5b24a0319fc1e902742dbc5db35b756eae9571e892f3d8c6842bea2d6cd2cc72ed30e9b
-  data.tar.gz: 6ecd0f2805ef502c2114c2049b271aded858eb811fb19968d8f9a2a0bdbffe393b4d99fe7caecd7d8c103adefb7aac96f84ef650ac9f9d0a6fd3371a6031d8e2
+  metadata.gz: 9fe6c8701d1cb6ddcfc2e6ecd48c9f0dd9a7290fb651af2bac719f264cd91f55ed94496329d12920df90c5583dba7b5fafa28f9818d1e6229273b9f9520b54b0
+  data.tar.gz: c8eb497535c733525785e9d1b2705af97bfcc1646a205f154a63a6636c3f65acd578d54c3b9241e954332f173a4b32df64fe1edb294d4437df359fbcad108f9f

data/lib/condo/configuration.rb

@@ -1,17 +1,13 @@
-require 'singleton'
-
 
 module Condo
-
     class Configuration
-        include Singleton
-
-
         @@callbacks = {
+            # Must be defined by the including class:
+            #:resident_id => proc
+            #:bucket_name => proc
+            #:upload_complete => proc
+            #:destroy_upload => proc
             #
-            #:resident_id        # Must be defined by the including class
-            #
-            :bucket_name => proc {"#{Rails.application.class.parent_name}#{instance_eval @@callbacks[:resident_id]}"},
             :object_key => proc { |upload|
                 if upload[:file_path]
                     upload[:file_path] + upload[:file_name]
@@ -42,8 +38,6 @@ module Condo
                 # upload will only be present if it already exists
                 config.residencies[0]
             }
-            #:upload_complete    # Must be defined by the including class
-            #:destroy_upload     # the actual delete should be done by the application
         }
 
         def self.callbacks

data/lib/condo/strata/open_stack_swift.rb

@@ -66,7 +66,7 @@ class Condo::Strata::OpenStackSwift
     end
 
 
-    def allow_cors(domains = 'http://localhost:3000', options_age = 10, headers = 'etag, x-object-manifest, content-type, accept, origin, x-requested-with')
+    def allow_cors(domains = 'http://localhost:9000', options_age = 10, headers = 'etag, content-type, accept, origin, x-requested-with')
         fog_connection.request(
             :expects  => [201, 202, 204],
             :method   => 'POST',
@@ -152,29 +152,28 @@ class Condo::Strata::OpenStackSwift
 
         request = {}
         if options[:part] == 'finish'
-=begin
-Dynamic large object now have to be created on the server...
-This is how that was done. We now use Static Large Objects that can be created client side
-
-            key = CGI::escape options[:object_key]
-
-            # Send the commitment request
-            fog_connection.request(
-                :expects  => [200, 201],
-                :method   => 'PUT',
-                :headers  => {
-                    'X-Object-Manifest' => "#{CGI::escape options[:bucket_name]}/#{key}/p"
-                },
-                path: "#{CGI::escape options[:bucket_name]}/#{key}"
-            )
-
-            return {}
-=end
-
-            options[:object_options][:headers]['ETag'] = options[:file_id] if options[:file_id].present?
-            options[:object_options][:headers]['Content-Type'] = 'application/json'
-            options[:object_key] = CGI::escape(options[:object_key])
-            request[:signature] = sign_request(options, '&multipart-manifest=put')
+            # Dynamic large object now have to be created on the server...
+            # Static Large Objects could be created client side.
+            if @options[:use_static_large_objects]
+                options[:object_options][:headers]['ETag'] = options[:file_id] if options[:file_id].present?
+                options[:object_options][:headers]['Content-Type'] = 'text/plain'
+                options[:object_key] = CGI::escape(options[:object_key])
+                request[:signature] = sign_request(options, 'multipart-manifest=put&')
+            else
+                key = CGI::escape options[:object_key]
+
+                # Send the commitment request
+                fog_connection.request(
+                    :expects  => [200, 201],
+                    :method   => 'PUT',
+                    :headers  => {
+                        'X-Object-Manifest' => "#{CGI::escape options[:bucket_name]}/#{key}/p"
+                    },
+                    path: "#{CGI::escape options[:bucket_name]}/#{key}"
+                )
+
+                return {}
+            end
         else
             # Send the part upload request
             options[:object_options][:headers]['ETag'] = options[:file_id] if options[:file_id].present? && options[:object_options][:headers]['ETag'].nil?
@@ -235,7 +234,7 @@ This is how that was done. We now use Static Large Objects that can be created c
         # Finish building the request
         return {
             :verb => options[:object_options][:verb].to_s.upcase,
-            :url => "#{options[:http_only] ? 'http' : 'https'}://#{@options[:location]}#{url}?temp_url_sig=#{signature}&temp_url_expires=#{options[:object_options][:expires]}#{param}",
+            :url => "#{options[:http_only] ? 'http' : 'https'}://#{@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.1"
+    VERSION = "2.0.2"
 end

metadata

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