Fixing bugs

Author: owahab

lib/paperclip/av/transcoder/version.rb

@@ -1,7 +1,7 @@
 module Paperclip
   module Av
     module Transcoder
-      VERSION = "0.1.0"
+      VERSION = "0.1.2"
     end
   end
 end

lib/paperclip/paperclip_processors/transcoder.rb

@@ -20,7 +20,7 @@ def initialize file, options = {}, attachment = nil
       @geometry         = options[:geometry]
       unless @geometry.nil?
         modifier = @geometry[0]
-        @geometry[0] = '' if ['#', '<', '>'].includes? modifier
+        @geometry[0] = '' if ['#', '<', '>'].include? modifier
         @width, @height   = @geometry.split('x')
         @keep_aspect      = @width[0] == '!' || @height[0] == '!'
         @pad_only         = @keep_aspect    && modifier == '#'
@@ -41,28 +41,33 @@ def make
       ::Av.cli.add_source @file
       dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
       dst.binmode
-
-      cli = ::Av.cli(quite: true)
-      cli.add_source(@file.path)
-      cli.add_destination(dst.path)
-      cli.reset_input_filters
-      if @convert_options[:input]
-        @convert_options[:input].each do |h|
-          cli.add_input_param h
-        end
-      end
-      if @convert_options[:output]
-        @convert_options[:output].each do |h|
-          cli.add_output_param h
+      
+      if @meta
+        log "Transocding supported file #{@file.path}"
+        cli = ::Av.cli(quite: true)
+        cli.add_source(@file.path)
+        cli.add_destination(dst.path)
+        cli.reset_input_filters
+        if @convert_options.present?
+          if @convert_options[:input]
+            @convert_options[:input].each do |h|
+              cli.add_input_param h
+            end
+          end
+          if @convert_options[:output]
+            @convert_options[:output].each do |h|
+              cli.add_output_param h
+            end
+          end
         end
-      end
 
-      begin
-        cli.run
-        log "Successfully transcoded #{@base} to #{dst}"
-        return dst # Things went fine, pass the file to paperclip for saving
-      rescue Cocaine::ExitStatusError => e
-        raise Paperclip::Error, "error while transcoding #{@basename}: #{e}" if @whiny
+        begin
+          cli.run
+          log "Successfully transcoded #{@base} to #{dst}"
+          return dst
+        rescue Cocaine::ExitStatusError => e
+          raise Paperclip::Error, "error while transcoding #{@basename}: #{e}" if @whiny
+        end
       end
       # If the file is not supported, just return it
       @file

paperclip-av-transcoder.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
 
   spec.add_dependency "paperclip", ">=2.5.2"
-  spec.add_dependency "av", ">= 0.0.1"
+  spec.add_dependency "av", ">= 0.4.0"
 end

spec/schema.rb

@@ -1,9 +1,13 @@
 ActiveRecord::Schema.define version: 0 do
   create_table "documents", force: true do |t|
     t.string :owner
-    t.string :original_file_name
-    t.string :original_content_type
-    t.integer :original_updated_at
-    t.integer :original_file_size
+    t.string :video_file_name
+    t.string :video_content_type
+    t.integer :video_updated_at
+    t.integer :video_file_size
+    t.string :image_file_name
+    t.string :image_content_type
+    t.integer :image_updated_at
+    t.integer :image_file_size
   end
 end

spec/spec_helper.rb

@@ -11,7 +11,7 @@
 # Connect to sqlite
 ActiveRecord::Base.establish_connection("adapter" => "sqlite3", "database" => ":memory:")
 
-ActiveRecord::Base.logger = Logger.new(nil)
+ActiveRecord::Base.logger = Logger.new(STDOUT)
 load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
 Paperclip::Railtie.insert
@@ -22,7 +22,7 @@
 end
 
 class Document < ActiveRecord::Base
-  has_attached_file :original,
+  has_attached_file :video,
     storage: :filesystem,
     path: "./spec/tmp/:id.:extension",
     url: "/spec/tmp/:id.:extension",
@@ -40,5 +40,17 @@ class Document < ActiveRecord::Base
       }
     },
   processors: [:transcoder]
-  do_not_validate_attachment_file_type :original
+
+  has_attached_file :image,
+    storage: :filesystem,
+    path: "./spec/tmp/:id.:extension",
+    url: "/spec/tmp/:id.:extension",
+    whiny: true,
+    styles: {
+      small: "100x100"
+    },
+  processors: [:transcoder, :thumbnail]
+  
+  do_not_validate_attachment_file_type :video
+  do_not_validate_attachment_file_type :image
 end

spec/support/assets/image.png

@@ -1,12 +1,26 @@
 require 'spec_helper'
 
 describe Paperclip::Transcoder do
-  let(:subject) { Paperclip::Transcoder.new(source) }
-  let(:document) { Document.create(original: source) }
-  let(:source) { File.new(Dir.pwd + '/spec/support/assets/sample.mp4') }
+  let(:supported) { File.new(Dir.pwd + '/spec/support/assets/sample.mp4') }
+  let(:unsupported) { File.new(File.expand_path('spec/support/assets/image.png')) }
+  
   let(:destination) { Pathname.new("#{Dir.tmpdir}/transcoder/") }
 
-  describe ".transcode" do
-    it { expect(File.exists?(document.original.path(:small))).to eq true }
+  describe "supported formats" do
+    let(:subject) { Paperclip::Chainer.new(supported) }
+    let(:document) { Document.create(video: Rack::Test::UploadedFile.new(supported, 'video/mp4')) }
+    
+    describe ".transcode" do
+      it { expect(File.exists?(document.video.path(:small))).to eq true }
+    end
+  end
+  
+  describe "unsupported formats" do
+    let(:subject) { Paperclip::Chainer.new(unsupported) }
+    let(:document) { Document.create(image: Rack::Test::UploadedFile.new(unsupported, 'image/png')) }
+    describe ".transcode" do
+      it { expect(File.exists?(document.image.path(:small))).to eq true }
+    end
   end
+  
 end