enigmamachine 0.5.0 → 0.6.0

data/.autotest

@@ -0,0 +1,4 @@
+Autotest.add_hook :initialize do |at|
+ %w{ .sqlite3 }.each {|exception| at.add_exception(exception)}
+end
+

data/README.rdoc

@@ -45,8 +45,8 @@ Then check it out in your browser, at http://localhost:2002.  This web interface
 exists so that you can configure your enigmamachine easily, and check its status.
 
 Most of the time, though, your enigmamachine will be accessed not through a
-browser, but by your program's code.  Let's say you want your website to be able to
-enocode video.  You write the code for the video upload, so your web app can
+browser, but by your program's code.  Let's say you want your website to be able
+to encode video.  You write the code for the video upload, so your web app can
 receive the video. When the upload is complete, make an HTTP call something like this in your code:
 
  POST http://localhost:2002/videos
@@ -214,11 +214,10 @@ system).
 
 == Status
 
-This thing is still pre-release, but it is usable in a basic form now.
-
-I'm still working on getting the gem dependencies correct, so you may need to
-manually install a few things to get it to work.  You'll also need a working
-copy of ffmpeg available on your path.
+Enigmamachine should be considered beta quality code.  At the same time,
+crashes and bugs have been infrequent for us, and it's a simple system which
+is working well.  Please let us know of any bugs by filing an issue on the
+GitHub tracker.
 
 
 == Note on Patches/Pull Requests

data/Rakefile

