paperclip-av-chainer 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdbacfd64f64719206ade55adb7a2cef08cc6176
-  data.tar.gz: 3fd2cbb391b91a92dc1d651021f90dc01a5f8dd0
+  metadata.gz: db7b12da41c54238ec0c0cac9a0ab34046a10726
+  data.tar.gz: 1e5586ca0d594be38c01c90fa666752790a03c42
 SHA512:
-  metadata.gz: d836f46cd64845b18b5d90a5197878ddd844dc7d71052e1270edf8ae06c15b662a035e2e86bf26d4b771f04c08a7715afc75dfb0be566398231a11c035ba9743
-  data.tar.gz: 3327f7a44c66acb8c7f6d6fc2fe54408e8dfcc656eea916973f9f25b70de3ced8e3b282ed3e34ee84b87c907c41b1d73bfd54aa0e6abb81b717909001b751824
+  metadata.gz: 8b5c975ef11cafb7b1122d7210e1c5e47a584e2eca9b3ffedb59bd515d28da333b507b0666901bd94c74ffb16c5b0900b3f9bb42ecf67576d03b5aea046dceaf
+  data.tar.gz: 528cb3d89634c6ac85fe229a56c009d8f869d6ecb84eb9f5a5dd3d3af759a19fa5af88cb3ec2be4f52ff691f42a2b7bd916c311a3f48a97e9631afdf1402c5c3

data/lib/paperclip/av/chainer/version.rb

@@ -1,7 +1,7 @@
 module Paperclip
   module Av
     module Chainer
-      VERSION = "0.1.0"
+      VERSION = "0.5.0"
     end
   end
 end

data/lib/paperclip/paperclip_processors/chainer.rb

@@ -3,21 +3,20 @@ require 'av'
 
 module Paperclip
   class Chainer < Processor
-    attr_accessor :whiny, :destination, :extension, :basename, :supported_formats
+    attr_accessor :file, :whiny, :destination, :extension, :basename, :supported_formats
     
     def initialize file, options = {}, attachment = nil
-      Paperclip.log "[chainer] Got file #{file.path}"
-      @whiny = options[:whiny].nil? ? true : options[:whiny]
       @file = file
+      @whiny = options[:whiny].nil? ? true : options[:whiny]
+      @destination = Pathname.new("#{Dir.tmpdir}/#{SecureRandom.uuid}")
       @extension  = File.extname(@file.path)
       @basename = File.basename(@file.path, @extension)
       @supported_formats = ['.zip']
-      @destination = Pathname.new("#{Dir.tmpdir}/#{SecureRandom.uuid}")
     end
     
     def make
       if @supported_formats.include?(@extension)
-        Paperclip.log "[chainer] Got file #{@file.path} with extension #{@extension}"
+        Paperclip.log "[chainer] Received supported file #{@file.path}"
         case @extension
         when '.zip'
           unzip
@@ -28,21 +27,24 @@ module Paperclip
         # on the new file
         return result
       end
+      Paperclip.log "[chainer] Skipping file with unsupported format: #{@file.path}"
       # If the file is not supported, just return it
       @file
     end
     
     def unzip
-      Paperclip.log "[chainer] Extracting contents to #{@destination}"
-      Zip::File.open(File.expand_path(@file.path)) do |zip_file|
-        Paperclip.log "[chainer] Creating #{@destination}"
-        FileUtils.mkdir_p(@destination)
-        zip_file.each do |source|
-          # Extract to file/directory/symlink
-          Paperclip.log "[chainer] Extracting #{source.name}"
-          target_file = @destination.join(source.name)
-          @target_format = File.extname(source.name)
-          zip_file.extract(source, target_file) unless File.exists?(target_file)
+      if @supported_formats.include?(@extension)
+        Paperclip.log "[chainer] Extracting contents to #{@destination}"
+        Zip::File.open(File.expand_path(@file.path)) do |zip_file|
+          Paperclip.log "[chainer] Creating #{@destination}"
+          FileUtils.mkdir_p(@destination)
+          zip_file.each do |source|
+            # Extract to file/directory/symlink
+            Paperclip.log "[chainer] Extracting #{source.name}"
+            target_file = @destination.join(source.name)
+            @target_format = File.extname(source.name)
+            zip_file.extract(source, target_file) unless File.exists?(target_file)
+          end
         end
       end
     end

