s3_multipart 0.0.4 → 0.0.6

data/lib/s3_multipart/transfer_helpers.rb

@@ -0,0 +1,92 @@
+module S3Multipart
+
+  # Collection of methods to be mixed in to the Upload class.  
+  # Handle all communication with Amazon S3 servers
+  module TransferHelpers
+
+    def initiate(options)
+      real_name = options[:object_name]
+      unique_name = UUID.generate + real_name.match(/.[A-Za-z]+$/)[0] # clean this up later
+      url = "/#{unique_name}?uploads"
+
+      headers = {content_type: options[:content_type]}
+      headers[:authorization], headers[:date] = sign_request verb: 'POST', url: url, content_type: options[:content_type]
+
+      response = Http.post url, {headers: headers}
+      parsed_response_body = XmlSimple.xml_in(response.body)  
+
+      return { "key"  => parsed_response_body["Key"][0],
+               "upload_id"   => parsed_response_body["UploadId"][0],
+               "name" => real_name }
+    end
+
+    def sign_batch(options)
+      parts = options[:content_lengths].split('-').each_with_index.map do |len, i|
+        sign_part(options.merge!({content_length: len, part_number: i+1}))
+      end
+    end
+
+    def sign_part(options)
+      url = "/#{options[:object_name]}?partNumber=#{options[:part_number]}&uploadId=#{options[:upload_id]}"
+      authorization, date = sign_request verb: 'PUT', url: url, content_length: options[:content_length]
+      
+      return {authorization: authorization, date: date}
+    end
+
+    def complete(options)
+      options[:content_type] = "application/xml"
+
+      url = "/#{options[:object_name]}?uploadId=#{options[:upload_id]}"
+      
+      body = format_part_list_in_xml(options)
+      headers = { content_type: options[:content_type],
+                  content_length: options[:content_length] }
+                
+      headers[:authorization], headers[:date] = sign_request verb: 'POST', url: url, content_type: options[:content_type]
+
+      response = Http.post url, {headers: headers, body: body}
+      parsed_response_body = XmlSimple.xml_in(response.body)  
+
+      begin
+        return { location: parsed_response_body["Location"][0] }
+      rescue NoMethodError
+        return { error: "Upload does not exist"} if parsed_response_body["Message"].first.match("The specified upload does not exist. The upload ID may be invalid, or the upload may have been aborted or completed.")
+      end
+    end
+
+    def sign_request(options)
+      #options.default = ""
+      time = Time.now.strftime("%a, %d %b %Y %T %Z")
+
+      return [calculate_authorization_hash(time, options), time]
+    end
+
+    private
+
+      def calculate_authorization_hash(time, options)
+        date = String.new(time)
+        date.insert(0, "\nx-amz-date:") if from_upload_part?(options) && options[:parts].nil?
+
+        unsigned_request = "#{options[:verb]}\n\n#{options[:content_type]}\n#{date}\n/#{Config.instance.bucket_name}#{options[:url]}" 
+        signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha1', Config.instance.s3_secret_key, unsigned_request))
+        
+        authorization = "AWS" + " " + Config.instance.s3_access_key + ":" + signature
+      end
+
+      def from_upload_part?(options)
+        options[:content_length].to_s.match(/^[0-9]+$/) ? true : false
+      end
+
+      def format_part_list_in_xml(options)
+        hash = Hash["Part", ""];
+        hash["Part"] = options[:parts].map do |part| 
+          { "PartNumber" => part[:partNum], "ETag" => part[:ETag] }
+        end
+        hash["Part"].sort_by! {|obj| obj["PartNumber"]}
+
+        XmlSimple.xml_out(hash, { :RootName => "CompleteMultipartUpload", :AttrPrefix => true })
+      end
+
+    end
+
+end

data/lib/s3_multipart/uploader/callbacks.rb

@@ -0,0 +1,17 @@
+module S3Multipart
+  module Uploader
+    module Callbacks
+
+      attr_accessor :on_begin_callback, :on_complete_callback
+
+      def on_begin(&block)
+        self.on_begin_callback = block
+      end
+
+      def on_complete(&block)
+        self.on_complete_callback = block
+      end
+
+    end
+  end 
+end

data/lib/s3_multipart/uploader/validations.rb

@@ -0,0 +1,9 @@
+module S3Multipart
+  module Uploader
+    module Validations
+
+      # To do
+
+    end
+  end 
+end

data/lib/s3_multipart/uploader.rb

@@ -1,85 +1,44 @@
+require "s3_multipart/uploader/callbacks"
+require "s3_multipart/uploader/validations"
+require 'active_support/core_ext/string'
+require "digest/sha1"
+
 module S3Multipart
   module Uploader
-    def initiate(options)
-      url = "/#{options[:object_name]}?uploads"
-
-      headers = {content_type: options[:content_type]}
-      headers[:authorization], headers[:date] = sign_request verb: 'POST', url: url, content_type: options[:content_type]
-
-      response = Http.post url, {headers: headers}
-      parsed_response_body = XmlSimple.xml_in(response.body)  
 
-      return { "key"  => parsed_response_body["Key"][0],
-               "upload_id"   => parsed_response_body["UploadId"][0],
-               "name" => options[:object_name] }
+    class << self
+      attr_accessor :controllers
     end
 
-    def sign_batch(options)
-      parts = options[:content_lengths].split('-').each_with_index.map do |len, i|
-        sign_part(options.merge!({content_length: len, part_number: i+1}))
-      end
-    end
-
-    def sign_part(options)
-      url = "/#{options[:object_name]}?partNumber=#{options[:part_number]}&uploadId=#{options[:upload_id]}"
-      authorization, date = sign_request verb: 'PUT', url: url, content_length: options[:content_length]
-      
-      return {authorization: authorization, date: date}
-    end
-
-    def complete(options)
-      options[:content_type] = "application/xml"
-
-      url = "/#{options[:object_name]}?uploadId=#{options[:upload_id]}"
+    self.controllers = {}
 
-      body = format_part_list_in_xml(options)
-      headers = { content_type: options[:content_type],
-                  content_length: options[:content_length] }
-                
-      headers[:authorization], headers[:date] = sign_request verb: 'POST', url: url, content_type: options[:content_type]
-
-      response = Http.post url, {headers: headers, body: body}
-      response.body
-      parsed_response_body = XmlSimple.xml_in(response.body)  
-
-      begin
-        return { location: parsed_response_body["Location"][0] }
-      rescue NoMethodError
-        return { error: "Upload does not exist"} if parsed_response_body["Message"].first.match("The specified upload does not exist. The upload ID may be invalid, or the upload may have been aborted or completed.")
-      end
+    def self.serialize(controller)
+      controllers[controller.to_s.to_sym]
     end
 
-    def sign_request(options)
-      #options.default = ""
-      time = Time.now.strftime("%a, %d %b %Y %T %Z")
-
-      return [calculate_authorization_hash(time, options), time]
+    # What is wrong with this method?
+    def self.deserialize(digest)
+      controllers.key(digest).to_s.constantize
     end
 
-    private
+    # Generated multipart upload controllers (which reside in the app/uploaders/multipart
+    # directory in the Rails application) extend this module.
+    module Core
 
-    def calculate_authorization_hash(time, options)
-      date = String.new(time)
-      date.insert(0, "\nx-amz-date:") if from_upload_part?(options) && options[:parts].nil?
+      include S3Multipart::Uploader::Callbacks
+      include S3Multipart::Uploader::Validations
 
-      unsigned_request = "#{options[:verb]}\n\n#{options[:content_type]}\n#{date}\n/#{Config.instance.bucket_name}#{options[:url]}" 
-      signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha1', Config.instance.s3_secret_key, unsigned_request))
-      
-      authorization = "AWS" + " " + Config.instance.s3_access_key + ":" + signature
-    end
-
-    def from_upload_part?(options)
-      options[:content_length].to_s.match(/^[0-9]+$/) ? true : false
-    end
+      def self.extended(klass)
+        Uploader.controllers[klass.to_s.to_sym] = Digest::SHA1.hexdigest(klass.to_s)
+      end
 
