s3_cors_fileupload 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.5
+
+  - Added option to select 'haml' as the language template for the view files on the install generator.
+  - Fixed `S3CorsFileupload::Config` YAML initializer so that it properly reads in ERB statements.
+
 ## 0.1.4
 
   - 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).

data/Gemfile

@@ -1,14 +1,19 @@
 source :rubygems
 
+# 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 'bundler'
   gem 'rdoc', '~> 3.12'
   gem 'gem-release', '~> 0.4'
 end
 
 group :test do
-  gem 'rspec', '~> 2.11'
+  gem 'rails'
+  gem 'sqlite3' # the database driver for rails
+  gem 'rspec-rails', '~> 2.11'
   gem 'shoulda-matchers'
 end

data/Gemfile.lock

@@ -1,14 +1,87 @@
+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/
   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)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      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)
       multi_json (~> 1.0)
+    arel (3.0.2)
+    aws-s3 (0.6.3)
+      builder
+      mime-types
+      xml-simple
+    builder (3.0.4)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     gem-release (0.4.1)
+    hike (1.2.1)
     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)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
     multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      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)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      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)
       json (~> 1.4)
     rspec (2.11.0)
@@ -19,8 +92,25 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
     shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.34)
+    xml-simple (1.1.2)
 
 PLATFORMS
   ruby
@@ -28,6 +118,10 @@ PLATFORMS
 DEPENDENCIES
   bundler
   gem-release (~> 0.4)
+  rails
+  rake (>= 0.8.7)
   rdoc (~> 3.12)
-  rspec (~> 2.11)
+  rspec-rails (~> 2.11)
+  s3_cors_fileupload!
   shoulda-matchers
+  sqlite3

data/README.md

@@ -16,10 +16,14 @@ 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:
+
+    bundle exec rails g s3_cors_fileupload:install --template-language=haml
+
 If you don't want to generate a migration (for instance if you've already run the install generator in the past),
-you can pass in an options `--skip-migration` like so:
+you can pass in `--skip-migration` like so:
 
-   bundle exec rails generate s3_cors_fileupload:install --skip-migration
+    bundle exec rails g s3_cors_fileupload:install --skip-migration
 
 If you chose to generate a migration, run it now:
 
@@ -27,7 +31,7 @@ If you chose to generate a migration, run it now:
 
 Also, as you may have noticed, a config file was generated at `config/amazon_s3.yml`.  Edit this file and fill in
 the fields with your AWS S3 credentials.  If you don't want to commit your S3 account credentials to your
-repository, you can make the config load from environment variables like so:
+repository, you can make the config file load from environment variables like so (this functionality is fixed as of version `0.1.5`):
 
     secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
 

data/Rakefile

@@ -1,7 +1,11 @@
 # encoding: utf-8
 
 require 'rubygems'
-require 'bundler'
+# 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'
@@ -26,12 +30,14 @@ Rake::RDocTask.new do |rdoc|
   version = S3CorsFileupload::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "s3_cors_fileupload #{version}"
