active_encode 0.5.0 → 0.6.0

data/lib/active_encode/engine_adapters/ffmpeg_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'fileutils'
 require 'nokogiri'
 
@@ -9,8 +10,8 @@ module ActiveEncode
       def create(input_url, options = {})
         new_encode = ActiveEncode::Base.new(input_url, options)
         new_encode.id = SecureRandom.uuid
-        new_encode.created_at = Time.new
-        new_encode.updated_at = Time.new
+        new_encode.created_at = Time.now.utc
+        new_encode.updated_at = Time.now.utc
         new_encode.current_operations = []
         new_encode.output = []
 
@@ -26,11 +27,11 @@ module ActiveEncode
           new_encode.state = :failed
           new_encode.percent_complete = 1
 
-          if new_encode.input.file_size.blank?
-            new_encode.errors = ["#{input_url} does not exist or is not accessible"]
-          else
-            new_encode.errors = ["Error inspecting input: #{input_url}"]
-          end
+          new_encode.errors = if new_encode.input.file_size.blank?
+                                ["#{input_url} does not exist or is not accessible"]
+                              else
+                                ["Error inspecting input: #{input_url}"]
+                              end
 
           write_errors new_encode
           return new_encode
@@ -53,9 +54,10 @@ module ActiveEncode
       end
 
       # Return encode object from file system
-      def find(id, opts={})
+      def find(id, opts = {})
         encode_class = opts[:cast]
-        encode = ActiveEncode::Base.new(nil, opts)
+        encode_class ||= ActiveEncode::Base
+        encode = encode_class.new(nil, opts)
         encode.id = id
         encode.output = []
         encode.created_at, encode.updated_at = get_times encode.id
@@ -84,9 +86,9 @@ module ActiveEncode
           encode.state = :running
           encode.current_operations = ["transcoding"]
         elsif progress_ended?(encode.id) && encode.percent_complete == 100
-            encode.state = :completed
+          encode.state = :completed
         elsif encode.percent_complete < 100
-            encode.state = :cancelled
+          encode.state = :cancelled
         end
 
         encode.output = build_outputs encode if encode.completed?
@@ -102,25 +104,25 @@ module ActiveEncode
         find id
       end
 
-private
+    private
 
-      def get_times id
+      def get_times(id)
         updated_at = if File.file? working_path("progress", id)
-            File.mtime(working_path("progress", id))
-          elsif File.file? working_path("error.log", id)
-            File.mtime(working_path("error.log", id))
-          else
-            File.mtime(working_path("input_metadata", id))
-          end
+                       File.mtime(working_path("progress", id))
+                     elsif File.file? working_path("error.log", id)
+                       File.mtime(working_path("error.log", id))
+                     else
+                       File.mtime(working_path("input_metadata", id))
+                     end
 
-        return File.mtime(working_path("input_metadata", id)), updated_at
+        [File.mtime(working_path("input_metadata", id)), updated_at]
       end
 
-      def write_errors encode
+      def write_errors(encode)
         File.write(working_path("error.log", encode.id), encode.errors.join("\n"))
       end
 
-      def build_input encode
+      def build_input(encode)
         input = ActiveEncode::Input.new
         metadata = get_tech_metadata(working_path("input_metadata", encode.id))
         input.url = metadata[:url]
@@ -132,7 +134,7 @@ private
         input
       end
 
-      def build_outputs encode
+      def build_outputs(encode)
         id = encode.id
         outputs = []
         Dir["#{File.absolute_path(working_path('outputs', id))}/*"].each do |file_path|
@@ -162,15 +164,11 @@ private
           " #{output[:ffmpeg_opt]} #{working_path(file_name, id)}"
         end.join(" ")
 
-        "ffmpeg -y -loglevel error -progress #{working_path("progress", id)} -i #{input_url} #{output_opt} > #{working_path("error.log", id)} 2>&1"
+        "ffmpeg -y -loglevel error -progress #{working_path('progress', id)} -i #{input_url} #{output_opt} > #{working_path('error.log', id)} 2>&1"
       end
 
       def get_pid(id)
-        if File.file? working_path("pid", id)
-          File.read(working_path("pid", id)).remove("\n")
-        else
-          nil
-        end
+        File.read(working_path("pid", id)).remove("\n") if File.file? working_path("pid", id)
       end
 
       def working_path(path, id)
@@ -178,15 +176,13 @@ private
       end
 
       def running?(pid)
-        begin
-          Process.getpgid pid.to_i
-          true
-        rescue Errno::ESRCH
-          false
-        end
+        Process.getpgid pid.to_i
+        true
+      rescue Errno::ESRCH
+        false
       end
 
-      def calculate_percent_complete encode
+      def calculate_percent_complete(encode)
         data = read_progress encode.id
         if data.blank?
           1
@@ -196,32 +192,25 @@ private
         end
       end
 
