dynamic_paperclip 1.0.0.alpha.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 520ff66ae208d8c9fd390b036848638a68712442
-  data.tar.gz: 361cb3f76ed5bc35d812833a5c312b12c6e7fbce
+  metadata.gz: 532f05d2c123371561ae9a1fabdde9621994a72c
+  data.tar.gz: af6332a7d263cac5c5bc59cb6ba532f8fdb67e1c
 SHA512:
-  metadata.gz: f49d318831c5c3ad14573450fdcb21ab52efdc0c5cc9ca7c72803d4b4f2c484b607b7a088f0cd148532cf903bfd5393d4c4f7fb7275e20e9d6b78b7330a248e9
-  data.tar.gz: 820b5db8650c4e48ed966d1383cdf10ddc217fc48d2d81f50683906c00de269ca538abf9f19f90ba3318024410e00a2e0b294bed0a4ab1c29e52745272471246
+  metadata.gz: 4d410c0304dfe6fe9c195e08c72e7b9875ee091e8e194c36ffeadc025915237b32639033f5197db425ed203ff3623ce54241c8614c33f5ee267be6ad34fe3611
+  data.tar.gz: 4162c46ed79f90659a04fffa7c24a5754ee866ffb819d0b94213444a99de742ba08556bb35474faf928bfc3e97405e09248bae03ead968e3c78ee769dc63964d

data/lib/dynamic_paperclip/attachment.rb

@@ -42,7 +42,7 @@ module DynamicPaperclip
 
       url = url(style_name)
 
-      delimiter_char = url.match(/\?.+=/) ? '&' : '?'
+      delimiter_char = url.match(/\?/) ? '&' : '?'
 
       "#{url}#{delimiter_char}s=#{UrlSecurity.generate_hash(style_name)}"
     end
@@ -64,4 +64,4 @@ module DynamicPaperclip
         @dynamic_styles[name.to_sym] = Paperclip::Style.new(name, StyleNaming.style_definition_from_dynamic_style_name(name), self)
       end
   end
-end
+end

data/lib/dynamic_paperclip/attachment_style_generator.rb

@@ -1,5 +1,7 @@
 require 'rack/request'
-require 'action_controller/metal/data_streaming'
+
+require 'action_controller/metal/data_streaming' # For Rails 4
+require 'action_dispatch/http/response.rb' # For Rails 5
 
 module DynamicPaperclip
   class AttachmentStyleGenerator
@@ -18,6 +20,11 @@ module DynamicPaperclip
           id = id_from_partition(match[:id])
           attachment = klass.find(id).send(name)
 
+          # When the filename is wrong, return a 404
+          if !attachment.exists? || attachment.original_filename != URI.unescape(match[:filename])
+            return [404, {}, []]
+          end
+
           # The definition will be escaped twice in the URL, so we need to unescape it once.
           # We should always reference dynamic style names after escaping once - that's how they reside on the FS.
           style_name = StyleNaming.dynamic_style_name_from_definition(CGI.unescape(match[:definition]), false)
@@ -30,6 +37,9 @@ module DynamicPaperclip
             # an existing style
             attachment.process_dynamic_style style_name unless attachment.exists?(style_name)
 
+            # The FileBody class has been moved to another module in Rails 5
+            file_body = defined?(ActionController::DataStreaming::FileBody) ? ActionController::DataStreaming::FileBody : ActionDispatch::Response::FileBody
+
             return [
               200,
               {
@@ -37,7 +47,7 @@ module DynamicPaperclip
                 'Content-Transfer-Encoding' => 'binary',
                 'Content-Disposition' => "inline; filename=#{File.basename(attachment.path(style_name))}"
               },
-              ActionController::DataStreaming::FileBody.new(attachment.path(style_name))
+              file_body.new(attachment.path(style_name))
             ]
           else
             # Invalid hash, just 403

data/lib/dynamic_paperclip/railtie.rb

@@ -3,9 +3,9 @@ require 'dynamic_paperclip/attachment_style_generator'
 module DynamicPaperclip
   class Railtie < Rails::Railtie
     initializer 'dynamic_paperclip.insert_middleware' do |app|
