s3_relay 0.6.2 → 0.7.0

data/test/factories/products.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product do
-    name "Flux Capacitor"
+    name { "Flux Capacitor" }
   end
 end

data/test/factories/uploads.rb

@@ -1,23 +1,23 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :upload, class: "S3Relay::Upload" do
     uuid { SecureRandom.uuid }
   end
 
   factory :file_upload, parent: :upload do
-    filename     "cat.png"
-    content_type "image/png"
-    upload_type  "FileUpload"
+    filename     { "cat.png" }
+    content_type { "image/png" }
+    upload_type  { "FileUpload" }
   end
 
   factory :icon_upload, parent: :upload do
-    filename     "cat.png"
-    content_type "image/png"
-    upload_type  "IconUpload"
+    filename     { "cat.png" }
+    content_type { "image/png" }
+    upload_type  { "IconUpload" }
   end
 
   factory :photo_upload, parent: :upload do
-    filename     "cat.png"
-    content_type "image/png"
-    upload_type  "PhotoUpload"
+    filename     { "cat.png" }
+    content_type { "image/png" }
+    upload_type  { "PhotoUpload" }
   end
 end

data/test/helpers/s3_relay/uploads_helper_test.rb

@@ -1,7 +1,10 @@
 require "test_helper"
 
+include ActionView::Helpers::FormTagHelper
+include S3Relay::UploadsHelper
+
 describe S3Relay::UploadsHelper do
-  before { @product = FactoryGirl.create(:product) }
+  before { @product = FactoryBot.create(:product) }
 
   describe "#s3_relay_field" do
     describe "without options" do

data/test/lib/s3_relay/model_test.rb

@@ -2,19 +2,19 @@ require "test_helper"
 
 describe S3Relay::Model do
   before do
-    @product = FactoryGirl.build(:product)
+    @product = FactoryBot.build(:product)
   end
 
   describe "#s3_relay" do
 
     describe "associations" do
       it "has_one" do
-        Product.reflect_on_association(:icon_upload).macro
+        _(Product.reflect_on_association(:icon_upload).macro)
           .must_equal(:has_one)
       end
 
       it "has_many" do
-        Product.reflect_on_association(:photo_uploads).macro
+        _(Product.reflect_on_association(:photo_uploads).macro)
           .must_equal(:has_many)
       end
     end
@@ -22,41 +22,41 @@ describe S3Relay::Model do
     describe "scopes" do
       before do
         @product.save
-        @icon    = FactoryGirl.create(:icon_upload, parent: @product)
-        @photo_1 = FactoryGirl.create(:photo_upload, parent: @product)
-        @photo_2 = FactoryGirl.create(:photo_upload, parent: @product)
+        @icon    = FactoryBot.create(:icon_upload, parent: @product)
+        @photo_1 = FactoryBot.create(:photo_upload, parent: @product)
+        @photo_2 = FactoryBot.create(:photo_upload, parent: @product)
       end
 
       describe "has_one" do
-        it { @product.icon_upload.must_equal @icon }
+        it { _(@product.icon_upload).must_equal @icon }
       end
 
       describe "has_many" do
         it do
-          @product.photo_uploads.pluck(:id).sort
+          _(@product.photo_uploads.pluck(:id).sort)
             .must_equal [@photo_1.id, @photo_2.id]
         end
       end
     end
 
     describe "virtual attribute for UUID assignment" do
-      it { @product.must_respond_to :new_photo_uploads_uuids= }
+      it { _(@product).must_respond_to :new_photo_uploads_uuids= }
     end
 
     describe "association method" do
       before do
-        @product = FactoryGirl.create(:product)
-        @icon    = FactoryGirl.create(:icon_upload)
-        @photo_1 = FactoryGirl.create(:photo_upload)
-        @photo_2 = FactoryGirl.create(:photo_upload)
+        @product = FactoryBot.create(:product)
+        @icon    = FactoryBot.create(:icon_upload)
+        @photo_1 = FactoryBot.create(:photo_upload)
+        @photo_2 = FactoryBot.create(:photo_upload)
       end
 
       describe "has_many" do
         it do
