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..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(:meta, @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 meta - instance_read(:meta) + def meta_video + instance_read(:meta_video) end end end diff --git a/paperclip-av-transcoder.gemspec b/paperclip-av-transcoder.gemspec index c62aa5c..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_dependency "paperclip", ">=2.5.2" + spec.add_dependency "kt-paperclip", ">= 6.2.0" spec.add_dependency "av", "~> 0.9.0" end