active_encode 0.5.0 → 0.6.0

data/spec/shared_specs/engine_adapter_specs.rb

@@ -130,7 +130,7 @@ RSpec.shared_examples 'an ActiveEncode::EngineAdapter' do |*_flags|
 
       it 'output has technical metadata' do
         subject.output.each do |output|
-          expected_output = completed_output.find {|expected_out| expected_out[:id] == output.id }
+          expected_output = completed_output.find { |expected_out| expected_out[:id] == output.id }
           expect(output.as_json.symbolize_keys).to include expected_output
         end
       end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'coveralls'
 Coveralls.wear!
 
@@ -13,6 +14,6 @@ end
 
 RSpec::Matchers.define :be_the_same_time_as do |expected|
   match do |actual|
-    expect(Time.parse(expected)).to eq(Time.parse(actual))
+    expect(Time.parse(expected).utc).to eq(Time.parse(actual).utc)
   end
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,15 +1,16 @@
-        require 'rails/generators'
+# frozen_string_literal: true
+# frozen_string_literal: true
+require 'rails/generators'
 
-        class TestAppGenerator < Rails::Generators::Base
-          source_root "./spec/test_app_templates"
+class TestAppGenerator < Rails::Generators::Base
+  source_root "./spec/test_app_templates"
 
-          # if you need to generate any additional configuration
-          # into the test app, this generator will be run immediately
-          # after setting up the application
-
-          def install_engine
-            generate 'active_encode:install'
-            rake 'active_encode:install:migrations'
-          end
-        end
+  # if you need to generate any additional configuration
+  # into the test app, this generator will be run immediately
+  # after setting up the application
 
+  def install_engine
+    generate 'active_encode:install'
+    rake 'active_encode:install:migrations'
+  end
+end

data/spec/units/callbacks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveEncode::Callbacks do
@@ -36,14 +37,14 @@ describe ActiveEncode::Callbacks do
   end
 
   describe 'find callback' do
-    let(:encode) { CallbackEncode.create("sample.mp4") }
     subject { CallbackEncode.find(encode.id).history }
+    let(:encode) { CallbackEncode.create("sample.mp4") }
     it { is_expected.to include("CallbackEncode ran after_find") }
   end
 
   describe 'reload callback' do
-    let(:encode) { CallbackEncode.create("sample.mp4") }
     subject { encode.reload.history }
+    let(:encode) { CallbackEncode.create("sample.mp4") }
     it { is_expected.to include("CallbackEncode ran after_reload") }
   end
 

data/spec/units/core_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveEncode::Core do
@@ -5,7 +6,7 @@ describe ActiveEncode::Core do
     class CustomEncode < ActiveEncode::Base
     end
   end
-   after do
+  after do
     Object.send(:remove_const, :CustomEncode)
   end
 
@@ -24,8 +25,8 @@ describe ActiveEncode::Core do
   end
 
   describe 'find' do
-    let(:id) { encode_class.create(nil).id }
     subject { encode_class.find(id) }
+    let(:id) { encode_class.create(nil).id }
 
     it { is_expected.to be_a encode_class }
     its(:id) { is_expected.to eq id }
@@ -70,8 +71,8 @@ describe ActiveEncode::Core do
   end
 
   describe '#create!' do
-    let(:encode) { encode_class.new(nil) }
     subject { encode.create! }
+    let(:encode) { encode_class.new(nil) }
 
     it { is_expected.to equal encode }
     it { is_expected.to be_a encode_class }
@@ -89,8 +90,8 @@ describe ActiveEncode::Core do
   end
 
   describe '#cancel!' do
-    let(:encode) { encode_class.create(nil) }
     subject { encode.cancel! }
+    let(:encode) { encode_class.create(nil) }
 
     it { is_expected.to equal encode }
     it { is_expected.to be_a encode_class }
@@ -108,8 +109,8 @@ describe ActiveEncode::Core do
   end
 
   describe '#reload' do
-    let(:encode) { encode_class.create(nil) }
     subject { encode.reload }
+    let(:encode) { encode_class.create(nil) }
 
     it { is_expected.to equal encode }
     it { is_expected.to be_a encode_class }
@@ -134,15 +135,15 @@ describe ActiveEncode::Core do
         end
       end
     end
