active_encode 0.1.1 → 0.2

data/lib/active_encode/status.rb

@@ -7,17 +7,13 @@ module ActiveEncode
     included do
       # Current state of the encoding process
       attr_accessor :state
-      attr_accessor :current_operations
-      attr_accessor :percent_complete
       attr_accessor :errors
 
       attr_accessor :created_at
-      attr_accessor :finished_at
       attr_accessor :updated_at
-    end
 
-    def created?
-      !id.nil?
+      # @deprecated
+      attr_accessor :finished_at
     end
 
     def cancelled?

data/lib/active_encode/technical_metadata.rb

@@ -5,7 +5,22 @@ module ActiveEncode
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :tech_metadata
+      attr_accessor :width
+      attr_accessor :height
+      attr_accessor :frame_rate
+
+      # In milliseconds
+      attr_accessor :duration
+
+      # In bytes
+      attr_accessor :file_size
+
+      attr_accessor :checksum
+
+      attr_accessor :audio_codec
+      attr_accessor :video_codec
+      attr_accessor :audio_bitrate
+      attr_accessor :video_bitrate
     end
   end
 end

data/lib/active_encode/version.rb

@@ -1,3 +1,3 @@
 module ActiveEncode
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2'.freeze
 end

data/spec/fixtures/elastic_transcoder/job_canceled.json

@@ -1 +1 @@
-{"id":"1471963629141-kmcocm","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Canceled","timing":{"submit_time_millis":1471963629189,"finish_time_millis":1471975185271}}
+{"id":"cancelled-id","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Canceled","timing":{"submit_time_millis":1471963629189,"finish_time_millis":1471975185271}}

data/spec/fixtures/elastic_transcoder/job_completed.json

@@ -1 +1 @@
-{"id":"1471963629141-kmcocm","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Complete","timing":{"submit_time_millis":1471963629189,"start_time_millis":1471975169865,"finish_time_millis":1471975185271}}
+{"id":"completed-id","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Complete","timing":{"submit_time_millis":1471963629189,"start_time_millis":1471975169865,"finish_time_millis":1471975185271}}

data/spec/fixtures/elastic_transcoder/job_created.json

@@ -1 +1 @@
-{"id":"1471963629141-kmcocm","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","input":{"key":"somefile.mp4"},"output":{"id":"1","key":"hlsAudio/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a","preset_id":"1351620000001-200071","segment_duration":"2.0","status":"Submitted","watermarks":[]},"output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Submitted","timing":{"submit_time_millis":1471963629189}}
+{"id":"1471963629141-kmcocm-created","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","input":{"key":"somefile.mp4"},"output":{"id":"1","key":"hlsAudio/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a","preset_id":"1351620000001-200071","segment_duration":"2.0","status":"Submitted","watermarks":[]},"output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Submitted","timing":{"submit_time_millis":1471963629189}}

data/spec/fixtures/elastic_transcoder/job_failed.json

@@ -1 +1 @@
-{"id":"1471963629141-kmcocm","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Error","timing":{"submit_time_millis":1471963629189,"start_time_millis":1471975169865,"finish_time_millis":1471975185271}}
+{"id":"failed-id","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Error","timing":{"submit_time_millis":1471963629189,"start_time_millis":1471975169865,"finish_time_millis":1471975185271}}

data/spec/fixtures/elastic_transcoder/job_progressing.json

@@ -1 +1 @@
-{"id":"1471963629141-kmcocm","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Progressing","timing":{"submit_time_millis":1471963629189,"start_time_millis":1471975169865}}
+{"id":"running-id","arn":"arn:aws:elastictranscoder:us-west-2:039358184980:job/1471963629141-kmcocm","pipeline_id":"1470797373927-1ukxrn","output_key_prefix":"elastic-transcoder-samples/output/hls/","playlists":[],"status":"Progressing","timing":{"submit_time_millis":1471963629189,"start_time_millis":1471975169865}}

data/spec/integration/elastic_transcoder_adapter_spec.rb

@@ -1,207 +1,127 @@
 require 'spec_helper'
 require 'aws-sdk'
 require 'json'
+require 'shared_specs/engine_adapter_specs'
 
 describe ActiveEncode::EngineAdapters::ElasticTranscoderAdapter do
-  before(:all) do
+  around(:example) do |example|
+    # Setting this before each test works around a stubbing + memoization limitation
     ActiveEncode::Base.engine_adapter = :elastic_transcoder
