s3_multipart 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    s3_multipart (0.0.1)
-      uuid
-      xml-simple
+    s3_multipart (0.0.2)
+      uuid (>= 2.3.6)
+      xml-simple (>= 1.1.2)
 
 GEM
   remote: https://rubygems.org/

data/app/controllers/s3_multipart/uploads_controller.rb

@@ -5,6 +5,7 @@ module S3Multipart
         response = Upload.initiate(params)
         upload = Upload.create(key: response["key"], upload_id: response["upload_id"], name: response["name"])
         response["id"] = upload["id"]
+        upload.on_begin if upload.respond_to?(:on_begin)
       rescue
         response = {error: 'There was an error initiating the upload'}
       ensure
@@ -45,7 +46,7 @@ module S3Multipart
         response = Upload.complete(params)
         upload = Upload.find_by_upload_id(params[:upload_id])
         upload.update_attributes(location: response[:location])
-        upload.on_complete
+        upload.on_complete if upload.respond_to?(:on_complete)
       rescue
         response = {error: 'There was an error completing the upload'}
       ensure

data/app/models/s3_multipart/upload.rb

@@ -3,6 +3,7 @@ module S3Multipart
     class << self   
       include S3Multipart::Uploader 
       attr_accessor :on_complete_callback
+      attr_accessor :on_begin_callback
     end
 
     attr_accessible :key, :upload_id, :name, :location

data/lib/s3_multipart/version.rb

@@ -1,3 +1,3 @@
 module S3Multipart
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/s3_multipart.rb

@@ -15,6 +15,7 @@ module S3Multipart
     #   config.s3_secret_key = ''
     #   config.bucket_name   = ''
     # end
+
     def configure(&block)
       S3Multipart::Uploader::Config.configure(block)
     end
@@ -27,18 +28,28 @@ module S3Multipart
 
   module ActionControllerHelpers
 
-    #
-    # Stores a code block in the Upload class that will be executed (and passed the
-    # completed upload object) when the on_complete method is called on an 
-    # instance of the Upload class
-    #
-    def attach_uploader(&block)
-      S3Multipart::Upload.class_eval do
-        self.on_complete_callback = block
-        def on_complete
-          Upload.on_complete_callback.call(self)
+    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

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

@@ -19,6 +19,9 @@ $(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")
         },

data/spec/internal/app/controllers/pages_controller.rb

@@ -1,9 +1,13 @@
 class PagesController < ApplicationController
 
   def upload
-    attach_uploader do |upload|
-      upload.update_attributes(name: "modified")
+    upload = attach_uploader
+    upload.on_begin do |upload|
+      upload.update_attributes(name: "begun")
+    end
+    upload.on_complete do |upload|
+      upload.update_attributes(name: "completed")
     end
   end
-
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_multipart
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -166,7 +166,6 @@ files:
 - lib/s3_multipart/uploader.rb
 - lib/s3_multipart/uploader/config.rb
 - lib/s3_multipart/version.rb
-- s3_multipart-0.0.1.gem
 - s3_multipart.gemspec
 - spec/integration/uploads_controller_spec.rb
 - spec/internal/app/assets/javascripts/application.js