s3_cors_fileupload 0.1.5 → 0.2.0.pre1

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

@@ -17,8 +17,8 @@
         <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
         <td colspan="2"></td>
         {% } %}
-      <td class="delete">
-        <button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}" data-confirmation="Are you sure?">
+      <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>

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

@@ -11,8 +11,8 @@
     <td>
       <div class="progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
     </td>
-    <td class="start">{% if (!o.options.autoUpload) { %}
-      <button class="btn btn-primary">
+    <td>{% if (!o.options.autoUpload) { %}
+      <button class="btn btn-primary start">
         <i class="icon-upload icon-white"></i>
         <span>Start</span>
       </button>
@@ -20,8 +20,8 @@
     {% } else { %}
     <td colspan="2"></td>
     {% } %}
-    <td class="cancel">{% if (!i) { %}
-      <button class="btn btn-warning">
+    <td>{% if (!i) { %}
+      <button class="btn btn-warning cancel">
         <i class="icon-ban-circle icon-white"></i>
         <span>Cancel</span>
       </button>

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

@@ -15,7 +15,7 @@
     <td class="size"><span>{%=formatFileSize(o.size)%}</span></td>
     <td colspan="2"></td>
     <td class="delete">
-      <button class="btn btn-danger" data-type="DELETE" data-url="{%=o.delete_url%}" data-confirmation="Are you sure?">
+      <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}'{% } %}>
         <i class="icon-trash icon-white"></i>
         <span>Delete</span>
       </button>

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

@@ -1,7 +1,7 @@
-<%= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap-combined.min.css' %>
+<%= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css' %>
 
 <div style="padding: 10px;">
-  <h2>Upload file</h2>
+  <h2>Upload file(s)</h2>
   <%= s3_cors_fileupload_form_tag :id => 'fileupload' %>
 
   <div class="javascript-templates">

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

@@ -24,8 +24,8 @@
       %span {%=$('#fileupload').formatFileSize(file.size)%}
     %td{:colspan => "2"}
     {% } %}
-    %td.delete
-      %button.btn.btn-danger{"data-type" => "{%=file.delete_type%}", "data-url" => "{%=file.delete_url%}", "data-confirmation" => "Are you sure?"}
+    %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"}

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

@@ -17,18 +17,18 @@
     %td
       .progress.progress-success.progress-striped.active
         .bar{:style => "width:0%;"}
-    %td.start
+    %td
       {% if (!o.options.autoUpload) { %}
-      %button.btn.btn-primary
+      %button.btn.btn-primary.start
         %i.icon-upload.icon-white
         %span Start
       {% } %}
     {% } else { %}
     %td{:colspan => "2"}
     {% } %}
-    %td.cancel
+    %td
       {% if (!i) { %}
-      %button.btn.btn-warning
+      %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

@@ -14,8 +14,8 @@
     %td.size
       %span {%=formatFileSize(o.size)%}
     %td{:colspan => "2"}
-    %td.delete
-      %button.btn.btn-danger{"data-type" => "DELETE", "data-url" => "{%=o.delete_url%}", "data-confirmation" => "Are you sure?"}
+    %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} {% } %}"}
         %i.icon-trash.icon-white
         %span Delete
       %input{:name => "delete", :type => "checkbox", :value => "1"}

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

@@ -1,7 +1,7 @@
-= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap-combined.min.css'
+= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css'
 
 %div{:style => 'padding: 10px;'}
-  %h2 Upload file
+  %h2 Upload file(s)
   = s3_cors_fileupload_form_tag :id => 'fileupload'
   
   .javascript-templates

data/lib/s3_cors_fileupload/rails/config.rb

@@ -2,7 +2,6 @@ require 'yaml'
 
 module S3CorsFileupload
   module Config
-
     # this allows us to lazily instantiate the configuration by reading it in when it needs to be accessed
     class << self
       # if a method is called on the class, attempt to look it up in the config array

data/lib/s3_cors_fileupload/rails/form_helper.rb

@@ -44,7 +44,7 @@ module S3CorsFileupload
     # hidden fields argument should be a hash of key value pairs (values may be blank if desired)
     def construct_form_html(hidden_fields, bucket, html_options = {}, &block)
       # now build the html for the form
