s3_cors_fileupload 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2cfe9cc0074544ce499718dcade6db5f33a0f51
-  data.tar.gz: da9078e43ca4632005d14abd7722fa5ec91e28cc
+  metadata.gz: 1663604ff16d796357b7403b636742f6e24918bb
+  data.tar.gz: e57aa2433e8b7bc6d9dd2310eef4d3c618e0fb54
 SHA512:
-  metadata.gz: c34ea6dcfdcbd365338edae0d6c9360bb99a4b4fb8023c3f2650775af59455cef3fc14e965677e9dff9f041faed8ce3fcf1f636a70b5fb32974610f8b6e1cd9c
-  data.tar.gz: 80b107368d59fb206ea925c414047750d829208b425a318846b4e37a5deac53987517f3672f97d9f86f0f0e637aabe82caf09b43a23ad7f36caccdc02d9c5d66
+  metadata.gz: 5151172fdf0783b98a8a5f49230387c7bdc1856ccdf6840c4a657b814ed127af593e2e3ad2265bf76361fb9728f17b05935fbe5eb6dda2d89309c6dac462eaae
+  data.tar.gz: 1c609d8679a456000135604c3f008b1986290529fabf70e6b840ef08903a86d2399e345b77525afcd72e0f8373cfa76b733932af298070a99c215ea4ddae892d

data/CHANGELOG.md

@@ -1,10 +1,20 @@
-## 0.2.0 (Unreleased)
+## 0.3.0 (Unreleased)
+
+  - Added a lot more spec coverage.
+
+## 0.2.1
+
+  - Adjusted FormHelper module so that the 'Add files...' button is a `span` tag instead of a `button` tag (fixes compatibility with FireFox)
+  - 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)
+  - Added new Process and Validation plugins from the jQuery-File-Upload package.
+  - Minor stability enhancements.
+
+## 0.2.0
 
   - 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/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'rdoc', '~> 3.12'
-  gem 'gem-release', '~> 0.5'
+  gem 'gem-release', '~> 0.6'
 end
 
 group :test do

data/Gemfile.lock

@@ -36,21 +36,21 @@ GEM
     builder (3.0.4)
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffaker (1.15.0)
-    gem-release (0.5.5)
-    generator_spec (0.8.7)
-      activerecord (>= 3.0, < 4.0)
-      railties (>= 3.0, < 4.0)
-    hike (1.2.2)
+    ffaker (1.16.2)
+    gem-release (0.6.0)
+    generator_spec (0.9.0)
+      activerecord (>= 3.0, <= 4.0)
+      railties (>= 3.0, <= 4.0)
+    hike (1.2.3)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.7)
+    json (1.8.0)
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    multi_json (1.7.2)
+    multi_json (1.7.7)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -74,21 +74,21 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec-core (2.14.3)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.1)
+    rspec-mocks (2.14.1)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    shoulda-matchers (2.0.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -97,7 +97,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     thor (0.18.1)
-    tilt (1.3.7)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -110,7 +110,7 @@ PLATFORMS
 DEPENDENCIES
   aws-s3
   ffaker
-  gem-release (~> 0.5)
+  gem-release (~> 0.6)
   generator_spec
   rails (~> 3.2)
   rdoc (~> 3.12)

data/README.md

@@ -3,6 +3,18 @@
 A gem to allow for uploading of files to directly AWS-S3 via [CORS](http://www.w3.org/TR/cors/) using the
 [jQuery-File-Upload javascript](http://blueimp.github.com/jQuery-File-Upload/) for Rails 3.1 and greater.
 
+### Included JavaScript plugin versions
+
+* jQuery File Upload User Interface Plugin 8.5.0
+* jQuery File Upload Plugin 5.32.0
+* jQuery UI Widget 1.10.3+amd
+
+### Upgrade notes for `0.2` (and higher) releases
+
+If you are upgrading from an older version, please re-run the install generator with the `--skip-migration` option.
+The view templates (`_template_download`, `_template_upload`, `_template_uploaded`) often change to stay compatible with
+the new version(s) of the jQuery-File-Upload UI JavaScript.
+
 ## Installation
 Add this line to your application's Gemfile:
 
@@ -139,5 +151,5 @@ Note: I am still in the process of trying to write a more thorough test suite, s
 
 ## Copyright
 
-Copyright (c) 2012 Ben Atkins. See [LICENSE.txt](https://github.com/fullbridge-batkins/s3_cors_fileupload/blob/master/LICENSE.txt)
+Copyright © 2013 Ben Atkins. See [LICENSE.txt](https://github.com/fullbridge-batkins/s3_cors_fileupload/blob/master/LICENSE.txt)
 for further details.

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

@@ -72,9 +72,8 @@ $(function() {
       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();
+      $('#source_file_' + data.object_id).remove();
    });
 
 });

data/lib/generators/s3_cors_fileupload/install/templates/source_file.rb

@@ -24,7 +24,7 @@ class SourceFile < ActiveRecord::Base
       'size' => file_size,
       'url' => url,
       'image' => self.is_image?,
-      'delete_url' => Rails.application.routes.url_helpers.source_file_path(self)
+      'delete_url' => Rails.application.routes.url_helpers.source_file_path(self, :format => :json)
     }
   end
 

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

@@ -2,28 +2,31 @@
 <script id="template-download" type="text/x-tmpl">
   {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-download fade">
-      {% if (file.error) { %}
-        <td></td>
-        <td class="name"><span>{%=file.name%}</span></td>
-        <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-        <td class="error" colspan="2"><span class="label label-important">Error</span> {%=file.error%}</td>
-        {% } else { %}
-        <td class="preview">{% if (file.thumbnail_url) { %}
-          <a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
-          {% } %}</td>
-        <td class="name">
-          <a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
-        </td>
-        <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-        <td colspan="2"></td>
+      <td>
+        <span class="preview">
+          {% if (file.thumbnailUrl) { %}
+            <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" data-gallery><img src="{%=file.thumbnailUrl%}"></a>
+          {% } %}
+        </span>
+      </td>
+      <td>
+        <p class="name">
+          <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl ? 'data-gallery' : ''%}>{%=file.name%}</a>
+        </p>
+        {% if (file.error) { %}
+          <div><span class="label label-important">Error</span> {%=file.error%}</div>
         {% } %}
+      </td>
+      <td>
+        <span class="size">{%=o.formatFileSize(file.size)%}</span>
+      </td>
       <td>
         <button class="btn btn-danger delete" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}" data-confirmation="Are you sure?" {% if (file.delete_with_credentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
           <i class="icon-trash icon-white"></i>
           <span>Delete</span>
         </button>
-        <input type="checkbox" name="delete" value="1">
+        <input type="checkbox" name="delete" value="1" class="toggle">
       </td>
     </tr>
-    {% } %}
+  {% } %}
 </script>

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