@@ -10,15 +10,18 @@ begin
     gem.email = "dave@caprica"
     gem.homepage = "http://github.com/futurechimp/enigmamachine"
     gem.authors = ["Dave Hrycyszyn", "Dmitry Brazhkin"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "rack-test"
     gem.add_dependency "data_mapper", ">=1.0.2"
     gem.add_dependency "dm-sqlite-adapter", ">=1.0.2"
+    gem.add_dependency "state_machine", ">=0.9.4"
     gem.add_dependency "eventmachine", ">=0.12.10"
     gem.add_dependency "rack-flash"
     gem.add_dependency "ruby-debug"
     gem.add_dependency "sinatra", ">=1.0.0"
     gem.add_dependency "streamio-ffmpeg", ">=0.7.3"
     gem.add_dependency "thin"
+    gem.add_dependency "em-http-request"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/enigmamachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{enigmamachine}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Hrycyszyn", "Dmitry Brazhkin"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-11-01}
   s.default_executable = %q{enigmamachine}
   s.description = %q{A RESTful video encoder which you can use as either a front-end to ffmpeg or headless on a server.}
   s.email = %q{dave@caprica}
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".document",
+    ".autotest",
+     ".document",
      ".gitignore",
      "LICENSE",
      "README.rdoc",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/enigmamachine.rb",
      "lib/enigmamachine.sqlite3",
      "lib/enigmamachine/config.ru",
+     "lib/enigmamachine/download_queue.rb",
      "lib/enigmamachine/encoding_queue.rb",
      "lib/enigmamachine/models/encoder.rb",
      "lib/enigmamachine/models/encoding_task.rb",
@@ -76,52 +78,61 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/futurechimp/enigmamachine}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A RESTful video encoder.}
   s.test_files = [
-    "test/support/blueprints.rb",
-     "test/helper.rb",
-     "test/test_encoding_queue.rb",
-     "test/test_video.rb",
+    "test/test_encoding_queue.rb",
      "test/test_encoder.rb",
-     "test/test_enigmamachine.rb"
+     "test/test_video.rb",
+     "test/test_enigmamachine.rb",
+     "test/helper.rb",
+     "test/support/blueprints.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_runtime_dependency(%q<data_mapper>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<dm-sqlite-adapter>, [">= 1.0.2"])
+      s.add_runtime_dependency(%q<state_machine>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-debug>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<streamio-ffmpeg>, [">= 0.7.3"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
+      s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<data_mapper>, [">= 1.0.2"])
       s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.2"])
+      s.add_dependency(%q<state_machine>, [">= 0.9.4"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<rack-flash>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_dependency(%q<streamio-ffmpeg>, [">= 0.7.3"])
       s.add_dependency(%q<thin>, [">= 0"])
+      s.add_dependency(%q<em-http-request>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<data_mapper>, [">= 1.0.2"])
     s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.2"])
+    s.add_dependency(%q<state_machine>, [">= 0.9.4"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<rack-flash>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 1.0.0"])
     s.add_dependency(%q<streamio-ffmpeg>, [">= 0.7.3"])
     s.add_dependency(%q<thin>, [">= 0"])
+    s.add_dependency(%q<em-http-request>, [">= 0"])
   end
 end
 

data/lib/enigmamachine.rb

@@ -8,9 +8,10 @@ require 'eventmachine'
 require 'rack-flash'
 require 'dm-validations'
 require 'dm-migrations'
-require 'open3'
+require 'state_machine'
 require 'logger'
 require 'streamio-ffmpeg'
+require 'em-http-request'
 
 # Extensions to Sinatra
 #
@@ -24,6 +25,7 @@ require File.dirname(__FILE__) + '/enigmamachine/models/encoder'
 require File.dirname(__FILE__) + '/enigmamachine/models/encoding_task'
 require File.dirname(__FILE__) + '/enigmamachine/models/video'
 require File.dirname(__FILE__) + '/enigmamachine/encoding_queue'
+require File.dirname(__FILE__) + '/enigmamachine/download_queue'
 
 
 
@@ -38,7 +40,6 @@ class EnigmaMachine < Sinatra::Base
 
   configure :development do
     db = "sqlite3:///#{Dir.pwd}/enigmamachine.sqlite3"
-    DataMapper::Logger.new(STDOUT, :debug)
     DataMapper.setup(:default, db)
   end
 
@@ -60,9 +61,12 @@ class EnigmaMachine < Sinatra::Base
     unless File.exist? File.join(Dir.getwd, 'config.yml')
       FileUtils.cp(File.dirname(__FILE__) +  '/generators/config.yml', Dir.getwd)
     end
-    raw_config = File.read(Dir.getwd + "/config.yml")
-    @@username = YAML.load(raw_config)['username']
-    @@password = YAML.load(raw_config)['password']
+    config = YAML.load(File.read(Dir.getwd + "/config.yml"))
+    @@username = config['username']
+    @@password = config['password']
+    @@threads = config['threads']
+    @@enable_http_downloads = config['enable_http_downloads']
+    @@download_storage_path = config['download_storage_path']
   end
 
   # Set the views to the proper path inside the gem
@@ -93,12 +97,14 @@ class EnigmaMachine < Sinatra::Base
   # main Sinatra/thin thread once the periodic timer is added.
   #
   configure do
-    Video.reset_encoding_videos
     Thread.new do
       until EM.reactor_running?
         sleep 1
       end
-      queue = EncodingQueue.new
+      Video.reset_encoding_videos
+      Video.reset_downloading_videos
+      encode_queue = EncodingQueue.new
+      download_queue = DownloadQueue.new
     end
   end
 
@@ -110,6 +116,10 @@ class EnigmaMachine < Sinatra::Base
     [username, password] == [@@username, @@password]
   end
 
+  # Some accessors for config variables
+  #
+  cattr_accessor :download_storage_path, :enable_http_downloads, :threads
+
 
   # Shows the enigma status page.
   #
@@ -242,8 +252,10 @@ class EnigmaMachine < Sinatra::Base
   get '/videos' do
     @completed_videos = Video.complete
     @encoding_videos = Video.encoding
-    @videos_with_errors = Video.with_errors
+    @videos_with_errors = Video.with_encode_errors
     @unencoded_videos = Video.unencoded
+    @downloading_videos = Video.downloading
+    @waiting_for_download_videos = Video.waiting_for_download
     erb :'videos/index'
   end
 

data/lib/enigmamachine/download_queue.rb

@@ -0,0 +1,31 @@
+class DownloadQueue
+
+  # Adds a periodic timer to the Eventmachine reactor loop and immediately
+  # starts looking for videos to download.
+  #
+  def initialize
+    if EnigmaMachine.enable_http_downloads
+      EM.add_periodic_timer(5) do
+        download_next_video
+      end
+    end
+  end
+
+
+  # Gets the next waiting_for_download Video from the database and
+  # starts downloading it.
+  #
+  def download_next_video
+    if Video.waiting_for_download.count > 0 && Video.downloading.count == 0
+      video = Video.waiting_for_download.first
+      begin
+        puts "downloading video #{video.id}"
+        video.download!
+      rescue Exception => ex
+        # don't do anything just yet, until we set up logging properly.
+      end
+    end
+  end
+
+end
+

data/lib/enigmamachine/encoding_queue.rb

@@ -6,20 +6,19 @@ class EncodingQueue
   # starts looking for unencoded videos.
   #
   def initialize
-    @threads = YAML.load_file(Dir.getwd + '/config.yml')['threads'] if @threads.nil?
     EM.add_periodic_timer(5) {
       encode_next_video
     }
   end
 
 
-  # Gets the next unencoded Video from the database and starts encoding it.
+  # Gets the next unencoded Video from the database and starts encoding its file.
   #
   def encode_next_video
-    if Video.unencoded.count > 0 && ::Video.encoding.count < @threads
+    if Video.unencoded.count > 0 && Video.encoding.count < EnigmaMachine.threads
       video = Video.unencoded.first
       begin
-        video.encoder.encode(video)
+        video.encode!
       rescue Exception => ex
         # don't do anything just yet, until we set up logging properly.
       end

data/lib/enigmamachine/models/encoder.rb

@@ -19,39 +19,5 @@ class Encoder
   #
   has n, :encoding_tasks
 
-  # Kicks off an FFMpeg encode on a given video.
-  #
-  def encode(video)
-    ffmpeg(encoding_tasks.first, video)
-  end
-
-  private
-
-  # Shells out to ffmpeg and hits the given video with the parameters in the
-  # given task.  Will call itself recursively until all tasks in this encoder's
-  # encoding_tasks are completed.
-  #
-  def ffmpeg(task, video)
-    current_task_index = encoding_tasks.index(task)
-    movie = FFMPEG::Movie.new(video.file)
-    encoding_operation = proc {
-      video.update(:state => 'encoding')
-      movie.transcode(video.file + task.output_file_suffix, task.command) do |p|
-        puts p*100
-      end
-    }
-    completion_callback = proc {|result|
-      if task == encoding_tasks.last
-        video.update(:state => 'complete')
-        video.notify_complete
-      else
-        next_task_index = current_task_index + 1
-        next_task = encoding_tasks[next_task_index]
-        ffmpeg(next_task, video)
-      end
-    }
-    EventMachine.defer(encoding_operation, completion_callback)
-  end
-
 end
 

data/lib/enigmamachine/models/video.rb

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/encoder'
+require 'net/http'
+require 'uri'
 
 # A video which we want to encode.
 #
@@ -9,32 +11,74 @@ class Video
   #
   property :id, Serial
   property :file, String,  :required => true, :length => (1..510)
-  property :state, String, :required => true,
-    :length => (1..10), :default => 'unencoded'
   property :created_at, DateTime
   property :updated_at, DateTime
   property :encoder_id, Integer, :required => true
   property :callback_url, String
+  property :state, String
 
-  validates_with_method :file, :method => :check_file
+  # State machine transitions
+  #
+  state_machine do
+
+    # State transitions for HTTP-hosted videos
+    after_transition :on => :download, :do => :do_download
+
+    # States for videos on the local filesystem
+    after_transition :on => :encode, :do => :do_encode
+    after_transition :on => :complete, :do => :notify_complete
+
+    event :download do
+      transition :waiting_for_download => :downloading
+    end
+
+    event :download_complete do
+      transition :downloading => :unencoded
+    end
+
+    event :download_error do
+      transition :downloading =>  :download_error
+    end
+
+    event :reset_download do
+      transition :downloading => :waiting_for_download
+    end
+
+    event :encode do
+      transition :unencoded => :encoding
+    end
+
+    event :complete do
+      transition :encoding => :complete
+    end
+
+    event :reset do
+      transition :encoding => :unencoded
+    end
+
+    event :encode_error do
+      transition :encoding => :encode_error
+    end
+
+  end
+
+  # Validations
+  #
   validates_uniqueness_of :file, :scope => :encoder_id,
     :message => "Same file with same encoder already exists"
+  validates_with_method :file, :method => :check_file
+
+  # Associations
+  #
   belongs_to :encoder
 
+  # Filters
+  #
   before :destroy, :check_destroy
+  before :create, :set_initial_state
 
   default_scope(:default).update(:order => [:created_at.asc])
 
-  # Notifies a calling application that processing has completed by sending
-  # a GET request to the video's callback_url.
-  #
-  def notify_complete
-    begin
-      Net::HTTP.get(URI.parse(video.callback_url)) unless callback_url.nil?
-    rescue
-    end
-  end
-
 
   # Named scope for all videos which are waiting to start encoding.
   #
@@ -51,8 +95,8 @@ class Video
 
   # Named scope giving back all videos with encoding errors.
   #
-  def self.with_errors
-    all(:state => 'error')
+  def self.with_encode_errors
+    all(:state => 'encode_error')
   end
 
   # Named scope giving back all videos which have completed encoding.
@@ -61,6 +105,18 @@ class Video
     all(:state => 'complete', :order => [:updated_at.desc])
   end
 
+  # Named scope returning all videos which are not yet downloaded.
+  #
+  def self.waiting_for_download
+    all(:state => 'waiting_for_download')
+  end
+
+  # Named scope returning all videos which currently downloading.
+  #
+  def self.downloading
+    all(:state => 'downloading')
+  end
+
   # Resets all videos currently marked as "encoding" to state "unencoded"
   # which is the initial state.
   #
@@ -70,34 +126,138 @@ class Video
   #
   def self.reset_encoding_videos
     Video.encoding.each do |video|
-      video.state = "unencoded"
-      video.save!
+      video.reset!
+    end
+  end
+
+  def self.reset_downloading_videos
+    Video.downloading.each do |video|
+      puts "resetting video #{video.id}"
+      video.reset_download!
     end
   end
 
   private
 
+  # Validation checks for files - we want to ensure that the video file exists,
+  # and that it can be encoded by ffmpeg.
+  #
   def check_file
-    return [false, "Give a file name, not nil"] if self.file.nil?
-    return [false, "Give a file name, not a blank string"] if self.file.to_s.empty?
-    return [false, "#{self.file} does not exist"] unless File.exist? self.file
-    return [false, "#{self.file} is a directory"] if File.directory? self.file
-    movie = FFMPEG::Movie.new(self.file)
-    return [false, "#{self.file} is not a media file"] unless movie.valid?
+    if local?
+      return [false, "Give a file name, not nil"] if self.file.nil?
+      return [false, "Give a file name, not a blank string"] if self.file.to_s.empty?
+      return [false, "#{self.file} does not exist"] unless File.exist? self.file
+      return [false, "#{self.file} is a directory"] if File.directory? self.file
+      movie = FFMPEG::Movie.new(self.file)
+      return [false, "#{self.file} is not a media file"] unless movie.valid?
+    end
     return true
   end
 
+  # Returns true unless the video's file starts with 'http://'
+  #
+  def set_initial_state
+    if local?
+      self.state = "unencoded"
+    else
+      self.state = "waiting_for_download"
+    end
+  end
+
+  # Checks whether a video object can be destroyed - videos cannot be destroyed
+  # if they are currently encoding.
+  #
   def check_destroy
     return true if (self.state != 'encoding')
-    encoder = Encoder.get(self.encoder_id)
     return true if stop_encode
     throw :halt
   end
 
+  # Would stop the encoder process if it was implemented.  Currently does nothing
+  # and returns false.
+  #
   def stop_encode
     return false
     #TODO Kill the encoder process
   end
 
+  # Tells this video's encoder to start encoding tasks.
+  #
+  def do_encode
+    ffmpeg(encoder.encoding_tasks.first)
+  end
+
+  # Shells out to ffmpeg and hits the given video with the parameters in the
+  # given task.  Will call itself recursively until all tasks in the encoder's
+  # encoding_tasks are completed.
+  #
+  def ffmpeg(task)
+    current_task_index = encoder.encoding_tasks.index(task)
+    movie = FFMPEG::Movie.new(file_to_encode)
+    encoding_operation = proc do
+      movie.transcode(file_to_encode + task.output_file_suffix, task.command)
+    end
+
+    completion_callback = proc do |result|
+      if task == encoder.encoding_tasks.last
+        self.complete!
+      else
+        next_task_index = current_task_index + 1
+        next_task = encoder.encoding_tasks[next_task_index]
+        ffmpeg(next_task)
+      end
+    end
+
+    EventMachine.defer(encoding_operation, completion_callback)
+  end
+
+  # Notifies a calling application that processing has completed by sending
+  # a GET request to the video's callback_url.
+  #
+  def notify_complete
+    EventMachine::HttpRequest.new(callback_url).get :timeout => 10 unless callback_url.nil?
+  end
+
+  # Downloads a video from a remote location via HTTP
+  #
+  def do_download
+    FileUtils.rm(file_to_encode, :force => true)
+    FileUtils.mkdir_p(File.dirname(file_to_encode))
+    http = EventMachine::HttpRequest.new(file).get :timeout => 10
+
+    http.stream do |data|
+      puts "what is status?: " + http.response_header.status.to_s
+      File.open(file_to_encode, 'a') {|f| f.write(data) }
+    end
+
+    http.callback do
+      download_complete!
+    end
+
+    http.errback do
+      download_error!
+    end
+  end
+
+  # Returns false if the video is available via http
+  #
+  def local?
+    return false if self.file =~ /^http:\/\//
+    return true
+  end
+
+  # If the file is local, this just returns its location. If it's not local,
+  # it builds a path to the file based on your config.yml + the video's id and
+  # returns that.
+  #
+  def file_to_encode
+    if local?
+      return file
+    else
+      filename = File.basename(URI.parse(file).path)
+      return File.join(EnigmaMachine.download_storage_path, self.id.to_s, filename)
+    end
+  end
+
 end
 

data/lib/enigmamachine/views/videos/index.erb

@@ -34,6 +34,20 @@
       </ul>
     <% end %>
 
+    <% unless @downloading_videos.empty? %>
+      <h2>Failed to encode</h2>
+      <ul>
+        <%= partial :"videos/video", :collection => @downloading_videos %>
+      </ul>
+    <% end %>
+
+    <% unless @waiting_for_download_videos.empty? %>
+      <h2>Failed to encode</h2>
+      <ul>
+        <%= partial :"videos/video", :collection => @waiting_for_download_videos %>
+      </ul>
+    <% end %>
+
   </div>
 </div>
 

data/lib/generators/config.yml

@@ -1,3 +1,6 @@
 username: admin
 password: admin
 threads: 1
+enable_http_downloads: false
+download_storage_path: /path/to/where/downloads/should/end/up
+

data/test/helper.rb

@@ -42,3 +42,7 @@ def encode_credentials(username, password)
   "Basic " + Base64.encode64("#{username}:#{password}")
 end
 
+def http_file_location
+  "http://foo.org/bar/blah.wmv"
+end
+

data/test/support/blueprints.rb

@@ -2,22 +2,11 @@ require 'machinist/data_mapper'
 require 'faker'
 require 'sham'
 
+
 Encoder.blueprint do
   name { Faker::Name.name }
 end
 
-Video.blueprint do
-  encoder
-  file { File.dirname(__FILE__) + "/afile.mpg" }
-  state { "unencoded" }
-  created_at DateTime.now
-  updated_at DateTime.now
-end
-
-Video.blueprint(:with_callback) do
-  callback_url { "http://example.com/call/back/id" }
-end
-
 EncodingTask.blueprint do
   name { "320x240 flv"}
   output_file_suffix { ".foo.flv" }
@@ -31,3 +20,19 @@ EncodingTask.blueprint(:with_encoder) do
   encoder
 end
 
+Video.blueprint do
+  encoder
+  file { File.dirname(__FILE__) + "/afile.mpg" }
+  state { "unencoded" }
+  created_at DateTime.now
+  updated_at DateTime.now
+end
+
+Video.blueprint(:http) do
+  file { http_file_location }
+end
+
+Video.blueprint(:with_callback) do
+  callback_url { "http://example.com/call/back/id" }
+end
+

data/test/test_encoder.rb

@@ -5,7 +5,7 @@ class TestEncoder <  Test::Unit::TestCase
   context "An Encoder instance" do
 
     setup do
-      @encoder = ::Encoder.make
+      @encoder = Encoder.make
     end
 
     should "be invalid without a name" do
@@ -28,18 +28,19 @@ class TestEncoder <  Test::Unit::TestCase
     context "hitting the ffmpeg method" do
       context "for an encoder with 1 task" do
         setup do
-          video = Video.make
+          @video = Video.make
           task = EncodingTask.make
-          video.encoder.encoding_tasks << task
-          video.encoder.save
-          video.encoder.encode(video)
-          @id = video.id
+          @video.encoder.encoding_tasks << task
+          @video.encoder.save
+          @video.encode!
+          @id = @video.id
           sleep 1
         end
 
-        should "mark the video as encoding" do
-          video = Video.get(@id)
-          assert_equal "encoding", video.state
+        should "create the file specified in the encoder's first encoding task" do
+          suffix = @video.encoder.encoding_tasks.first.output_file_suffix
+          file = @video.file + suffix
+          assert File.exist? file
         end
 
         should_eventually "mark the video as complete" do
@@ -56,22 +57,15 @@ class TestEncoder <  Test::Unit::TestCase
           task = EncodingTask.make
           2.times { video.encoder.encoding_tasks << EncodingTask.make }
           video.encoder.save
-          video.encoder.encode(video)
+          video.encode!
           @id = video.id
         end
 
-        should "mark the video as encoding" do
-          sleep 1
-          video = Video.get(@id)
-          assert_equal "encoding", video.state
-        end
-
         should_eventually "mark the video as complete" do
           sleep 1
           video = Video.get(@id)
           assert_equal "complete", video.state
         end
-
       end
 
     end

data/test/test_enigmamachine.rb

@@ -18,7 +18,7 @@ class TestEnigmamachine < Test::Unit::TestCase
       get '/', {}, basic_auth_creds
     end
 
-    should "respond" do
+    should "work" do
       assert last_response.ok?
     end
 

data/test/test_video.rb

@@ -6,36 +6,36 @@ class TestVideo <  Test::Unit::TestCase
   context "A Video instance" do
 
     should "be invalid with a bad file path" do
-      resource = ::Video.make
-      resource.file = ""
-      assert(!resource.valid?, "must not be empty")
-      resource.file = nil
-      assert(!resource.valid?, "must not be nil")
-      resource.file = "/fdfdf/sfdsdfsd/fse.gfr"
-      assert(!resource.valid?, "must be exist")
-      resource.file = File.dirname(__FILE__)
-      assert(!resource.valid?, "must not be a directory")
-      resource.file = __FILE__
-      assert(!resource.valid?, "must be media file")
+      video = Video.make
+      video.file = ""
+      assert(!video.valid?, "must not be empty")
+      video.file = nil
+      assert(!video.valid?, "must not be nil")
+      video.file = "/fdfdf/sfdsdfsd/fse.gfr"
+      assert(!video.valid?, "must exist")
+      video.file = File.dirname(__FILE__)
+      assert(!video.valid?, "must not be a directory")
+      video.file = __FILE__
+      assert(!video.valid?, "must be media file")
     end
 
     should "be valid without a callback_url" do
-      resource = ::Video.make
-      resource.callback_url = ""
-      assert resource.valid?
-      resource.callback_url = nil
-      assert resource.valid?
+      video = Video.make
+      video.callback_url = ""
+      assert video.valid?
+      video.callback_url = nil
+      assert video.valid?
     end
 
     should "be valid with a callback_url" do
-      resource = ::Video.make
-      resource.callback_url = "blah"
-      assert resource.valid?
+      video = Video.make
+      video.callback_url = "blah"
+      assert video.valid?
     end
 
     should "be valid with a correct file path" do
-      resource = ::Video.make
-      assert resource.valid?
+      video = ::Video.make
+      assert video.valid?
     end
 
     should "belong to an Encoder" do
@@ -51,6 +51,60 @@ class TestVideo <  Test::Unit::TestCase
       end
     end
 
+    context "on a local filesystem" do
+      setup do
+        @video = Video.make
+      end
+
+      should "have an initial state of 'unencoded'" do
+        assert_equal("unencoded", @video.state)
+      end
+
+      should "transition to state 'encoding' on 'encode!' command" do
+        @video.encode!
+        assert_equal("encoding", @video.state)
+      end
+
+      should "transition to state 'unencoded' on 'reset!' command" do
+        @video.encode!
+        @video.reset!
+        assert_equal("unencoded", @video.state)
+      end
+
+    end
+
+    context "available via http" do
+      setup do
+        @video = Video.make(:http)
+      end
+
+      should "have an initial state of 'waiting_for_download'" do
+        assert_equal("waiting_for_download", @video.state)
+      end
+
+      context "for the download! event" do
+        setup do
+          EventMachine.run do
+            EventMachine::MockHttpRequest.use {
+              EventMachine::HttpRequest.register_file(http_file_location, :get, '/home/dave/workspace/enigmamachine/test/support/afile.mpg')
+            }
+            @video.download!
+            EventMachine.stop
+          end
+        end
+
+        should_eventually "transition to state 'downloading'" do
+          assert_equal("downloading", @video.state)
+        end
+
+        should_eventually "hit the download URL once" do
+          EventMachine::MockHttpRequest.activate!
+          assert_equal(1, EventMachine::HttpRequest.count(http_file_location, :get))
+          EventMachine::MockHttpRequest.deactivate!
+        end
+
+      end
+    end
   end
 
   context "The Video class" do
@@ -81,40 +135,40 @@ class TestVideo <  Test::Unit::TestCase
       end
     end
 
-    context "when try to delete any kind of videos from base" do
+    context "deleting videos" do
       setup do
         clear_videos
         5.times { Video.make }
       end
 
-      should "be delete an unencoded videos" do
+      should "delete an unencoded video" do
         count = Video.unencoded.count
         2.times { Video.unencoded.first.destroy }
         assert_equal count - 2, Video.unencoded.count
       end
 
-      should "be delete a completed videos" do
+      should "delete a completed video" do
         3.times { Video.unencoded.first.update(:state => "complete") }
         count = Video.complete.count
         2.times { Video.complete.first.destroy }
         assert_equal count - 2, Video.complete.count
       end
 
-      should "be delete a videos with errors" do
-        3.times { Video.unencoded.first.update(:state => "error") }
-        count = Video.with_errors.count
-        2.times { Video.with_errors.first.destroy  }
-        assert_equal count - 2, Video.with_errors.count
+      should "delete videos with errors" do
+        3.times { Video.unencoded.first.update(:state => "encode_error") }
+        count = Video.with_encode_errors.count
+        2.times { Video.with_encode_errors.first.destroy  }
+        assert_equal count - 2, Video.with_encode_errors.count
       end
 
-      should "not be delete an encoding videos" do
+      should "not delete an encoding video" do
         3.times { Video.unencoded.first.update(:state => "encoding") }
         count = Video.encoding.count
         2.times { Video.encoding.first.destroy }
         assert_equal count, Video.encoding.count
       end
 
-      should "be hard delete an encoding videos" do
+      should "allow force destroy of an encoding video" do
         3.times { Video.unencoded.first.update(:state => "encoding") }
         count = Video.encoding.count
         2.times { Video.encoding.first.destroy! }
@@ -128,13 +182,21 @@ class TestVideo <  Test::Unit::TestCase
     end
 
     should "be able to grab all videos with errors" do
-      assert Video.respond_to? "with_errors"
+      assert Video.respond_to? "with_encode_errors"
     end
 
     should "be able to grab all videos that are encoding" do
       assert Video.respond_to? "encoding"
     end
 
+    should "be able to grab all videos that are not yet downloaded" do
+      assert Video.respond_to? "waiting_for_download"
+    end
+
+    should "be able to grab all videos that are downloading" do
+      assert Video.respond_to? "downloading"
+    end
+
   end
 
   def clear_videos

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enigmamachine
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Dave Hrycyszyn
@@ -15,127 +16,189 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2010-11-01 00:00:00 +00:00
 default_executable: enigmamachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: data_mapper
+  name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: data_mapper
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
         - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-sqlite-adapter
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
         - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: state_machine
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
         - 10
         version: 0.12.10
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-flash
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: streamio-ffmpeg
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 7
         - 3
         version: 0.7.3
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id012
 description: A RESTful video encoder which you can use as either a front-end to ffmpeg or headless on a server.
 email: dave@caprica
 executables: 
@@ -146,6 +209,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .autotest
 - .document
 - .gitignore
 - LICENSE
@@ -157,6 +221,7 @@ files:
 - lib/enigmamachine.rb
 - lib/enigmamachine.sqlite3
 - lib/enigmamachine/config.ru
+- lib/enigmamachine/download_queue.rb
 - lib/enigmamachine/encoding_queue.rb
 - lib/enigmamachine/models/encoder.rb
 - lib/enigmamachine/models/encoding_task.rb
@@ -209,30 +274,34 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A RESTful video encoder.
 test_files: 
-- test/support/blueprints.rb
-- test/helper.rb
 - test/test_encoding_queue.rb
-- test/test_video.rb
 - test/test_encoder.rb
+- test/test_video.rb
 - test/test_enigmamachine.rb
+- test/helper.rb
+- test/support/blueprints.rb