dragonfly 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4de8c2fdfcbd31e9e81550bda591c3a72f33a33dad988a176bea232c38768029
-  data.tar.gz: c3ed8cf808992154674c1abc4902502a34281ae18c759de4e351610f29aed775
+  metadata.gz: 5385c46218c68349adc9f33a89600ed52901b483fc4b8b7ad3bab0ea1e3aa579
+  data.tar.gz: bd4341674548d3526d786be990912b527745000b6d887148e91bfe88e7a9618c
 SHA512:
-  metadata.gz: 69007250136c7d8aba75e0f32244a30fe7cc7aeb351a36a4515dc94ec53baff8084d950137e293623170b7310f41b6b1849375bc9d7ab062a017f595fca9d395
-  data.tar.gz: 5fe9075b447c6c9013542742282c1e529f3143fc288ece1afd05139ffb17f95da9fd2af982b11f7a989c8faf85c738915dc1de0b7f110c31d188107a2b87e3d6
+  metadata.gz: 28b284e2ca3d15914787357c2035f900a2c0c61c5fdc0b36302b2bcd24b01683b073774b70a9583ef446ba764dbb7019e3e92eab8cd83b042d428236498ccaf4
+  data.tar.gz: 2fc17f0f4587fe85ccf6af91798a0a89aa58086a9518445d2684abcffd16ab9d53c10fdea2e7f0a5cb2f07a24774b3865b80e7ddd293f5a53bfea4f04b0b24bd

data/.travis.yml

@@ -1,8 +1,5 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0"
-  - "2.1"
   - "2.2"
   - "2.3"
   - "2.4"

data/History.md

@@ -1,69 +1,66 @@
+# 1.3.0 (2021-01-09)
+
+## Changes
+
+- Dropped official support for ruby < 2.2 - too annoying to maintain
+
+## Fixes
+
+- Fixed losing attachment when transaction rolled back on destroy (dlibanori)
+- Fixed fetch_url edge case when redirect url includes special chars (thedanbob)
+
 # 1.2.1 (2020-07-24)
 
 ## Features
 
 - Allow having no logger (setting to `nil`) (kaimou1357)
-  Fixes
 
----
+## Fixes
 
 - Fix URI.unescape deprecation warning (alberto-mota)
 
-  # 1.2.0 (2018-11-13)
-
-  Fixes
+# 1.2.0 (2018-11-13)
 
----
+## Fixes
 
 - Replaced `quote` with `escape` for escaping shell commands - works with paths with apostrophes
-  Changes
 
----
+## Changes
 
 - Replaced Open3.popen3 with now recommended Open3.capture3 (tomasc)
 
-  # 1.1.5 (2018-03-23)
-
-  Fixes
+# 1.1.5 (2018-03-23)
 
----
+## Fixes
 
 - Moved `destroy_dragonfly_attachments` into an `after_destroy` - issue #477 (eldotz)
 
-  # 1.1.4 (2017-12-31)
+# 1.1.4 (2017-12-31)
 
-  Fixes
-
----
+## Fixes
 
 - Fixed data uris not working for long strings (reported dlibanori)
 - Removed syntax warnings (swamp09)
 - Correct ActiveRecord hook with `ActiveSupport.on_load` (efatsi)
 
-  # 1.1.3 (2017-06-02)
-
-  Fixes
+# 1.1.3 (2017-06-02)
 
----
+## Fixes
 
 - Make sure imagemagick convert processor updates mime_type correctly when format is changed
 
-  # 1.1.2 (2017-05-06)
-
-  Fixes
+# 1.1.2 (2017-05-06)
 
----
+## Fixes
 
 - Allow relative redirect urls in `fetch_url` (zorec)
 - Fixed Forwardable deprecation warnings (neodude)
 - Fixed incorrect detection of empty directories in ruby 2.4 (yuszuv)
 - Store content type in meta if it's available so we don't lose information (Lukas Svoboda)
 
-  # 1.1.1 (2016-10-26)
+# 1.1.1 (2016-10-26)
 
-  Features
-
----
+## Features
 
 - Added delegate option for imagemagick (Will Fisher)
 
@@ -87,67 +84,52 @@
 
 - Dropped official support for Ruby &lt;= 1.9.2 and Rubinius
 
-  # 1.0.12 (2015-09-16)
-
-  Features
+# 1.0.12 (2015-09-16)
 
----
+## Features
 
 - Made thumb processor args for a specific geometry publicly accesible
 
