zencodable 0.1.0 → 0.1.2

data/README.md

@@ -26,13 +26,15 @@ _developed on ruby 1.9.2-p290 and Rails 3.1.3_
 3. this gem (zencodable) in your gemfile, and typhoeus.
 
     gem 'zencodable'
-    gem 'typhoeus'
+    gem 'typhoeus' # NOTE: for heroku deploys, pin to 0.2.4 https://github.com/dbalatero/typhoeus/issues/123
 
 # Setup
 
-## Zencoder API keys
+## Zencoder API keys and initializer settings
 
-the zencoder/zencoder-rb gem expects access to your Zencoder API keys in some fashion. Also, we need to use dbalatero/typhoeus for HTTP stuffs, that's the only way Zencoder will work with S3. So, I like something in `config/initializers` like
+the [zencoder](https://github.com/zencoder/zencoder-rb) gem expects access to your Zencoder API keys in some fashion. Also, [typhoeus](https://github.com/dbalatero/typhoeus) is a big improvement for HTTP stuffs. Thirdly, Zencoder's API v2 (soon to be released as of 2011-12-4) is full of options, has more progress information and much more hotness - so let's use that!.
+
+So, I like something in `config/initializers/zencoder.rb` like
 
     # zencoder setup
     if Rails.env == 'production'
@@ -43,6 +45,8 @@ the zencoder/zencoder-rb gem expects access to your Zencoder API keys in some fa
 
     Zencoder::HTTP.http_backend = Zencoder::HTTP::Typhoeus
 
+    Zencoder.base_url = 'https://app.zencoder.com/api/v2'
+
 ## Bucket policy
 
 The bucket needs to have a custom policy to allow Zencoder to place the output videos on it. [Here is a guide on Zencoder's site, follow it](https://app.zencoder.com/docs/guides/getting-started/working-with-s3)
@@ -71,7 +75,7 @@ add something like the above `has_video_encodings` class method to your model (t
 
 The options should include a `:s3_config` key that gives a location of a YAML file containing your S3 credentials, which should contain a 'bucket' key (you already have one, right?) Actually, all we need from that is the bucket name, so you can instead use a `:bucket` key to give the name of the bucket where the output files should be placed.
 
-The `:path` option can be any path within that bucket. It can contain a `:basename` token, which will be replaced with a sanitized, URL-encoded version of the original filename as uploaded. 
+The `:path` option can be any path within that bucket. It can contain a `:basename` token, which will be replaced with a sanitized, URL-encoded version of the original filename as uploaded.
 
 `:formats` is a list of output formats you'd like. [Supported formats and codecs](https://app.zencoder.com/docs/api/encoding/format-and-codecs/format)
 
@@ -79,7 +83,7 @@ The other options are all those that can be handled by Zencoder. More info can b
 
 ### Give it a source URL
 
-All that's needed to trigger the Zencoder job is to change the `origin_url` value of your model, and then save. That will be picked up, sent to Zencoder, and your job will be started with your desired settings. 
+All that's needed to trigger the Zencoder job is to change the `origin_url` value of your model, and then save. That will be picked up, sent to Zencoder, and your job will be started with your desired settings.
 
 As the job runs, you can check `Model.job_status` as you see fit, if the job is neither failed nor finished, it will request an update from Zencoder for that Job.
 
@@ -89,22 +93,26 @@ Individual files will complete at different times, so you can also check the `st
     vid.origin_url = 'http://sourcebucket.s3.amazonaws.com/largevideos/funny_kittehs[HD].mov'
     vid.save
     vid.job_status # "new"
-    ... 
+    ...
     vid.job_status # "waiting"
-    ... 
+    ...
     vid.job_status # "processing"
     vid.video_encoded_files.collect { |v| [v.format, v.state] }
-    ... 
+    ...
     vid.job_status # "finished"
     vid.video_encoded_files.size # 4
     vid.video_encoded_file_thumbnails.size # 2
-    
+
 
 ## TODO
 
-* change name of `origin_url` column and make sure its added in the migrations
 * rake task to generate a working bucket policy (even if it has to be pasted in)
+* set timeouts on update_job
+* create DJ and/or Resque workers to handle job submission (should be optional dependencies though)
+* generator to install config/initializer
+* remove files from S3 when object is deleted
 * background jobs to update the ZC job progress, with events/notifications
+* use API v2 features to get more interesting info on job progress
 * is s3_url basename sanitization going to be good for non-ASCII filenames? no.
 
 ## License

data/lib/generators/zencodable/migration_generator.rb

@@ -24,11 +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"
-        end
+        migration_template 'zencodable_add_tracking_columns_and_tables.rb', "db/migrate/zencodable_add_tracking_columns_and_tables"
       end
 
     end

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

@@ -0,0 +1,33 @@
+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
+
+    create_table "<%= association_name %>" do |t|
+      t.string   "url"
+      t.string   "format"
+      t.integer  "zencoder_file_id"
+      t.integer  "<%= name.foreign_key %>"
+      t.datetime "created_at"
+      t.integer  "width"
+      t.integer  "height"
+      t.integer  "file_size"
+      t.string   "error_message"
+      t.string   "state"
+      t.timestamps
+    end
+
+    <% if !options.skip_thumbnails %>
+      create_table "<%= association_name.singularize %>_thumbnails" do |t|
+        t.string   "thumbnail_file_name"
+        t.string   "thumbnail_content_type"
+        t.integer  "thumbnail_file_size"
+        t.datetime "thumbnail_updated_at"
+        t.integer  "<%= name.foreign_key %>"
+        t.timestamps
+      end
+    <% end %>
+  end
+end

data/lib/zencodable/version.rb

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

data/test/debug.log

@@ -901,3 +901,357 @@ Unfinished job found. Updating details.
    (0.0ms)  SAVEPOINT active_record_1
    (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-02 21:23:00.609743' WHERE "videos"."id" = 1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (17.2ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Origin URL changed. Creating new ZenCoder job.
+ZenCoder job created, ID = 123
+   (0.2ms)  UPDATE "videos" SET "origin_url" = 'http://foo.com/1/2/4', "zencoder_job_id" = '123', "zencoder_job_status" = 'new', "zencoder_job_created" = '2011-12-02 21:47:37.303304', "updated_at" = '2011-12-02 21:47:37.303528' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "finished"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["duration_sec", 120], ["error_message", nil], ["file_size", 19293819], ["format", "webm"], ["height", 600], ["state", "finished"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["url", "http://parallaxp.s3.amazonaws.com/videos/zc/video-title/file.1.off"], ["video_id", 1], ["width", 800], ["zencoder_file_id", 12345329]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFile Load (0.2ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1 AND "video_files"."format" = 'webm' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "new"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'makin progress', "updated_at" = '2011-12-02 21:47:37.468334' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["duration_sec", nil], ["error_message", nil], ["file_size", nil], ["format", "flv"], ["height", nil], ["state", nil], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["url", "http://s3.com/6/7/8.flv"], ["video_id", 1], ["width", nil], ["zencoder_file_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-02 21:47:37.481324' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.7ms)  INSERT INTO "video_file_thumbnails" ("created_at", "thumbnail_content_type", "thumbnail_file_name", "thumbnail_file_size", "thumbnail_updated_at", "updated_at", "video_id") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["thumbnail_content_type", "png"], ["thumbnail_file_name", "http://s3.com/1/2/3.png"], ["thumbnail_file_size", nil], ["thumbnail_updated_at", nil], ["updated_at", Fri, 02 Dec 2011 21:47:37 UTC +00:00], ["video_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-02 21:47:37.502119' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (47.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Origin URL changed. Creating new ZenCoder job.
+ZenCoder job created, ID = 123
+   (0.2ms)  UPDATE "videos" SET "origin_url" = 'http://foo.com/1/2/4', "zencoder_job_id" = '123', "zencoder_job_status" = 'new', "zencoder_job_created" = '2011-12-02 21:48:06.791811', "updated_at" = '2011-12-02 21:48:06.792022' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "finished"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.2ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["duration_sec", 120], ["error_message", nil], ["file_size", 19293819], ["format", "webm"], ["height", 600], ["state", "finished"], ["updated_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["url", "http://parallaxp.s3.amazonaws.com/videos/zc/video-title/file.1.off"], ["video_id", 1], ["width", 800], ["zencoder_file_id", 12345329]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFile Load (0.2ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1 AND "video_files"."format" = 'webm' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "new"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.4ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'makin progress', "updated_at" = '2011-12-02 21:48:06.995664' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:48:06 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:07 UTC +00:00], ["duration_sec", nil], ["error_message", nil], ["file_size", nil], ["format", "flv"], ["height", nil], ["state", nil], ["updated_at", Fri, 02 Dec 2011 21:48:07 UTC +00:00], ["url", "http://s3.com/6/7/8.flv"], ["video_id", 1], ["width", nil], ["zencoder_file_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-02 21:48:07.006681' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:07 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Fri, 02 Dec 2011 21:48:07 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.8ms)  INSERT INTO "video_file_thumbnails" ("created_at", "thumbnail_content_type", "thumbnail_file_name", "thumbnail_file_size", "thumbnail_updated_at", "updated_at", "video_id") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 02 Dec 2011 21:48:07 UTC +00:00], ["thumbnail_content_type", "png"], ["thumbnail_file_name", "http://s3.com/1/2/3.png"], ["thumbnail_file_size", nil], ["thumbnail_updated_at", nil], ["updated_at", Fri, 02 Dec 2011 21:48:07 UTC +00:00], ["video_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-02 21:48:07.027814' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (74.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Origin URL changed. Creating new ZenCoder job.
+ZenCoder job created, ID = 123
+   (0.2ms)  UPDATE "videos" SET "origin_url" = 'http://foo.com/1/2/4', "zencoder_job_id" = '123', "zencoder_job_status" = 'new', "zencoder_job_created" = '2011-12-05 19:17:23.313278', "updated_at" = '2011-12-05 19:17:23.313506' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (2.4ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "finished"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["duration_sec", 120], ["error_message", nil], ["file_size", 19293819], ["format", "webm"], ["height", 600], ["state", "finished"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["url", "http://parallaxp.s3.amazonaws.com/videos/zc/video-title/file.1.off"], ["video_id", 1], ["width", 800], ["zencoder_file_id", 12345329]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFile Load (0.2ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1 AND "video_files"."format" = 'webm' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "new"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'makin progress', "updated_at" = '2011-12-05 19:17:23.517874' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["duration_sec", nil], ["error_message", nil], ["file_size", nil], ["format", "flv"], ["height", nil], ["state", nil], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["url", "http://s3.com/6/7/8.flv"], ["video_id", 1], ["width", nil], ["zencoder_file_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:17:23.536124' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.2ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.7ms)  INSERT INTO "video_file_thumbnails" ("created_at", "thumbnail_content_type", "thumbnail_file_name", "thumbnail_file_size", "thumbnail_updated_at", "updated_at", "video_id") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["thumbnail_content_type", "png"], ["thumbnail_file_name", "http://s3.com/1/2/3.png"], ["thumbnail_file_size", nil], ["thumbnail_updated_at", nil], ["updated_at", Mon, 05 Dec 2011 19:17:23 UTC +00:00], ["video_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:17:23.603967' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (22.2ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Origin URL changed. Creating new ZenCoder job.
+ZenCoder job created, ID = 123
+   (0.2ms)  UPDATE "videos" SET "origin_url" = 'http://foo.com/1/2/4', "zencoder_job_id" = '123', "zencoder_job_status" = 'new', "zencoder_job_created" = '2011-12-05 19:19:54.743676', "updated_at" = '2011-12-05 19:19:54.743899' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "finished"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["duration_sec", 120], ["error_message", nil], ["file_size", 19293819], ["format", "webm"], ["height", 600], ["state", "finished"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["url", "http://parallaxp.s3.amazonaws.com/videos/zc/video-title/file.1.off"], ["video_id", 1], ["width", 800], ["zencoder_file_id", 12345329]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFile Load (0.2ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1 AND "video_files"."format" = 'webm' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.6ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "new"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'makin progress', "updated_at" = '2011-12-05 19:19:54.961043' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.4ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.3ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["duration_sec", nil], ["error_message", nil], ["file_size", nil], ["format", "flv"], ["height", nil], ["state", nil], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["url", "http://s3.com/6/7/8.flv"], ["video_id", 1], ["width", nil], ["zencoder_file_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:19:54.978432' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_file_thumbnails" ("created_at", "thumbnail_content_type", "thumbnail_file_name", "thumbnail_file_size", "thumbnail_updated_at", "updated_at", "video_id") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["thumbnail_content_type", "png"], ["thumbnail_file_name", "http://s3.com/1/2/3.png"], ["thumbnail_file_size", nil], ["thumbnail_updated_at", nil], ["updated_at", Mon, 05 Dec 2011 19:19:54 UTC +00:00], ["video_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:19:55.000816' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (21.6ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:10 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:10 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Origin URL changed. Creating new ZenCoder job.
+ZenCoder job created, ID = 123
+   (0.2ms)  UPDATE "videos" SET "origin_url" = 'http://foo.com/1/2/4', "zencoder_job_id" = '123', "zencoder_job_status" = 'new', "zencoder_job_created" = '2011-12-05 19:22:10.914862', "updated_at" = '2011-12-05 19:22:10.915089' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:10 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:10 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "finished"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:10 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:10 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["duration_sec", 120], ["error_message", nil], ["file_size", 19293819], ["format", "webm"], ["height", 600], ["state", "finished"], ["updated_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["url", "http://parallaxp.s3.amazonaws.com/videos/zc/video-title/file.1.off"], ["video_id", 1], ["width", 800], ["zencoder_file_id", 12345329]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFile Load (0.4ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1 AND "video_files"."format" = 'webm' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "new"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'makin progress', "updated_at" = '2011-12-05 19:22:11.107726' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["duration_sec", nil], ["error_message", nil], ["file_size", nil], ["format", "flv"], ["height", nil], ["state", nil], ["updated_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["url", "http://s3.com/6/7/8.flv"], ["video_id", 1], ["width", nil], ["zencoder_file_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:22:11.120747' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.5ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.7ms)  INSERT INTO "video_file_thumbnails" ("created_at", "thumbnail_content_type", "thumbnail_file_name", "thumbnail_file_size", "thumbnail_updated_at", "updated_at", "video_id") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["thumbnail_content_type", "png"], ["thumbnail_file_name", "http://s3.com/1/2/3.png"], ["thumbnail_file_size", nil], ["thumbnail_updated_at", nil], ["updated_at", Mon, 05 Dec 2011 19:22:11 UTC +00:00], ["video_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:22:11.143948' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (18.7ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Origin URL changed. Creating new ZenCoder job.
+ZenCoder job created, ID = 123
+   (0.2ms)  UPDATE "videos" SET "origin_url" = 'http://foo.com/1/2/4', "zencoder_job_id" = '123', "zencoder_job_status" = 'new', "zencoder_job_created" = '2011-12-05 19:22:42.870261', "updated_at" = '2011-12-05 19:22:42.870534' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "finished"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["duration_sec", 120], ["error_message", nil], ["file_size", 19293819], ["format", "webm"], ["height", 600], ["state", "finished"], ["updated_at", Mon, 05 Dec 2011 19:22:42 UTC +00:00], ["url", "http://parallaxp.s3.amazonaws.com/videos/zc/video-title/file.1.off"], ["video_id", 1], ["width", 800], ["zencoder_file_id", 12345329]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFile Load (0.2ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1 AND "video_files"."format" = 'webm' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.1ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "new"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.2ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'makin progress', "updated_at" = '2011-12-05 19:22:43.070084' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "video_files" ("created_at", "duration_sec", "error_message", "file_size", "format", "height", "state", "updated_at", "url", "video_id", "width", "zencoder_file_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["duration_sec", nil], ["error_message", nil], ["file_size", nil], ["format", "flv"], ["height", nil], ["state", nil], ["updated_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["url", "http://s3.com/6/7/8.flv"], ["video_id", 1], ["width", nil], ["zencoder_file_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:22:43.083887' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.0ms)  INSERT INTO "videos" ("created_at", "origin_url", "title", "updated_at", "zencoder_job_created", "zencoder_job_finished", "zencoder_job_id", "zencoder_job_status") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["origin_url", nil], ["title", "At the Foo Bar"], ["updated_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["zencoder_job_created", nil], ["zencoder_job_finished", nil], ["zencoder_job_id", nil], ["zencoder_job_status", "processing"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Unfinished job found. Updating details.
+  VideoFile Load (0.1ms)  SELECT "video_files".* FROM "video_files" WHERE "video_files"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  VideoFileThumbnail Load (0.1ms)  SELECT "video_file_thumbnails".* FROM "video_file_thumbnails" WHERE "video_file_thumbnails"."video_id" = 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.7ms)  INSERT INTO "video_file_thumbnails" ("created_at", "thumbnail_content_type", "thumbnail_file_name", "thumbnail_file_size", "thumbnail_updated_at", "updated_at", "video_id") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["thumbnail_content_type", "png"], ["thumbnail_file_name", "http://s3.com/1/2/3.png"], ["thumbnail_file_size", nil], ["thumbnail_updated_at", nil], ["updated_at", Mon, 05 Dec 2011 19:22:43 UTC +00:00], ["video_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "videos" SET "zencoder_job_status" = 'finished', "updated_at" = '2011-12-05 19:22:43.113256' WHERE "videos"."id" = 1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1

data/test/dummy/tmp/db/migrate/{20111202214515_create_encoded_kitteh_vids.rb → 20111205192243_zencodable_add_tracking_columns_and_tables.rb}

@@ -1,5 +1,10 @@
-class CreateZencodableOutputFilesAssociationTable < ActiveRecord::Migration
+class AddZencoderJobTrackingColumns < ActiveRecord::Migration
   def change
+    add_column :kitteh_movies, :origin_url, :string
+    add_column :kitteh_movies, :zencoder_job_status, :string
+    add_column :kitteh_movies, :zencoder_job_created, :datetime
+    add_column :kitteh_movies, :zencoder_job_finished, :datetime
+
     create_table "encoded_kitteh_vids" do |t|
       t.string   "url"
       t.string   "format"
@@ -13,5 +18,7 @@ class CreateZencodableOutputFilesAssociationTable < ActiveRecord::Migration
       t.string   "state"
       t.timestamps
     end
+
+    
   end
 end

data/test/zencodable_generators_test.rb

@@ -9,19 +9,13 @@ class ZencodableGeneratorTest < Rails::Generators::TestCase
 
   test "creates a migration for the output files model" do
     run_generator %w(KittehMovie encoded_kitteh_vids)
-    assert_migration "db/migrate/create_encoded_kitteh_vids.rb" do |migration|
+    assert_migration "db/migrate/zencodable_add_tracking_columns_and_tables.rb" do |migration|
       assert_match /create_table "encoded_kitteh_vids"/, migration
       assert_match /t\.integer\s+\"kitteh_movie_id\"/, migration
-    end
-    assert_migration "db/migrate/create_encoded_kitteh_vids_thumbnails.rb" do |migration|
+
       assert_match /create_table "encoded_kitteh_vid_thumbnails"/, migration
       assert_match /t\.integer\s+\"kitteh_movie_id\"/, migration
-    end
-  end
 
-  test "creates a migration to add job tracking columns to the named model" do
-    run_generator %w(KittehMovie encoded_kitteh_vids)
-    assert_migration "db/migrate/add_zencoder_job_tracking_columns_to_kitteh_movies.rb" do |migration|
       assert_match /add_column :kitteh_movies, :origin_url, :string/, migration
       assert_match /add_column :kitteh_movies, :zencoder_job_status, :string/, migration
       assert_match /add_column :kitteh_movies, :zencoder_job_created, :datetime/, migration
@@ -31,8 +25,9 @@ class ZencodableGeneratorTest < Rails::Generators::TestCase
 
   test "does not create a migration for the thumbnails when --skip_thumbnails is given" do
     run_generator %w(KittehMovie encoded_kitteh_vids --skip-thumbnails)
-    assert_migration "db/migrate/create_encoded_kitteh_vids.rb"
-    assert_no_migration "db/migrate/create_encoded_kitteh_vids_thumbnails.rb"
+    assert_migration "db/migrate/zencodable_add_tracking_columns_and_tables.rb" do |migration|
+      assert_no_match /create_table "encoded_kitteh_vid_thumbnails"/, migration
+    end
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: zencodable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sam Beam
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2011-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -100,9 +100,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/generators/zencodable/migration_generator.rb
-- lib/generators/zencodable/templates/add_zencoder_job_tracking_columns.rb
-- lib/generators/zencodable/templates/create_association_table.rb
-- lib/generators/zencodable/templates/create_association_thumbnails_table.rb
+- lib/generators/zencodable/templates/zencodable_add_tracking_columns_and_tables.rb
 - lib/zencodable/version.rb
 - lib/zencodable.rb
 - MIT-LICENSE
@@ -150,13 +148,12 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/dummy/tmp/db/migrate/20111202214515_add_zencoder_job_tracking_columns_to_kitteh_movies.rb
-- test/dummy/tmp/db/migrate/20111202214515_create_encoded_kitteh_vids.rb
+- test/dummy/tmp/db/migrate/20111205192243_zencodable_add_tracking_columns_and_tables.rb
 - test/factories.rb
 - test/test_helper.rb
 - test/zencodable_generators_test.rb
 - test/zencodable_test.rb
-homepage: http://onsetcorps.net
+homepage: https://github.com/sbeam/zencodable
 licenses: []
 
 post_install_message: 
@@ -226,8 +223,7 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/dummy/tmp/db/migrate/20111202214515_add_zencoder_job_tracking_columns_to_kitteh_movies.rb
-- test/dummy/tmp/db/migrate/20111202214515_create_encoded_kitteh_vids.rb
+- test/dummy/tmp/db/migrate/20111205192243_zencodable_add_tracking_columns_and_tables.rb
 - test/factories.rb
 - test/test_helper.rb
 - test/zencodable_generators_test.rb

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

@@ -1,8 +0,0 @@
-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/generators/zencodable/templates/create_association_table.rb

@@ -1,17 +0,0 @@
-class CreateZencodableOutputFilesAssociationTable < ActiveRecord::Migration
-  def change
-    create_table "<%= association_name %>" do |t|
-      t.string   "url"
-      t.string   "format"
-      t.integer  "zencoder_file_id"
-      t.integer  "<%= name.foreign_key %>"
-      t.datetime "created_at"
-      t.integer  "width"
-      t.integer  "height"
-      t.integer  "file_size"
-      t.string   "error_message"
-      t.string   "state"
-      t.timestamps
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-class CreateZencodableOutputFilesAssociationTable < ActiveRecord::Migration
-  def change
-    create_table "<%= association_name.singularize %>_thumbnails" do |t|
-      t.string   "thumbnail_file_name"
-      t.string   "thumbnail_content_type"
-      t.integer  "thumbnail_file_size"
-      t.datetime "thumbnail_updated_at"
-      t.integer  "<%= name.foreign_key %>"
-      t.timestamps
-    end
-  end
-end

data/test/dummy/tmp/db/migrate/20111202214515_add_zencoder_job_tracking_columns_to_kitteh_movies.rb

@@ -1,8 +0,0 @@
-class AddZencoderJobTrackingColumns < ActiveRecord::Migration
-  def change
-    add_column :kitteh_movies, :origin_url, :string
-    add_column :kitteh_movies, :zencoder_job_status, :string
-    add_column :kitteh_movies, :zencoder_job_created, :datetime
-    add_column :kitteh_movies, :zencoder_job_finished, :datetime
-  end
-end