-  end
-  after(:all) do
-    ActiveEncode::Base.engine_adapter = :inline
+    example.run
+    ActiveEncode::Base.engine_adapter = :test
   end
 
-  let(:client) { double(Aws::ElasticTranscoder::Client) }
+  let(:client) { Aws::ElasticTranscoder::Client.new(stub_responses: true) }
 
   before do
-    allow_any_instance_of(ActiveEncode::EngineAdapters::ElasticTranscoderAdapter).to receive(:client).and_return(client)
-    allow(client).to receive(:read_job).and_return(Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: job))
-    allow(client).to receive(:create_job).and_return(Aws::ElasticTranscoder::Types::CreateJobResponse.new(job: job_created))
+    allow(Aws::ElasticTranscoder::Client).to receive(:new).and_return(client)
   end
 
-  let(:job_created) do
+  let(:created_job) do
     j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_created.json'))
     j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
     j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_submitted.json')))]
-    j
+
+    client.stub_responses(:create_job, Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j))
+
+    ActiveEncode::Base.create(
+     "somefile.mp4",
+     pipeline_id: "1471963629141-kmcocm",
+       output_key_prefix: "elastic-transcoder-samples/output/hls/",
+       outputs: [{
+         key: 'hls0400k/' + "e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a",
+         preset_id: "1351620000001-200050",
+         segment_duration: "2"
+       }])
+  end
+
+  let(:running_job) do
+    j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_progressing.json'))
+    j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_progressing.json')))
+    j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_progressing.json')))]
+
+    client.stub_responses(:read_job, Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j))
+    ActiveEncode::Base.find('running-id')
+  end
+
+  let(:canceled_job) do
+    j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_canceled.json'))
+    j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
+    j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_canceled.json')))]
+
+    client.stub_responses(:read_job, Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j))
+
+    ActiveEncode::Base.find('cancelled-id')
+  end
+
+  let(:cancelling_job) do
+    j1 = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_progressing.json'))
+    j1.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_progressing.json')))
+    j1.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_progressing.json')))]
+
+    j2 = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_canceled.json'))
+    j2.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
+    j2.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_canceled.json')))]
+
+    client.stub_responses(:read_job, [Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j1), Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j2)])
+
+    cancel_response = double(Aws::ElasticTranscoder::Types::CancelJobResponse)
+    allow(cancel_response).to receive(:successful?).and_return(true)
+    allow(client).to receive(:cancel_job).and_return(cancel_response)
+
+    ActiveEncode::Base.find('cancelled-id')
+  end
+
+  let(:completed_job) do
+    j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_completed.json'))
+    j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_completed.json')))
+    j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_completed.json')))]
+
+    client.stub_responses(:read_job, Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j))
+    ActiveEncode::Base.find('completed-id')
+  end
+
+  let(:failed_job) do
+    j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_failed.json'))
+    j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
+    j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_failed.json')))]
+
+    client.stub_responses(:read_job, Aws::ElasticTranscoder::Types::ReadJobResponse.new(job: j))
+    ActiveEncode::Base.find('failed-id')
   end
 
+  let(:completed_output) { [{id: "2", url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a", hls_url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a.m3u8", label: "hls0400k", :width=>400, :height=>224, :video_framerate=>"25", :file_size=>6901104, :duration=>"117353", :segment_duration=> "2.0"}] }
+  let(:completed_tech_metadata) { {:width=>1280, :height=>720, :video_framerate=>"25", :file_size=>21069678, :duration=>"117312"} }
+  let(:failed_tech_metadata) { {} }
+
+  it_behaves_like "an ActiveEncode::EngineAdapter"
+
   describe "#create" do
-    let(:job) { job_created }
     let(:create_output) { [{id: "2", url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a", hls_url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a.m3u8", label: "hls0400k", segment_duration: "2.0"}] }
 
-    subject { ActiveEncode::Base.create(
-      "somefile.mp4",
-      pipeline_id: "1471963629141-kmcocm",
-        output_key_prefix: "elastic-transcoder-samples/output/hls/",
-        outputs: [{
-          key: 'hls0400k/' + "e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a",
-          preset_id: "1351620000001-200050",
-          segment_duration: "2"
-        }])
-    }
-
-    it { is_expected.to be_a ActiveEncode::Base }
-    its(:id) { is_expected.not_to be_empty }
+    subject { created_job }
+
     it { is_expected.to be_running }
     its(:output) { is_expected.to eq create_output }
     its(:current_operations) { is_expected.to be_empty }