-    def format_part_list_in_xml(options)
-      hash = Hash["Part", ""];
-      hash["Part"] = options[:parts].map do |part| 
-        { "PartNumber" => part[:partNum], "ETag" => part[:ETag] }
+      def attach(model)
+        S3Multipart::Upload.class_eval do
+          has_one(model)
+        end
       end
-      hash["Part"].sort_by! {|obj| obj["PartNumber"]}
 
-      XmlSimple.xml_out(hash, { :RootName => "CompleteMultipartUpload", :AttrPrefix => true })
     end
-  end
+
+  end 
 end

data/lib/s3_multipart/version.rb

@@ -1,3 +1,3 @@
 module S3Multipart
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/s3_multipart.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'active_record'
+# require 'active_record'
 require 'xmlsimple'
 require 'uuid'
 
@@ -8,16 +8,8 @@ module S3Multipart
 
   class << self
 
-    # Syntax:
-    #
-    # S3_Multipart.configure do |config|
-    #   config.s3_access_key = ''
-    #   config.s3_secret_key = ''
-    #   config.bucket_name   = ''
-    # end
-
     def configure(&block)
-      S3Multipart::Uploader::Config.configure(block)
+      S3Multipart::Config.configure(block)
     end
 
     def remove_unfinished_uploads(seconds=60*60*24*10)
@@ -26,41 +18,11 @@ module S3Multipart
 
   end
 
-  module ActionControllerHelpers
-
-    module AttachUploader
-      def self.on_begin(&block)
-        S3Multipart::Upload.class_eval do
-          self.on_begin_callback = block
-          def on_begin
-            Upload.on_begin_callback.call(self)
-          end
-        end
-      end
-
-      def self.on_complete(&block)
-        S3Multipart::Upload.class_eval do
-          self.on_complete_callback = block
-          def on_complete
-            Upload.on_complete_callback.call(self)
-          end
-        end
-      end 
-    end
-
-    def attach_uploader
-      return AttachUploader
-    end
-
-  end
-
 end
 
+require 's3_multipart/config'
 require 's3_multipart/railtie'
 require 's3_multipart/engine'
 require 's3_multipart/http/net_http'
 require 's3_multipart/uploader'
-require 's3_multipart/uploader/config'
-
-
-ActionController::Base.send(:include, S3Multipart::ActionControllerHelpers)
+require 's3_multipart/transfer_helpers'

data/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "s3_multipart",
+  "version": "0.0.6",
+  "devDependencies": {
+    "grunt": "latest",
+    "grunt-contrib-uglify": "latest",
+    "grunt-jasmine-runner": "latest"
+  }
+}

data/s3_multipart.gemspec

@@ -2,15 +2,21 @@
 
 $:.push File.expand_path("../lib", __FILE__)
 require 's3_multipart/version'
+require 'date'
 
 Gem::Specification.new do |s|
   s.name        = "s3_multipart"
+  s.date        = Date.today
   s.version     = S3Multipart::VERSION
   s.authors     = ["Max Gillett"]
   s.email       = ["max.gillett@gmail.com"]
   s.homepage    = "https://github.com/maxgillett/s3_multipart"
   s.summary     = %q{Upload directly to S3 using multipart uploading}
   s.description = %q{See github for installation and configuration }