-     after do
+    after do
       Object.send(:remove_const, :DefaultOptionsEncode)
     end
 
+    subject { encode.options }
     let(:encode_class) { DefaultOptionsEncode }
     let(:default_options) { { preset: 'video' } }
-    let(:options) { { output: [{label: 'high', ffmpeg_opt: "640x480" }] } }
+    let(:options) { { output: [{ label: 'high', ffmpeg_opt: "640x480" }] } }
     let(:encode) { encode_class.new(nil, options) }
-    subject { encode.options }
 
     it 'merges default options and options parameter' do
       expect(subject).to include default_options

data/spec/units/engine_adapter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveEncode::EngineAdapter do

data/spec/units/file_locator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright 2011-2018, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -24,12 +25,12 @@ describe FileLocator, type: :service do
     let(:key) { "mykey.mp4" }
     let(:s3file) { FileLocator::S3File.new("s3://#{bucket}/#{key}") }
 
-    it "should be able to initialize from an S3 URI" do
+    it "is able to initialize from an S3 URI" do
       expect(s3file.bucket).to eq bucket
       expect(s3file.key).to eq key
     end
 
-    it "should return an S3 Object" do
+    it "returns an S3 Object" do
       s3_object = s3file.object
       expect(s3_object).to be_an Aws::S3::Object
       expect(s3_object.bucket_name).to eq bucket
@@ -42,30 +43,30 @@ describe FileLocator, type: :service do
     let(:source) { "file://#{path}" }
     let(:locator) { FileLocator.new(source) }
 
-    it "should return the correct uri" do
+    it "returns the correct uri" do
       expect(locator.uri).to eq Addressable::URI.parse(source)
     end
 
-    it "should return the correct location" do
+    it "returns the correct location" do
       expect(locator.location).to eq path
     end
 
-    it "should tell if file exists" do
+    it "tells if file exists" do
       allow(File).to receive(:exist?).with(path) { true }
       expect(locator.exist?).to be_truthy
     end
 
     context "return file" do
       let(:file) { double(File) }
-      before :each do
+      before do
         allow(File).to receive(:open).and_return file
       end
 
-      it "should return reader" do
+      it "returns reader" do
         expect(locator.reader).to eq file
       end
 
-      it "should return attachment" do
+      it "returns attachment" do
         expect(locator.attachment).to eq file
       end
     end
@@ -77,23 +78,23 @@ describe FileLocator, type: :service do
     let(:source) { "s3://#{bucket}/#{key}" }
     let(:locator) { FileLocator.new(source) }
 
-    it "should return the correct uri" do
+    it "returns the correct uri" do
       expect(locator.uri).to eq Addressable::URI.parse(source)
     end
 
-    it "should return the correct location" do
+    it "returns the correct location" do
       expect(locator.location).to start_with "https://#{bucket}.s3.us-stubbed-1.amazonaws.com/#{key}"
     end
 
-    it "should tell if file exists" do
+    it "tells if file exists" do
       expect(locator.exist?).to be_truthy
     end
 
-    it "should return reader" do
+    it "returns reader" do
       expect(locator.reader).to be_a StringIO
     end
 
-    it "should return attachment" do
+    it "returns attachment" do
       expect(locator.attachment).to eq Addressable::URI.parse(source)
     end
   end
@@ -103,25 +104,25 @@ describe FileLocator, type: :service do
     let(:source) { "bogus://#{path}" }
     let(:locator) { FileLocator.new(source) }
 
-    it "should return the correct uri" do
+    it "returns the correct uri" do
       expect(locator.uri).to eq Addressable::URI.parse(source)
     end
 
-    it "should return the correct location" do
+    it "returns the correct location" do
       expect(locator.location).to eq source
     end
 
-    it "should tell if file exists" do
+    it "tells if file exists" do
       expect(locator.exist?).to be_falsy
     end
 
-    it "should return reader" do
+    it "returns reader" do
       io = double(IO)
       allow(Kernel).to receive(:open).and_return io
       expect(locator.reader).to eq io
     end
 
-    it "should return attachment" do
+    it "returns attachment" do
       expect(locator.attachment).to eq locator.location
     end
   end

data/spec/units/global_id_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveEncode::GlobalID do
@@ -11,9 +12,9 @@ describe ActiveEncode::GlobalID do
   end
 
   describe '#to_global_id' do
