condo 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92cc7003ecce7499b7c92bc3aed7facde40cf79d
-  data.tar.gz: a4b4e8d9a93bace70e3c236d13d23d97116dd44e
+  metadata.gz: f1827a85ce98d40fd5de3f69857aeaa3944f29d3
+  data.tar.gz: f55839e3df14e84e133d949c101598283341ab0b
 SHA512:
-  metadata.gz: c45dcf3f6aed9abe71705db52d83ffd3731c105259d10d43672f2deff33d2e19bcb6e3d7e77a7b47e373ef882ddf3ffc9949661363460a103f25356787e402cc
-  data.tar.gz: bbd682e45ad4a9f651d77abd5cae57e14b163ca476d38cc89c78ff8b3678c35ab37a9c6df36a601e2f28339a605ff67958a2bef7faf82d59f661aad6a6ba3ebd
+  metadata.gz: 56bdd19a5ccc8c1873038c60d37d373a62a6ec19d5617bae731fa9f2e5b24a0319fc1e902742dbc5db35b756eae9571e892f3d8c6842bea2d6cd2cc72ed30e9b
+  data.tar.gz: 6ecd0f2805ef502c2114c2049b271aded858eb811fb19968d8f9a2a0bdbffe393b4d99fe7caecd7d8c103adefb7aac96f84ef650ac9f9d0a6fd3371a6031d8e2

data/lib/condo.rb

@@ -7,6 +7,14 @@ require 'condo/configuration'
 
 
 module Condo
+    module Condo::Strata
+        autoload :AmazonS3,           File.expand_path('../condo/strata/amazon_s3', __FILE__)
+        autoload :GoogleCloudStorage, File.expand_path('../condo/strata/google_cloud_storage', __FILE__)
+        autoload :MicrosoftAzure,     File.expand_path('../condo/strata/microsoft_azure', __FILE__)
+        autoload :OpenStackSwift,     File.expand_path('../condo/strata/open_stack_swift', __FILE__)
+    end
+
+
     def self.included(base)
         base.class_eval do
 

data/lib/condo/strata/google_cloud_storage.rb

@@ -75,7 +75,7 @@ DATA
             :headers  => {},
             :host       => "#{bucket}.storage.googleapis.com",
             :idempotent => true,
-            :path     => '?cors'    # There is an issue with Fog where this isn't included as a canonical_resource
+            :path     => '?cors'
         )
     end
 
@@ -191,7 +191,6 @@ DATA
     def set_part(options)
         resp = get_parts(options, true)
         resp[:type] = :resume_upload
-        resp[:type] = :resume_upload
         return resp
     end
 

data/lib/condo/strata/microsoft_azure.rb