+  s.extra_rdoc_files = ["README.md"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.require_paths = ["lib"]
 
   s.add_dependency "uuid",       ">= 2.3.6"
   s.add_dependency "xml-simple", ">= 1.1.2"
@@ -21,7 +27,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara'
-
-  s.files         = `git ls-files`.split("\n")
-  s.require_paths = ["lib"]
 end

data/spec/integration/uploads_controller_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper.rb'
+require "digest/sha1"
 
 describe "Uploads controller" do
   it "should create an upload" do
-    post '/s3_multipart/uploads', {object_name: "example_object", content_type: "video/x-ms-wmv"}
+    post '/s3_multipart/uploads', {object_name: "example_object", content_type: "video/x-ms-wmv", uploader: Digest::SHA1.hexdigest("VideoUploader")}
     parsed_body = JSON.parse(response.body)
     parsed_body.should_not eq({"error"=>"There was an error initiating the upload"})
   end

data/spec/internal/app/assets/javascripts/application.js

@@ -12,83 +12,168 @@
 //
 //= require underscore
 //= require_tree .
-//= require s3_multipart/s3_multipart
+//= require jquery.ui.progressbar
+//= require s3_multipart/lib
 
 $(function() {
-    $(".submit-button").click(function() {
-      window.SS3MP = new window.S3MP({
-        bucket: 'bitcast-bucket',
-        fileSelector: "#uploader",
-        onStart: function(num) {
-          console.log("File "+num+" has started uploading")
-        },
-        onComplete: function(num) {
-          console.log("File "+num+" successfully uploaded")
-        },
-        onPause: function(num) {
-          console.log("File "+num+" has been paused")
-        },
-        onCancel: function(num) {
-          console.log("File upload "+num+" was canceled")
-        },
-        onError: function() {
-          console.log("There was an error")
-        },
-        onProgress: function(num, size, done, percent, speed) {
-          console.log("File %d is %f percent done (%f of %f total) and uploading at %s", num, percent, done, size, speed);
+  var file_list, s3mp;
+
+  $(".submit-button").click(function() {
+    s3mp = new window.S3MP({
+      bucket: 'bitcast-bucket',
+      fileInputElement: "#uploader",
+      fileList: file_list,
+      onStart: function(upload) {
+        var id = upload.id
+          , key = upload.key;
+
+        // Insert the upload details form if only one file upload is going on
+        if (file_list.length === 1) {
+          // $.ajax({
+          //   url: "/videos/"+id+"/settings",
+          //   cache: false,
+          //   success: function(html){
+          //     $(".upload-form").append(html);
+          //     $('.edit_video').bind('ajax:success', function(evt, data, status, xhr){
+          //       alert("Video updated successfully");
+          //     })
+          //   }
+          // });
         }
-      });
-      console.log(SS3MP);
+
+        // Hide the upload button + list, and insert the progress bar
+        $(".upload-wrapper, .upload-list").hide();
+        $(".upload-list").after('<div class="progress-bar-'+key+'"></div>')
+        $(".progress-bar-"+key).progressbar({ max: 100 })
+          .after('<div class="progress-bar-info progress-bar-info-'+key+'"><span class="name">'+upload.name+'</span><span class="speed"></span></div>');
+        
+        console.log("File "+key+" has started uploading")
+      },
+      onComplete: function(upload) {
+        $('.progress-bar-'+upload.key).progressbar({ value: 100 });
+        $('.progress-bar-info-'+upload.key)
+          .find(".speed").html("100% ("+(upload.size/1000000).toFixed(1)+" MB of "+(upload.size/1000000).toFixed(1)+" MB)");
+
+        console.log("File "+upload.key+" successfully uploaded")
+      },
+      onPause: function(key) {
+        console.log("File "+key+" has been paused")
+      },
+      onResume: function(key) {
+        console.log("File "+key+" has been resumed")
+      },
+      onCancel: function(key) {
+        console.log("File upload "+key+" was canceled")
+      },
+      onError: function() {
+        console.log("There was an error")
+      },
+      onProgress: function(key, size, done, percent, speed) {
+        $('.progress-bar-'+key).progressbar({ value: percent });
+        $('.progress-bar-info-'+key)
+          .find(".speed").html(percent.toFixed(1)+"% ("+(done/1000000).toFixed(1)+" MB of "+(size/1000000).toFixed(1)+" MB) at "+(speed/1000).toFixed(0)+" kbps");
+        console.log("File %d is %f percent done (%f of %f total) and uploading at %s", key, percent, done, size, speed);
+      }
     });
+  });
+
+  // Empty array to store all the files (cannot store in FileList b/c it is read only)
+  file_list = [];
+
+  // Code to handle upload buttons + the upload list
+  (function() {
+    var uploader, cbs;
+
+    // Reference to uploader file element
+    uploader = document.getElementById("uploader");
+
+    // Callback functions
+    cbs = {
+
+      moveFileInputEl: _.throttle(function(e) {
+        var offset = { left: $(uploader).parent().offset().left, top: $(uploader).parent().offset().top };
+        uploader.style.left = e.pageX - offset.left - 100 + "px";
+        uploader.style.top = e.pageY - offset.top - 5 + "px";
+      },50),
+
+      addActiveClass: function() {
+        $(".upload-button").addClass("active");
+      },
 
+      removeActiveClass: function() {
+        $(".upload-button").removeClass("active");
+      },
 
-    // (function() {
-    //   var uploader, adjust_uploader_position, reset_uploader_position
+      updateFileList: function() {
+        var upload_list, clone, size, num;
 
-    //   uploader = document.getElementById("uploader");
+        $("#uploader, .upload-button").hide();
+        $(".submit-button").show();
 
-    //   // Callback functions
-    //   mousemove_fn = _.throttle(function(e) {
-    //     uploader.style.left = e.pageX-280 +"px";
-    //     uploader.style.top = "0px";
-    //   },10);
-    //   mouseover_fn = function() {
-    //     $(".upload-button").addClass("active");
-    //   };
-    //   mouseleave_fn = function() {
-    //     $(".upload-button").removeClass("active");
-    //   }
-    //   change_fn = function() {
-    //     var upload_list, clone, size;
+        upload_list = $(".upload-list")
+        upload_list.show();
 
-    //     $(".upload-wrapper").hide();
-    //     $(".submit-button").show();
+        _.each($("#uploader").get(0).files, function(val, key, list) {
+          file_list.push(val);
+
+          size = (val.size/1000000).toFixed(1);
+
+          if (upload_list.find("li").length === 2 && upload_list.find("li").data("num") === undefined) {
+            clone = upload_list.find("li:first");         
+          } else {
+            clone = upload_list.find("li:first").clone()          
+          }
+
+          clone.find(".name").text(val.name);
+          clone.find(".size").text(size + " MB");
+
+          clone.insertBefore(".upload-list ul .select-another-video").attr("data-num", key);
+        });
+
+        num = file_list.length
+        if (num > 1) {
+          $(".upload-list .total").text(num+" files"); 
+        }
+      },
+
+      removeFile: function(e) {      
+        var li = $(this).parent();
+        file_list[li.data("num")] = null;
+        li.remove();
+
+        // Update "total" span element
+        var num = _.without(file_list, null).length;
+        if (num > 1) {
+          $(".upload-list .total").text(num+" files"); 
+        }
+        if (num == 1) {
+          $(".upload-list .total").text("1 file"); 
+        }
+      },
 
-    //     upload_list = $(".upload-list")
-    //     upload_list.show();
+      pauseAll: function(e) {
+        _.each(file_list, function(file, key) {
+          s3mp.pause(key);          
+        });
+      },
 
-    //     _.each($("#uploader").get(0).files, function(val, key, list) {
-    //       size = (val.size/1000000).toFixed(2);
+      resumeAll: function(e) {
+        _.each(file_list, function(file, key) {
+          s3mp.resume(key);          
+        });
+      }
 
-    //       if (upload_list.find("li").length === 1) {
-    //         clone = upload_list.find("li");         
-    //       } else {
-    //         clone = upload_list.find("li:first").clone()          
-    //       }
+    }
 
-    //       clone.find(".name").text(val.name)
-    //       clone.find(".size").text(size + " mb")
+    $(".upload-wrapper")
+      .mouseover(cbs.addActiveClass)
+      .mouseleave(cbs.removeActiveClass)
+      .mousemove(cbs.moveFileInputEl)
+      .live('change',cbs.updateFileList);
 
-    //       upload_list.find("ul").append(clone)
-    //     });
-    //   }
+    $(".upload-list").on("click", ".delete", cbs.removeFile);
 
-    //   $(".upload-wrapper")
-    //     .mouseover(mouseover_fn)
-    //     .mouseleave(mouseleave_fn)
-    //     .mousemove(mousemove_fn)
-    //     .live('change',change_fn);
+  })();
 
-    // })();
+});
 
-  });