fogged 0.0.5 → 0.0.6

data/test/models/fogged/resource_test.rb

@@ -77,9 +77,8 @@ module Fogged
           OpenStruct.new(:body => create_output)
         )
 
-        assert_difference("Delayed::Job.count") do
-          @resource.process!
-        end
+        @resource.process!
+
         assert @resource.encoding?
         assert_equal "1234567890", @resource.encoding_job_id
       end

data/test/models/fogged/resources/aws_encoder_test.rb

@@ -40,15 +40,12 @@ module Fogged
         in_a_fork do
           require "zencoder"
           require "delayed_job_active_record"
-          Rails.application.config.active_job.queue_adapter = :delayed_job
           Fogged.configure
 
           Zencoder::Job.expects(:create).returns(
             OpenStruct.new(:body => create_output)
           )
-          assert_difference("Delayed::Job.count") do
-            encoder.encode!
-          end
+          encoder.encode!
 
           assert resource.encoding?
           assert_equal 0, resource.encoding_progress
@@ -110,7 +107,6 @@ module Fogged
         in_a_fork do
           require "zencoder"
           require "delayed_job_active_record"
-          Rails.application.config.active_job.queue_adapter = :delayed_job
           Fogged.configure do |config|
             config.zencoder_additional_outputs do |bucket, res|
               [
@@ -124,12 +120,32 @@ module Fogged
             end
           end
 
-          Zencoder::Job.expects(:create).with { |options| assert_equal 4, options[:output].size }.returns(
+          Zencoder::Job.expects(:create).with() { |options| assert_equal 4, options[:output].size }.returns(
             OpenStruct.new(:body => create_output)
           )
-          assert_difference("Delayed::Job.count") do
-            encoder.encode!
-          end
+          encoder.encode!
+
+          assert resource.encoding?
+          assert_equal 0, resource.encoding_progress
+          assert_equal "1234567890", resource.encoding_job_id
+        end
+      end
+
+      test "should encode video with zencoder notification url" do
+        resource = fogged_resources(:resource_mov_3)
+        encoder = AWSEncoder.new(resource)
+
+        in_a_fork do
+          require "zencoder"
+          require "delayed_job_active_record"
+          Fogged.configure
+          Fogged.stubs(:zencoder_notification_url).returns("http://test")
+
+          Zencoder::Job.expects(:create).with() { |options| assert options[:notifications] }.returns(
+            OpenStruct.new(:body => create_output)
+          )
+
+          encoder.encode!
 
           assert resource.encoding?
           assert_equal 0, resource.encoding_progress

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fogged
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,7 +189,6 @@ files:
 - Rakefile
 - app/controllers/fogged/resources_controller.rb
 - app/jobs/fogged/resources/aws_thumbnail_job.rb
-- app/jobs/fogged/resources/zencoder_poll_job.rb
 - app/models/fogged/resource.rb
 - app/models/fogged/resources/aws_encoder.rb
 - app/models/fogged/resources/encoder.rb
@@ -214,6 +213,7 @@ files:
 - test/controllers/fogged/resources_controller/destroy_test.rb
 - test/controllers/fogged/resources_controller/show_test.rb
 - test/controllers/fogged/resources_controller/update_test.rb
+- test/controllers/fogged/resources_controller/zencoder_notification_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -270,7 +270,6 @@ files:
 - test/fixtures/movies.yml
 - test/fogged_test.rb
 - test/jobs/fogged/resources/aws_thumbnail_job_test.rb
-- test/jobs/fogged/resources/zencoder_poll_job_test.rb
 - test/models/fogged/resource_test.rb
 - test/models/fogged/resources/aws_encoder_test.rb
 - test/models/fogged/resources/encoder_test.rb
@@ -307,6 +306,7 @@ test_files:
 - test/controllers/fogged/resources_controller/destroy_test.rb
 - test/controllers/fogged/resources_controller/show_test.rb
 - test/controllers/fogged/resources_controller/update_test.rb
+- test/controllers/fogged/resources_controller/zencoder_notification_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -363,7 +363,6 @@ test_files:
 - test/fixtures/movies.yml
 - test/fogged_test.rb
 - test/jobs/fogged/resources/aws_thumbnail_job_test.rb
-- test/jobs/fogged/resources/zencoder_poll_job_test.rb
 - test/models/fogged/resource_test.rb
 - test/models/fogged/resources/aws_encoder_test.rb
 - test/models/fogged/resources/encoder_test.rb

data/app/jobs/fogged/resources/zencoder_poll_job.rb

@@ -1,37 +0,0 @@
-module Fogged
-  module Resources
-    class ZencoderPollJob < ActiveJob::Base
-      def perform(resource)
-        return unless Fogged.zencoder_enabled
-        update_encoding_progress(resource)
-
-        return if resource.encoding_progress == 100
-
-        frequency = Fogged.zencoder_polling_frequency
-        retry_job(:wait => frequency.seconds)
-      end
-
-      private
-
-      def update_encoding_progress(resource)
-        job = Zencoder::Job.progress(resource.encoding_job_id)
-
-        case job.body["state"]
-        when "finished"
-          job = Zencoder::Job.details(resource.encoding_job_id)
-          f = job.body["job"]["output_media_files"][0]
-          resource.update!(
-            :encoding_progress => 100,
-            :width => f["width"],
-            :height => f["height"],
-            :duration => f["duration_in_ms"].to_f / 1000.0
-          )
-        when "processing", "waiting"
-          resource.update!(:encoding_progress => job.body["progress"].to_i)
-        else
-          fail(ArgumentError, "Unknown Zencoder job state #{job.body["state"]}")
-        end
-      end
-    end
-  end
-end

data/test/jobs/fogged/resources/zencoder_poll_job_test.rb

@@ -1,96 +0,0 @@
-require "test_helper"
-
-module Fogged
-  module Resources
-    class ZencoderPollJobTest < ActiveSupport::TestCase
-      def setup
-        super
-        @resource = fogged_resources(:encoding_resource)
-      end
-
-      test "should poll job with status success" do
-        in_a_fork do
-          require "zencoder"
-          require "delayed_job_active_record"
-          Rails.application.config.active_job.queue_adapter = :delayed_job
-          Fogged.configure
-
-          Zencoder::Job.expects(:progress).with("1234567890").returns(
-            OpenStruct.new(:body => progress_output("finished"))
-          )
-          Zencoder::Job.expects(:details).with("1234567890").returns(
-            OpenStruct.new(:body => details_output)
-          )
-
-          assert_no_difference("Delayed::Job.count") do
-            ZencoderPollJob.perform_now(@resource)
-          end
-          refute @resource.reload.encoding?
-          assert_equal 800, @resource.width
-          assert_equal 600, @resource.height
-          assert_equal 15, @resource.duration
-        end
-      end
-
-      %w(processing waiting).each do |status|
-        test "should poll job with status #{status}" do
-          in_a_fork do
-            require "zencoder"
-            require "delayed_job_active_record"
-            Rails.application.config.active_job.queue_adapter = :delayed_job
-            Fogged.configure
-
-            Zencoder::Job.expects(:progress).with("1234567890").returns(
-              OpenStruct.new(:body => progress_output(status))
-            )
-
-            assert_difference("Delayed::Job.count") do
-              ZencoderPollJob.perform_now(@resource)
-            end
-            assert @resource.reload.encoding?
-            assert_equal 55, @resource.encoding_progress
-          end
-        end
-      end
-
-      test "should poll job with status unknown" do
-        in_a_fork do
-          require "zencoder"
-          require "delayed_job_active_record"
-          Fogged.configure
-
-          Zencoder::Job.expects(:progress).with("1234567890").returns(
-            OpenStruct.new(:body => progress_output("unknown"))
-          )
-
-          assert_raise(ArgumentError) do
-            assert_no_difference("Delayed::Job.count") do
-              ZencoderPollJob.perform_now(@resource)
-            end
-          end
-        end
-      end
-
-      private
-
-      def progress_output(state)
-        {
-          :state => state,
-          :progress => "55.5"
-        }.with_indifferent_access
-      end
-
-      def details_output
-        {
-          :job => {
-            :output_media_files => [{
-              :width => 800,
-              :height => 600,
-              :duration_in_ms => 15753
-            }]
-          }
-        }.with_indifferent_access
-      end
-    end
-  end
-end