s3_relay 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc5415d8757f11bbbfce2dc39e1e185eee3a2f7
-  data.tar.gz: f9855a56037d0a2822a2cc888e9e5edd26ace1f1
+  metadata.gz: e3e10d8c93c2b0dfb2c30d18dc6f4bd8843951d7
+  data.tar.gz: 3306281d165ad4cad71aaffddad4ae7f10593b30
 SHA512:
-  metadata.gz: ed0dd8dd182bc57118b2e8e7828b4894fda0350c81bbbf5e1889548faad285d80c263e6bd9ab6cee51869210277cc1993c5c5f3e06b0dc76dd44fa4bc8662b8f
-  data.tar.gz: 7ee20e055833c5eb99528b6874c16a441f552ea9dcfce3cd07e2c30191650d72f4e2dace956741eeb60377224bf92309960c7af389534ca5eb95c82eb9a89a54
+  metadata.gz: 3b4db0505eb9f8b6b47530634ffc7d7dd8a497c49f86c4a1025b91de9a06ef35e504a70e62e5686800cc6a297b97ce0a9b0956fdee42ed9256e567c6cacc6bb7
+  data.tar.gz: e36d26eb9e0d782bded5badef70b270f4127f26a6171b81f8345d217fd774722cb6492fa3ccd24bdc5df8e57c0e83f7cf360b5ac91bbf9fd988dacb2200d0e76

data/README.md

@@ -52,8 +52,8 @@ adhering to for a couple of major versions now.  Even IE, wuh?
 The latest versions of all of the following are ideal, but here are the gem's
 minimum requirements:
 
-* Ruby 1.9.3+
-* Rails 3.1+
+* For rails 5.1+, use version 0.6.x+ and ruby 2.3+
+* For rails 3.1 to 5.0, use version 0.5.x and ruby 1.9.3+
 * Modern versions of Chrome, Safari, FireFox or IE 10+
   * Note: Progress bars are currently disabled in IE
   * Note: IE <= 9 users will be instructed to upgrade their browser upon

data/app/controllers/s3_relay/uploads_controller.rb

@@ -11,7 +11,13 @@ class S3Relay::UploadsController < ApplicationController
     @upload = S3Relay::Upload.new(upload_attrs)
 
     if @upload.save
-      render json: { private_url: @upload.private_url }, status: 201
+      data = {
+        private_url: @upload.private_url,
+        parent_type: @upload.parent_type,
+        parent_id: @upload.parent_id,
+        user_id: user_attrs[:user_id]
+      }
+      render json: data, status: 201
     else
       render json: { errors: @upload.errors }, status: 422
     end
@@ -55,7 +61,7 @@ class S3Relay::UploadsController < ApplicationController
   end
 
   def user_attrs
-    if respond_to?(:current_user) && (id = current_user.try(:id))
+    if respond_to?(:current_user) && (id = current_user&.id)
       { user_id: id }
     else
       {}

data/app/models/s3_relay/upload.rb

@@ -1,7 +1,7 @@
 module S3Relay
   class Upload < ActiveRecord::Base
 
-    belongs_to :parent, polymorphic: true
+    belongs_to :parent, polymorphic: true, optional: true
 
     validates :uuid,         presence: true, uniqueness: true
     validates :upload_type,  presence: true

data/lib/s3_relay/private_url.rb

@@ -4,7 +4,7 @@ module S3Relay
     attr_reader :expires, :path
 
     def initialize(uuid, file, options={})
-      filename = URI.encode(file).gsub("+", "%2B")
+      filename = Addressable::URI.escape(file).gsub("+", "%2B")
       @path    = [uuid, filename].join("/")
       @expires = (options[:expires] || 10.minutes.from_now).to_i
     end

data/lib/s3_relay/version.rb

@@ -1,3 +1,3 @@
 module S3Relay
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/test/controllers/s3_relay/uploads_controller_test.rb

@@ -22,7 +22,7 @@ module S3Relay
         S3Relay::UploadPresigner.any_instance.stubs(:uuid).returns(uuid)
         S3Relay::UploadPresigner.any_instance.stubs(:expires).returns(time)
 
-        get :new
+        get new_s3_relay_upload_url
         assert_response 200
 
         data = JSON.parse(response.body)