+  rdoc.title = "S3CorsFileupload #{version}"
+  rdoc.rdoc_files.include('LICENSE*')
   rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('CHANGELOG*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Open an irb session preloaded with this library"
+desc 'Open an irb session preloaded with this library'
 task :console do
-  sh "irb -I lib -r s3_cors_fileupload.rb"
+  sh 'irb -I lib -r s3_cors_fileupload.rb'
 end

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

@@ -8,8 +8,11 @@ module S3CorsFileupload
       include ::Rails::Generators::Migration
       extend ActiveRecord::Generators::Migration
 
+      VALID_TEMPLATE_LANGS = [:erb, :haml]
+
       source_root File.expand_path('../templates', __FILE__)
       class_option :migration, :type => :boolean, :default => true, :desc => "Generate a migration for the SourceFile model."
+      class_option :template_language, :type => :string, :default => 'erb', :desc => "Specify a template language to use for view files, must be one of: [erb, haml]"
 
       desc('Creates a config file, then generates (but does not run) a migration to add a source_files table and ' +
             'a corresponding model, as well as a controller, routes, and views for the file uploading.')
@@ -32,8 +35,10 @@ module S3CorsFileupload
       end
 
       def create_views
-        Dir.foreach(File.expand_path('../templates/views', __FILE__)).reject { |file_name| %w(. ..).include?(file_name) }.each do |file_name|
-          copy_file "views/#{file_name}", "app/views/s3_uploads/#{file_name}"
+        template_language = options.template_language if VALID_TEMPLATE_LANGS.include?(options.template_language.to_sym)
+        template_language ||= 'erb'
+        Dir.foreach(File.expand_path("../templates/views/#{template_language}", __FILE__)).reject { |file_name| %w(. ..).include?(file_name) }.each do |file_name|
+          copy_file "views/#{template_language}/#{file_name}", "app/views/s3_uploads/#{file_name}"
         end
       end
 

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

@@ -0,0 +1,32 @@
+/ To be used with Javascript-Templates (see: https://github.com/blueimp/JavaScript-Templates)
+/ The template to display files available for download (the stock one from the jquery-fileupload script)
+%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 {%=locale.fileupload.error%}
+      {%=locale.fileupload.errors[file.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%}"}/
+      {% } %}
+    %td.name
+      %a{:download => "{%=file.name%}", :href => "{%=file.url%}", :rel => "{%=file.thumbnail_url&&'gallery'%}", :title => "{%=file.name%}"} {%=file.name%}
+    %td.size
+      %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?"}
+        %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

@@ -0,0 +1,35 @@
+/ To be used with Javascript-Templates (see: https://github.com/blueimp/JavaScript-Templates)
+/ The template to display files available for upload
+%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
+        .bar{:style => "width:0%;"}
+    %td.start
+      {% if (!o.options.autoUpload) { %}
+      %button.btn.btn-primary
+        %i.icon-upload.icon-white
+        %span Start
+      {% } %}
+    {% } else { %}
+    %td{:colspan => "2"}
+    {% } %}
+    %td.cancel
+      {% if (!i) { %}
+      %button.btn.btn-warning
+        %i.icon-ban-circle.icon-white
+        %span Cancel
+      {% } %}
+  {% } %}

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

@@ -0,0 +1,21 @@
+/ To be used with Javascript-Templates (see: https://github.com/blueimp/JavaScript-Templates)
+/ 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"}
+    %td.delete
+      %button.btn.btn-danger{"data-type" => "DELETE", "data-url" => "{%=o.delete_url%}", "data-confirmation" => "Are you sure?"}
+        %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

@@ -0,0 +1,38 @@
+= stylesheet_link_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap-combined.min.css'
+
+%div{:style => 'padding: 10px;'}
+  %h2 Upload file
+  = s3_cors_fileupload_form_tag :id => 'fileupload'
+  
+  .javascript-templates
+    = render 'template_upload'
+    = render 'template_uploaded'
+    =# render 'template_download'
+
+:javascript
+  $(function () {
+    // Initialize the jQuery File Upload widget:
+    $('#fileupload').fileupload({
+      dataType: 'xml',
+      sequentialUploads: true,
+      downloadTemplateId: null,
+      downloadTemplate: null
+    });
+    
+    // Load existing files:
+    $.getJSON('/source_files', function (files) {
+      $.each(files, function(index, value) { 
+        $('#upload_files tbody').append(tmpl('template-uploaded', value));
+      });
+    });
+  });
+  
+  // used by the jQuery File Upload
+  var fileUploadErrors = {
+    maxFileSize: 'File is too big',
+    minFileSize: 'File is too small',
+    acceptFileTypes: 'Filetype not allowed',
+    maxNumberOfFiles: 'Max number of files exceeded',
+    uploadedBytes: 'Uploaded bytes exceed file size',
+    emptyResult: 'Empty file upload result'
+  };

data/lib/s3_cors_fileupload/rails/config.rb

@@ -17,7 +17,7 @@ module S3CorsFileupload
       private
 
       def config
-        @config ||= YAML.load_file(File.join(::Rails.root, 'config', 'amazon_s3.yml'))[::Rails.env]
+        @config ||= YAML.load(ERB.new(File.read(File.join(::Rails.root, 'config', 'amazon_s3.yml'))).result)[::Rails.env]
       rescue
         warn('WARNING: s3_cors_fileupload gem was unable to locate a configuration file in config/amazon_s3.yml and may not ' +
              'be able to function properly.  Please run `rails generate s3_cors_upload:install` before proceeding.')

data/lib/s3_cors_fileupload/version.rb

@@ -1,5 +1,5 @@
 module S3CorsFileupload
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   JQUERY_FILEUPLOAD_VERSION = '5.19'
   JQUERY_FILEUPLOAD_UI_VERSION = '6.10'
 end

data/s3_cors_fileupload.gemspec

@@ -22,12 +22,14 @@ Gem::Specification.new do |s|
   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"
+    "README.md",
+    "CHANGELOG.md"
   ]
 end

data/spec/spec_helper.rb

@@ -1,12 +1,36 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require File.expand_path('../../lib/s3_cors_fileupload', __FILE__)
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path('../dummy/config/environment', __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
 
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[::Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+  
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_cors_fileupload
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,6 +100,7 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
+- CHANGELOG.md
 files:
 - .document
 - .gitignore
@@ -117,10 +118,14 @@ files:
 - lib/generators/s3_cors_fileupload/install/templates/s3_uploads.js
 - lib/generators/s3_cors_fileupload/install/templates/s3_uploads_controller.rb
 - lib/generators/s3_cors_fileupload/install/templates/source_file.rb
-- lib/generators/s3_cors_fileupload/install/templates/views/_template_download.html.erb
-- lib/generators/s3_cors_fileupload/install/templates/views/_template_upload.html.erb
-- lib/generators/s3_cors_fileupload/install/templates/views/_template_uploaded.html.erb
-- lib/generators/s3_cors_fileupload/install/templates/views/index.html.erb
+- lib/generators/s3_cors_fileupload/install/templates/views/erb/_template_download.html.erb
+- lib/generators/s3_cors_fileupload/install/templates/views/erb/_template_upload.html.erb
+- lib/generators/s3_cors_fileupload/install/templates/views/erb/_template_uploaded.html.erb
+- lib/generators/s3_cors_fileupload/install/templates/views/erb/index.html.erb
+- lib/generators/s3_cors_fileupload/install/templates/views/haml/_template_download.html.haml
+- lib/generators/s3_cors_fileupload/install/templates/views/haml/_template_upload.html.haml
+- lib/generators/s3_cors_fileupload/install/templates/views/haml/_template_uploaded.html.haml
+- lib/generators/s3_cors_fileupload/install/templates/views/haml/index.html.haml
 - lib/s3_cors_fileupload.rb
 - lib/s3_cors_fileupload/rails.rb
 - lib/s3_cors_fileupload/rails/config.rb