dropio 1.0.3 → 1.0.4

data/dropio.gemspec

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

data/lib/dropio/api.rb

@@ -122,8 +122,8 @@ class Dropio::Api
     self.class.post("/drops/#{drop_name}/assets/#{asset_name}/move", :body => params)
   end
 
-  def comments(drop_name, asset_name, token = nil)
-    self.class.get("/drops/#{drop_name}/assets/#{asset_name}/comments", :query => {:token => token})
+  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})
   end
 
   def create_comment(drop_name, asset_name, contents, token = nil)
@@ -151,8 +151,8 @@ class Dropio::Api
     self.class.post("/drops/#{drop_name}/subscriptions", :body => params)
   end
   
-  def subscriptions(drop_name, admin_token)
-    self.class.get("/drops/#{drop_name}/subscriptions", :query => {:token => admin_token})
+  def subscriptions(drop_name, page, admin_token)
+    self.class.get("/drops/#{drop_name}/subscriptions", :query => {:token => admin_token, :page => page})
   end
   
   

data/lib/dropio/asset.rb

@@ -12,9 +12,8 @@ class Dropio::Asset < Dropio::Resource
   # Returns the comments on this Asset.  Comments are loaded lazily.  The first
   # call to +comments+ will fetch the comments from the server.  They are then
   # cached until the Asset is reloaded.
-  def comments
-    @comments = Dropio::Resource.client.comments(self) if @comments.nil?
-    @comments ||= []
+  def comments(page = 1)
+    @comments = Dropio::Resource.client.comments(self, page)
   end
   
   # Gets the Assets's embed code

data/lib/dropio/client.rb

@@ -129,8 +129,8 @@ class Dropio::Client
     r["result"]
   end
 
-  def comments(asset)
-    comments = handle(:comments, self.service.comments(asset.drop.name,asset.name,asset.drop.default_token))
+  def comments(asset, page = 1)
+    comments = handle(:comments, self.service.comments(asset.drop.name,asset.name,page,asset.drop.default_token))
     comments.each{|c| c.asset = asset}
     comments
   end
@@ -170,8 +170,8 @@ class Dropio::Client
     s
   end
   
-  def subscriptions(drop)
-    subscriptions = handle(:subscriptions, self.service.subscriptions(drop.name, drop.admin_token))
+  def subscriptions(drop, page = 1)
+    subscriptions = handle(:subscriptions, self.service.subscriptions(drop.name,page,drop.admin_token))
     subscriptions.each{|s| s.drop = drop}
     subscriptions
   end

data/lib/dropio/drop.rb

@@ -83,8 +83,8 @@ class Dropio::Drop < Dropio::Resource
   end
   
   # Gets a list of Subscription objects.
-  def subscriptions
-    Dropio::Resource.client.subscriptions(self)
+  def subscriptions(page = 1)
+    Dropio::Resource.client.subscriptions(self, page)
   end
   
   # Generates an authenticated URL that will bypass any login action.

data/lib/dropio.rb

@@ -1,5 +1,5 @@
 module Dropio
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   
   class MissingResourceError < Exception; end
   class AuthorizationError < Exception; end

data/spec/dropio/asset_spec.rb

@@ -27,7 +27,7 @@ describe Dropio::Asset do
     @comment = stub(Comment)
     @comment.should_receive(:asset=).once
     @client.should_receive(:handle).with(:comments,{}).and_return([@comment])
-    @api.stub!(:comments).with(@drop.name, @asset.name, @drop.default_token).and_return({})
+    @api.stub!(:comments).with(@drop.name, @asset.name, 1, @drop.default_token).and_return({})
     @asset.comments.should == [@comment]
   end
   

data/spec/dropio/drop_spec.rb

@@ -146,7 +146,7 @@ describe Drop do
     @sub = stub(Subscription)
     @sub.should_receive(:drop=).once
     @client.should_receive(:handle).with(:subscriptions,{}).and_return([@sub])
-    @api.stub!(:subscriptions).with(@mydrop.name, @mydrop.admin_token).and_return({})
+    @api.stub!(:subscriptions).with(@mydrop.name, 1, @mydrop.admin_token).and_return({})
     @mydrop.subscriptions.should == [@sub]
   end
   

metadata

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