@@ -1,31 +1,36 @@
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
   {% for (var i=0, file; file=o.files[i]; i++) { %}
-  <tr class="template-upload fade">
-    <td class="preview"><span class="fade"></span></td>
-    <td class="name"><span>{%=file.name%}</span></td>
-    <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-    {% if (file.error) { %}
-    <td class="error" colspan="2"><span class="label label-important">Error</span> {%=file.error%}</td>
-    {% } else if (o.files.valid && !i) { %}
-    <td>
-      <div class="progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
-    </td>
-    <td>{% if (!o.options.autoUpload) { %}
-      <button class="btn btn-primary start">
-        <i class="icon-upload icon-white"></i>
-        <span>Start</span>
-      </button>
-      {% } %}</td>
-    {% } else { %}
-    <td colspan="2"></td>
-    {% } %}
-    <td>{% if (!i) { %}
-      <button class="btn btn-warning cancel">
-        <i class="icon-ban-circle icon-white"></i>
-        <span>Cancel</span>
-      </button>
-      {% } %}</td>
-  </tr>
+    <tr class="template-upload fade">
+      <td>
+        <span class="preview"></span>
+      </td>
+      <td>
+        <p class="name">{%=file.name%}</p>
+        {% if (file.error) { %}
+          <div><span class="label label-important">Error</span> {%=file.error%}</div>
+        {% } %}
+      </td>
+      <td>
+        <p class="size">{%=o.formatFileSize(file.size)%}</p>
+        {% if (!o.files.error) { %}
+          <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
+        {% } %}
+      </td>
+      <td>
+        {% if (!o.files.error && !i && !o.options.autoUpload) { %}
+          <button class="btn btn-primary start">
+            <i class="icon-upload icon-white"></i>
+            <span>Start</span>
+          </button>
+        {% } %}
+        {% if (!i) { %}
+          <button class="btn btn-warning cancel">
+              <i class="icon-ban-circle icon-white"></i>
+              <span>Cancel</span>
+          </button>
+        {% } %}
+      </td>
+    </tr>
   {% } %}
 </script>

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

