s3_cors_fileupload 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1663604ff16d796357b7403b636742f6e24918bb
-  data.tar.gz: e57aa2433e8b7bc6d9dd2310eef4d3c618e0fb54
+  metadata.gz: 4b847b99b1ab87ff28551afbc29835bae6d05ade
+  data.tar.gz: d9329093fdede0b711a306514b69304b85ad2b8e
 SHA512:
-  metadata.gz: 5151172fdf0783b98a8a5f49230387c7bdc1856ccdf6840c4a657b814ed127af593e2e3ad2265bf76361fb9728f17b05935fbe5eb6dda2d89309c6dac462eaae
-  data.tar.gz: 1c609d8679a456000135604c3f008b1986290529fabf70e6b840ef08903a86d2399e345b77525afcd72e0f8373cfa76b733932af298070a99c215ea4ddae892d
+  metadata.gz: f5aec54483c76bf143514a86f90c0ba792838635b7e4744f3c71099d6116a179f201b879add769631f11ed45bf2ea8364930cb50df5223d6ec2d76bee4e0ec87
+  data.tar.gz: 63a8cc7ec0cd76e0d287e3b1f16bd5ddc9e2063170da7e953ea1856bbace1dcfb903076ba86390986a8dbd056985963c601f6b88a1a10a71b5632436b6ed73dd

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3

data/CHANGELOG.md

@@ -1,11 +1,18 @@
-## 0.3.0 (Unreleased)
-
+## 0.3.0
+
+  - Rails 4 compatibility.
+  - Upgraded jQuery-File-Upload and corresponding JavaScript dependencies to 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)
+  - Updated to [Twitter Bootstrap](http://twitter.github.com/bootstrap/) 3.
+  - Added new `:secure` option that can be passed into the `FormHelper`'s `s3_cors_fileupload_form_tag` method to set the protocol to `http` or `https` (defaults to `https`).
+  - Removed dependency on [jquery-rails](https://github.com/rails/jquery-rails), since there are other valid solutions for including it to a Rails app.
   - 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)
+  - 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/v0.2.1/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.
 

data/Gemfile

@@ -1,19 +1,21 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'rdoc', '~> 3.12'
+  gem 'rdoc', '~> 4.0'
   gem 'gem-release', '~> 0.6'
 end
 
 group :test do
-  gem 'rspec-rails', '~> 2.13'
-  gem 'shoulda-matchers', '~> 2.0'
-  gem 'generator_spec'
-  gem 'ffaker'
-
   # dependencies for S3CorsFileUpload
-  gem 'rails', '~> 3.2'
-  # gem 'jquery-rails' # would be necessary to do UI testing on the dummy app
-  gem 'sqlite3' # the database driver for rails
+  gem 'rails', '~> 4.0'
   gem 'aws-s3'
+  gem 'sqlite3' # the database driver for rails
+  gem 'jquery-rails' # for including jQuery into the dummy app
+
+  gem 'rspec-rails', '~> 2.14'
+  gem 'shoulda-matchers', '~> 2.4'
+  gem 'generator_spec'
+  gem 'ffaker'
+  gem 'capybara'
+  gem 'poltergeist' # to use as JS driver for Capybara
 end

data/Gemfile.lock

@@ -1,86 +1,95 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
       mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.14)
     aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
-    builder (3.0.4)
+    builder (3.1.4)
+    capybara (2.1.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    cliver (0.2.2)
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffaker (1.16.2)
+    ffaker (1.19.0)
     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)