@@ -44,11 +44,12 @@ module S3Relay
       describe "success" do
         it do
           assert_difference "S3Relay::Upload.count", 1 do
-            post :create,
+            post s3_relay_uploads_url, params: {
               association:  "photo_uploads",
               uuid:         SecureRandom.uuid,
               filename:     "cat.png",
               content_type: "image/png"
+            }
           end
 
           assert_response 201
@@ -60,13 +61,14 @@ module S3Relay
 
             it do
               assert_difference "@product.photo_uploads.count", 1 do
-                post :create,
+                post s3_relay_uploads_url, params: {
                   association:  "photo_uploads",
                   uuid:         SecureRandom.uuid,
                   filename:     "cat.png",
                   content_type: "image/png",
                   parent_type:  @product.class.to_s,
                   parent_id:    @product.id.to_s
+                }
               end
 
               assert_response 201
@@ -76,40 +78,43 @@ module S3Relay
           describe "not matching an object" do
             it do
               assert_difference "S3Relay::Upload.count" do
-                post :create,
+                post s3_relay_uploads_url, params: {
                   association:  "photo_uploads",
                   uuid:         SecureRandom.uuid,
                   filename:     "cat.png",
                   content_type: "image/png",
                   parent_type:  "Product",
                   parent_id:    "10000000"
+                }
               end
 
               assert_response 201
+              body = JSON.parse(response.body)
 
-              assigns[:upload].parent_type.must_equal nil
-              assigns[:upload].parent_id.must_equal nil
+              assert body["parent_type"] == nil
+              assert body["parent_id"] == nil
             end
           end
 
           describe "with a current_user" do
             before do
               @user = OpenStruct.new(id: 123)
-              @controller.stubs(:current_user).returns(@user)
+              UploadsController.any_instance.stubs(:current_user).returns(@user)
             end
 
             it "associates the upload with the user" do
               assert_difference "S3Relay::Upload.count", 1 do
-                post :create,
+                post s3_relay_uploads_url, params: {
                   association:  "photo_uploads",
                   uuid:         SecureRandom.uuid,
                   filename:     "cat.png",
                   content_type: "image/png"
+                }
               end
 
               assert_response 201
-
-              assigns[:upload].user_id.must_equal @user.id
+              body = JSON.parse(response.body)
+              body["user_id"].must_equal @user.id
             end
           end
 
@@ -119,10 +124,11 @@ module S3Relay
       describe "error" do
         it do
           assert_no_difference "S3Relay::Upload.count" do
-            post :create,
+            post s3_relay_uploads_url, params: {
               uuid:         SecureRandom.uuid,
               filename:     "cat.png",
               content_type: "image/png"
+            }
           end
 
           assert_response 422

data/test/dummy/{README.rdoc → README.md}

@@ -1,4 +1,4 @@
-== README
+# README
 
 This README would normally document whatever steps are necessary to get the
 application up and running.
@@ -22,7 +22,3 @@ Things you may want to cover:
 * Deployment instructions
 
 * ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/test/dummy/Rakefile

@@ -1,6 +1,6 @@
 # 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__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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

@@ -1,13 +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.
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory 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
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require rails-ujs
+//= require turbolinks
 //= require_tree .

data/test/dummy/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `rails generate channel` command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

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

@@ -2,13 +2,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.
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
+ * vendor/assets/stylesheets directory 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 bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_tree .
  *= require_self

data/test/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

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

@@ -1,5 +1,3 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 end

data/test/dummy/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/test/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/test/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/test/dummy/app/models/product.rb

@@ -1,4 +1,4 @@
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
 
   s3_relay :icon_upload
   s3_relay :photo_uploads, has_many: true

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

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Dummy</title>
+    <%= csrf_meta_tags %>
 
-<%= yield %>
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/test/dummy/app/views/layouts/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/test/dummy/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/test/dummy/bin/rails

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/rake

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/test/dummy/bin/setup

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/test/dummy/bin/spring

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end

data/test/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/test/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/test/dummy/config/application.rb

@@ -1,23 +1,19 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
+require 's3_relay'
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
-require "s3_relay"
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # 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.
-
-    # 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
   end
 end
-

data/test/dummy/config/boot.rb

@@ -1,5 +1,3 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/test/dummy/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
+  channel_prefix: dummy_production

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

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

@@ -9,13 +9,28 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -27,11 +42,13 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end