@@ -2,24 +2,29 @@
 <!-- This essentially is a stand-in for the template_download partial for the s3_cors_fileupload gem's purposes -->
 <script id="template-uploaded" type="text/x-tmpl">
   <tr class="template-uploaded" id="source_file_{%=o.id%}">
-    <td class="preview">
-      {% if (o.image == true) { %}
-        <a href="{%=o.url%}" title="{%=o.name%}" rel="gallery" download="{%=o.name%}">
-          <image src="{%=o.url%}", style='width:80px; height:56px;'></image>
-        </a>
-      {% } %}
+    <td>
+      <span class="preview">
+        {% if (o.image == true) { %}
+          <a href="{%=o.url%}" title="{%=o.name%}" download="{%=o.name%}" data-gallery>
+            <image src="{%=o.url%}", style='width:80px; height:56px;'></image>
+          </a>
+        {% } %}
+      </span>
     </td>
-    <td class="name">
-      <a href="{%=o.url%}" title="{%=o.name%}" rel="{%=o.thumbnail_url&&'gallery'%}" download="{%=o.name%}">{%=o.name%}</a>
+    <td>
+      <p class="name">
+        <a href="{%=o.url%}" title="{%=o.name%}" download="{%=o.name%}" {%=o.image ? 'data-gallery' : ''%}>{%=o.name%}</a>
+      </p>
     </td>
