media_monster_client 2.0.1 → 2.0.2

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.DS_Store

data/lib/media_monster/job.rb

@@ -3,9 +3,11 @@ module MediaMonster
   class Job < Model
 
     attr_accessor :job_type # which type of job is this? audio to start, video, document, etc.
+    attr_accessor :priority # curently supports blank and 'high'
     attr_accessor :original # file location
     attr_accessor :call_back  # url for webhook
     attr_accessor :tasks  # array of tasks
+    attr_accessor :id
 
     def initialize(*args)
       super
@@ -36,6 +38,10 @@ module MediaMonster
       end
       @tasks << new_task
     end
+    
+    def retry!
+      MediaMonsterClient.retry_job self
+    end
 
   end
 

data/lib/media_monster_client/version.rb

@@ -1,3 +1,3 @@
 module MediaMonsterClient
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/media_monster_client.rb

@@ -25,19 +25,37 @@ module MediaMonsterClient
     def create_job(job=nil)
       job ||= MediaMonster::Job.new
       yield job
-      post(create_url("jobs"), job.to_json, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
+      job.tap do |j|
+        j_str = post(create_url('jobs'), j.to_json, {'Accept'=>'application/json','Content-Type'=>'application/json'}).body
+        json  = JSON.parse(j_str)
+        j.id  = json['job']['id']
+      end
     end
     
     def update_task(task_id, task_status)
       json = {'task'=>{'status'=>task_status}}.to_json
       put(create_url("tasks/#{task_id.to_i}"), json, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
     end
+    
+    def retry_job(job)
+      case job
+      when MediaMonster::Job then job
+      when Fixnum then MediaMonster::Job.new(:id => job)
+      when String then MediaMonster::Job.new(:id => job.to_i)   
+      end.tap do |j|
+        post(retry_url(j), {}, {'Accept'=>'application/json'})
+      end
+    end
 
     protected
 
     def create_url(path)
       "/api/#{version}/#{path}"
     end
+    
+    def retry_url(model)
+      "/api/#{version}/#{model.class.to_s.downcase.pluralize}/#{model.id}/retry"
+    end
 
     [:delete, :get, :head, :post, :put, :request].each do |method|
       define_method method do |*args|

data/media_monster_client.gemspec

@@ -12,13 +12,16 @@ Gem::Specification.new do |s|
   s.summary     = %q{client gem for media monster app}
   s.description = %q{client gem for media monster app}
 
-  s.rubyforge_project = "media_monster_client"
-
-  s.add_dependency("activesupport")
-  s.add_dependency("oauth")
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  
+  s.add_runtime_dependency("activesupport")
+  s.add_runtime_dependency("oauth")
+  
+  s.add_development_dependency "rake"
+  s.add_development_dependency "test-unit"
+  s.add_development_dependency 'fakeweb'
+  
 end

data/test/test_media_monster_client.rb

@@ -4,6 +4,7 @@
 # gem 'activesupport', '=3.0.9'
 
 require 'helper'
+require 'fakeweb'
 
 class TestMediaMonsterClient < Test::Unit::TestCase
 
@@ -13,49 +14,70 @@ class TestMediaMonsterClient < Test::Unit::TestCase
     MediaMonsterClient.host    = "development.prx.org"
     MediaMonsterClient.port    = 3000
     MediaMonsterClient.version = 'v1'
+
+    # FakeWeb.register_uri(:post, "http://development.prx.org:3000/api/v1/jobs", :body => MediaMonster::Job.new(:id=>123).to_json)
   end
 
-  def test_create_job
+  def test_create_job_with_hash_original
     response = MediaMonsterClient.create_job do |job|
       job.job_type = 'audio'
-      job.original = 's3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test.mp2'
+      job.priority = 'high'
+      job.original = {:url=>'s3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test.mp2', :format=>'mp2'}
       job.call_back = "http://development.prx.org:3001/audio_files/21/transcoded"
-  
       job.add_task( 'transcode',
                     {:format=>'mp3', :sample_rate=>'44100', :bit_rate=>'128'},
-                    's3://development.tcf.prx.org/public/audio_files/21/test.mp3',
+                    's3://development.tcf.prx.org/public/audio_files/21/test_AK.mp3',
                     nil,
                     'download')
   
     end
-    
     puts response.inspect
-  
+
+    assert !response.id.blank?
   end 
-  
-  def test_create_job_with_sequence
-    response = MediaMonsterClient.create_job do |job|
-      job.job_type = 'audio'
-      job.original = 's3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test.mp2'
-      job.call_back = "http://development.prx.org:3001/audio_files/21/transcoded"
-  
-      job.add_sequence do |s|
-        s.call_back = "http://development.prx.org:3001/audio_files/21/transcoded"
-        s.label = 'preview'
-  
-        s.add_task( :task_type=>'cut',
-                    :options=>{:length=>4, :fade=>1},
-                    :label=>'cut it')
-  
-        s.add_task( :task_type=>'transcode',
-                    :options=>{:format=>'mp3', :sample_rate=>'44100', :bit_rate=>'64'},
-                    :label=>'mp3',
-                    :result=>'s3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test_preview.mp3')
-      end
-  
-    end
-    puts response.inspect
-  end
+
+  # 
+  # def test_create_job
+  #   response = MediaMonsterClient.create_job do |job|
+  #     job.job_type = 'audio'
+  #     job.original = 's3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test.mp2'
+  #     job.call_back = "http://development.prx.org:3001/audio_files/21/transcoded"
+  # 
+  #     job.add_task( 'transcode',
+  #                   {:format=>'mp3', :sample_rate=>'44100', :bit_rate=>'128'},
+  #                   's3://development.tcf.prx.org/public/audio_files/21/test.mp3',
+  #                   nil,
+  #                   'download')
+  # 
+  #   end
+  #   
+  #   puts response.inspect
+  # 
+  # end 
+  # 
+  # def test_create_job_with_sequence
+  #   response = MediaMonsterClient.create_job do |job|
+  #     job.job_type = 'audio'
+  #     job.original = 's3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test.mp2'
+  #     job.call_back = "http://development.prx.org:3001/audio_files/21/transcoded"
+  # 
+  #     job.add_sequence do |s|
+  #       s.call_back = "http://development.prx.org:3001/audio_files/21/transcoded"
+  #       s.label = 'preview'
+  # 
+  #       s.add_task( :task_type=>'cut',
+  #                   :options=>{:length=>4, :fade=>1},
+  #                   :label=>'cut it')
+  # 
+  #       s.add_task( :task_type=>'transcode',
+  #                   :options=>{:format=>'mp3', :sample_rate=>'44100', :bit_rate=>'64'},
+  #                   :label=>'mp3',
+  #                   :result=>'s3://development.tcf.prx.org/public/uploads/entry_audio_files/2/test_preview.mp3')
+  #     end
+  # 
+  #   end
+  #   puts response.inspect
+  # end
 
     # MediaMonsterClient.create_job do |job|
     #   job.job_type = 'audio'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: media_monster_client
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Andrew Kuklewicz (kookster)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -04:00
+date: 2012-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,48 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: client gem for media monster app
 email: 
 - andrew@prx.org
@@ -98,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: media_monster_client
+rubyforge_project: 
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3