-          @product.photo_uploads.must_equal []
+          _(@product.photo_uploads).must_equal []
           @product.new_photo_uploads_uuids = [@photo_1.uuid, @photo_2.uuid]
           @product.associate_photo_uploads
-          @product.photo_uploads.must_equal [@photo_1, @photo_2]
+          _(@product.photo_uploads).must_equal [@photo_1, @photo_2]
         end
       end
     end

data/test/lib/s3_relay/private_url_test.rb

@@ -21,7 +21,7 @@ describe S3Relay::PrivateUrl do
       time = Time.parse("2014-01-01 12:00am")
       url  = S3Relay::PrivateUrl.new(uuid, file, expires: time).generate
 
-      url.must_equal "https://bucket.s3-region.amazonaws.com/123-456-789/Crazy%20%2B%20c@t%20picture.png?AWSAccessKeyId=access-key-id&Expires=1388563200&Signature=8Kp5NL77iycg4CFFwxboo905t%2Fs%3D"
+      _(url).must_equal "https://s3.region.amazonaws.com/bucket/123-456-789/Crazy%20%2B%20c@t%20picture.png?AWSAccessKeyId=access-key-id&Expires=1388563200&Signature=8Kp5NL77iycg4CFFwxboo905t%2Fs%3D"
     end
   end
 

data/test/lib/s3_relay/upload_presigner_test.rb

@@ -23,15 +23,15 @@ describe S3Relay::UploadPresigner do
 
       data = S3Relay::UploadPresigner.new(expires: time).form_data
 
-      data["awsaccesskeyid"].must_equal "access-key-id"
-      data["x_amz_server_side_encryption"].must_equal "AES256"
-      data["key"].must_equal "#{uuid}/${filename}"
-      data["success_action_status"].must_equal "201"
-      data["acl"].must_equal "acl"
-      data["endpoint"].must_equal "https://bucket.s3-region.amazonaws.com"
-      data["policy"].length.must_equal 400  # TODO: Improve this
-      data["signature"].length.must_equal 28  # TODO: Improve this
-      data["uuid"].must_equal uuid
+      _(data["awsaccesskeyid"]).must_equal "access-key-id"
+      _(data["x_amz_server_side_encryption"]).must_equal "AES256"
+      _(data["key"]).must_equal "#{uuid}/${filename}"
+      _(data["success_action_status"]).must_equal "201"
+      _(data["acl"]).must_equal "acl"
+      _(data["endpoint"]).must_equal "https://s3.region.amazonaws.com/bucket"
+      _(data["policy"].length).must_equal 400  # TODO: Improve this
+      _(data["signature"].length).must_equal 28  # TODO: Improve this
+      _(data["uuid"]).must_equal uuid
     end
   end
 

data/test/models/s3_relay/upload_test.rb

@@ -2,13 +2,13 @@ require "test_helper"
 
 describe S3Relay::Upload do
   before do
-    @upload = FactoryGirl.build(:upload)
+    @upload = FactoryBot.build(:upload)
   end
 
   describe "associations" do
     describe "parent" do
       it do
-        S3Relay::Upload.reflect_on_association(:parent).macro
+        _(S3Relay::Upload.reflect_on_association(:parent).macro)
           .must_equal :belongs_to
       end
     end
@@ -19,34 +19,34 @@ describe S3Relay::Upload do
       it "validates presence" do
         @upload.uuid = nil
         @upload.valid?
-        @upload.errors[:uuid].must_include("can't be blank")
+        _(@upload.errors[:uuid]).must_include("can't be blank")
       end
 
       it "validates uniqueness" do
-        FactoryGirl.create(:file_upload, uuid: @upload.uuid)
+        FactoryBot.create(:file_upload, uuid: @upload.uuid)
         @upload.valid?
-        @upload.errors[:uuid].must_include("has already been taken")
+        _(@upload.errors[:uuid]).must_include("has already been taken")
       end
     end
 
     describe "upload_type" do
       it "validates presence" do
         @upload.valid?
-        @upload.errors[:upload_type].must_include("can't be blank")
+        _(@upload.errors[:upload_type]).must_include("can't be blank")
       end
     end
 
     describe "filename" do
       it "validates presence" do
         @upload.valid?