-  # 1.0.11 (2015-09-04)
-
-  Fixes
+# 1.0.11 (2015-09-04)
 
----
+## Fixes
 
 - Make sure tempfiles are created with paths matching the meta name
 
-  # 1.0.10 (2015-05-14)
+# 1.0.10 (2015-05-14)
 
-  Features
-
----
+## Features
 
 - Allow method signified by symbol in storage_options to take an attachment object
 - Allow passing in "input_args" to convert processor
-  Fixes
 
----
+## Fixes
 
 - correct Rack version
 
-  # 1.0.9 (2015-04-29)
+# 1.0.9 (2015-04-29)
 
-  Fixes
-
----
+## Fixes
 
 - Remove sha parameter being echoed back on error for better security
 
-  # 1.0.8 (2015-04-23)
-
-  Fixes
+# 1.0.8 (2015-04-23)
 
----
+## Fixes
 
 - Job#close re-added, so that tempfiles are immediately removed after each request
 - Specs passing for 1.8.7, 1.9.2 (i18n gem version specified)
 
-  # 1.0.7 (2014-08-26)
-
-  Changes
+# 1.0.7 (2014-08-26)
 
----
+## Changes
 
 - Job#sha uses better algorithm
 - renamed `protect_from_dos_attacks` -> `verify_urls` and turn on by default
 
-  # 1.0.6 (2014-08-22)
+# 1.0.6 (2014-08-22)
 
-  Features
-
----
+## Features
 
 - env can be accessed by routed endpoint blocks
 
@@ -157,44 +139,34 @@
 - removed default secret, forcing user to specify one explicitly
 - deal with "[" character problems in urls https://github.com/markevans/dragonfly/pull/337
 
-  # 1.0.5 (2014-05-15)
-
-  Fixes
+# 1.0.5 (2014-05-15)
 
----
+## Fixes
 
 - fetch_url wasn't correctly getting https endpoints on Ruby approx < 2
 
-  # 1.0.4 (2014-04-11)
-
-  Fixes
+# 1.0.4 (2014-04-11)
 
----
+## Fixes
 
 - fetch_url is more forgiving - assume escaped, if not escape
 
-  # 1.0.3 (2014-01-28)
+# 1.0.3 (2014-01-28)
 
-  Fixes
-
----
+## Fixes
 
 - changing meta on a job (e.g. `fetch('blah').encode('jpg')`) was interfering with meta on its parent job (e.g. `fetch('blah')`)
 
-  # 1.0.2 (2013-12-20)
-
-  Fixes
+# 1.0.2 (2013-12-20)
 
----
+## Fixes
 
 - more secure generation of secret in rails generator
 - ensure popen3 doesn't hang
 
-  # 1.0.1 (2013-11-28)
-
-  Changes
+# 1.0.1 (2013-11-28)
 
----
+## Changes
 
 - FileDataStore doesn't use hours_minutes_seconds in its path - it uses a random string instead (12_15_59_saf4fs_file.png -> sdf4c2G_file.png)
 
@@ -209,11 +181,9 @@
 - default Content-Disposition header doesn't url-encode filename unless the request is from IE
 - `fetch_url` deals with urls that redirect to https (previously was blowing up)
 
-  # 1.0.0 (2013-11-24)
+# 1.0.0 (2013-11-24)
 
-  Changes
-
----
+## Changes
 
 - configuration
   - `Dragonfly[:images]` -> `Dragonfly.app` and `Dragonfly.app(:named_app)`
@@ -261,11 +231,9 @@
 - shell commands don't print warnings to stderr
 - ability to assign attachment/job from other app
 
-  # 0.9.15 (2013-05-04)
-
-  Features
+# 0.9.15 (2013-05-04)
 
----
+## Features
 
 - Allow turning off support of legacy urls
 
@@ -274,11 +242,9 @@
 - More conservative URL escaping - back to Rack::Utils.escape_path
 - Don't check for malicious strings when deserializing from datastores (they're to be trusted)
 
-  # 0.9.14 (2013-02-13)
-
-  Features
+# 0.9.14 (2013-02-13)
 
----
+## Features
 
 - Attachment#b64_data
 
@@ -288,19 +254,15 @@
 - Support old-style deprecated urls (with a check for malicious ones)
 - Handle case where uid is an empty string
 
-  # 0.9.13 (2013-01-30)
-
-  Changes
+# 0.9.13 (2013-01-30)
 
----
+## Changes
 
 - URLS are encoded/decoded with JSON, not with Marshal
 
-  # 0.9.12 (2012-04-08)
-
-  Features
+# 0.9.12 (2012-04-08)
 
----
+## Features
 
 - Allow using a mongo replica set with mongo datastore
 
@@ -308,11 +270,9 @@
 
 - `define_macro_on_include` was giving a stack error with multiple accessors on same app
 
-  # 0.9.11 (2012-03-12)
+# 0.9.11 (2012-03-12)
 
-  Features
-
----
+## Features
 
 - Allow the S3 base URL to be customised with `url_host` (or per-request)
 - Added App#name (name as per `Dragonfly[:app_name]`)
@@ -329,19 +289,15 @@
 - Use fog's `sync_clock` to overcome potential S3 time skew problems
 - Using :name in urls was causing problems when filenames had dashes in them
 
-  # 0.9.10 (2012-01-11)
-
-  Fixes
+# 0.9.10 (2012-01-11)
 
----
+## Fixes
 
 - FileDataStore was causing errors when the storage path was flat (not in a directory structure)
 
-  # 0.9.9 (2011-12-30)
-
-  Features
+# 0.9.9 (2011-12-30)
 
----
+## Features
 
 - Created tempfiles use the original file extension if known
 - Added `:case_sensitive` option to `validates_property` for dealing with upper-case extensions and mime-types.
@@ -371,27 +327,21 @@
 - S3DataStore was breaking on bucket_exists? when using AWS IAM
 - Put CookieMonster before ActionDispatch::Cookies in rack middleware stack - that way Rack::Cache won't come between them and mess things up
 
-  # 0.9.8 (2011-09-08)
+# 0.9.8 (2011-09-08)
 
-  Fixes
-
----
+## Fixes
 
 - Regenerated gemspec again with ruby 1.8.7 - didn't seem to be fixed
 
-  # 0.9.7 (2011-09-08)
-
-  Fixes
+# 0.9.7 (2011-09-08)
 
----
+## Fixes
 
 - Regenerated gemspec to overcome annoying yaml issue (http://blog.rubygems.org/2011/08/31/shaving-the-yaml-yacc.html)
 
-  # 0.9.6 (2011-09-06)
-
-  Features
+# 0.9.6 (2011-09-06)
 
----
+## Features
 
 - Allow setting `content_type` when storing in Mongo GridFS
 
@@ -406,11 +356,9 @@
 - Tests working in Windows (except feature that uses FileCommandAnalyser)
 - Better shell quoting
 
-  # 0.9.5 (2011-07-27)
+# 0.9.5 (2011-07-27)
 
-  Features
-
----
+## Features
 
 - Added reflection method `app.analyser_methods`
 
@@ -419,30 +367,24 @@
 - Fixed `convert` and `identify` for files with spaces
 - Fixed size validations for Rails 3.0.7
 
-  # 0.9.4 (2011-06-10)
-
-  Fixes
+# 0.9.4 (2011-06-10)
 
----
+## Fixes
 
 - Made use of Rack calling `close` on the response body to clean up tempfiles.
   The response body is now the job, which delegates `each` to the temp_object.
 
-  # 0.9.3 (2011-06-03)
-
-  Fixes
+# 0.9.3 (2011-06-03)
 
----
+## Fixes
 
 - TempObject#to_file sets file permissions 644 - copying wasn't previously guaranteeing this
 - Added TempObject#close and closed?, which Rack uses to clean up tempfiles
 - replaced '/' characters with '~' in base64 encoded urls (they were confusing url recognition)
 
-  # 0.9.2 (2011-05-19)
+# 0.9.2 (2011-05-19)
 
-  Features
-
----
+## Features
 
 - Added env['dragonfly.job'] for use in other Rack middlewares
 - Added CookieMonster middleware for removing 'Set-Cookie' headers
@@ -451,11 +393,9 @@
 
 - Remove 'Set-Cookie' header from any requests coming from a rails route
 
-  # 0.9.1 (2011-05-11)
-
-  Features
+# 0.9.1 (2011-05-11)
 
----
+## Features
 
 - Added reflection methods `app.processor_methods`, `app.generator_methods` and `app.job_methods`
 
@@ -466,11 +406,9 @@
 - Deal with Excon::Errors::SocketError: EOFError errors which get thrown sometimes from S3 connection
 - Allow files with '..' (but not '../') in the middle of their name in file data store
 
-  # 0.9.0 (2011-04-27)
-
-  Features
+# 0.9.0 (2011-04-27)
 
----
+## Features
 
 - Model accessors are configurable
   - added `after_assign` callback
@@ -519,39 +457,31 @@
 
 - Performance tweaks regarding temp_objects model accessors and job objects
 
-  # 0.8.5 (2011-05-11)
+# 0.8.5 (2011-05-11)
 
-  Fixes
-
----
+## Fixes
 
 - Allow filenames that have '..' in them (but not '../') in the filedatastore
 - Better security for server
 
-  # 0.8.4 (2011-04-27)
-
-  Fixes
+# 0.8.4 (2011-04-27)
 
----
+## Fixes
 
 - Security fix for file data store
 
-  # 0.8.2 (2011-01-11)
-
-  Fixes
+# 0.8.2 (2011-01-11)
 
----
+## Fixes
 
 - Renamed ActiveModel methods like 'attachments' to avoid name clashes
 - Respond properly to HEAD, POST, PUT and DELETE requests
 - Got it working with jRuby and Rubinius
 - Made DOS protection SHA (and ETag) consistent
 
-  # 0.8.1 (2010-11-22)
+# 0.8.1 (2010-11-22)
 
-  Fixes
-
----
+## Fixes
 
 Removed runtime dependencies that Jeweler automatically takes from the Gemfile
 
@@ -607,35 +537,27 @@ Removed runtime dependencies that Jeweler automatically takes from the Gemfile
   They can be configured to use in-memory strings with the use_filesystem config option.
 - Upgraded support from Rails 3.0.0.rc -> Rails.3.0.0
 
-  # 0.7.4 (2010-08-28)
-
-  Features
+# 0.7.4 (2010-08-28)
 
----
+## Features
 
 - Gave model accessors bang methods process! and encode!
 
-  # 0.7.3 (2010-08-27)
-
-  Fixes
+# 0.7.3 (2010-08-27)
 
----
+## Fixes
 
 - Seems as though inserting after Rails' Rack::Lock was worth it after all
 
-  # 0.7.2 (2010-08-27)
+# 0.7.2 (2010-08-27)
 
-  Fixes
-
----
+## Fixes
 
 - S3DataStore was breaking if previous data hadn't stored meta
 
-  # 0.7.1 (2010-08-26)
-
-  Fixes
+# 0.7.1 (2010-08-26)
 
----
+## Fixes
 
 - SimpleEndpoint was modifying env path_info so wasn't creating proper cache keys
 - to_response accepts env, so can use if-not-modified, etc.
@@ -648,7 +570,7 @@ Removed runtime dependencies that Jeweler automatically takes from the Gemfile
 
 - ETags generated by hash of job.serialize - was getting a bit long
 
-  # 0.7.0 (2010-08-25)
+# 0.7.0 (2010-08-25)
 
 ## Features
 
@@ -702,15 +624,13 @@ Removed runtime dependencies that Jeweler automatically takes from the Gemfile
 
 - Added ability for custom error messages in validations
 
-  # 0.6.1 (2010-05-16)
-
-  Fixes
+# 0.6.1 (2010-05-16)
 
----
+## Fixes
 
 - STI was breaking when the model had a mixin too
 
-  # 0.6.0 (2010-05-11)
+# 0.6.0 (2010-05-11)
 
 ## Features
 
@@ -736,25 +656,25 @@ Removed runtime dependencies that Jeweler automatically takes from the Gemfile
 - Imagemagick errors in RMagick processor/analyser/encoder now throw unable_to_handle and log a warning
 - Removed Rails generators - better being more explicit with saved configurations which are more concise now
 
-  # 0.5.7 (2010-04-18)
+# 0.5.7 (2010-04-18)
 
 ## Fixes
 
 - Strip file command mime_type value because some versions of file command were appending a line-break
 
-  # 0.5.6 (2010-04-13)
+# 0.5.6 (2010-04-13)
 
 ## Fixes
 
 - Wasn't working properly with Single-Table Inheritance
 
-  # 0.5.5 (2010-04-13)
+# 0.5.5 (2010-04-13)
 
 ## Fixes
 
 - Rails 3 has changed 'metaclass' -> 'singleton_class' so adapt accordingly
 
-  # 0.5.4 (2010-04-12)
+# 0.5.4 (2010-04-12)
 
 ## Features
 
@@ -787,7 +707,7 @@ Removed runtime dependencies that Jeweler automatically takes from the Gemfile
 
 - Fixed 'broken pipe' errors in FileCommandAnalyser due to outputting loads of stuff to the command line stdin
 
-  # 0.5.0 (2010-02-20)
+# 0.5.0 (2010-02-20)
 
 ## Added support
 

data/README.md

@@ -47,7 +47,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.2.1'
+gem 'dragonfly', '~> 1.2.2'
 ```
 
 Require with

data/dev/rails_template.rb

@@ -1,40 +1,42 @@
-gem 'dragonfly', :path => File.expand_path('../..', __FILE__)
-generate "dragonfly"
-generate "scaffold", "photo image_uid:string image_name:string"
-rake "db:migrate"
-route %(
-  get "text/:text" => Dragonfly.app.endpoint { |params, app|
-    app.generate(:text, params[:text])
-  }
-)
-route "root :to => 'photos#index'"
-run "rm -rf public/index.html"
+after_bundle do
+  gem 'dragonfly', :path => File.expand_path('../..', __FILE__)
+  generate "dragonfly"
+  generate "scaffold", "photo image_uid:string image_name:string"
+  rake "db:migrate"
+  route %(
+    get "text/:text" => Dragonfly.app.endpoint { |params, app|
+      app.generate(:text, params[:text])
+    }
+  )
+  route "root :to => 'photos#index'"
+  run "rm -rf public/index.html"
 
-possible_base_classes = ['ActiveRecord::Base', 'ApplicationRecord']
-possible_base_classes.each do |base_class|
-  inject_into_file 'app/models/photo.rb', :after => "class Photo < #{base_class}\n" do
-    %(
-      attr_accessible :image rescue nil
-      dragonfly_accessor :image
-    )
+  possible_base_classes = ['ActiveRecord::Base', 'ApplicationRecord']
+  possible_base_classes.each do |base_class|
+    inject_into_file 'app/models/photo.rb', :after => "class Photo < #{base_class}\n" do
+      %(
+        attr_accessible :image rescue nil
+        dragonfly_accessor :image
+      )
+    end
   end
-end
 
-gsub_file 'app/views/photos/_form.html.erb', /^.*:image_.*$/, ''
+  gsub_file 'app/views/photos/_form.html.erb', /^.*:image_.*$/, ''
 
-inject_into_file 'app/views/photos/_form.html.erb', :before => %(<div class="actions">\n) do
-  %(
-    <div class="field">
-      <%= form.label :image %><br>
-      <%= form.file_field :image %>
-    </div>
+  inject_into_file 'app/views/photos/_form.html.erb', :before => %(<div class="actions">\n) do
+    %(
+      <div class="field">
+        <%= form.label :image %><br>
+        <%= form.file_field :image %>
+      </div>
 
-    <%= image_tag @photo.image.thumb('100x100').url if @photo.image_stored? %>
-  )
-end
+      <%= image_tag @photo.image.thumb('100x100').url if @photo.image_stored? %>
+    )
+  end
 
-gsub_file "app/controllers/photos_controller.rb", "permit(", "permit(:image, "
+  gsub_file "app/controllers/photos_controller.rb", "permit(", "permit(:image, "
 
-append_file 'app/views/photos/show.html.erb', %(
- <%= image_tag @photo.image.thumb('300x300').url if @photo.image_stored? %>
-)
+  append_file 'app/views/photos/show.html.erb', %(
+  <%= image_tag @photo.image.thumb('300x300').url if @photo.image_stored? %>
+  )
+end

data/dragonfly.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dragonfly/version'
+require "dragonfly/version"
 
 Gem::Specification.new do |spec|
   spec.name = "dragonfly"
@@ -13,33 +13,27 @@ Gem::Specification.new do |spec|
   spec.homepage = "http://github.com/markevans/dragonfly"
   spec.license = "MIT"
   spec.files = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.extra_rdoc_files = [
     "LICENSE",
-    "README.md"
+    "README.md",
   ]
 
-  # Rack 2.0 only works with ruby >= 2.2.2
-  if RUBY_VERSION < "2.2.2"
-    rack_version = "~> 1.3"
-    activemodel_version = "~> 4.2"
-  else
-    rack_version = ">= 1.3"
-    activemodel_version = nil
-  end
-
   # Runtime dependencies
-  spec.add_runtime_dependency("rack", rack_version)
+  spec.add_runtime_dependency("rack", ">= 1.3")
   spec.add_runtime_dependency("multi_json", "~> 1.0")
   spec.add_runtime_dependency("addressable", "~> 2.3")
 
   # Development dependencies
   spec.add_development_dependency("rspec", "~> 2.5")
   spec.add_development_dependency("webmock")
-  spec.add_development_dependency("activemodel", activemodel_version)
+  spec.add_development_dependency("activemodel")
   if RUBY_PLATFORM == "java"
     spec.add_development_dependency("jruby-openssl")
+  else
+    spec.add_development_dependency("activerecord")
+    spec.add_development_dependency("sqlite3")
   end
 end

data/lib/dragonfly/job/fetch_url.rb

@@ -91,7 +91,7 @@ module Dragonfly
       end
 
       def parse_url(url)
-        URI.parse(url)
+        URI.parse(url.to_s)
       rescue URI::InvalidURIError
         begin
           encoded_uri = Addressable::URI.parse(url).normalize.to_s

data/lib/dragonfly/model/class_methods.rb

@@ -30,7 +30,12 @@ module Dragonfly
 
         # Add callbacks
         before_save :save_dragonfly_attachments if respond_to?(:before_save)
-        after_destroy :destroy_dragonfly_attachments if respond_to?(:after_destroy)
+        case
+        when respond_to?(:after_commit)
+          after_commit :destroy_dragonfly_attachments, on: :destroy
+        when respond_to?(:after_destroy)
+          after_destroy :destroy_dragonfly_attachments
+        end
 
         # Register the new attribute
         dragonfly_attachment_classes << new_dragonfly_attachment_class(attribute, app, config_block)

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.2.1'
+  VERSION = "1.3.0"
 end

data/spec/dragonfly/model/active_record_spec.rb

@@ -0,0 +1,62 @@
+# jruby has problems with installing sqlite3 - don't bother with these tests for jruby
+unless RUBY_PLATFORM == "java"
+  require "spec_helper"
+  require "active_record"
+  require "sqlite3"
+
+  # ActiveRecord specific stuff goes here (there should be very little!)
+  describe "ActiveRecord models" do
+    let! :dragonfly_app do test_app(:test_ar) end
+
+    before :all do
+      @connection = ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+
+      ActiveRecord::Migration.verbose = false
+
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table :photos do |t|
+          t.string :image_uid
+        end
+      end
+
+      class Photo < ActiveRecord::Base
+        extend Dragonfly::Model
+        dragonfly_accessor :image, app: :test_ar
+      end
+    end
+
+    after :all do
+      Photo.destroy_all
+      ActiveRecord::Base.remove_connection(@connection)
+    end
+
+    describe "destroying" do
+      before do
+        Photo.destroy_all
+        @photo = Photo.create(image: "some data")
+      end
+
+      def data_exists(uid)
+        !!dragonfly_app.datastore.read(uid)
+      end
+
+      it "should not remove the attachment if a transaction is cancelled" do
+        Photo.transaction do
+          @photo.destroy
+          raise ActiveRecord::Rollback
+        end
+        photo = Photo.last
+        expect(photo.image_uid).not_to be_nil
+        expect(data_exists(photo.image_uid)).to eq(true)
+      end
+
+      it "should remove the attachment as per usual otherwise" do
+        uid = @photo.image_uid
+        @photo.destroy
+        photo = Photo.last
+        expect(photo).to be_nil
+        expect(data_exists(uid)).to eq(false)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Mark Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Dragonfly is a framework that enables on-the-fly processing for any content type.
     It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation.
@@ -208,6 +236,7 @@ files:
 - spec/dragonfly/job_spec.rb
 - spec/dragonfly/memory_data_store_spec.rb
 - spec/dragonfly/middleware_spec.rb
+- spec/dragonfly/model/active_record_spec.rb
 - spec/dragonfly/model/model_spec.rb
 - spec/dragonfly/model/validations_spec.rb
 - spec/dragonfly/register_spec.rb
@@ -288,6 +317,7 @@ test_files:
 - spec/dragonfly/job_spec.rb
 - spec/dragonfly/memory_data_store_spec.rb
 - spec/dragonfly/middleware_spec.rb
+- spec/dragonfly/model/active_record_spec.rb
 - spec/dragonfly/model/model_spec.rb
 - spec/dragonfly/model/validations_spec.rb
 - spec/dragonfly/register_spec.rb