From 1c2acbd7c63f840d5cb45e156b5c4fb934b7da22 Mon Sep 17 00:00:00 2001 From: Tomas Hruska Date: Fri, 27 Apr 2018 13:22:43 +0200 Subject: [PATCH 1/4] Change meta column to videometa --- .gitignore | 1 + lib/paperclip/paperclip_processors/transcoder.rb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 90d2f3a..f759f45 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ tmp *.a mkmf.log .DS_Store +.idea diff --git a/lib/paperclip/paperclip_processors/transcoder.rb b/lib/paperclip/paperclip_processors/transcoder.rb index d67efea..9079d44 100755 --- a/lib/paperclip/paperclip_processors/transcoder.rb +++ b/lib/paperclip/paperclip_processors/transcoder.rb @@ -36,7 +36,7 @@ def initialize file, options = {}, attachment = nil @convert_options[:output][:s] = format_geometry(@geometry) if @geometry.present? - attachment.instance_write(:meta, @meta) if attachment + attachment.instance_write(:videometa, @meta) if attachment end # Performs the transcoding of the +file+ into a thumbnail/video. Returns the Tempfile @@ -108,8 +108,8 @@ def output_is_image? end class Attachment - def meta - instance_read(:meta) + def videometa + instance_read(:videometa) end end end From 447ced289c932c267dc14293f3e8c7b050be3b2a Mon Sep 17 00:00:00 2001 From: Tomas Hruska Date: Mon, 31 Aug 2020 20:52:01 +0200 Subject: [PATCH 2/4] Rename videometa to meta_video --- lib/paperclip/paperclip_processors/transcoder.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/paperclip/paperclip_processors/transcoder.rb b/lib/paperclip/paperclip_processors/transcoder.rb index 9079d44..e2f1f76 100755 --- a/lib/paperclip/paperclip_processors/transcoder.rb +++ b/lib/paperclip/paperclip_processors/transcoder.rb @@ -36,7 +36,7 @@ def initialize file, options = {}, attachment = nil @convert_options[:output][:s] = format_geometry(@geometry) if @geometry.present? - attachment.instance_write(:videometa, @meta) if attachment + attachment.instance_write(:meta_video, @meta) if attachment end # Performs the transcoding of the +file+ into a thumbnail/video. Returns the Tempfile @@ -108,8 +108,8 @@ def output_is_image? end class Attachment - def videometa - instance_read(:videometa) + def meta_video + instance_read(:meta_video) end end end From 1ac79abb095010b99fb184c5cb136ded2041e4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hru=C5=A1ka?= Date: Tue, 19 Jan 2021 14:25:44 +0100 Subject: [PATCH 3/4] Update paperclip-av-transcoder.gemspec Use kt-paperclip as dependency --- paperclip-av-transcoder.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperclip-av-transcoder.gemspec b/paperclip-av-transcoder.gemspec index c62aa5c..be01f56 100644 --- a/paperclip-av-transcoder.gemspec +++ b/paperclip-av-transcoder.gemspec @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "sqlite3" spec.add_development_dependency "coveralls" - spec.add_dependency "paperclip", ">=2.5.2" + spec.add_runtime_dependency "kt-paperclip", ">= 6.2.0" spec.add_dependency "av", "~> 0.9.0" end From ff65dd8d26714d82ea4c9204574e77ce6f57a344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hru=C5=A1ka?= Date: Tue, 19 Jan 2021 14:29:26 +0100 Subject: [PATCH 4/4] Use kt-paperclip as dependency --- paperclip-av-transcoder.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperclip-av-transcoder.gemspec b/paperclip-av-transcoder.gemspec index be01f56..2776412 100644 --- a/paperclip-av-transcoder.gemspec +++ b/paperclip-av-transcoder.gemspec @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "sqlite3" spec.add_development_dependency "coveralls" - spec.add_runtime_dependency "kt-paperclip", ">= 6.2.0" + spec.add_dependency "kt-paperclip", ">= 6.2.0" spec.add_dependency "av", "~> 0.9.0" end