s3_cors_fileupload 0.1.5 → 0.2.0.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 79391b654debb51c6dd03fe45b28cb12a1d06065
+  data.tar.gz: b06c05d0b17b59e005c8569e256356573fc88472
+SHA512:
+  metadata.gz: c5637708ed1fb4f9c7d387f854e46817c70d3d29207f5faa14dfa7d8add69756c60d7a22f9024d955a7f373aa948725aa35d04faf1cd2615d91960b446c0d59a
+  data.tar.gz: ddf94cb6e3e397f1d4f8b20b5af3b441697c523b506290a1215188f86677d6f1ac24d191f9bd4d824f4a4e3847407113481d41eddc30a54226b06c276fbf42d4

data/.document

@@ -1,5 +1,6 @@
+lib/*.rb
 lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
+-
+README.md
+CHANGELOG.md
 LICENSE.txt

data/.gitignore

@@ -1,4 +1,7 @@
 .rvmrc
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp
 
 # rcov generated
 coverage
@@ -29,7 +32,6 @@ pkg
 # Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
 #
 # For MacOS:
-#
 #.DS_Store
 
 # For TextMate
@@ -43,9 +45,3 @@ pkg
 
 # For vim:
 #*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.0 (Unreleased)
+
+  - 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.
+  - Added a lot more spec coverage.
+
 ## 0.1.5
 
   - Added option to select 'haml' as the language template for the view files on the install generator.
@@ -7,7 +14,8 @@
 
   - Added a `data-confirmation` option to the delete buttons and functionality to the jQuery-File-Upload UI's destroy callback that picks up the contents of that attribute to use as a confirmation dialog.  (Fixed the implementation from v0.1.3)  [See the README notes for more details](https://github.com/fullbridge-batkins/s3_cors_fileupload#notes).
 
-## 0.1.3 (Yanked)
+## 0.1.3
+*This version was yanked because the 'data-confirmation' feature (see 0.1.4) was broken in a way that caused the user to be prompted every time they clicked on the delete button, regardless of the option.*
   
   - Improving install generator so that generation of the migration file is optional.
   - Removed some unnecessary code on some of the generator templates.

data/Gemfile

@@ -1,19 +1,19 @@
-source :rubygems
+source 'https://rubygems.org'
 
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-gemspec
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'rdoc', '~> 3.12'
-  gem 'gem-release', '~> 0.4'
+  gem 'gem-release', '~> 0.5'
 end
 
 group :test do
-  gem 'rails'
+  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 'rspec-rails', '~> 2.11'
-  gem 'shoulda-matchers'
+  gem 'aws-s3'
 end

data/Gemfile.lock

@@ -1,40 +1,32 @@
-PATH
-  remote: .
-  specs:
-    s3_cors_fileupload (0.1.4)
-      aws-s3 (~> 0.6)
-      jquery-rails (>= 2.0)
-      rails (~> 3.1)
-
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    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)
     aws-s3 (0.6.3)
@@ -42,86 +34,86 @@ GEM
       mime-types
       xml-simple
     builder (3.0.4)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    gem-release (0.4.1)
-    hike (1.2.1)
+    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)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    mail (2.4.4)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.23)
+    multi_json (1.7.2)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    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.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
-    shoulda-matchers (1.4.1)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    shoulda-matchers (2.0.0)
       activesupport (>= 3.0.0)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.3.7)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.37)
     xml-simple (1.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  gem-release (~> 0.4)
-  rails
-  rake (>= 0.8.7)
+  aws-s3
+  ffaker
+  gem-release (~> 0.5)
+  generator_spec
+  rails (~> 3.2)
   rdoc (~> 3.12)
-  rspec-rails (~> 2.11)
-  s3_cors_fileupload!
-  shoulda-matchers
+  rspec-rails (~> 2.13)
+  shoulda-matchers (~> 2.0)
   sqlite3

data/README.md

@@ -1,6 +1,6 @@
 # S3CorsFileupload
 
-A gem to allow for uploading of files to directly AWS-S3 via [CORS](http://www.w3.org/TR/cors/) via the
+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.
 
 ## Installation
@@ -16,7 +16,8 @@ and views for the file uploading.
 
     bundle exec rails generate s3_cors_fileupload:install
 
-If you are using HAML as the template language for your app, you can make the install generator produce HAML view files:
+If you are using HAML as the template language for your app, the install generator has an option to produce
+HAML view files (the default is ERB):
 
     bundle exec rails g s3_cors_fileupload:install --template-language=haml
 
@@ -121,7 +122,7 @@ mimics that of Rails's built in [jquery-ujs behavior for `data-confirm`](https:/
 attributes on forms (I named this one `data-confirmation` to prevent jquery-ujs from conflicts).
 The code for this was based off of [pull request #1127 to the jQuery-File-Upload project](https://github.com/blueimp/jQuery-File-Upload/pull/1127),
 which appears to have been rejected by the author of jQuery-File-Upload, but seems appropriate for rails.  If you wish not to use it,
-simply remove the `data-confirm` attribute from the destroy button on `_template_uploaded.html.erb` in the views directory.
+simply remove the `data-confirmation` attribute from the destroy button on `_template_uploaded.html.erb` in the views directory.
 
 ## Contributing to S3CorsFileupload
  

data/Rakefile

@@ -1,17 +1,16 @@
 # encoding: utf-8
 
 require 'rubygems'
-# begin
-#   require 'bundler/setup'
-# rescue LoadError
-#   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-# end
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
 
-# If you want to make this the default task
 task :default => :spec
 
 # require 'rcov/rcovtask'
@@ -25,12 +24,11 @@ task :default => :spec
 # task :default => :test
 
 require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   require File.expand_path('../lib/s3_cors_fileupload/version', __FILE__)
-  version = S3CorsFileupload::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "S3CorsFileupload #{version}"
+  rdoc.title = "S3CorsFileupload #{S3CorsFileupload::VERSION}"
   rdoc.rdoc_files.include('LICENSE*')
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('CHANGELOG*')

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

@@ -2,7 +2,7 @@
  * s3-cors-file-upload
  * http://github.com/fullbridge-batkins/s3_cors_fileupload
  *
- * Copyright 2012, Ben Atkins
+ * Copyright 2013, Ben Atkins
  * http://batkins.net
  *
  * Licensed under the MIT license:
@@ -17,23 +17,17 @@ $(function() {
   $('#fileupload').bind('fileuploadadd', function (e, data) {
       var content_type = data.files[0].type;
       var file_name = data.files[0].name;
-     $.ajax({
-        url: '/source_files/generate_key',
-        type: 'GET',
-        dataType: 'json',
-        data: {filename: file_name}, // send the file name to the server so it can generate the key param
-        async: false,
-        success: function(data) {
-          // Now that we have our data, we add it to the global s3_upload_hash so that it can be
-          // accessed (in the fileuploadsubmit callback) prior to being submitted
-          s3_upload_hash[file_name] = {
-                                        key: data.key,
-                                        content_type: content_type
-                                      };
-        }
-      })
-    });
-  
+
+      $.getJSON('/source_files/generate_key.json', {filename: file_name}, function(data) {
+        // Now that we have our data, we add it to the global s3_upload_hash so that it can be
+        // accessed (in the fileuploadsubmit callback) prior to being submitted
+        s3_upload_hash[file_name] = {
+                                      key: data.key,
+                                      content_type: content_type
+                                    };
+      });
+  });
+
   // this gets triggered right before a file is about to be sent (and have their form action submitted)
   $('#fileupload').bind('fileuploadsubmit', function (e, data) {
       var file_name = data.files[0].name;
@@ -43,7 +37,7 @@ $(function() {
       form.find('input[name=Content-Type]').val(s3_upload_hash[file_name]['content_type']);
       delete s3_upload_hash[file_name];
   });
-   
+
   $('#fileupload').bind('fileuploaddone', function (e, data) {
     // the response will be XML, and can be accessed by calling `data.result`
     //
@@ -55,7 +49,7 @@ $(function() {
     //    <ETag>"c7902ef289687931f34f92b65afda320"</ETag>
     //  </PostResponse>
      
-     $.post('/source_files',
+      $.post('/source_files.json',
           {
             'source_file[url]': $(data.result).find('Location').text(),
             'source_file[bucket]': $(data.result).find('Bucket').text(),
@@ -68,14 +62,14 @@ $(function() {
           'json'
       );
    });
-   
+
    // remove the table row containing the source file information from the page
    $('#fileupload').bind('fileuploaddestroyed', function (e, data) {
       var deleted_object_id = data.url.split('/').pop();
       // now remove the element from the page
       $('#source_file_' + deleted_object_id).remove();
    });
- 
+
 });
 
 // used for displaying approximate file size on the file listing index.

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

@@ -6,7 +6,7 @@ class S3UploadsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @source_files.map{|sf| sf.to_jq_upload } }
+      format.json { render json: @source_files.map(&:to_jq_upload) }
     end
   end
 

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

@@ -40,13 +40,13 @@ class SourceFile < ActiveRecord::Base
   end
 
   def self.open_aws
-    unless AWS::S3::Base.connected?
+    unless @aws_connected
       AWS::S3::Base.establish_connection!(
         :access_key_id     => S3CorsFileupload::Config.access_key_id,
         :secret_access_key => S3CorsFileupload::Config.secret_access_key
       )
     end
-    return AWS::S3::Base.connected?
+    @aws_connected ||= AWS::S3::Base.connected?
   end
   #---- end S3 related methods -----