-    its(:percent_complete) { is_expected.to eq 10 }
-    its(:errors) { is_expected.to be_empty }
-    its(:created_at) { is_expected.to be_the_same_time_as '2016-08-23T10:47:09-04:00' }
-    its(:updated_at) { is_expected.to be_nil }
-    its(:finished_at) { is_expected.to be_nil }
-    its(:tech_metadata) { is_expected.to be_empty }
   end
 
   describe "#find" do
     context "a running encode" do
-      let(:job) do
-        j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_progressing.json'))
-        j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_progressing.json')))
-        j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_progressing.json')))]
-        j
-      end
-
       let(:running_output) { [{id: "2", url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a", hls_url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a.m3u8", label: "hls0400k", :segment_duration=>"2.0"}] }
       let(:running_tech_metadata) { {:width=>1280, :height=>720, :video_framerate=>"25", :file_size=>21069678, :duration=>"117312"} }
 
-      subject { ActiveEncode::Base.find('1471963629141-kmcocm') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq '1471963629141-kmcocm' }
-      it { is_expected.to be_running }
+      subject { running_job }
+
       its(:output) { is_expected.to eq running_output }
       its(:current_operations) { is_expected.to be_empty }
-      its(:percent_complete) { is_expected.to eq 50 }
-      its(:errors) { is_expected.to be_empty }
-      its(:created_at) { is_expected.to be_the_same_time_as '2016-08-23T10:47:09-04:00' }
-      its(:updated_at) { is_expected.to be_the_same_time_as '2016-08-23T13:59:29-04:00' }
-      its(:finished_at) { is_expected.to be_nil }
       its(:tech_metadata) { is_expected.to eq running_tech_metadata }
     end
 
     context "a canceled encode" do
-      let(:job) do
-        j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_canceled.json'))
-        j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
-        j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_canceled.json')))]
-        j
-      end
-
-      subject { ActiveEncode::Base.find('1471963629141-kmcocm') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq '1471963629141-kmcocm' }
-      it { is_expected.to be_cancelled }
-      its(:current_operations) { is_expected.to be_empty }
-      its(:percent_complete) { is_expected.to eq 0 }
-      its(:errors) { is_expected.to be_empty }
-      its(:created_at) { is_expected.to be_the_same_time_as '2016-08-23T10:47:09-04:00' }
-      its(:updated_at) { is_expected.to be_nil }
-      its(:finished_at) { is_expected.to be_the_same_time_as '2016-08-23T13:59:45-04:00' }
-      its(:tech_metadata) { is_expected.to be_empty }
-    end
-
-    context "a completed encode" do
-      let(:job) do
-        j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_completed.json'))
-        j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_completed.json')))
-        j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_completed.json')))]
-        j
-      end
-      let(:completed_output) { [{id: "2", url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a", hls_url: "elastic-transcoder-samples/output/hls/hls0400k/e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a.m3u8", label: "hls0400k", :width=>400, :height=>224, :video_framerate=>"25", :file_size=>6901104, :duration=>"117353", :segment_duration=> "2.0"}] }
-      let(:completed_tech_metadata) { {:width=>1280, :height=>720, :video_framerate=>"25", :file_size=>21069678, :duration=>"117312"} }
-
-      subject { ActiveEncode::Base.find('1471963629141-kmcocm') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq '1471963629141-kmcocm' }
-      it { is_expected.to be_completed }
-      its(:output) { is_expected.to eq completed_output }
-      its(:current_operations) { is_expected.to be_empty }
-      its(:percent_complete) { is_expected.to eq 100 }
-      its(:errors) { is_expected.to be_empty }
-      its(:created_at) { is_expected.to be_the_same_time_as '2016-08-23T10:47:09-04:00' }
-      its(:updated_at) { is_expected.to be_the_same_time_as '2016-08-23T13:59:29-04:00' }
-      its(:finished_at) { is_expected.to be_the_same_time_as '2016-08-23T13:59:45-04:00' }
-      its(:tech_metadata) { is_expected.to eq completed_tech_metadata }
-    end
+      subject { canceled_job }
 
-    context "a failed encode" do
-      let(:job) do
-        j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_failed.json'))
-        j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
-        j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_failed.json')))]
-        j
-      end
-      let(:failed_tech_metadata) { {} }
-
-      subject { ActiveEncode::Base.find('1471963629141-kmcocm') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq '1471963629141-kmcocm' }
-      it { is_expected.to be_failed }
-      its(:current_operations) { is_expected.to be_empty }
-      its(:percent_complete) { is_expected.to eq 0 }
-      its(:errors) { is_expected.not_to be_empty }
-      its(:created_at) { is_expected.to be_the_same_time_as '2016-08-23T10:47:09-04:00' }
-      its(:updated_at) { is_expected.to be_the_same_time_as '2016-08-23T13:59:29-04:00' }
-      its(:finished_at) { is_expected.to be_the_same_time_as '2016-08-23T13:59:45-04:00' }
-      its(:tech_metadata) { is_expected.to be_empty }
-    end
-  end
-
-  describe "#cancel!" do
-    before do
-      allow(client).to receive(:cancel_job).and_return(cancel_response)
-    end
-
-    let(:cancel_response) do
-      res = double(Aws::ElasticTranscoder::Types::CancelJobResponse)
-      allow(res).to receive(:successful?).and_return(true)
-      res
-    end
-
-    let(:job) do
-      j = Aws::ElasticTranscoder::Types::Job.new JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_canceled.json'))
-      j.input = Aws::ElasticTranscoder::Types::JobInput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/input_generic.json')))
-      j.outputs = [ Aws::ElasticTranscoder::Types::JobOutput.new(JSON.parse(File.read('spec/fixtures/elastic_transcoder/output_canceled.json')))]
-      j
+      its(:updated_at) { is_expected.to be_nil }
     end
-
-    let(:encode) { ActiveEncode::Base.create(
-      "somefile.mp4",
-      pipeline_id: "1471963629141-kmcocm",
-        output_key_prefix: "elastic-transcoder-samples/output/hls/",
-        outputs: [{
-          key: 'hls0400k/' + "e8fe80f5b7063b12d567b90c0bdf6322116bba11ac458fe9d62921644159fe4a",
-          preset_id: "1351620000001-200050",
-          segment_duration: "2"
-        }]) }
-    subject { encode.cancel! }
-    it { is_expected.to be_a ActiveEncode::Base }
-    its(:id) { is_expected.to eq '1471963629141-kmcocm' }
-    it { is_expected.to be_cancelled }
   end
-
-  # describe "reload" do
-  #   before do
-  #     allow(ElasticTranscoder::Job).to receive(:details).and_return(details_response)
-  #     allow(ElasticTranscoder::Job).to receive(:progress).and_return(progress_response)
-  #   end
-  #
-  #   let(:details_response) { ElasticTranscoder::Response.new(body: JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_details_running.json'))) }
-  #   let(:progress_response) { ElasticTranscoder::Response.new(body: JSON.parse(File.read('spec/fixtures/elastic_transcoder/job_progress_running.json'))) }
-  #   let(:reload_output) { [{ id: "510582971", url: "https://elastic_transcoder-temp-storage-us-east-1.s3.amazonaws.com/o/20150609/48a6907086c012f68b9ca43461280515/1726d7ec3e24f2171bd07b2abb807b6c.mp4?AWSAccessKeyId=AKIAI456JQ76GBU7FECA&Signature=vSvlxU94wlQLEbpG3Zs8ibp4MoY%3D&Expires=1433953106", label: nil }] }
-  #   let(:reload_tech_metadata) { { audio_bitrate: "52", audio_codec: "aac", audio_channels: "2", duration: "57992", mime_type: "mpeg4", video_framerate: "29.97", height: "240", video_bitrate: "535", video_codec: "h264", width: "320" } }
-  #
-  #   subject { ActiveEncode::Base.find('166019107').reload }
-  #   it { is_expected.to be_a ActiveEncode::Base }
-  #   its(:id) { is_expected.to eq '166019107' }
-  #   it { is_expected.to be_running }
-  #   its(:output) { is_expected.to eq reload_output }
-  #   its(:current_operations) { is_expected.to be_empty }
-  #   its(:percent_complete) { is_expected.to eq 30.0 }
-  #   its(:errors) { is_expected.to be_empty }
-  #   its(:created_at) { is_expected.to eq '2015-06-09T16:18:26Z' }
-  #   its(:updated_at) { is_expected.to eq '2015-06-09T16:18:28Z' }
-  #   its(:finished_at) { is_expected.to be_nil }
-  #   its(:tech_metadata) { is_expected.to eq reload_tech_metadata }
-  # end
 end

data/spec/integration/matterhorn_adapter_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'rubyhorn'
+require 'shared_specs/engine_adapter_specs'
 
 describe ActiveEncode::EngineAdapters::MatterhornAdapter do
   before(:all) do
@@ -7,119 +8,79 @@ describe ActiveEncode::EngineAdapters::MatterhornAdapter do
     ActiveEncode::Base.engine_adapter = :matterhorn
   end
   after(:all) do
-    ActiveEncode::Base.engine_adapter = :inline
+    ActiveEncode::Base.engine_adapter = :test
   end
 
   before do
     # Stub out all Matterhorn interactions
     allow(Rubyhorn).to receive(:client).and_return(double("Rubyhorn::MatterhornClient"))
     allow(Rubyhorn.client).to receive(:addMediaPackageWithUrl).and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/create_response.xml')))
+    allow(Rubyhorn.client).to receive(:instance_xml).with('running-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/running_response.xml')))
+    allow(Rubyhorn.client).to receive(:instance_xml).with('cancelled-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/cancelled_response.xml')))
+    allow(Rubyhorn.client).to receive(:instance_xml).with('completed-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/completed_response.xml')))
+    allow(Rubyhorn.client).to receive(:instance_xml).with('failed-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/failed_response.xml')))
+    allow(Rubyhorn.client).to receive(:stop).and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/cancelled_response.xml')))
   end
 
   let(:file) { "file://#{File.absolute_path('spec/fixtures/Bars_512kb.mp4')}" }
+  let(:created_job) { ActiveEncode::Base.create(file) }
+  let(:running_job) { ActiveEncode::Base.find('running-id') }
+  let(:canceled_job) { ActiveEncode::Base.find('cancelled-id') }
+  let(:cancelling_job) { ActiveEncode::Base.find('running-id')}
+  let(:completed_job) { ActiveEncode::Base.find('completed-id') }
+  let(:failed_job) { ActiveEncode::Base.find('failed-id') }
+
+  let(:completed_output) { [{ id: "track-7", mime_type: "video/mp4", checksum: "77de9765545ef63d2c21f7557ead6176", duration: "6337", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "76502.0", video_codec: "AVC", video_bitrate: "2000000.0", video_framerate: "30.0", width: "1308", height: "720", url: "file:///home/cjcolvar/Code/avalon/avalon/red5/webapps/avalon/streams/f564d9de-9c35-4b74-95f0-f3013f32cc1a/b09c765f-b64e-4725-a863-736af66b688c/videoshort.mp4", label: "quality-high" }, { id: "track-8", mime_type: "video/mp4", checksum: "10e13cf51bf8a973011eec6a17ea47ff", duration: "6337", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "76502.0", video_codec: "AVC", video_bitrate: "500000.0", video_framerate: "30.0", width: "654", height: "360", url: "file:///home/cjcolvar/Code/avalon/avalon/red5/webapps/avalon/streams/f564d9de-9c35-4b74-95f0-f3013f32cc1a/8d5cd8a9-ad0e-484a-96f0-05e26a84a8f0/videoshort.mp4", label: "quality-low" }, { id: "track-9", mime_type: "video/mp4", checksum: "f2b16a2606dc76cb53c7017f0e166204", duration: "6337", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "76502.0", video_codec: "AVC", video_bitrate: "1000000.0", video_framerate: "30.0", width: "872", height: "480", url: "file:///home/cjcolvar/Code/avalon/avalon/red5/webapps/avalon/streams/f564d9de-9c35-4b74-95f0-f3013f32cc1a/0f81d426-0e26-4496-8f58-c675c86e6f4e/videoshort.mp4", label: "quality-medium" }] }
+  let(:completed_tech_metadata) { { } }
+  let(:failed_tech_metadata) { { mime_type: "video/mp4", checksum: "7ae24368ccb7a6c6422a14ff73f33c9a", duration: "6314", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "171030.0", video_codec: "AVC", video_bitrate: "74477.0", video_framerate: "23.719", width: "200", height: "110" } }
+  let(:failed_errors) { "org.opencastproject.workflow.api.WorkflowOperationException: org.opencastproject.workflow.api.WorkflowOperationException: One of the encoding jobs did not complete successfully" }
+
+  # Enforce generic behavior
+  it_behaves_like "an ActiveEncode::EngineAdapter"
 
   describe "#create" do
-    subject { ActiveEncode::Base.create(file) }
-    it { is_expected.to be_a ActiveEncode::Base }
-    its(:id) { is_expected.not_to be_empty }
-    it { is_expected.to be_running }
+    subject { created_job }
+
     its(:output) { is_expected.to be_empty }
     its(:options) { is_expected.to include(preset: 'full') }
-    its(:current_operations) { is_expected.to be_empty }
-    its(:percent_complete) { is_expected.to eq 0 }
-    its(:errors) { is_expected.to be_empty }
-    its(:created_at) { is_expected.to eq '2015-04-24T15:44:47Z' }
-    its(:updated_at) { is_expected.to be_nil }
-    its(:finished_at) { is_expected.to be_nil }
-    its(:tech_metadata) { is_expected.to be_empty }
   end
 
   describe "#find" do
     context "a running encode" do
-      before do
-        allow(Rubyhorn.client).to receive(:instance_xml).with('running-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/running_response.xml')))
-      end
+      subject { running_job }
 
-      subject { ActiveEncode::Base.find('running-id') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq 'running-id' }
-      it { is_expected.to be_running }
-      its(:output) { is_expected.to be_empty }
       its(:options) { is_expected.to include(preset: 'full') }
+      its(:output) { is_expected.to be_empty }
       its(:current_operations) { is_expected.to include("Hold for workflow selection") }
-      its(:percent_complete) { is_expected.to eq 0.43478260869565216 }
-      its(:errors) { is_expected.to be_empty }
-      its(:created_at) { is_expected.to eq '2015-04-20T17:58:43Z' }
-      its(:updated_at) { is_expected.to eq '2015-04-21T18:38:50Z' }
-      its(:finished_at) { is_expected.to be_nil }
       its(:tech_metadata) { is_expected.to be_empty }
     end
     context "a cancelled encode" do
-      before do
-        allow(Rubyhorn.client).to receive(:instance_xml).with('cancelled-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/cancelled_response.xml')))
-      end
+      subject { canceled_job }
 
-      subject { ActiveEncode::Base.find('cancelled-id') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq 'cancelled-id' }
-      it { is_expected.to be_cancelled }
       its(:options) { is_expected.to include(preset: 'full') }
+      its(:current_operations) { is_expected.not_to be_empty }
       its(:current_operations) { is_expected.to include("Tagging dublin core catalogs for publishing") }
-      its(:percent_complete) { is_expected.to eq 1.7391304347826086 }
-      its(:errors) { is_expected.to be_empty }
-      its(:created_at) { is_expected.to eq '2015-04-20T18:01:57Z' }
-      its(:updated_at) { is_expected.to eq '2015-04-21T18:46:05Z' }
-      its(:finished_at) { is_expected.to eq '2015-04-21T18:46:05Z' }
-      its(:tech_metadata) { is_expected.to be_empty }
+      its(:updated_at) { is_expected.to be > subject.created_at }
     end
+
     context "a completed encode" do
-      before do
-        allow(Rubyhorn.client).to receive(:instance_xml).with('completed-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/completed_response.xml')))
-      end
-      let(:completed_output) { [{ id: "track-7", mime_type: "video/mp4", checksum: "77de9765545ef63d2c21f7557ead6176", duration: "6337", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "76502.0", video_codec: "AVC", video_bitrate: "2000000.0", video_framerate: "30.0", width: "1308", height: "720", url: "file:///home/cjcolvar/Code/avalon/avalon/red5/webapps/avalon/streams/f564d9de-9c35-4b74-95f0-f3013f32cc1a/b09c765f-b64e-4725-a863-736af66b688c/videoshort.mp4", label: "quality-high" }, { id: "track-8", mime_type: "video/mp4", checksum: "10e13cf51bf8a973011eec6a17ea47ff", duration: "6337", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "76502.0", video_codec: "AVC", video_bitrate: "500000.0", video_framerate: "30.0", width: "654", height: "360", url: "file:///home/cjcolvar/Code/avalon/avalon/red5/webapps/avalon/streams/f564d9de-9c35-4b74-95f0-f3013f32cc1a/8d5cd8a9-ad0e-484a-96f0-05e26a84a8f0/videoshort.mp4", label: "quality-low" }, { id: "track-9", mime_type: "video/mp4", checksum: "f2b16a2606dc76cb53c7017f0e166204", duration: "6337", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "76502.0", video_codec: "AVC", video_bitrate: "1000000.0", video_framerate: "30.0", width: "872", height: "480", url: "file:///home/cjcolvar/Code/avalon/avalon/red5/webapps/avalon/streams/f564d9de-9c35-4b74-95f0-f3013f32cc1a/0f81d426-0e26-4496-8f58-c675c86e6f4e/videoshort.mp4", label: "quality-medium" }] }
+      subject { completed_job }
 
-      subject { ActiveEncode::Base.find('completed-id') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq 'completed-id' }
-      it { is_expected.to be_completed }
-      its(:output) { is_expected.to eq completed_output }
       its(:options) { is_expected.to include(preset: 'avalon') }
       its(:current_operations) { is_expected.to include("Cleaning up") }
-      its(:percent_complete) { is_expected.to eq 100 }
-      its(:errors) { is_expected.to be_empty }
-      its(:created_at) { is_expected.to eq '2015-04-21T18:08:00Z' }
-      its(:updated_at) { is_expected.to eq '2015-04-21T18:14:18Z' }
-      its(:finished_at) { is_expected.to eq '2015-04-21T18:14:18Z' }
-      its(:tech_metadata) { is_expected.to be_empty }
     end
     context "a failed encode" do
-      before do
-        allow(Rubyhorn.client).to receive(:instance_xml).with('failed-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/failed_response.xml')))
-      end
-      let(:failed_tech_metadata) { { mime_type: "video/mp4", checksum: "7ae24368ccb7a6c6422a14ff73f33c9a", duration: "6314", audio_codec: "AAC", audio_channels: "2", audio_bitrate: "171030.0", video_codec: "AVC", video_bitrate: "74477.0", video_framerate: "23.719", width: "200", height: "110" } }
-      let(:failed_errors) { "org.opencastproject.workflow.api.WorkflowOperationException: org.opencastproject.workflow.api.WorkflowOperationException: One of the encoding jobs did not complete successfully" }
+      subject { failed_job }
 
-      subject { ActiveEncode::Base.find('failed-id') }
-      it { is_expected.to be_a ActiveEncode::Base }
-      its(:id) { is_expected.to eq 'failed-id' }
-      it { is_expected.to be_failed }
       its(:options) { is_expected.to include(preset: 'error') }
       its(:current_operations) { is_expected.to include("Cleaning up after failure") }
-      its(:percent_complete) { is_expected.to eq 56.666666666666664 }
-      its(:errors) { is_expected.to include failed_errors }
-      its(:created_at) { is_expected.to eq '2015-04-09T16:12:00Z' }
-      its(:updated_at) { is_expected.to eq '2015-04-09T16:14:06Z' }
-      its(:finished_at) { is_expected.to eq '2015-04-09T16:14:06Z' }
-      its(:tech_metadata) { is_expected.to include failed_tech_metadata }
     end
   end
 
   describe "#cancel!" do
-    before do
-      allow(Rubyhorn.client).to receive(:stop).and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/cancelled_response.xml')))
-    end
     let(:encode) { ActiveEncode::Base.create(file) }
     subject { encode.cancel! }
+
     it { is_expected.to be_a ActiveEncode::Base }
     its(:id) { is_expected.to eq 'cancelled-id' }
     it { is_expected.to be_cancelled }
@@ -172,18 +133,12 @@ describe ActiveEncode::EngineAdapters::MatterhornAdapter do
       expect(Rubyhorn.client).to receive(:instance_xml).twice.with('running-id').and_return(Rubyhorn::Workflow.from_xml(File.open('spec/fixtures/matterhorn/running_response.xml')))
     end
 
-    subject { ActiveEncode::Base.find('running-id').reload }
-    it { is_expected.to be_a ActiveEncode::Base }
-    its(:id) { is_expected.to eq 'running-id' }
-    it { is_expected.to be_running }
+    subject { running_job.reload }
+
     its(:output) { is_expected.to be_empty }
     its(:options) { is_expected.to include(preset: 'full') }
     its(:current_operations) { is_expected.to include("Hold for workflow selection") }
     its(:percent_complete) { is_expected.to eq 0.43478260869565216 }
-    its(:errors) { is_expected.to be_empty }
-    its(:created_at) { is_expected.to eq '2015-04-20T17:58:43Z' }
-    its(:updated_at) { is_expected.to eq '2015-04-21T18:38:50Z' }
-    its(:finished_at) { is_expected.to be_nil }
     its(:tech_metadata) { is_expected.to be_empty }
   end