+    subject { encode.to_global_id }
     let(:encode_class) { ActiveEncode::Base }
     let(:encode) { encode_class.create(nil) }
-    subject { encode.to_global_id }
 
     it { is_expected.to be_a GlobalID }
     its(:model_class) { is_expected.to eq encode_class }
@@ -31,17 +32,17 @@ describe ActiveEncode::GlobalID do
   end
 
   describe 'GlobalID::Locator#locate' do
+    subject { GlobalID::Locator.locate(global_id) }
     let(:encode_class) { ActiveEncode::Base }
     let(:encode) { encode_class.create(nil) }
     let(:global_id) { encode.to_global_id }
-    subject { GlobalID::Locator.locate(global_id) }
 
     it { is_expected.to be_a encode_class }
     its(:id) { is_expected.to eq encode.id }
 
     context 'with an ActiveEncode::Base subclass' do
       let(:encode_class) { CustomEncode }
-      
+
       it { is_expected.to be_a encode_class }
       its(:id) { is_expected.to eq encode.id }
     end

data/spec/units/input_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveEncode::Input do
@@ -6,8 +7,10 @@ describe ActiveEncode::Input do
   describe 'attributes' do
     it { is_expected.to respond_to(:id, :url) }
     it { is_expected.to respond_to(:state, :errors, :created_at, :updated_at) }
-    it { is_expected.to respond_to(:width, :height, :frame_rate, :checksum,
-                                   :audio_codec, :video_codec, :audio_bitrate, :video_bitrate) }
+    it {
+      is_expected.to respond_to(:width, :height, :frame_rate, :checksum,
+                                :audio_codec, :video_codec, :audio_bitrate, :video_bitrate)
+    }
   end
 
   describe '#valid?' do
@@ -15,8 +18,8 @@ describe ActiveEncode::Input do
       described_class.new.tap do |obj|
         obj.id = "1"
         obj.url = "file:///tmp/video.mp4"
-        obj.created_at = Time.now
-        obj.updated_at = Time.now
+        obj.created_at = Time.now.utc
+        obj.updated_at = Time.now.utc
       end
     end
 
@@ -31,7 +34,7 @@ describe ActiveEncode::Input do
       expect(valid_input.tap { |obj| obj.created_at = "today" }).not_to be_valid
       expect(valid_input.tap { |obj| obj.updated_at = nil }).not_to be_valid
       expect(valid_input.tap { |obj| obj.updated_at = "today" }).not_to be_valid
-      expect(valid_input.tap { |obj| obj.created_at = Time.now }).not_to be_valid
+      expect(valid_input.tap { |obj| obj.created_at = Time.now.utc }).not_to be_valid
     end
   end
 end

data/spec/units/output_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveEncode::Output do
@@ -6,8 +7,10 @@ describe ActiveEncode::Output do
   describe 'attributes' do
     it { is_expected.to respond_to(:id, :url, :label) }
     it { is_expected.to respond_to(:state, :errors, :created_at, :updated_at) }
-    it { is_expected.to respond_to(:width, :height, :frame_rate, :checksum,
-                                   :audio_codec, :video_codec, :audio_bitrate, :video_bitrate) }
+    it {
+      is_expected.to respond_to(:width, :height, :frame_rate, :checksum,
+                                :audio_codec, :video_codec, :audio_bitrate, :video_bitrate)
+    }
   end
 
   describe '#valid?' do
@@ -16,8 +19,8 @@ describe ActiveEncode::Output do
         obj.id = "1"
         obj.url = "file:///tmp/video.mp4"
         obj.label = "HD"
-        obj.created_at = Time.now
-        obj.updated_at = Time.now
+        obj.created_at = Time.now.utc
+        obj.updated_at = Time.now.utc
       end
     end
 
@@ -33,7 +36,7 @@ describe ActiveEncode::Output do
       expect(valid_output.tap { |obj| obj.created_at = "today" }).not_to be_valid
       expect(valid_output.tap { |obj| obj.updated_at = nil }).not_to be_valid
       expect(valid_output.tap { |obj| obj.updated_at = "today" }).not_to be_valid
-      expect(valid_output.tap { |obj| obj.created_at = Time.now }).not_to be_valid
+      expect(valid_output.tap { |obj| obj.created_at = Time.now.utc }).not_to be_valid
     end
   end
 end