-    <td class="size"><span>{%=formatFileSize(o.size)%}</span></td>
-    <td colspan="2"></td>
-    <td class="delete">
-      <button class="btn btn-danger delete" data-type="DELETE" data-url="{%=o.delete_url%}" data-confirmation="Are you sure?" {% if (file.delete_with_credentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
+    <td>
+      <span class="size">{%=formatFileSize(o.size)%}</span>
+    </td>
+    <td>
+      <button class="btn btn-danger delete" data-type="DELETE" data-url="{%=o.delete_url%}" data-object_id="{%=o.id%}" data-confirmation="Are you sure?" {% if (o.delete_with_credentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
         <i class="icon-trash icon-white"></i>
         <span>Delete</span>
       </button>
-      <input type="checkbox" name="delete" value="1">
+      <input type="checkbox" name="delete" value="1" class="toggle">
     </td>
   </tr>
 </script>

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

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css' %>
+<%= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css' %>
 
 <div style="padding: 10px;">
   <h2>Upload file(s)</h2>

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

@@ -3,30 +3,25 @@
 %script#template-download{:type => "text/x-tmpl"}
   {% for (var i=0, file; file=o.files[i]; i++) { %}
   %tr.template-download.fade
-    {% if (file.error) { %}
     %td
-    %td.name
-      %span {%=file.name%}
-    %td.size
-      %span {%=o.formatFileSize(file.size)%}
-    %td.error{:colspan => "2"}
-      %span.label.label-important Error
-      {%=file.error%}
-    {% } else { %}
-    %td.preview
-      {% if (file.thumbnail_url) { %}
-      %a{:download => "{%=file.name%}", :href => "{%=file.url%}", :rel => "gallery", :title => "{%=file.name%}"}
-        %img{:src => "{%=file.thumbnail_url%}"}/
+      %span.preview
+        {% if (file.thumbnailUrl) { %}
+        %a{:download => "{%=file.name%}", :href => "{%=file.url%}", :title => "{%=file.name%}", :"data-gallery" => ''}
+          %img{:src => "{%=file.thumbnailUrl%}"}/
+        {% } %}
+    %td
+      %p.name
+        %a{:href => "{%=file.url%}", :title => "{%=file.name%}", :download => "{%=file.name%}", :"data-gallery" => !"{%= file.thumbnailUrl ? ' ' : '' %}".html_safe.empty? && ''} {%=file.name%}
+      {% if (file.error) { %}
+      %div
+        %span.label.label-important Error
+        {%=file.error%}
       {% } %}
-    %td.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"}
-    {% } %}
+    %td
+      %span.size {%=o.formatFileSize(file.size)%}
     %td
       %button.btn.btn-danger.delete{"data-type" => "{%=file.delete_type%}", "data-url" => "{%=file.delete_url%}", "data-confirmation" => "Are you sure?", "data-xhr-fields" => !"{% if (file.delete_with_credentials) { %} {'withCredentials': true} {% } %}".blank? && "{% if (file.delete_with_credentials) { %} {'withCredentials': true} {% } %}"}
         %i.icon-trash.icon-white
         %span Delete
-      %input{:name => "delete", :type => "checkbox", :value => "1"}
-  {% } %}
+      %input.toggle{:name => "delete", :type => "checkbox", :value => "1"}
+  {% } %}

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

@@ -3,33 +3,30 @@
 %script#template-upload{:type => "text/x-tmpl"}
   {% for (var i=0, file; file=o.files[i]; i++) { %}
   %tr.template-upload.fade
-    %td.preview
-      %span.fade
-    %td.name
-      %span {%=file.name%}
-    %td.size
-      %span {%=o.formatFileSize(file.size)%}
-    {% if (file.error) { %}
-    %td.error{:colspan => "2"}
-      %span.label.label-important Error
-      {%=file.error%}
-    {% } else if (o.files.valid && !i) { %}
     %td
-      .progress.progress-success.progress-striped.active
+      %span.preview
+    %td
+      %p.name {%=file.name%}
+      {% if (file.error) { %}
+      %div
+        %span.label.label-important Error
+        {%=file.error%}
+      {% } %}
+    %td
+      %p.size {%=o.formatFileSize(file.size)%}
+      {% if (!o.files.error) { %}
+      .progress.progress-success.progress-striped.active{:role => 'progressbar', :"aria-valuemin" => '0', :"aria-valuemax" => '100', :"aria-valuenow" => '0'}
         .bar{:style => "width:0%;"}
+      {% } %}
     %td
-      {% if (!o.options.autoUpload) { %}
+      {% if (!o.files.error && !i && !o.options.autoUpload) { %}
       %button.btn.btn-primary.start
         %i.icon-upload.icon-white
         %span Start
       {% } %}
-    {% } else { %}
-    %td{:colspan => "2"}
-    {% } %}
-    %td
       {% if (!i) { %}
       %button.btn.btn-warning.cancel
         %i.icon-ban-circle.icon-white
         %span Cancel
       {% } %}
-  {% } %}
+  {% } %}

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

@@ -2,20 +2,19 @@
 / The template to display files that have been uploaded to S3 already
 %script#template-uploaded{:type => "text/x-tmpl"}
   %tr.template-uploaded{:id => "source_file_{%=o.id%}"}
-    {% if (o.image == true) { %}
-    %td.preview
-      %a{:download => "{%=o.name%}", :href => "{%=o.url%}", :rel => "gallery", :title => "{%=o.name%}"}
-        %img{:src => "{%=o.url%}", :style => 'width:80px; height:56px;'}
-    {% } else { %}
     %td
-    {% } %}
-    %td.name
-      %a{:download => "{%=o.name%}", :href => "{%=o.url%}", :rel => "{%=o.thumbnail_url&&'gallery'%}".html_safe, :title => "{%=o.name%}"} {%=o.name%}
-    %td.size
-      %span {%=formatFileSize(o.size)%}
-    %td{:colspan => "2"}
+      %span.preview
+        {% if (o.image == true) { %}
+        %a{:download => "{%=o.name%}", :href => "{%=o.url%}", :title => "{%=o.name%}", :"data-gallery" => ''}
+          %img{:src => "{%=o.url%}", :style => 'width:80px; height:56px;'}
+        {% } %}
     %td
-      %button.btn.btn-danger.delete{"data-type" => "DELETE", "data-url" => "{%=o.delete_url%}", "data-confirmation" => "Are you sure?", "data-xhr-fields" => !"{% if (file.delete_with_credentials) { %} {'withCredentials': true} {% } %}".blank? && "{% if (file.delete_with_credentials) { %} {'withCredentials': true} {% } %}"}
+      %p.name
+        %a{:href => "{%=o.url%}", :title => "{%=o.name%}", :download => "{%=o.name%}", :"data-gallery" => !"{%= o.thumbnailUrl ? 'true' : '' %}".html_safe.empty? && ''} {%=o.name%}
+    %td
+      %span.size {%=formatFileSize(o.size)%}
+    %td
+      %button.btn.btn-danger.delete{"data-type" => "DELETE", "data-url" => "{%=o.delete_url%}", "data-object_id" => "{%=o.id%}", "data-confirmation" => "Are you sure?", "data-xhr-fields" => !"{% if (o.delete_with_credentials) { %} {'withCredentials': true} {% } %}".blank? && "{% if (o.delete_with_credentials) { %} {'withCredentials': true} {% } %}"}
         %i.icon-trash.icon-white
         %span Delete
-      %input{:name => "delete", :type => "checkbox", :value => "1"}
+      %input.toggle{:name => "delete", :type => "checkbox", :value => "1"}