applicious_utils 0.1.47 → 0.1.48

data/lib/applicious_utils/version.rb

@@ -1,3 +1,3 @@
 module AppliciousUtils
-  VERSION = "0.1.47"
+  VERSION = "0.1.48"
 end

data/lib/applicious_utils/view_helpers.rb

@@ -1,26 +1,10 @@
 module AppliciousUtils
   module ViewHelpers
 
-    #  Creates an instance of a plupload S3 file uploader
-    ###
-    # required parameters:
-    ###
-    #  key                       s3 'path' to uploaded files
-    #
-    ###
-    # optional parameters:
-    ###
-    #  s3_config_filename        filename of s3 config yaml file (full path), defaults to "#{RAILS_ROOT}/config/amazon_s3.yml"
-    #
-    #  content_type              binary/octet-stream
-    #
-    #  acl                       public-read
-    #
-    #  expiration_date           10.hours.from_now.utc.iso8601
-    #
-    #  max_filesize              2.megabytes
+    # Creates an instance of a plupload S3 file uploader
+		# Derived from https://github.com/iwasrobbed/Rails3-S3-Uploader-Plupload
 
-    def s3_uploader(options = {})
+    def applicious_uploader(options = {})
       options[:s3_config_filename] ||= Rails.root.join('config', 'amazon_s3.yml')
       config = YAML.load_file(options[:s3_config_filename])[Rails.env].symbolize_keys
       bucket            = config[:bucket_name]
@@ -34,7 +18,9 @@ module AppliciousUtils
       options[:content_type] ||= 'image/' # Videos would be binary/octet-stream
       options[:filter_title] ||= 'Images'
       options[:filter_extentions] ||= 'jpg,jpeg,gif,png,bmp'
-
+			
+			filename_token = "#{SecureRandom.hex(10)}_#{Time.now.to_i}"
+			
       id = options[:id] ? "_#{options[:id]}" : ''
 
       policy = Base64.encode64(
@@ -77,8 +63,8 @@ module AppliciousUtils
               multi_selection: false,
               multipart: true,
               multipart_params: {
-                'key': 'uploads/#{SecureRandom.hex(10)}_#{Time.now.to_i}_${filename}',
-                'Filename': 'uploads/#{SecureRandom.hex(10)}_#{Time.now.to_i}_${filename}', // adding this to keep consistency across the runtimes
+                'key': 'uploads/#{filename_token}_${filename}',
+                'Filename': 'uploads/#{filename_token}_${filename}', // adding this to keep consistency across the runtimes
           			'acl': '#{options[:acl]}',
           			'Content-Type': '#{options[:content_type]}',
           			'success_action_status': '201',

data/lib/generators/{uploader_generator.rb → applicious_uploader_generator.rb}

@@ -1,6 +1,6 @@
 require 'rails/generators'
 
-class UploaderGenerator < Rails::Generators::Base
+class AppliciousUploaderGenerator < Rails::Generators::Base
   def self.source_root
     @source_root ||= File.join(File.dirname(__FILE__), 'templates')
   end
@@ -12,7 +12,5 @@ class UploaderGenerator < Rails::Generators::Base
     copy_file  "applicious_uploader.js.coffee", "app/assets/javascripts/applicious_uploader.js.coffee"    
     copy_file  "crossdomain.xml", "public/applicious/UPLOAD_TO_S3/crossdomain.xml"
     copy_file  "clientaccesspolicy.xml", "public/applicious/UPLOAD_TO_S3/clientaccesspolicy.xml"
-
-    #template "session_store.rb", "app/config/initializers/session_store.rb"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applicious_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
   prerelease: 
 platform: ruby
 authors:
@@ -80,12 +80,11 @@ files:
 - lib/applicious_utils/version.rb
 - lib/applicious_utils/view_helpers.rb
 - lib/applicious_utils.rb
+- lib/generators/applicious_uploader_generator.rb
 - lib/generators/templates/amazon_s3.yml
 - lib/generators/templates/applicious_uploader.js.coffee
 - lib/generators/templates/clientaccesspolicy.xml
 - lib/generators/templates/crossdomain.xml
-- lib/generators/templates/session_store.rb
-- lib/generators/uploader_generator.rb
 - Rakefile
 homepage: http://appliciousagency.com
 licenses: []

data/lib/generators/templates/session_store.rb

@@ -1,69 +0,0 @@
-=begin
-<script type="text/javascript">
-<% session_key_name = Rails.application.config.session_options[:key] %>
-
-// Default options
-$(function() {
-	var uploader = new plupload.Uploader({
-    runtimes: 'html5,flash',
-		//url: '<%= photos_path %>',
-		//container : 'container',
-		browse_button : 'applicious_uploader',
-		max_file_size : '10mb',
-		flash_swf_url : '<%= asset_path("plupload.flash.swf") %>',
-		
-		multipart: true,
-    multipart_params: {
-      '_http_accept': 'application/javascript',
-      'authenticity_token' : '<%= form_authenticity_token %>',
-      '<%= session_key_name %>' : encodeURIComponent('<%= u cookies[session_key_name] %>')
-    },
-
-		filters : [
-			//{title : "Zip files", extensions : "zip"},
-			{title : "Image files", extensions : "jpeg,jpg,gif,png"},
-		],
-		
-		//resize : {width : 320, height : 240, quality : 90},
-		    
-		filters : [
-			{title : "Image files", extensions : "jpg,gif,png"},
-			{title : "Zip files", extensions : "zip"}
-		],
-	});
-	
-	uploader.bind('FilesAdded', function(up, files) {
-		$.each(files, function(i, file) {
-			$('#filelist').append(
-				'<div id="' + file.id + '">' +
-				file.name + ' (' + plupload.formatSize(file.size) + ') <b></b>' +
-			'</div>');
-		});
-
-		up.refresh(); // Reposition Flash/Silverlight
-	});
-
-
-	uploader.bind('UploadProgress', function(up, file) {
-		AP.log( up, file );
-	});
-
-	uploader.bind('Error', function(up, err) {
-		AP.log( up, err );
-		up.refresh(); // Reposition Flash/Silverlight
-	});
-
-	uploader.bind('FileUploaded', function(up, file) {
-		AP.log( up, file );
-	});
-
-	uploader.init();
-
-	$('#uploadfiles').click(function(e) {
-		uploader.start();
-		e.preventDefault();
-	});
-
-});
-</script>
-=end