@@ -0,0 +1,188 @@
+# encoding: utf-8
+# Good reference: http://gauravmantri.com/2013/02/16/uploading-large-files-in-windows-azure-blob-storage-using-shared-access-signature-html-and-javascript/
+
+require 'azure' # Tested against 0.7.1
+require 'azure/blob/auth/shared_access_signature'
+
+require 'uri'
+
+
+module Condo; end
+module Condo::Strata; end
+
+
+class Condo::Strata::MicrosoftAzure
+    def initialize(options)
+        @options = {
+            :name => :MicrosoftAzure
+        }.merge!(options)
+
+        raise ArgumentError, 'Azure Account Name missing' if @options[:account_name].nil?
+        raise ArgumentError, 'Azure Access Key missing' if @options[:access_key].nil?
+        
+        @options[:blob_host] = "https://#{@options[:account_name]}.blob.core.windows.net" if @options[:blob_host].nil?
+
+        @options[:location] = @options[:blob_host].to_sym
+    end
+
+
+    def name
+        @options[:name]
+    end
+
+    def location
+        @options[:location]
+    end
+
+    def enable_cors(origin = 'http://localhost:9000')
+        origins = origin.class == Array ? origin : [origin]
+        blobs = azure_connection
+
+        p = blobs.get_service_properties
+        p.cors = Azure::Service::Cors.new do |cors|
+            cors.cors_rules = []
+            cors.cors_rules.push(Azure::Service::CorsRule.new { |cors_rule|
+                cors_rule.allowed_origins = origins
+                cors_rule.allowed_methods = ["GET", "HEAD", "PUT", "POST", "OPTIONS"]
+                cors_rule.max_age_in_seconds = 60
+                cors_rule.exposed_headers = ["x-ms-*", "etag", "content-type", "content-md5"]
+                cors_rule.allowed_headers = ["x-ms-blob-type", "x-ms-version", "content-md5", "content-type"]
+            })
+        end
+
+        blobs.set_service_properties(p)
+    end
+
+
+    # Create a signed URL for accessing a private file
+    def get_object(options)
+        options = {}.merge!(options)    # Need to deep copy here
+        options[:object_options] = {
+            verb: :get,
+            headers: {},
+            permission: 'r',
+            expires: 5.minutes.from_now
+        }.merge!(options[:object_options] || {})
+        options.merge!(@options)
+
+        sign_request(options)[:url]
+    end
+
+
+    # Creates a new upload request (either single shot or multi-part)
+    # => Passed: bucket_name, object_key, object_options, file_size
+    def new_upload(options)
+        options = build_request(options)
+        options[:object_options][:headers]['x-ms-blob-type'] = 'BlockBlob'
+
+        # Decide what type of request is being sent
+        if options[:file_size] > 2.megabytes
+            return {
+                signature: sign_request(options),
+                type: :chunked_upload
+            }
+        else
+            return {
+                signature: sign_request(options),
+                type: :direct_upload
+            }
+        end
+    end
+
+
+    # No signing required for this request in Azure
+    def get_parts(options)
+        {
+            type: :parts,
+            current_part: options[:resumable_id]
+        }
+    end
+
+
+    # Returns the requests for uploading parts and completing a resumable upload
+    def set_part(options)
+        options = build_request(options)
+
+        if options[:part] == 'finish'
+            options[:object_options][:headers]['Content-Type'] = 'application/xml; charset=UTF-8'
+
+            return {
+                signature: sign_request(options),
+                type: :finish
+            }
+        else
+            options = build_request(options)
+            options[:object_options][:headers]['x-ms-blob-type'] = 'BlockBlob'
+            # MaxID for a part is 100_000, hence rjust 6
+            options[:partId] = Base64.encode64(options[:part].to_s.rjust(6, '0')).gsub("\n", '')
+
+            return {
+                signature: sign_request(options),
+                type: :part_upload
+            }
+        end
+    end
+
+
+    def azure_connection
+        options = {
+            storage_account_name: @options[:account_name],
+            storage_access_key: @options[:access_key]
+        }
+        options[:storage_blob_host] = @options[:location].to_s if @options[:location]
+
+        client = Azure.client(options)
+        client.blobs
+    end
+
+
+    def destroy(upload)
+        blobs = azure_connection
+        blobs.delete_blob(upload.bucket_name, upload.object_key)
+    end
+
+
+
+    protected
+
+
+
+    def build_request(options)
+        options = {}.merge!(options)    # Need to deep copy here
+        options[:object_options] = {
+            verb: :put,
+            headers: {},
+            permission: 'w',
+            expires: 5.minutes.from_now
+        }.merge!(options[:object_options] || {})
+        options.merge!(@options)
+
+        options[:object_options][:headers]['Content-Md5'] = options[:file_id] if options[:file_id].present? && options[:object_options][:headers]['Content-Md5'].nil?
+        options
+    end
+
+    def sign_request(options)
+        signer = ::Azure::Blob::Auth::SharedAccessSignature.new(@options[:account_name], @options[:access_key])
+        url = URI "#{@options[:blob_host]}/#{options[:bucket_name]}/#{options[:object_key]}"
+        url = signer.signed_uri(url, {
+            permissions: options[:object_options][:permission],
+            expires: options[:object_options][:expires].utc.iso8601,
+            resource: 'b'
+        })
+
+        # Adjust the request for chunked uploads
+        if options[:partId]
+            url.query += "&comp=block&blockid=#{options[:partId]}"
+        elsif options[:part] == 'finish'
+            url.query += '&comp=blocklist'
+        end
+
+        # Finish building the request
+        return {
+            verb: options[:object_options][:verb].to_s.upcase,
+            url: url.to_s,
+            headers: options[:object_options][:headers]
+        }
+    end
+end
+

data/lib/condo/strata/open_stack_swift.rb

@@ -8,8 +8,7 @@ module Condo::Strata; end
 #
 
 class Condo::Strata::OpenStackSwift
-
-    MIN_CHUNK_SIZE = 2097152
+    MIN_CHUNK_SIZE = 2.megabytes
 
     def initialize(options)
         @options = {

data/lib/condo/version.rb

@@ -1,3 +1,3 @@
 module Condo
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: azure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.4'
 description: Provides signed upload signatures to your users browsers so they can
   upload directly to cloud storage providers
 email:
@@ -69,6 +83,7 @@ files:
 - lib/condo/errors.rb
 - lib/condo/strata/amazon_s3.rb
 - lib/condo/strata/google_cloud_storage.rb
+- lib/condo/strata/microsoft_azure.rb
 - lib/condo/strata/open_stack_swift.rb
 - lib/condo/version.rb
 - lib/tasks/condo_tasks.rake