data/paperclip-av-chainer.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   
   spec.add_dependency "paperclip", ">=2.5.2"
   spec.add_dependency "rubyzip", "~> 1.1.0"
-  spec.add_dependency "av", ">= 0.1.2"
+  spec.add_dependency "av", ">= 0.4.0"
 end

data/spec/chainer/chainer_spec.rb

@@ -1,17 +1,35 @@
 require 'spec_helper'
 
 describe Paperclip::Chainer do
-  let(:subject) { Paperclip::Chainer.new(source) }
-  let(:document) { Document.create(original: Rack::Test::UploadedFile.new(source, 'application/zip')) }
-  let(:source) { File.new(File.expand_path('spec/support/assets/audio.zip')) }
+  let(:supported) { File.new(File.expand_path('spec/support/assets/audio.zip')) }
+  let(:unsupported) { File.new(File.expand_path('spec/support/assets/image.png')) }
   
-  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(audio: Rack::Test::UploadedFile.new(supported, 'application/zip')) }
+    
+    it { expect(File.exists?(document.audio.path(:small))).to eq true }
   
-  describe ".unzip" do
-    before do
-      subject.unzip
+    describe ".unzip" do
+      before do
+        subject.unzip
+      end
+    
+      it { expect(Dir["#{subject.destination}/*"].count).to eq 2 }
     end
+  end
+  describe "unsupported formats" do
+    let(:subject) { Paperclip::Chainer.new(unsupported) }
+    let(:document) { Document.create(image: Rack::Test::UploadedFile.new(unsupported, 'image/png')) }
     
-    it { expect(Dir["#{subject.destination}/*"].count).to eq 2 }
+    it { expect(File.exists?(document.image.path(:small))).to eq true }
+  
+    describe ".unzip" do
+      before do
+        subject.unzip
+      end
+    
+      it { expect(Dir["#{subject.destination}/*"].count).to eq 0 }
+    end
   end
 end

data/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 :audio_file_name
+    t.string :audio_content_type
+    t.integer :audio_updated_at
+    t.integer :audio_file_size
+    t.string :image_file_name
+    t.string :image_content_type
+    t.integer :image_updated_at
+    t.integer :image_file_size
   end
 end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ Bundler.require(:default)
 # 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 @@ RSpec.configure do |config|
 end
 
 class Document < ActiveRecord::Base
-  has_attached_file :original,
+  has_attached_file :audio,
     storage: :filesystem,
     path: "./spec/tmp/:id.:extension",
     url: "/spec/tmp/:id.:extension",
@@ -32,6 +32,17 @@ class Document < ActiveRecord::Base
       }
     }, processors: [:chainer]
     
-  do_not_validate_attachment_file_type :original
+    has_attached_file :image,
+      storage: :filesystem,
+      path: "./spec/tmp/:id.:extension",
+      url: "/spec/tmp/:id.:extension",
+      styles: {
+        small: {
+          format: :ogg
+        }
+      }, processors: [:chainer, :thumbnail]
+    
+  do_not_validate_attachment_file_type :audio
+  do_not_validate_attachment_file_type :image
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-av-chainer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.0
 description: Audio/Video Chainer for Paperclip using FFMPEG/Avconv
 email:
 - owahab@gmail.com
@@ -143,6 +143,7 @@ files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/assets/audio.zip
+- spec/support/assets/image.png
 homepage: https://github.com/ruby-av/paperclip-av-chainer
 licenses:
 - MIT
@@ -172,3 +173,4 @@ test_files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/assets/audio.zip
+- spec/support/assets/image.png