media_monster_client 2.0.4 → 2.0.5

data/lib/media_monster/job.rb

@@ -2,7 +2,6 @@ module MediaMonster
 
   class Job < Model
 
-    attr_accessor :id
     attr_accessor :priority     # Now supports a numeric value
     attr_accessor :job_type     # which type of job is this? audio to start, video, document, etc.
     attr_accessor :original     # file location

data/lib/media_monster/model.rb

@@ -2,6 +2,9 @@ module MediaMonster
 
   class Model
 
+    attr_accessor :id
+    attr_accessor :status
+
     def initialize(*args)
       return unless args
       if args[0].is_a?(Hash)

data/lib/media_monster_client.rb

@@ -26,36 +26,49 @@ module MediaMonsterClient
       job ||= MediaMonster::Job.new
       yield job
       job.tap do |j|
-        # puts "posting: #{j.to_json}"
-        j_str = post(create_url('jobs'), j.to_json, {'Accept'=>'application/json','Content-Type'=>'application/json'}).body
+        puts "posting: #{j.to_json}"
+        j_str = post(api_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'})
+
+    def update_job(job)
+      to_model(MediaMonster::Job, job).tap do |j|
+        puts "putting: #{j.to_json}"
+        put(model_url(j), j.to_json, {'Accept'=>'application/json','Content-Type'=>'application/json'})
+      end
     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'})
+      to_model(MediaMonster::Job, job).tap do |j|
+        put("#{model_url(j)}/retry", {}, {'Accept'=>'application/json'})
       end
     end
 
+    def update_task(task_id, task_status)
+      json = {'task'=>{'status'=>task_status}}.to_json
+      put(api_url("tasks/#{task_id.to_i}"), json, {'Accept'=>'application/json', 'Content-Type'=>'application/json'})
+    end    
+
     protected
 
-    def create_url(path)
+    def to_model(klass, param)
+      case param
+      when klass  then param
+      when Hash   then klass.new(param)
+      when Fixnum then klass.new(:id => param)
+      when String then klass.new(:id => param.to_i)
+      else klass.new(param)
+      end
+    end
+
+    def api_url(path)
       "/api/#{version}/#{path}"
     end
     
-    def retry_url(model)
-      "/api/#{version}/#{model.class.to_s.downcase.pluralize}/#{model.id}/retry"
+    def model_url(model)
+      api_url("#{model.class.to_s.demodulize.downcase.pluralize}/#{model.id}")
     end
 
     [:delete, :get, :head, :post, :put, :request].each do |method|
@@ -64,15 +77,15 @@ module MediaMonsterClient
       end
     end
 
+    def access_token
+      @access_token ||= OAuth::AccessToken.new(consumer)
+    end
+
     def consumer
       @consumer ||= OAuth::Consumer.new(key,
                                         secret,
-                                        :site               => "#{scheme || 'http'}://#{host}:#{port}",
-                                        :http_method        => :get)
-    end
-
-    def access_token
-      @access_token ||= OAuth::AccessToken.new(consumer)
+                                        :site        => "#{scheme || 'http'}://#{host}:#{port}",
+                                        :http_method => :get)
     end
 
   end

data/lib/media_monster_client/version.rb

@@ -1,3 +1,3 @@
 module MediaMonsterClient
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,131 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: media_monster_client
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.0.5
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 4
-  version: 2.0.4
 platform: ruby
-authors: 
+authors:
 - Andrew Kuklewicz (kookster)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-14 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: oauth
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: test-unit
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: fakeweb
-  version_requirements: *id007
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: client gem for media monster app
-email: 
+email:
 - andrew@prx.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -139,40 +143,30 @@ files:
 - media_monster_client.gemspec
 - test/helper.rb
 - test/test_media_monster_client.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: client gem for media monster app
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_media_monster_client.rb