data/spec/units/persistence_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails_helper'
 
 describe ActiveEncode::Persistence, db_clean: true do
@@ -12,8 +13,8 @@ describe ActiveEncode::Persistence, db_clean: true do
   end
 
   describe 'find' do
-    let(:encode) { CustomEncode.create(nil) }
     subject { ActiveEncode::EncodeRecord.find_by(global_id: encode.to_global_id.to_s) }
+    let(:encode) { CustomEncode.create(nil) }
 
     it 'persists changes on find' do
       expect { CustomEncode.find(encode.id) }.to change { subject.reload.updated_at }
@@ -21,8 +22,9 @@ describe ActiveEncode::Persistence, db_clean: true do
   end
 
   describe 'create' do
-    let(:encode) { CustomEncode.create(nil) }
     subject { ActiveEncode::EncodeRecord.find_by(global_id: encode.to_global_id.to_s) }
+    let(:create_options) { { option: 'value' } }
+    let(:encode) { CustomEncode.create(nil, create_options) }
 
     it 'creates a record' do
       expect { encode }.to change { ActiveEncode::EncodeRecord.count }.by(1)
@@ -35,11 +37,13 @@ describe ActiveEncode::Persistence, db_clean: true do
     its(:raw_object) { is_expected.to eq encode.to_json }
     its(:created_at) { is_expected.to be_within(1.second).of encode.created_at }
     its(:updated_at) { is_expected.to be_within(1.second).of encode.updated_at }
+    its(:create_options) { is_expected.to eq create_options.to_json }
+    its(:progress) { is_expected.to eq encode.percent_complete }
   end
 
   describe 'cancel' do
-    let(:encode) { CustomEncode.create(nil) }
     subject { ActiveEncode::EncodeRecord.find_by(global_id: encode.to_global_id.to_s) }
+    let(:encode) { CustomEncode.create(nil) }
 
     it 'persists changes on cancel' do
       expect { encode.cancel! }.to change { subject.reload.state }.from("running").to("cancelled")
@@ -47,8 +51,8 @@ describe ActiveEncode::Persistence, db_clean: true do
   end
 
   describe 'reload' do
-    let(:encode) { CustomEncode.create(nil) }
     subject { ActiveEncode::EncodeRecord.find_by(global_id: encode.to_global_id.to_s) }
+    let(:encode) { CustomEncode.create(nil) }
 
     it 'persists changes on reload' do
       expect { encode.reload }.to change { subject.reload.updated_at }

data/spec/units/polling_job_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails_helper'
 
 describe ActiveEncode::PollingJob do
@@ -22,9 +23,9 @@ describe ActiveEncode::PollingJob do
   end
 
   describe '#perform' do
-    let(:encode) { PollingEncode.create("sample.mp4").tap { |encode| encode.state = state } }
-    let(:poll) { ActiveEncode::PollingJob.new }
     subject { encode.history }
+    let(:encode) { PollingEncode.create("sample.mp4").tap { |encode| encode.state = state } }
+    let(:poll) { described_class.new }
 
     before do
       encode
@@ -41,7 +42,7 @@ describe ActiveEncode::PollingJob do
       end
 
       it "does not re-enqueue itself" do
-        expect(ActiveEncode::PollingJob).not_to have_been_enqueued
+        expect(described_class).not_to have_been_enqueued
       end
     end
 
@@ -54,7 +55,7 @@ describe ActiveEncode::PollingJob do
       end
 
       it "does not re-enqueue itself" do
-        expect(ActiveEncode::PollingJob).not_to have_been_enqueued
+        expect(described_class).not_to have_been_enqueued
       end
     end
 
@@ -67,7 +68,7 @@ describe ActiveEncode::PollingJob do
       end
 
       it "does not re-enqueue itself" do
-        expect(ActiveEncode::PollingJob).not_to have_been_enqueued
+        expect(described_class).not_to have_been_enqueued
       end
     end
 
@@ -79,7 +80,7 @@ describe ActiveEncode::PollingJob do
       end
 
       it "re-enqueues itself" do
-        expect(ActiveEncode::PollingJob).to have_been_enqueued.with(encode)
+        expect(described_class).to have_been_enqueued.with(encode)
       end
     end
   end