-      app.config.middleware.use "DynamicPaperclip::AttachmentStyleGenerator"
+      app.config.middleware.use DynamicPaperclip::AttachmentStyleGenerator
     end
 
     rake_tasks { load 'tasks/dynamic_paperclip.rake' }
   end
-end
+end

data/lib/dynamic_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DynamicPaperclip
-  VERSION = "1.0.0.alpha.4"
+  VERSION = "1.0.0"
 end

data/test/dummy/log/test.log

@@ -5274,3 +5274,360 @@ AttachmentTest: test_: Attachment should use DynamicPaperclip::Attachment for dy
 InstallGeneratorTest: test_generates_secret_and_configures_DynamicPaperclip_to_use_it
 -------------------------------------------------------------------------------------
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (2.2ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "test"], ["created_at", "2017-07-09 20:10:23.052416"], ["updated_at", "2017-07-09 20:10:23.052416"]]
+   (0.6ms)  commit transaction
+   (0.1ms)  begin transaction
+--------------------------------
+DynamicPaperclipTest: test_truth
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Fixture Delete (0.5ms)  DELETE FROM "photos"
+  Fixture Insert (0.7ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2017-07-09 20:10:23.106409', '2017-07-09 20:10:23.106409')
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "created_at", "updated_at") VALUES (2, '2017-07-09 20:10:23.106409', '2017-07-09 20:10:23.106409')
+   (1.1ms)  commit transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return true from query method when attachment is set. 
+-----------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should delete styles passed to #delete_styles and maintain existing delete queued. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should only include dynamic styles in #dynamic_styles. 
+-----------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should generate correct secure attachment URL when given a style definition. 
+---------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should include existing dynamic styles in #styles. 
+-------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return false from query method when attachment is not set. 
+----------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 2], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should use DynamicPaperclip::Attachment for dynamic attachments. 
+---------------------------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should add dynamic style to #styles and reprocess it when a dynamic style name is passed to #process_dynamic_style. 
+------------------------------------------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should raise error if no secret has been configured. 
+---------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+DynamicAttachmentStylesTest: test_: DynamicAttachmentStyles should generate dynamic style and send it to the client. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2017-07-09 16:10:23 -0400
+  Photo Load (0.0ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+Command :: file -b --mime '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720170709-15038-1vt65ol.png'
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720170709-15038-vjhbqg.png[0]' 2>/dev/null
+Command :: identify -format %m '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720170709-15038-vjhbqg.png[0]'
+Command :: convert '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720170709-15038-vjhbqg.png[0]' -auto-orient -resize "100x100" '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/36e34534f477f75d2a20fca014c56f9020170709-15038-nliyjj'
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  UPDATE "photos" SET "image_file_size" = ?, "image_updated_at" = ?, "updated_at" = ?, "image_file_name" = ? WHERE "photos"."id" = ?  [["image_file_size", 6646], ["image_updated_at", "2017-07-09 20:10:23.278875"], ["updated_at", "2017-07-09 20:10:23.367904"], ["image_file_name", "rails.png"], ["id", 1]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (1.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------------
+InstallGeneratorTest: test_generates_secret_and_configures_DynamicPaperclip_to_use_it
+-------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::InternalMetadata Load (0.4ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+   (0.1ms)  commit transaction
+   (0.1ms)  begin transaction
+--------------------------------
+DynamicPaperclipTest: test_truth
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Fixture Delete (0.4ms)  DELETE FROM "photos"
+  Fixture Insert (0.2ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2018-11-28 17:01:43.254736', '2018-11-28 17:01:43.254736')
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "created_at", "updated_at") VALUES (2, '2018-11-28 17:01:43.254736', '2018-11-28 17:01:43.254736')
+   (0.9ms)  commit transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should raise error if no secret has been configured. 
+---------------------------------------------------------------------------------------
+  Photo Load (0.2ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should use DynamicPaperclip::Attachment for dynamic attachments. 
+---------------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should delete styles passed to #delete_styles and maintain existing delete queued. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should only include dynamic styles in #dynamic_styles. 
+-----------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should include existing dynamic styles in #styles. 
+-------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return false from query method when attachment is not set. 
+----------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 2], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return true from query method when attachment is set. 
+-----------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should generate correct secure attachment URL when given a style definition. 
+---------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should add dynamic style to #styles and reprocess it when a dynamic style name is passed to #process_dynamic_style. 
+------------------------------------------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+DynamicAttachmentStylesTest: test_: DynamicAttachmentStyles should generate dynamic style and send it to the client. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2018-11-28 12:01:43 -0500
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+Command :: file -b --mime '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62536-8njla5.png'
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62536-150tusr.png[0]' 2>/dev/null
+Command :: identify -format %m '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62536-150tusr.png[0]'
+Command :: convert '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62536-150tusr.png[0]' -auto-orient -resize "100x100" '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/cdc0ec0084039f9f2ee2afc111bd872820181128-62536-y162l6'
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  UPDATE "photos" SET "image_file_size" = ?, "image_updated_at" = ?, "updated_at" = ?, "image_file_name" = ? WHERE "photos"."id" = ?  [["image_file_size", 6646], ["image_updated_at", "2018-11-28 17:01:43.462825"], ["updated_at", "2018-11-28 17:01:43.542524"], ["image_file_name", "rails.png"], ["id", 1]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------------
+InstallGeneratorTest: test_generates_secret_and_configures_DynamicPaperclip_to_use_it
+-------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.2ms)  begin transaction
+   (0.1ms)  commit transaction
+   (0.2ms)  begin transaction
+-------------------------------------------------------------------------------------
+InstallGeneratorTest: test_generates_secret_and_configures_DynamicPaperclip_to_use_it
+-------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------
+DynamicPaperclipTest: test_truth
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Fixture Delete (0.5ms)  DELETE FROM "photos"
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2018-11-28 17:02:06.431023', '2018-11-28 17:02:06.431023')
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "created_at", "updated_at") VALUES (2, '2018-11-28 17:02:06.431023', '2018-11-28 17:02:06.431023')
+   (1.2ms)  commit transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return false from query method when attachment is not set. 
+----------------------------------------------------------------------------------------------------
+  Photo Load (0.2ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 2], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return true from query method when attachment is set. 
+-----------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should only include dynamic styles in #dynamic_styles. 
+-----------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should add dynamic style to #styles and reprocess it when a dynamic style name is passed to #process_dynamic_style. 
+------------------------------------------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should generate correct secure attachment URL when given a style definition. 
+---------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.2ms)  rollback transaction
+   (0.4ms)  begin transaction
+---------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should raise error if no secret has been configured. 
+---------------------------------------------------------------------------------------
+  Photo Load (0.3ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should delete styles passed to #delete_styles and maintain existing delete queued. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.2ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should include existing dynamic styles in #styles. 
+-------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should use DynamicPaperclip::Attachment for dynamic attachments. 
+---------------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+DynamicAttachmentStylesTest: test_: DynamicAttachmentStyles should generate dynamic style and send it to the client. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2018-11-28 12:02:06 -0500
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT ?  [["id", 1], ["LIMIT", 1]]
+Command :: file -b --mime '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62681-i31zfe.png'
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62681-1d6ikc3.png[0]' 2>/dev/null
+Command :: identify -format %m '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62681-1d6ikc3.png[0]'
+Command :: convert '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-62681-1d6ikc3.png[0]' -auto-orient -resize "100x100" '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/144ee7012c69b8b06c56f6f90a39a39220181128-62681-1pg8hnk'
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (1.3ms)  UPDATE "photos" SET "image_file_size" = ?, "image_updated_at" = ?, "updated_at" = ?, "image_file_name" = ? WHERE "photos"."id" = ?  [["image_file_size", 6646], ["image_updated_at", "2018-11-28 17:02:06.710591"], ["updated_at", "2018-11-28 17:02:06.827831"], ["image_file_name", "rails.png"], ["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------
+InstallGeneratorTest: test_generates_secret_and_configures_DynamicPaperclip_to_use_it
+-------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "photos"
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2018-11-28 17:09:21', '2018-11-28 17:09:21')
+  Fixture Insert (0.0ms)  INSERT INTO "photos" ("id", "created_at", "updated_at") VALUES (2, '2018-11-28 17:09:21', '2018-11-28 17:09:21')
+   (0.6ms)  commit transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should add dynamic style to #styles and reprocess it when a dynamic style name is passed to #process_dynamic_style. 
+------------------------------------------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.2ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should delete styles passed to #delete_styles and maintain existing delete queued. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should generate correct secure attachment URL when given a style definition. 
+---------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should include existing dynamic styles in #styles. 
+-------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+-----------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should only include dynamic styles in #dynamic_styles. 
+-----------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should raise error if no secret has been configured. 
+---------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return false from query method when attachment is not set. 
+----------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 2]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should return true from query method when attachment is set. 
+-----------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------
+AttachmentTest: test_: Attachment should use DynamicPaperclip::Attachment for dynamic attachments. 
+---------------------------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+DynamicPaperclipTest: test_truth
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------------------------------
+DynamicAttachmentStylesTest: test_: DynamicAttachmentStyles should generate dynamic style and send it to the client. 
+---------------------------------------------------------------------------------------------------------------------
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2018-11-28 12:09:21 -0500
+  Photo Load (0.1ms)  SELECT  "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+[paperclip] Trying to link /var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-63225-g6srmw.png to /var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-63225-mztlk7.png
+Command :: file -b --mime '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-63225-mztlk7.png'
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-63225-g6srmw.png[0]' 2>/dev/null
+Command :: identify -format %m '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-63225-g6srmw.png[0]'
+Command :: convert '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4d003d1435f0827cfe18ac2d2a3979e720181128-63225-g6srmw.png[0]' -auto-orient -resize "100x100" '/var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/76121d983a58042e5a46fec21a87c16e20181128-63225-15z93pu'
+[paperclip] Trying to link /var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/76121d983a58042e5a46fec21a87c16e20181128-63225-15z93pu to /var/folders/fk/ltpzbpl167jfwr6wyty1tc200000gn/T/4a02615c6c08340aece92d8388bbc56220181128-63225-qv3jgm
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  UPDATE "photos" SET "image_file_size" = ?, "image_updated_at" = ?, "image_file_name" = ?, "updated_at" = ? WHERE "photos"."id" = ?  [["image_file_size", 6646], ["image_updated_at", "2018-11-28 17:09:21.579296"], ["image_file_name", "rails.png"], ["updated_at", "2018-11-28 17:09:21.683165"], ["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction

data/test/unit/attachment_style_generator_test.rb

@@ -19,7 +19,7 @@ class DynamicPaperclip::AttachmentStyleGeneratorTest < MiniTest::Unit::TestCase
     @app = stub('Application', :call => [200, {}, ''])
 
     @foo = stub('foo')
-    @attachment = stub('image attachment', :path => File.join(FIXTURES_DIR, 'rails.png'), :content_type => 'image/jpeg')
+    @attachment = stub('image attachment', :path => File.join(FIXTURES_DIR, 'rails.png'), :original_filename => 'rails.png', :content_type => 'image/jpeg')
     @attachment.stubs(:exists?).returns(true)
 
     Foo.stubs(:find).with(1).returns @foo
@@ -30,66 +30,69 @@ class DynamicPaperclip::AttachmentStyleGeneratorTest < MiniTest::Unit::TestCase
     @attachment.expects(:exists?).with(:dynamic_42x42).returns(true)
     @attachment.expects(:process_dynamic_style).never
 
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
   end
 
   should 'process style if it is dynamic and does not exist' do
     @attachment.expects(:exists?).with(:dynamic_42x42).returns(false)
     @attachment.expects(:process_dynamic_style).once
 
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
   end
 
   should 'find record when an ID is used' do
     Foo.expects(:find).with(1).returns @foo
 
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
   end
 
   should 'find record when an ID partition is used' do
     @foo.stubs(:image_with_id_partition_in_url).returns @attachment
     Foo.expects(:find).with(10042).returns @foo
 
-    get '/system/foos/image_with_id_partition_in_urls/000/010/042/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/image_with_id_partition_in_urls/000/010/042/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
   end
 
   should 'respond with correct content type' do
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
 
     assert_equal 'image/jpeg', last_response.header['Content-Type']
   end
 
   should 'respond with correct content-disposition' do
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
 
     assert_equal 'inline; filename=rails.png', last_response.header['Content-Disposition']
   end
 
   should 'respond with correct content-transfer-encoding' do
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
 
     assert_equal 'binary', last_response.header['Content-Transfer-Encoding']
   end
 
   should 'respond with FileBody' do
-    file_body = ActionController::DataStreaming::FileBody.new(File.join(FIXTURES_DIR, 'rails.png'))
-    ActionController::DataStreaming::FileBody.expects(:new).with(File.join(FIXTURES_DIR, 'rails.png')).returns(file_body)
+    # The FileBody class has been moved to another module in Rails 5
+    file_body = defined?(ActionController::DataStreaming::FileBody) ? ActionController::DataStreaming::FileBody : ActionDispatch::Response::FileBody
 
-    response = app.call(Rack::MockRequest.env_for('/system/foos/images/1/dynamic_42x42/file?s='+DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42')))
+    image_file_body = file_body.new(File.join(FIXTURES_DIR, 'rails.png'))
+    file_body.expects(:new).with(File.join(FIXTURES_DIR, 'rails.png')).returns(image_file_body)
 
-    assert_equal file_body, response[2]
+    response = app.call(Rack::MockRequest.env_for('/system/foos/images/1/dynamic_42x42/rails.png?s='+DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42')))
+
+    assert_equal image_file_body, response[2]
   end
 
   should 'respond with success' do
-    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
 
     assert last_response.ok?
   end
 
   should '403 with empty body if hash does not match style name' do
-    get '/system/foos/images/1/dynamic_42x42/file', { s: 'this is an invalid hash' }
+    get '/system/foos/images/1/dynamic_42x42/rails.png', { s: 'this is an invalid hash' }
 
     assert_equal 403, last_response.status
     assert_equal '', last_response.body
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_paperclip
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Jim Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -210,9 +210,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -220,38 +220,38 @@ signing_key:
 specification_version: 4
 summary: Generate Paperclip attachment styles on the fly
 test_files:
-- test/dummy/app/controllers/application_controller.rb
+- test/unit/has_attached_file_test.rb
+- test/unit/attachment_test.rb
+- test/unit/attachment_style_generator_test.rb
 - test/dummy/app/models/photo.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environment.rb
 - test/dummy/config/application.rb
 - test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/dynamic_paperclip.rb
-- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config.ru
-- test/dummy/db/migrate/20131102002336_create_photos.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
+- test/dummy/script/rails
+- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/system/photos/images/000/000/001/dynamic_42x42/rails.png
+- test/dummy/public/404.html
 - test/dummy/public/system/photos/images/000/000/001/original/rails.png
-- test/dummy/Rakefile
-- test/dummy/script/rails
+- test/dummy/public/system/photos/images/000/000/001/dynamic_42x42/rails.png
+- test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/db/migrate/20131102002336_create_photos.rb
+- test/dummy/log/test.log
+- test/integration/dynamic_attachment_styles_test.rb
 - test/dynamic_paperclip_test.rb
 - test/fixtures/photos.yml
 - test/fixtures/rails.png
-- test/generators/install_generator_test.rb
-- test/integration/dynamic_attachment_styles_test.rb
 - test/test_helper.rb
+- test/generators/install_generator_test.rb
 - test/tmp/config/initializers/dynamic_paperclip.rb
-- test/unit/attachment_style_generator_test.rb
-- test/unit/attachment_test.rb
-- test/unit/has_attached_file_test.rb