-      def read_progress id
-        if File.file? working_path("progress", id)
-          File.read working_path("progress", id)
-        else
-          nil
-        end
+      def read_progress(id)
+        File.read working_path("progress", id) if File.file? working_path("progress", id)
       end
 
-      def progress_ended? id
+      def progress_ended?(id)
         "end" == progress_value("progress=", read_progress(id))
       end
 
-      def progress_value key, data
-        if data.present? && key.present?
-          ri = data.rindex(key) + key.length
-          data[ri..data.index("\n", ri)-1]
-        else
-          nil
-        end
+      def progress_value(key, data)
+        return nil unless data.present? && key.present?
+        ri = data.rindex(key) + key.length
+        data[ri..data.index("\n", ri) - 1]
       end
 
-      def get_tech_metadata file_path
+      def get_tech_metadata(file_path)
         doc = Nokogiri::XML File.read(file_path)
         doc.remove_namespaces!
         duration = get_xpath_text(doc, '//Duration/text()', :to_f)
-        duration = duration * 1000 unless duration.nil?      # Convert to milliseconds
+        duration *= 1000 unless duration.nil? # Convert to milliseconds
         { url: get_xpath_text(doc, '//media/@ref', :to_s),
           width: get_xpath_text(doc, '//Width/text()', :to_f),
           height: get_xpath_text(doc, '//Height/text()', :to_f),
@@ -234,12 +223,8 @@ private
           video_bitrate: get_xpath_text(doc, '//track[@type="Video"]/BitRate/text()', :to_i) }
       end
 
-      def get_xpath_text doc, xpath, cast_method
-        if doc.xpath(xpath).first
-          doc.xpath(xpath).first.text.send(cast_method)
-        else
-          nil
-        end
+      def get_xpath_text(doc, xpath, cast_method)
+        doc.xpath(xpath).first&.text&.send(cast_method)
       end
     end
   end

data/lib/active_encode/engine_adapters/matterhorn_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubyhorn'
 
 module ActiveEncode
@@ -11,7 +12,7 @@ module ActiveEncode
         build_encode(get_workflow(workflow_om))
       end
 
-      def find(id, opts = {})
+      def find(id, _opts = {})
         build_encode(fetch_workflow(id))
       end
 
@@ -145,7 +146,7 @@ module ActiveEncode
 
         def convert_created_at(workflow)
           created_at = workflow.xpath('mediapackage/@start').last.to_s
-          created_at.present? ? Time.parse(created_at) : nil
+          created_at.present? ? Time.parse(created_at).utc : nil
         end
 
         def convert_updated_at(workflow)
@@ -156,13 +157,13 @@ module ActiveEncode
         def convert_output_created_at(track, workflow)
           quality = track.xpath('tags/tag[starts-with(text(),"quality")]/text()').to_s
           created_at = workflow.xpath("//operation[@id=\"compose\"][configurations/configuration[@key=\"target-tags\" and contains(text(), \"#{quality}\")]]/started/text()").to_s
-          created_at.present? ? Time.at(created_at.to_i / 1000.0) : nil
+          created_at.present? ? Time.at(created_at.to_i / 1000.0).utc : nil
         end
 
         def convert_output_updated_at(track, workflow)
           quality = track.xpath('tags/tag[starts-with(text(),"quality")]/text()').to_s
           updated_at = workflow.xpath("//operation[@id=\"compose\"][configurations/configuration[@key=\"target-tags\" and contains(text(), \"#{quality}\")]]/completed/text()").to_s
-          updated_at.present? ? Time.at(updated_at.to_i / 1000.0) : nil
+          updated_at.present? ? Time.at(updated_at.to_i / 1000.0).utc : nil
         end
 
         def convert_options(workflow)

data/lib/active_encode/engine_adapters/test_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveEncode
   module EngineAdapters
     class TestAdapter
@@ -9,8 +10,8 @@ module ActiveEncode
         new_encode = ActiveEncode::Base.new(input_url, options)
         new_encode.id = SecureRandom.uuid
         new_encode.state = :running
-        new_encode.created_at = Time.now
-        new_encode.updated_at = Time.now
+        new_encode.created_at = Time.now.utc
+        new_encode.updated_at = Time.now.utc
         @encodes[new_encode.id] = new_encode
         new_encode
       end
@@ -18,14 +19,14 @@ module ActiveEncode
       def find(id, _opts = {})
         new_encode = @encodes[id]
         # Update the updated_at time to simulate changes
-        new_encode.updated_at = Time.now
+        new_encode.updated_at = Time.now.utc
         new_encode
       end
 
       def cancel(id)
         new_encode = @encodes[id]
         new_encode.state = :cancelled
-        new_encode.updated_at = Time.now
+        new_encode.updated_at = Time.now.utc
         new_encode
       end
     end

data/lib/active_encode/engine_adapters/zencoder_adapter.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 module ActiveEncode
   module EngineAdapters
     class ZencoderAdapter
       # TODO: add a stub for an input helper (supplied by an initializer) that transforms encode.input.url into a zencoder accepted url
-      def create(input_url, options = {})
+      def create(input_url, _options = {})
         response = Zencoder::Job.create(input: input_url.to_s)
         build_encode(get_job_details(response.body["id"]))
       end
 
-      def find(id, opts = {})
+      def find(id, _opts = {})
         build_encode(get_job_details(id))
       end
 

data/lib/active_encode/global_id.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'globalid'
 
 module ActiveEncode
@@ -9,7 +10,7 @@ module ActiveEncode
       other.is_a?(ActiveEncode::Base) && to_global_id == other.to_global_id
     end
 
-    def to_global_id(options = {})
+    def to_global_id(_options = {})
       super(app: 'ActiveEncode')
     end
   end

data/lib/active_encode/input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveEncode
   class Input
     include Status
@@ -8,8 +9,8 @@ module ActiveEncode
 
     def valid?
       id.present? && url.present? &&
-      created_at.is_a?(Time) && updated_at.is_a?(Time) &&
-      updated_at >= created_at
+        created_at.is_a?(Time) && updated_at.is_a?(Time) &&
+        updated_at >= created_at
     end
   end
 end

data/lib/active_encode/output.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveEncode
   class Output
     include Status
@@ -9,8 +10,8 @@ module ActiveEncode
 
     def valid?
       id.present? && url.present? && label.present? &&
-      created_at.is_a?(Time) && updated_at.is_a?(Time) &&
-      updated_at >= created_at
+        created_at.is_a?(Time) && updated_at.is_a?(Time) &&
+        updated_at >= created_at
     end
   end
 end

data/lib/active_encode/persistence.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 
 module ActiveEncode
@@ -9,8 +10,10 @@ module ActiveEncode
         persist(persistence_model_attributes(encode))
       end
 
-      after_create do |encode|
-        persist(persistence_model_attributes(encode))
+      around_create do |encode, block|
+        create_options = encode.options
+        encode = block.call
+        persist(persistence_model_attributes(encode).merge(create_options: create_options.to_json))
       end
 
       after_cancel do |encode|
@@ -38,7 +41,8 @@ module ActiveEncode
           # Need to ensure that these values come through or else validations will fail
           created_at: encode.created_at,
           updated_at: encode.updated_at,
-          raw_object: encode.to_json
+          raw_object: encode.to_json,
+          progress: encode.percent_complete
         }
       end
   end

data/lib/active_encode/polling.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 require 'active_model/callbacks'
 
@@ -8,7 +9,7 @@ module ActiveEncode
     POLLING_WAIT_TIME = 10.seconds.freeze
 
     CALLBACKS = [
-        :after_status_update, :after_failed, :after_cancelled, :after_completed
+      :after_status_update, :after_failed, :after_cancelled, :after_completed
     ].freeze
 
     included do

data/lib/active_encode/status.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 
 module ActiveEncode

data/lib/active_encode/technical_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 
 module ActiveEncode
@@ -23,10 +24,10 @@ module ActiveEncode
       attr_accessor :video_bitrate
     end
 
-    def assign_tech_metadata metadata
+    def assign_tech_metadata(metadata)
       [:width, :height, :frame_rate, :duration, :file_size, :checksum,
        :audio_codec, :video_codec, :audio_bitrate, :video_bitrate].each do |field|
-         self.send("#{field}=", metadata[field]) if metadata.has_key?(field)
+        send("#{field}=", metadata[field]) if metadata.key?(field)
       end
     end
   end

data/lib/active_encode/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveEncode
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'
 end

data/lib/file_locator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'addressable/uri'
 require 'aws-sdk'
 
@@ -10,7 +11,7 @@ class FileLocator
     def initialize(uri)
       uri = Addressable::URI.parse(uri)
       @bucket = URI.decode(uri.host)
-      @key = URI.decode(uri.path).sub(%r(^/*(.+)/*$),'\1')
+      @key = URI.decode(uri.path).sub(%r{^/*(.+)/*$}, '\1')
     end
 
     def object
@@ -39,9 +40,7 @@ class FileLocator
           end
         end
 
-        if @uri.scheme.nil?
-          @uri = Addressable::URI.parse("file://#{URI.encode(File.expand_path(source))}")
-        end
+        @uri = Addressable::URI.parse("file://#{URI.encode(File.expand_path(source))}") if @uri.scheme.nil?
       end
     end
     @uri
@@ -68,16 +67,16 @@ class FileLocator
       false
     end
   end
-  alias_method :exists?, :exist?
+  alias exists? exist?
 
   def reader
     case uri.scheme
     when 's3'
       S3File.new(uri).object.get.body
     when 'file'
-      File.open(location,'r')
+      File.open(location, 'r')
     else
-      Kernel::open(uri.to_s, 'r')
+      Kernel.open(uri.to_s, 'r')
     end
   end
 
@@ -86,7 +85,7 @@ class FileLocator
     when 's3'
       uri
     when 'file'
-      File.open(location,'r')
+      File.open(location, 'r')
     else
       location
     end