zencodable 0.0.1 → 0.1.0

data/lib/generators/zencodable/migration_generator.rb

@@ -24,6 +24,7 @@ module Zencodable
       end
 
       def create_migration_files
+        migration_template 'add_zencoder_job_tracking_columns.rb', "db/migrate/add_zencoder_job_tracking_columns_to_#{name.tableize}"
         migration_template 'create_association_table.rb', "db/migrate/create_#{association_name}"
         unless options.skip_thumbnails?
           migration_template 'create_association_thumbnails_table.rb', "db/migrate/create_#{association_name}_thumbnails"

data/lib/generators/zencodable/templates/add_zencoder_job_tracking_columns.rb

@@ -0,0 +1,8 @@
+class AddZencoderJobTrackingColumns < ActiveRecord::Migration
+  def change
+    add_column :<%= name.tableize %>, :origin_url, :string
+    add_column :<%= name.tableize %>, :zencoder_job_status, :string
+    add_column :<%= name.tableize %>, :zencoder_job_created, :datetime
+    add_column :<%= name.tableize %>, :zencoder_job_finished, :datetime
+  end
+end

data/lib/zencodable/version.rb

@@ -1,3 +1,3 @@
 module Zencodable
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/zencodable.rb

@@ -127,38 +127,40 @@ module Zencodable
           end
         end
 
-        def build_encoder_output_options(origin, definitions)
+        def build_encoder_output_options(origin, settings)
 
-          formats = definitions[:formats] || [:ogg]
-          size = definitions[:output_dimensions] || '400x300'
-          base_url = s3_url(origin, definitions[:s3_config], definitions[:path])
+          formats = settings[:formats] || [:mp4]
 
-          defaults = { :public => true,
-                       :device_profile => "mobile/advanced",
-                       :size => size
-                     }
-          defaults = defaults.merge(definitions[:options]) if definitions[:options]
+          bucket_name = settings[:bucket] || s3_bucket_name(settings[:s3_config])
+
+          s3_base_url = s3_url(origin, bucket_name, settings[:path])
+
+          defaults = { :public => true }
+
+          defaults[:size] = settings[:output_dimensions] if settings[:output_dimensions]
+
+          defaults = defaults.merge(settings[:options]) if settings[:options]
+
+          output_settings = formats.collect{ |f| defaults.merge( :format => f.to_s, :label => f.to_s, :base_url => s3_base_url ) }
 
-          if definitions[:thumbnails]
-            defaults[:thumbnails] = {:aspect_mode => 'crop',
-                                     :base_url => base_url,
-                                     :size => size
-                                    }.merge(definitions[:thumbnails])
+          if settings[:thumbnails]
+            output_settings[0][:thumbnails] = {:base_url => s3_base_url}.merge(settings[:thumbnails])
           end
+          output_settings
 
-          formats.collect{ |f| defaults.merge( :format => f.to_s, :label => f.to_s, :base_url => base_url ) }
         end
 
-        def s3_url origin_url, s3_config_file, path
+        def s3_url origin_url, bucket, path
           basename = origin_url.match( %r|([^/][^/\?]+)[^/]*\.[^.]+\z| )[1] # matches filename without extension
           basename = basename.downcase.squish.gsub(/\s+/, '-').gsub(/[^\w\d_.-]/, '') # cheap/ugly to_url
           path = path.gsub(%r|:basename\b|, basename)
-          "s3://#{s3_bucket_name(s3_config_file)}.s3.amazonaws.com/#{path}/"
+          "s3://#{bucket}.s3.amazonaws.com/#{path}/"
         end
 
         def s3_bucket_name s3_config_file
           s3_config_file ||= "#{Rails.root}/config/s3.yml"
           @s3_config ||= YAML.load_file(s3_config_file)[Rails.env].symbolize_keys
+          puts @s3_config.inspect
           @s3_config[:bucket_name]
         end