-        @upload.errors[:filename].must_include("can't be blank")
+        _(@upload.errors[:filename]).must_include("can't be blank")
       end
     end
 
     describe "content_type" do
       it "validates presence" do
         @upload.valid?
-        @upload.errors[:content_type].must_include("can't be blank")
+        _(@upload.errors[:content_type]).must_include("can't be blank")
       end
     end
 
@@ -54,68 +54,68 @@ describe S3Relay::Upload do
       it "validates presence" do
         @upload.pending_at = nil
         @upload.valid?
-        @upload.errors[:pending_at].must_include("can't be blank")
+        _(@upload.errors[:pending_at]).must_include("can't be blank")
       end
     end
   end
 
   describe "scopes" do
     before do
-      @pending = FactoryGirl.build(:file_upload)
+      @pending = FactoryBot.build(:file_upload)
         .tap { |u| u.save(validate: false) }
-      @imported = FactoryGirl.build(:upload, state: "imported")
+      @imported = FactoryBot.build(:upload, state: "imported")
         .tap { |u| u.save(validate: false) }
     end
 
     describe "pending" do
       it do
         results = S3Relay::Upload.pending.all
-        results.must_include @pending
-        results.wont_include @imported
+        _(results).must_include @pending
+        _(results).wont_include @imported
       end
     end
 
     describe "imported" do
       it do
         results = S3Relay::Upload.imported.all
-        results.wont_include @pending
-        results.must_include @imported
+        _(results).wont_include @pending
+        _(results).must_include @imported
       end
     end
   end
 
   describe "upon finalization" do
     it do
-      @upload.state.must_equal "pending"
-      @upload.pending_at.wont_equal nil
+      _(@upload.state).must_equal "pending"
+      _(@upload.pending_at).wont_equal nil
     end
   end
 
   describe "#pending?" do
-    it { @upload.pending?.must_equal true }
+    it { _(@upload.pending?).must_equal true }
   end
 
   describe "#imported" do
     it do
       @upload.state = "imported"
-      @upload.imported?.must_equal true
+      _(@upload.imported?).must_equal true
     end
   end
 
   describe "#mark_imported!" do
     it do
       @upload.mark_imported!
-      @upload.state.must_equal "imported"
-      @upload.imported_at.wont_equal nil
+      _(@upload.state).must_equal "imported"
+      _(@upload.imported_at).wont_equal nil
     end
   end
 
   describe "#notify_parent" do
-    before { @upload = FactoryGirl.build(:file_upload) }
+    before { @upload = FactoryBot.build(:file_upload) }
 
     describe "when the parent is associated" do
       it do
-        @product = FactoryGirl.create(:product)
+        @product = FactoryBot.create(:product)
         @upload.parent = @product
         @product.expects(:import_upload)
         @upload.save
@@ -135,7 +135,7 @@ describe S3Relay::Upload do
       S3Relay::PrivateUrl.expects(:new).with(uuid, filename).returns(klass)
       klass.expects(:generate).returns(url)
 
-      @upload.private_url.must_equal url
+      _(@upload.private_url).must_equal url
     end
   end
 

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 
 IS_RAKE_TASK = (!! ($0 =~ /rake/))
 
@@ -14,16 +14,13 @@ if IS_RAKE_TASK
   end
 end
 
-ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment",  __FILE__)
 
 Dir[File.join("./test/factories/*.rb")].sort.each { |f| require f }
 
-require "minitest/autorun"
 require "rails/generators"
 require "rails/test_help"
 require "minitest/rails"
-require "minitest/pride"
-require "mocha/mini_test"
+require "mocha/minitest"
 
 Dir[File.join("./test/support/*.rb")].sort.each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_relay
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Kenny Johnston
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -30,128 +30,108 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.8
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.6
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.20'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.20'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -166,9 +146,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  Enables direct file uploads to Amazon S3 and provides a flexible pattern for
-  your Rails app to asynchronously ingest the files.
+description: Enables direct file uploads to Amazon S3 and provides a flexible pattern
+  for your Rails app to asynchronously ingest the files.
 email:
 - kjohnston.ca@gmail.com
 executables: []
@@ -268,7 +247,7 @@ homepage: http://github.com/kjohnston/s3_relay
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -283,9 +262,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Direct uploads to S3 and ingestion by your Rails app.
 test_files: