s3_cors_fileupload 0.2.0.pre1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79391b654debb51c6dd03fe45b28cb12a1d06065
-  data.tar.gz: b06c05d0b17b59e005c8569e256356573fc88472
+  metadata.gz: c2cfe9cc0074544ce499718dcade6db5f33a0f51
+  data.tar.gz: da9078e43ca4632005d14abd7722fa5ec91e28cc
 SHA512:
-  metadata.gz: c5637708ed1fb4f9c7d387f854e46817c70d3d29207f5faa14dfa7d8add69756c60d7a22f9024d955a7f373aa948725aa35d04faf1cd2615d91960b446c0d59a
-  data.tar.gz: ddf94cb6e3e397f1d4f8b20b5af3b441697c523b506290a1215188f86677d6f1ac24d191f9bd4d824f4a4e3847407113481d41eddc30a54226b06c276fbf42d4
+  metadata.gz: c34ea6dcfdcbd365338edae0d6c9360bb99a4b4fb8023c3f2650775af59455cef3fc14e965677e9dff9f041faed8ce3fcf1f636a70b5fb32974610f8b6e1cd9c
+  data.tar.gz: 80b107368d59fb206ea925c414047750d829208b425a318846b4e37a5deac53987517f3672f97d9f86f0f0e637aabe82caf09b43a23ad7f36caccdc02d9c5d66

data/CHANGELOG.md

@@ -3,6 +3,7 @@
   - Upgraded jQuery-File-Upload and the other JavaScript files it is dependent upon to the most recent releases (see [lib/s3\_cors\_fileupload/version.rb](https://github.com/fullbridge-batkins/s3_cors_fileupload/blob/master/lib/s3_cors_fileupload/version.rb) for the current version #'s)
   - Adjusted the `s3_cors_fileupload_form_tag` view helper so that block arguments passed to it are inserted inside of the form tag as opposed to the end of it.
   - Changed the default expiration time for the form from 1 hour to 10 hours.
+  - Swapped in [MultiJSON](https://github.com/intridea/multi_json) for the JSON gem.
   - Added a lot more spec coverage.
 
 ## 0.1.5

data/lib/generators/s3_cors_fileupload/install/templates/s3_uploads.js

@@ -39,16 +39,16 @@ $(function() {
   });
 
   $('#fileupload').bind('fileuploaddone', function (e, data) {
-    // the response will be XML, and can be accessed by calling `data.result`
-    //
-    // Here is an example of what the XML will look like coming back from S3:
-    //  <PostResponse>
-    //    <Location>https://bucket-name.s3.amazonaws.com/uploads%2F3ducks.jpg</Location>
-    //    <Bucket>bucket-name</Bucket>
-    //    <Key>uploads/3ducks.jpg</Key>
-    //    <ETag>"c7902ef289687931f34f92b65afda320"</ETag>
-    //  </PostResponse>
-     
+      // the response will be XML, and can be accessed by calling `data.result`
+      //
+      // Here is an example of what the XML will look like coming back from S3:
+      //  <PostResponse>
+      //    <Location>https://bucket-name.s3.amazonaws.com/uploads%2F3ducks.jpg</Location>
+      //    <Bucket>bucket-name</Bucket>
+      //    <Key>uploads/3ducks.jpg</Key>
+      //    <ETag>"c7902ef289687931f34f92b65afda320"</ETag>
+      //  </PostResponse>
+
       $.post('/source_files.json',
           {
             'source_file[url]': $(data.result).find('Location').text(),
@@ -63,10 +63,17 @@ $(function() {
       );
    });
 
-   // remove the table row containing the source file information from the page
+   $('#fileupload').bind('fileuploadcompleted', function (e, data) {
+      // remove the downloaded templates, since in the above function we put our own custom 'template-uploaded' onto the list instead
+      data.context.remove();
+   });
+
    $('#fileupload').bind('fileuploaddestroyed', function (e, data) {
-      var deleted_object_id = data.url.split('/').pop();
-      // now remove the element from the page
+      if (!data.url) // sometimes this callback seems to get triggered a couple times, and has null data after the first time
+        return null;
+
+      var deleted_object_id = String(data.url).split('/').pop();
+      // remove the table row containing the source file information from the page
       $('#source_file_' + deleted_object_id).remove();
    });
 
@@ -75,14 +82,12 @@ $(function() {
 // used for displaying approximate file size on the file listing index.
 // functionality mimics what the jQuery-File-Upload script does.
 function formatFileSize(bytes) {
-    if (typeof bytes !== 'number') {
-        return '';
-    }
-    if (bytes >= 1000000000) {
-        return (bytes / 1000000000).toFixed(2) + ' GB';
-    }
-    if (bytes >= 1000000) {
-        return (bytes / 1000000).toFixed(2) + ' MB';
-    }
-    return (bytes / 1000).toFixed(2) + ' KB';
+    if (typeof bytes !== 'number')
+      return '';
+    else if (bytes >= 1000000000)
+      return (bytes / 1000000000).toFixed(2) + ' GB';
+    else if (bytes >= 1000000)
+      return (bytes / 1000000).toFixed(2) + ' MB';
+    else
+      return (bytes / 1000).toFixed(2) + ' KB';
 }

data/lib/generators/s3_cors_fileupload/install/templates/views/erb/index.html.erb

@@ -6,8 +6,8 @@
 
   <div class="javascript-templates">
     <%= render 'template_upload' %>
+    <%= render 'template_download' %>
     <%= render 'template_uploaded' %>
-    <%# render 'template_download' %>
   </div>
 </div>
 
@@ -17,9 +17,7 @@
       // Initialize the jQuery File Upload widget:
       $('#fileupload').fileupload({
         dataType: 'xml',
-        sequentialUploads: true,
-        downloadTemplateId: null,
-        downloadTemplate: null
+        sequentialUploads: true
       });
       
       // Load existing files:

data/lib/generators/s3_cors_fileupload/install/templates/views/haml/_template_download.html.haml

@@ -10,8 +10,8 @@
     %td.size
       %span {%=o.formatFileSize(file.size)%}
     %td.error{:colspan => "2"}
-      %span.label.label-important {%=locale.fileupload.error%}
-      {%=locale.fileupload.errors[file.error] || file.error%}
+      %span.label.label-important Error
+      {%=file.error%}
     {% } else { %}
     %td.preview
       {% if (file.thumbnail_url) { %}
@@ -19,7 +19,7 @@
         %img{:src => "{%=file.thumbnail_url%}"}/
       {% } %}
     %td.name
-      %a{:download => "{%=file.name%}", :href => "{%=file.url%}", :rel => "{%=file.thumbnail_url&&'gallery'%}", :title => "{%=file.name%}"} {%=file.name%}
+      %a{:download => "{%=file.name%}", :href => "{%=file.url%}", :rel => "{%=file.thumbnail_url&&'gallery'%}".html_safe, :title => "{%=file.name%}"} {%=file.name%}
     %td.size
       %span {%=$('#fileupload').formatFileSize(file.size)%}
     %td{:colspan => "2"}

data/lib/generators/s3_cors_fileupload/install/templates/views/haml/index.html.haml

@@ -6,17 +6,15 @@
   
   .javascript-templates
     = render 'template_upload'
+    = render 'template_download'
     = render 'template_uploaded'
-    =# render 'template_download'
 
 :javascript
   $(function () {
     // Initialize the jQuery File Upload widget:
     $('#fileupload').fileupload({
       dataType: 'xml',
-      sequentialUploads: true,
-      downloadTemplateId: null,
-      downloadTemplate: null
+      sequentialUploads: true
     });
     
     // Load existing files:

data/lib/s3_cors_fileupload/rails/form_helper.rb

@@ -21,7 +21,7 @@ module S3CorsFileupload
       hidden_form_fields = {
         :key => '',
         'Content-Type' => '',
-        'AWSAccessKeyId' => options[:access_key_id] || Config.access_key_id,
+        :AWSAccessKeyId => options[:access_key_id] || Config.access_key_id,
         :acl => policy_helper.options[:acl],
         :policy => policy_helper.policy_document,
         :signature => policy_helper.upload_signature,

data/lib/s3_cors_fileupload/rails/policy_helper.rb

@@ -1,7 +1,7 @@
 require 'base64'
 require 'openssl'
 require 'digest/sha1'
-require 'json'
+require 'multi_json'
 
 module S3CorsFileupload
   class PolicyHelper
@@ -18,31 +18,35 @@ module S3CorsFileupload
 
     # generate the policy document that amazon is expecting.
     def policy_document
-      Base64.encode64(
-        {
-          expiration: 10.hours.from_now.utc.iso8601(3),
-          conditions: [
-            { bucket: options[:bucket] },
-            { acl: options[:acl] },
-            { success_action_status: '201' },
-            ["content-length-range", 0, options[:max_file_size]],
-            ["starts-with", "$utf8", ""],
-            ["starts-with", "$key", ""],
-            ["starts-with", "$Content-Type", ""]
-          ]
-        }.to_json
-      ).gsub(/\n|\r/, '')
+      @policy_document ||=
+        Base64.encode64(
+          MultiJson.dump(
+            {
+              expiration: 10.hours.from_now.utc.iso8601(3),
+              conditions: [
+                { bucket: options[:bucket] },
+                { acl: options[:acl] },
+                { success_action_status: '201' },
+                ["content-length-range", 0, options[:max_file_size]],
+                ["starts-with", "$utf8", ""],
+                ["starts-with", "$key", ""],
+                ["starts-with", "$Content-Type", ""]
+              ]
+            }
+          )
+        ).gsub(/\n/, '')
     end
 
     # sign our request by Base64 encoding the policy document.
     def upload_signature
-      Base64.encode64(
-        OpenSSL::HMAC.digest(
-          OpenSSL::Digest::SHA1.new,
-          options[:secret_access_key],
-          self.policy_document
-        )
-      ).gsub(/\n/, '')
+      @upload_signature ||=
+        Base64.encode64(
+          OpenSSL::HMAC.digest(
+            OpenSSL::Digest::SHA1.new,
+            options[:secret_access_key],
+            self.policy_document
+          )
+        ).gsub(/\n/, '')
     end
   end
 end

data/lib/s3_cors_fileupload/version.rb

@@ -1,5 +1,5 @@
 module S3CorsFileupload
-  VERSION = '0.2.0.pre1'
+  VERSION = '0.2.0'
   JQUERY_FILEUPLOAD_VERSION = '5.26'
   JQUERY_FILEUPLOAD_UI_VERSION = '7.4.1'
 end

data/s3_cors_fileupload.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = %w(--charset=UTF-8)
 
   s.add_dependency('rails', ['~> 3.1'])
+  s.add_dependency('multi_json', ['~> 1.0'])
   s.add_dependency('jquery-rails', ['>= 2.0'])
   s.add_dependency('aws-s3', ['~> 0.6']) # :require => 'aws/s3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_cors_fileupload
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Atkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement