Skip to content

Fix for Active Record callbacks to enable Rails 5 compatibility #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2017
Merged

Fix for Active Record callbacks to enable Rails 5 compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/attachinary/orm/active_record/extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def attachinary_orm_definition(options)
define_method "#{options[:scope]}=" do |input, upload_options = {}|
input = Attachinary::Utils.process_input(input, upload_options, options[:scope])
if input.nil?
send("#{relation}").clear
send("#{relation}").destroy_all
else
files = [input].flatten
send("#{relation}=", files)
Expand Down
8 changes: 7 additions & 1 deletion lib/attachinary/orm/file_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ def self.included(base)
if Rails::VERSION::MAJOR == 3
base.attr_accessible :public_id, :version, :width, :height, :format, :resource_type
end
base.after_destroy :destroy_file
base.after_create :remove_temporary_tag
# In AR remote file deletion will be performed after transaction is committed
if base.respond_to?(:after_commit)
base.after_commit :destroy_file, on: :destroy
else
# Mongoid does not support after_commit
base.after_destroy :destroy_file
end
end

def as_json(options)
Expand Down