-      form_text = form_tag("https://#{bucket}.s3.amazonaws.com", build_form_options(html_options)) do
+      form_tag("https://#{bucket}.s3.amazonaws.com", build_form_options(html_options)) do
         hidden_fields.map do |name, value|
           hidden_field_tag(name, value)
         end.join.html_safe + "
@@ -84,10 +84,8 @@ module S3CorsFileupload
         <!-- The table listing the files available for upload/download -->
         <table class='table table-striped' id='upload_files'>
           <tbody class='files' data-target='#modal-gallery' data-toggle='modal-gallery'></tbody>
-        </table>".html_safe
+        </table>".html_safe + (block ? capture(&block) : '')
       end
-      form_text += capture(&block) if block
-      form_text
     end
   end
 end

data/lib/s3_cors_fileupload/rails/policy_helper.rb

@@ -20,7 +20,7 @@ module S3CorsFileupload
     def policy_document
       Base64.encode64(
         {
-          expiration: 1.hour.from_now.utc.strftime('%Y-%m-%dT%H:%M:%S.000Z'),
+          expiration: 10.hours.from_now.utc.iso8601(3),
           conditions: [
             { bucket: options[:bucket] },
             { acl: options[:acl] },
@@ -38,7 +38,7 @@ module S3CorsFileupload
     def upload_signature
       Base64.encode64(
         OpenSSL::HMAC.digest(
-          OpenSSL::Digest::Digest.new('sha1'),
+          OpenSSL::Digest::SHA1.new,
           options[:secret_access_key],
           self.policy_document
         )

data/lib/s3_cors_fileupload/version.rb

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

data/s3_cors_fileupload.gemspec

@@ -11,25 +11,22 @@ Gem::Specification.new do |s|
   s.summary     = "File uploads for Rails ~> 3.1 to AWS-S3 via CORS using the jQuery-File-Upload script"
   s.description = "Provides file uploads for Rails ~> 3.1 to AWS-S3 via CORS using the jQuery-File-Upload javascript"
   s.licenses    = ["MIT"]
-  
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = "1.8.24"
-  
-  s.add_dependency('rails', ['~> 3.1'])
-  s.add_dependency('jquery-rails', ['>= 2.0'])
-  s.add_dependency('aws-s3', ['~> 0.6']) # :require => 'aws/s3'
-  
-  s.add_development_dependency('rake', [">= 0.8.7"])
-  s.add_development_dependency('bundler', [">= 0"])
-  
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md",
-    "CHANGELOG.md"
-  ]
+
+  s.extra_rdoc_files = %w(README.md CHANGELOG.md LICENSE.txt)
+  s.rdoc_options = %w(--charset=UTF-8)
+
+  s.add_dependency('rails', ['~> 3.1'])
+  s.add_dependency('jquery-rails', ['>= 2.0'])
+  s.add_dependency('aws-s3', ['~> 0.6']) # :require => 'aws/s3'
+
+  s.add_development_dependency('rake', ['>= 0.8.7'])
+  s.add_development_dependency('bundler', ['>= 0'])
 end

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/spec/dummy/config/amazon_s3.yml

@@ -0,0 +1,17 @@
+defaults: &defaults
+  access_key_id: your_access_key_id
+  secret_access_key: your_secret_access_key
+  acl: public-read # options: private, public-read, public-read-write, authenticated-read
+  max_file_size: 524288000 # 500 megabytes
+
+development:
+  <<: *defaults
+  bucket: your_development_bucket_name
+    
+test:
+  <<: *defaults
+  bucket: your_development_bucket_name
+  
+production:
+  <<: *defaults
+  bucket: <%= ENV['S3_BUCKET'] || 'your_production_bucket_name_here' %>

data/spec/dummy/config/application.rb

@@ -0,0 +1,64 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+require "active_record/railtie"
+require "action_controller/railtie"
+# require "action_mailer/railtie" # comment out since we aren't testing the mailers
+require "active_resource/railtie"
+require "sprockets/railtie"
+
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+require 's3_cors_fileupload'
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = false
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+  end
+end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -0,0 +1,37 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end