+    i18n (0.6.5)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.7)
+    mime-types (1.25)
+    mini_portile (0.5.1)
+    minitest (4.7.5)
+    multi_json (1.8.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    poltergeist (1.4.1)
+      capybara (~> 2.1.0)
+      cliver (~> 0.2.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    rdoc (3.12.2)
+    rdoc (4.0.1)
       json (~> 1.4)
-    rspec-core (2.14.3)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec-mocks (2.14.3)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -88,32 +97,44 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    shoulda-matchers (2.2.0)
+    shoulda-matchers (2.4.0)
       activesupport (>= 3.0.0)
-    sprockets (2.2.2)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
+    websocket-driver (0.3.0)
     xml-simple (1.1.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aws-s3
+  capybara
   ffaker
   gem-release (~> 0.6)
   generator_spec
-  rails (~> 3.2)
-  rdoc (~> 3.12)
-  rspec-rails (~> 2.13)
-  shoulda-matchers (~> 2.0)
+  jquery-rails
+  poltergeist
+  rails (~> 4.0)
+  rdoc (~> 4.0)
+  rspec-rails (~> 2.14)
+  shoulda-matchers (~> 2.4)
   sqlite3

data/README.md

@@ -1,19 +1,23 @@
-# S3CorsFileupload
+# S3CorsFileupload [![Gem Version](https://badge.fury.io/rb/s3_cors_fileupload.png)](http://badge.fury.io/rb/s3_cors_fileupload) [![Build Status](https://travis-ci.org/fullbridge-batkins/s3_cors_fileupload.png?branch=master)](https://travis-ci.org/fullbridge-batkins/s3_cors_fileupload)
 
 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.
 
+*Note: your application must include [jQuery](http://jquery.com/) for the plugin to work properly,
+either through the [`jquery-rails` gem](https://github.com/rails/jquery-rails), or some other means.*
+
 ### Included JavaScript plugin versions
 
-* jQuery File Upload User Interface Plugin 8.5.0
-* jQuery File Upload Plugin 5.32.0
+* jQuery File Upload User Interface Plugin 8.8.5
+* jQuery File Upload Plugin 5.32.6
 * 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.
+the new version(s) of the jQuery-File-Upload UI JavaScript. You will also need to re-compile your asset pipeline assets to
+get the latest versions of the javascript plugins if you precompile your assets.
 
 ## Installation
 Add this line to your application's Gemfile:

data/lib/generators/s3_cors_fileupload/install/install_generator.rb

@@ -1,12 +1,11 @@
 require 'rails/generators'
 require 'rails/generators/migration'
-require 'rails/generators/active_record/migration'
+require 'rails/generators/active_record'
 
 module S3CorsFileupload
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       include ::Rails::Generators::Migration
-      extend ActiveRecord::Generators::Migration
 
       VALID_TEMPLATE_LANGS = [:erb, :haml]
 
@@ -50,6 +49,10 @@ module S3CorsFileupload
         )
       end
 
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+
     end
   end
 end

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

@@ -13,7 +13,9 @@ class S3UploadsController < ApplicationController
   # POST /source_files
   # POST /source_files.json
   def create
-    @source_file = SourceFile.new(params[:source_file])
+    # this line allows for compatibility with `ProtectedAttributes` or `StrongParameters`
+    parameters = S3CorsFileupload.active_record_protected_attributes? ? params[:source_file] : params.require(:source_file).permit(:url, :bucket, :key)
+    @source_file = SourceFile.new(parameters)
     respond_to do |format|
       if @source_file.save
         format.html {

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

@@ -1,7 +1,8 @@
 require 'aws/s3'
 
 class SourceFile < ActiveRecord::Base
-  attr_accessible :url, :bucket, :key
+  # This line can be removed for Rails 4 apps that are using Strong Parameters
+  attr_accessible :url, :bucket, :key if S3CorsFileupload.active_record_protected_attributes?
 
   validates_presence_of :file_name, :file_content_type, :file_size, :key, :bucket
 
@@ -9,8 +10,8 @@ class SourceFile < ActiveRecord::Base
     self.file_name = key.split('/').last if key
     # for some reason, the response from AWS seems to escape the slashes in the keys, this line will unescape the slash
     self.url = url.gsub(/%2F/, '/') if url
-    self.file_size ||= s3_object.try(:size)
-    self.file_content_type ||= s3_object.try(:content_type)
+    self.file_size ||= s3_object.size rescue nil
+    self.file_content_type ||= s3_object.content_type rescue nil
   end
   # make all attributes readonly after creating the record (not sure we need this?)
   after_create { readonly! }

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

@@ -11,21 +11,32 @@
       </td>
       <td>
         <p class="name">
-          <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl ? 'data-gallery' : ''%}>{%=file.name%}</a>
+          {% if (file.url) { %}
+            <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl ? 'data-gallery' : ''%}>{%=file.name%}</a>
+          {% } else { %}
+            <span>{%=file.name%}</span>
+          {% } %}
         </p>
         {% if (file.error) { %}
-          <div><span class="label label-important">Error</span> {%=file.error%}</div>
+          <div><span class="label label-danger">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" class="toggle">
+        {% if (file.deleteUrl) { %}
+          <button class="btn btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" data-confirmation="Are you sure?" {% if (file.delete_with_credentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
+            <i class="glyphicon glyphicon-trash"></i>
+            <span>Delete</span>
+          </button>
+          <input type="checkbox" name="delete" value="1" class="toggle">
+        {% } else { %}
+          <button class="btn btn-warning cancel">
+            <i class="glyphicon glyphicon-ban-circle"></i>
+            <span>Cancel</span>
+          </button>
+        {% } %}
       </td>
     </tr>
   {% } %}

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

@@ -8,25 +8,25 @@
       <td>
         <p class="name">{%=file.name%}</p>
         {% if (file.error) { %}
-          <div><span class="label label-important">Error</span> {%=file.error%}</div>
+          <div><span class="label label-danger">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>
+          <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" 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>
+            <i class="glyphicon glyphicon-upload"></i>
             <span>Start</span>
           </button>
         {% } %}
         {% if (!i) { %}
           <button class="btn btn-warning cancel">
-              <i class="icon-ban-circle icon-white"></i>
+              <i class="glyphicon glyphicon-ban-circle"></i>
               <span>Cancel</span>
           </button>
         {% } %}

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

@@ -13,18 +13,29 @@
     </td>
     <td>
       <p class="name">
-        <a href="{%=o.url%}" title="{%=o.name%}" download="{%=o.name%}" {%=o.image ? 'data-gallery' : ''%}>{%=o.name%}</a>
+        {% if (o.url) { %}
+          <a href="{%=o.url%}" title="{%=o.name%}" download="{%=o.name%}" {%=o.image ? 'data-gallery' : ''%}>{%=o.name%}</a>
+        {% } else { %}
+          <span>{%=o.name%}</span>
+        {% } %}
       </p>
     </td>
     <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" class="toggle">
+      {% if (o.delete_url) { %}
+        <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="glyphicon glyphicon-trash"></i>
+          <span>Delete</span>
+        </button>
+        <input type="checkbox" name="delete" value="1" class="toggle">
+      {% } else { %}
+        <button class="btn btn-warning cancel">
+          <i class="glyphicon glyphicon-ban-circle"></i>
+          <span>Cancel</span>
+        </button>
+      {% } %}
     </td>
   </tr>
 </script>