dropio 1.0.8 → 1.0.10

data/dropio.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dropio}
-  s.version = "1.0.8"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jake Good"]

data/lib/dropio.rb

@@ -1,5 +1,5 @@
 module Dropio
-  VERSION = '1.0.='
+  VERSION = '1.0.10'
   
   class MissingResourceError < Exception; end
   class AuthorizationError < Exception; end

data/lib/dropio/api.rb

@@ -50,18 +50,18 @@ class Dropio::Api
     self.class.post("/drops/#{drop_name}/assets", :body => {:url => url, :title => title, :description => description, :token => token})
   end
 
-  def create_note(drop_name, contents, title = nil, token = nil)
-    params = {:contents => contents, :title => title, :token => token}
+  def create_note(drop_name, contents, title = nil, description = nil, token = nil)
+    params = {:contents => contents, :title => title, :token => token, :description => description}
     self.class.post("/drops/#{drop_name}/assets", :body => params)
   end
 
-  def add_file(drop_name, file_path, convert_to = nil, pingback_url = nil, comment = nil, token = nil)
+  def add_file(drop_name, file_path, description = nil, convert_to = nil, pingback_url = nil, comment = nil, token = nil)
     url = URI.parse("http://assets.drop.io/upload/")
     r = nil
     File.open(file_path) do |file|
       mime_type = (MIME::Types.type_for(file_path)[0] || MIME::Types["application/octet-stream"][0])
       req = Net::HTTP::Post::Multipart.new url.path,
