Skip to content

default FileMixin#as_json options argument to nil #141

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

Open
AlexWheeler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

default FileMixin#as_json options argument to nil #141

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
6 changes: 3 additions & 3 deletions lib/attachinary/orm/file_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def self.included(base)
base.after_create :remove_temporary_tag
end

def as_json(options)
def as_json(options = nil)
super(only: [:id, :public_id, :format, :version, :resource_type], methods: [:path])
end

Expand All @@ -26,12 +26,12 @@ def fullpath(options={})
format = options.delete(:format)
Cloudinary::Utils.cloudinary_url(path(format), options.reverse_merge(:resource_type => resource_type))
end

protected
def keep_remote?
Cloudinary.config.attachinary_keep_remote == true
end

private
def destroy_file
Cloudinary::Uploader.destroy(public_id) if public_id && !keep_remote?
Expand Down