dropio 3.0.0.pre5 → 3.0.0.pre6

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 3.0 / 2010-09-21
+
+* Bump httparty requirement to 0.6.
+* Remove methods referencing deprecated 3.0 API calls
+* Add conversion API methods
+
 === 1.7 / 2010-02-08
 
 * Added 0.5.2 as a requirement for httparty

data/Manifest

@@ -11,6 +11,7 @@ lib/dropio/api.rb
 lib/dropio/asset.rb
 lib/dropio/client.rb
 lib/dropio/drop.rb
+lib/dropio/job.rb
 lib/dropio/resource.rb
 lib/dropio/subscription.rb
 lib/dropio/version.rb

data/Rakefile

@@ -18,7 +18,7 @@ begin
     echoe.changelog = "History.rdoc"
     
     # TODO have this generated from Gemfile or vice versa
-    echoe.runtime_dependencies     = ["mime-types", "json", "httparty 0.6.1", "multipart-post"]
+    echoe.runtime_dependencies     = ["mime-types", "json", "httparty 0.6.1", "multipart-post 1.0.1"]
     echoe.development_dependencies = ["rspec", "diff-lcs", "fakeweb"]
     
     echoe.ignore_pattern = "tmtags"

data/dropio.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dropio}
-  s.version = "3.0.0.pre5"
+  s.version = "3.0.0.pre6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jake Good, Eric Skiff, Kunal Shah, Seth Thomas Rasmussen"]
-  s.date = %q{2010-08-31}
-  s.description = %q{A Ruby client library for the Drop.io Rich Media Backbone (RMB) API (http://backbone.drop.io). Please email support@dropio.com for any issues.}
+  s.date = %q{2010-09-21}
+  s.description = %q{A Ruby client library for the Drop.io Rich Media Backbone (RMB) API (http://backbone.drop.io). Please send all feedback to contact@dropio.com}
   s.email = ["jake@dropio.com", "eric@dropio.com", "kunal@dropio.com", "seth@dropio.com"]
   s.extra_rdoc_files = ["History.rdoc", "Readme.rdoc", "Todo.rdoc"]
-  s.files = ["Gemfile", "History.rdoc", "LICENSE.txt", "Manifest", "Rakefile", "Readme.rdoc", "Todo.rdoc", "dropio.gemspec", "lib/dropio.rb", "lib/dropio/api.rb", "lib/dropio/asset.rb", "lib/dropio/client.rb", "lib/dropio/drop.rb", "lib/dropio/resource.rb", "lib/dropio/subscription.rb", "lib/dropio/version.rb", "spec/dropio/api_spec.rb", "spec/dropio/asset_spec.rb", "spec/dropio/client_spec.rb", "spec/dropio/drop_spec.rb", "spec/dropio/subscription_spec.rb", "spec/dropio_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.files = ["Gemfile", "History.rdoc", "LICENSE.txt", "Manifest", "Rakefile", "Readme.rdoc", "Todo.rdoc", "dropio.gemspec", "lib/dropio.rb", "lib/dropio/api.rb", "lib/dropio/asset.rb", "lib/dropio/client.rb", "lib/dropio/drop.rb", "lib/dropio/job.rb", "lib/dropio/resource.rb", "lib/dropio/subscription.rb", "lib/dropio/version.rb", "spec/dropio/api_spec.rb", "spec/dropio/asset_spec.rb", "spec/dropio/client_spec.rb", "spec/dropio/drop_spec.rb", "spec/dropio/subscription_spec.rb", "spec/dropio_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/dropio/dropio}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Dropio", "--main", "Readme.rdoc"]
   s.require_paths = ["lib"]
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, ["= 0.6.1"])
-      s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
+      s.add_runtime_dependency(%q<multipart-post>, ["= 1.0.1"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<diff-lcs>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<httparty>, ["= 0.6.1"])
-      s.add_dependency(%q<multipart-post>, [">= 0"])
+      s.add_dependency(%q<multipart-post>, ["= 1.0.1"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<diff-lcs>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<httparty>, ["= 0.6.1"])
-    s.add_dependency(%q<multipart-post>, [">= 0"])
+    s.add_dependency(%q<multipart-post>, ["= 1.0.1"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<diff-lcs>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])

data/lib/dropio.rb

@@ -29,3 +29,5 @@ require 'dropio/resource'
 require 'dropio/drop'
 require 'dropio/asset'
 require 'dropio/subscription'
+require 'dropio/job'
+

data/lib/dropio/api.rb

@@ -22,8 +22,8 @@ class Dropio::Api
     self.class.get("/drops/#{drop_name}", :query => sign_if_needed({:token => token}))
   end
   
-  def manager_drops(manager_api_token, page = 1)
-    self.class.get("/accounts/drops", :query => sign_if_needed({:manager_api_token => manager_api_token, :page => page}))
+  def all_drops(page = 1)
+    self.class.get("/accounts/drops", :query => sign_if_needed({:page => page}))
   end
   
   def generate_drop_url(drop_name, token)
@@ -82,7 +82,7 @@ class Dropio::Api
         'format'            => 'json',
         'description'       => description,
         'version'           => Dropio::Config.version,
-        'convert_to'        => convert_to,
+        'conversion'        => convert_to,
         'pingback_url'      => pingback_url,
         'output_locations'  => locs
       }).merge('file'  => UploadIO.new(file, mime_type, file_path))
@@ -180,6 +180,14 @@ class Dropio::Api
     params[:signature]
   end
   
+  def job(id, drop_name, asset_name_or_id, token=nil)
+    self.class.get("/drops/#{drop_name}/assets/#{asset_name_or_id}/jobs/#{id}", :query => {:token => token})
+  end
+
+  def create_job(job = {})
+    self.class.post("/jobs",:body => job)
+  end
+  
   private
   
   def sign_request(params={})

data/lib/dropio/asset.rb

@@ -1,10 +1,8 @@
 class Dropio::Asset < Dropio::Resource
   
-  attr_accessor :drop, :name, :type, :title, :description, :filesize, :created_at,
-                :thumbnail, :status, :converted, :hidden_url, :pages, :duration, 
-                :artist, :track_title, :height, :width, :contents, :url,
-                :original_filename, :converted_filename, :can_download_original,
-                :large_thumbnail, :roles, :locations
+  attr_accessor :id, :drop, :name, :type, :title, :description, :filesize, :created_at, :status, 
+                :pages, :duration, :artist, :track_title, :height, :width, :contents, :url,
+                :roles, :locations
      
   # Finds a particular Asset by drop and asset name.
   def self.find(drop, name)

data/lib/dropio/client.rb

@@ -9,8 +9,8 @@ class Dropio::Client
     handle(:drop, self.service.drop(drop_name, token))
   end
   
-  def manager_drops(manager_api_token, page = 1)
-    handle(:drops, self.service.manager_drops(manager_api_token, page))
+  def all_drops(page = 1)
+    handle(:drops, self.service.all_drops(page))
   end
   
   def generate_drop_url(drop)
@@ -159,6 +159,14 @@ class Dropio::Client
     r["result"]
   end
   
+  def job(id, drop_name, asset_name_or_id, token=nil)
+    handle(:job, self.service.job(id, drop_name, asset_name_or_id, token))
+  end
+  
+  def create_job(job = {})
+    handle(:job, self.service.create_job(job))
+  end
+  
   private
   
   def handle(type, response)
@@ -173,6 +181,7 @@ class Dropio::Client
     when :assets then return response['assets'].collect{|a| Dropio::Asset.new(a)}
     when :subscription then return Dropio::Subscription.new(response)
     when :subscriptions then return response['subscriptions'].collect{|s| Dropio::Subscription.new(s)}
+    when :job then return Dropio::Job.new(response)
     when :response then return parse_response(response)
     end
   end

data/lib/dropio/drop.rb

@@ -19,9 +19,9 @@ class Dropio::Drop < Dropio::Resource
     Dropio::Resource.client.drop(name, token)
   end
   
-  # Finds all the drops associated with a manager account.
-  def self.find_manager_drops(manager_api_token, page = 1)
-    Dropio::Resource.client.manager_drops(manager_api_token, page)
+  # Finds all the drops associated with an API account by page
+  def self.find_all(page = 1)
+    Dropio::Resource.client.all_drops(page)
   end
   
   # Creates a drop with an +attributes+ hash.

data/lib/dropio/job.rb

@@ -0,0 +1,22 @@
+class Dropio::Job < Dropio::Resource
+  
+  attr_accessor :id, :job_type, :using, :inputs, :outputs, :pingback_url, :state
+  
+  # Finds a job for a drop and asset
+  def self.find(id,drop_name,asset_name_or_id, token=nil)
+    Dropio::Resource.client.job(id, drop_name, asset_name_or_id, token)
+  end
+
+  # Creates a job
+  def self.create(job_type,using,inputs,outputs,pingback_url=nil)
+    Dropio::Resource.client.create_job({
+      :job_type => job_type,
+      :using => using,
+      :inputs => inputs,
+      :outputs => outputs,
+      :pingback_url => pingback_url
+    })
+  end
+ 
+  
+end

data/lib/dropio/resource.rb

@@ -2,7 +2,7 @@ class Dropio::Resource
   
   def initialize(params = {})
     params.each do |key,val|
-      self.send("#{key}=", val) if self.respond_to? key
+      self.send("#{key}=", val) if self.respond_to?("#{key}=")
     end
   end
 

data/lib/dropio/version.rb

@@ -1,3 +1,3 @@
 module Dropio
-  VERSION = '3.0.0.pre2'
+  VERSION = '3.0.0.pre5'
 end

data/spec/dropio/asset_spec.rb

@@ -19,9 +19,8 @@ describe Dropio::Asset do
   
   it "should have the attributes of an Asset" do
     @asset.should respond_to(:drop, :name, :type, :title, :description, :filesize, :created_at,
-                  :thumbnail, :status, :converted, :hidden_url, :pages, :duration, :artist, 
-                  :track_title, :height, :width, :contents, :url, :original_filename, :converted_filename, 
-                  :large_thumbnail)
+                             :status, :pages, :duration, :artist, 
+                             :track_title, :height, :width, :contents, :url)
   end
   
   it "should save itself" do

data/spec/dropio/drop_spec.rb

@@ -20,6 +20,12 @@ describe Drop do
                   :password, :admin_password, :admin_email, :email_key)
   end
   
+  it "should find drops by api account" do
+   @client.should_receive(:handle).with(:drops,[@mydrop]).and_return([@mydrop])
+    @api.should_receive(:all_drops).with(1).and_return([@mydrop])
+    Drop.find_all.should == [@mydrop]
+  end
+  
   it "should find drops by name" do
     @client.should_receive(:handle).with(:drop,{}).and_return(@mydrop)
     @api.should_receive(:drop).with("mydrop", nil).and_return({})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dropio
 version: !ruby/object:Gem::Version 
-  hash: -1876988212
+  hash: -1876988211
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - pre5
-  version: 3.0.0.pre5
+  - pre6
+  version: 3.0.0.pre6
 platform: ruby
 authors: 
 - Jake Good, Eric Skiff, Kunal Shah, Seth Thomas Rasmussen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,12 +69,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -119,7 +121,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
-description: A Ruby client library for the Drop.io Rich Media Backbone (RMB) API (http://backbone.drop.io). Please email support@dropio.com for any issues.
+description: A Ruby client library for the Drop.io Rich Media Backbone (RMB) API (http://backbone.drop.io). Please send all feedback to contact@dropio.com
 email: 
 - jake@dropio.com
 - eric@dropio.com
@@ -147,6 +149,7 @@ files:
 - lib/dropio/asset.rb
 - lib/dropio/client.rb
 - lib/dropio/drop.rb
+- lib/dropio/job.rb
 - lib/dropio/resource.rb
 - lib/dropio/subscription.rb
 - lib/dropio/version.rb