-      { 'api_key' => self.class.default_params[:api_key], 'drop_name' => drop_name, 'format' => 'json',
+      { 'api_key' => self.class.default_params[:api_key], 'drop_name' => drop_name, 'format' => 'json', 'description' => description,
         'token' => token, 'version' => '2.0', 'convert_to' => convert_to, 'pingback_url' => pingback_url,
         'comment' => comment, 'file' => UploadIO.new(file, mime_type, file_path) }
       http = Net::HTTP.new(url.host, url.port)
@@ -71,12 +71,12 @@ class Dropio::Api
     (r.nil? or r.body.nil? or r.body.empty?) ? [] : HTTParty::Response.new(Crack::JSON.parse(r.body), r.body, r.code, r.message, r.to_hash)
   end
   
-  def add_file_from_url(drop_name, url, convert_to = nil, pingback_url = nil, token = nil)
-    self.class.post("/drops/#{drop_name}/assets", :body => {:token => token, :file_url => url, :convert_to => convert_to, :pingback_url => pingback_url})
+  def add_file_from_url(drop_name, url, description = nil, convert_to = nil, pingback_url = nil, token = nil)
+    self.class.post("/drops/#{drop_name}/assets", :body => {:token => token, :file_url => url, :description => description, :convert_to => convert_to, :pingback_url => pingback_url})
   end
 
   def assets(drop_name, page = 1, order = :oldest, token = nil)
-    self.class.get("/drops/#{drop_name}/assets", :query => {:token => token, :page => page, :order => order.to_s})
+    self.class.get("/drops/#{drop_name}/assets", :query => {:token => token, :page => page, :order => order.to_s, :show_pagination_details => true})
   end
 
   def asset(drop_name, asset_name, token = nil)
@@ -123,7 +123,7 @@ class Dropio::Api
   end
 
   def comments(drop_name, asset_name, page = 1, token = nil)
-    self.class.get("/drops/#{drop_name}/assets/#{asset_name}/comments", :query => {:token => token, :page => page})
+    self.class.get("/drops/#{drop_name}/assets/#{asset_name}/comments", :query => {:token => token, :page => page, :show_pagination_details => true})
   end
 
   def create_comment(drop_name, asset_name, contents, token = nil)
@@ -156,7 +156,7 @@ class Dropio::Api
   end
   
   def subscriptions(drop_name, page, admin_token)
-    self.class.get("/drops/#{drop_name}/subscriptions", :query => {:token => admin_token, :page => page})
+    self.class.get("/drops/#{drop_name}/subscriptions", :query => {:token => admin_token, :page => page, :show_pagination_details => true})
   end
   
   

data/lib/dropio/client.rb

@@ -53,20 +53,20 @@ class Dropio::Client
     a
   end
 
-  def create_note(drop, contents, title = nil)
-    a = handle(:asset, self.service.create_note(drop.name, contents, title, drop.default_token))
+  def create_note(drop, contents, title = nil, description = nil)
+    a = handle(:asset, self.service.create_note(drop.name, contents, title, description, drop.default_token))
     a.drop = drop
     a
   end
 
-  def add_file(drop, file_path, convert_to = nil, pingback_url = nil, comment = nil)
-    a = handle(:asset, self.service.add_file(drop.name, file_path, convert_to, pingback_url, comment, drop.default_token))
+  def add_file(drop, file_path, description = nil, convert_to = nil, pingback_url = nil, comment = nil)
+    a = handle(:asset, self.service.add_file(drop.name, file_path, description, convert_to, pingback_url, comment, drop.default_token))
     a.drop = drop
     a
   end
   
-  def add_file_from_url(drop, url, convert_to = nil, pingback_url = nil)
-    a = handle(:asset, self.service.add_file_from_url(drop.name, url, convert_to, pingback_url, drop.default_token))
+  def add_file_from_url(drop, url, description = nil, convert_to = nil, pingback_url = nil)
+    a = handle(:asset, self.service.add_file_from_url(drop.name, url, description, convert_to, pingback_url, drop.default_token))
     a.drop = drop
     a
   end
@@ -192,11 +192,11 @@ class Dropio::Client
     case type
     when :drop then return Dropio::Drop.new(response)
     when :asset then return Dropio::Asset.new(response)
-    when :assets then return response.collect{|a| Dropio::Asset.new(a)}
+    when :assets then return response['assets'].collect{|a| Dropio::Asset.new(a)}
     when :comment then return Comment.new(response)
-    when :comments then return response.collect{|c| Dropio::Comment.new(c)}
+    when :comments then return response['comments'].collect{|c| Dropio::Comment.new(c)}
     when :subscription then return Dropio::Subscription.new(response)
-    when :subscriptions then return response.collect{|s| Dropio::Subscription.new(s)}
+    when :subscriptions then return response['subscriptions'].collect{|s| Dropio::Subscription.new(s)}
     when :response then return parse_response(response)
     end
   end

data/lib/dropio/drop.rb

@@ -53,18 +53,18 @@ class Dropio::Drop < Dropio::Resource
   end
   
   # Adds a file to the Drop from a given +url+
-  def add_file_from_url(url, convert_to = nil, pingback_url = nil)
-    Dropio::Resource.client.add_file_from_url(self,url, convert_to, pingback_url)
+  def add_file_from_url(url, description = nil, convert_to = nil, pingback_url = nil)
+    Dropio::Resource.client.add_file_from_url(self,url,description, convert_to, pingback_url)
   end
   
   # Adds a file to the Drop given the +file_path+.
-  def add_file(file_path, convert_to = nil, pingback_url = nil, comment = nil)
-    Dropio::Resource.client.add_file(self, file_path, convert_to, pingback_url, comment)
+  def add_file(file_path, description = nil, convert_to = nil, pingback_url = nil, comment = nil)
+    Dropio::Resource.client.add_file(self, file_path, description, convert_to, pingback_url, comment)
   end
   
   # Creates a note with a +title+ and +contents+
-  def create_note(contents, title = nil)
-    Dropio::Resource.client.create_note(self, contents, title)
+  def create_note(contents, title = nil, description = nil)
+    Dropio::Resource.client.create_note(self, contents, title, description)
   end
   
   # Creates a link with a +url+, +title+, and +description+.
@@ -72,6 +72,7 @@ class Dropio::Drop < Dropio::Resource
     Dropio::Resource.client.create_link(self, url, title, description)
   end
   
+  # Creates a subscription to receive POSTs from drop.io.
   def create_pingback_subscription(url, events = {})
     Dropio::Resource.client.create_pingback_subscription(self,url,events)
   end

data/spec/dropio/drop_spec.rb

@@ -90,40 +90,40 @@ describe Drop do
     @asset = stub(Asset)
     @asset.should_receive(:drop=).once
     @client.should_receive(:handle).with(:asset,{}).and_return(@asset)
-    @api.should_receive(:add_file_from_url).with(@mydrop.name,"http://myurl.com/myfile.txt", nil, nil, @mydrop.default_token).and_return({})
-    @mydrop.add_file_from_url("http://myurl.com/myfile.txt").should == @asset
+    @api.should_receive(:add_file_from_url).with(@mydrop.name,"http://myurl.com/myfile.txt", "description", nil, nil, @mydrop.default_token).and_return({})
+    @mydrop.add_file_from_url("http://myurl.com/myfile.txt","description").should == @asset
   end
   
   it "should add files from a url with conversion and pingback url" do
     @asset = stub(Asset)
     @asset.should_receive(:drop=).once
     @client.should_receive(:handle).with(:asset,{}).and_return(@asset)
-    @api.should_receive(:add_file_from_url).with(@mydrop.name,"http://myurl.com/myfile.txt", 'H264_HIGH_RES', 'http://drop.io/test/pinged', @mydrop.default_token).and_return({})
-    @mydrop.add_file_from_url("http://myurl.com/myfile.txt", 'H264_HIGH_RES', 'http://drop.io/test/pinged').should == @asset
+    @api.should_receive(:add_file_from_url).with(@mydrop.name,"http://myurl.com/myfile.txt", "description", 'H264_HIGH_RES', 'http://drop.io/test/pinged', @mydrop.default_token).and_return({})
+    @mydrop.add_file_from_url("http://myurl.com/myfile.txt", "description", 'H264_HIGH_RES', 'http://drop.io/test/pinged').should == @asset
   end
   
   it "should add files from a path" do
     @asset = stub(Asset)
     @asset.should_receive(:drop=).once
     @client.should_receive(:handle).with(:asset,{}).and_return(@asset)
-    @api.should_receive(:add_file).with(@mydrop.name,"/mypath/myfile.txt", nil, nil, nil, @mydrop.default_token).and_return({})
-    @mydrop.add_file("/mypath/myfile.txt").should == @asset
+    @api.should_receive(:add_file).with(@mydrop.name,"/mypath/myfile.txt", "description", nil, nil, nil, @mydrop.default_token).and_return({})
+    @mydrop.add_file("/mypath/myfile.txt", "description").should == @asset
   end
   
   it "should add files from a path with pingback url and convertsion target" do
     @asset = stub(Asset)
     @asset.should_receive(:drop=).once
     @client.should_receive(:handle).with(:asset,{}).and_return(@asset)
-    @api.should_receive(:add_file).with(@mydrop.name,"/mypath/myfile.txt", 'H264_HIGH_RES', 'http://drop.io/test/pinged', nil, @mydrop.default_token).and_return({})
-    @mydrop.add_file("/mypath/myfile.txt", 'H264_HIGH_RES', 'http://drop.io/test/pinged').should == @asset
+    @api.should_receive(:add_file).with(@mydrop.name,"/mypath/myfile.txt","description", 'H264_HIGH_RES', 'http://drop.io/test/pinged', nil, @mydrop.default_token).and_return({})
+    @mydrop.add_file("/mypath/myfile.txt","description",'H264_HIGH_RES', 'http://drop.io/test/pinged').should == @asset
   end
   
-  it "should create notes from title and contents" do
+  it "should create notes from title and contents and description" do
     @asset = stub(Asset)
     @asset.should_receive(:drop=).once
     @client.should_receive(:handle).with(:asset,{}).and_return(@asset)
-    @api.should_receive(:create_note).with(@mydrop.name,"contents", "title",@mydrop.default_token).and_return({})
-    @mydrop.create_note("contents","title").should == @asset
+    @api.should_receive(:create_note).with(@mydrop.name,"contents", "title","description",@mydrop.default_token).and_return({})
+    @mydrop.create_note("contents","title", "description").should == @asset
   end
   
   it "should create links from a url, title, and description" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dropio
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors: 
 - Jake Good