vj-sdk 0.7.1 → 0.7.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: 
 :major: 0
+:build: 
 :minor: 7
-:patch: 1
+:patch: 2

data/lib/videojuicer/asset.rb

@@ -2,6 +2,11 @@ module Videojuicer
   module Asset
     def self.all(options = {})
       proxy = Videojuicer::OAuth::RequestProxy.new(Videojuicer.current_scope)
+      
+      if options[:page]
+        options[:offset] = Videojuicer::Resource::Collection.limit_from_page_number options.delete(:page), options[:limit]
+      end
+      
       response = proxy.get("/assets", "asset" => options)
       items, count, offset, limit = JSON.parse(response.body).values_at("items", "count", "offset", "limit")
       assets = items.map { |i| const_get(i.delete("type").capitalize).new(i) }

data/lib/videojuicer/resource/collection.rb

@@ -21,6 +21,11 @@ module Videojuicer
         self.limit = limit
       end
       
+      def self.limit_from_page_number page, limit
+        return 0 if page == 1
+        (page - 1) * limit
+      end
+      
       def page_count
         return 1 if limit.nil? or total.nil? or total < 1
         (total.to_f/limit.to_f).ceil

data/spec/asset_spec.rb

@@ -27,7 +27,7 @@ describe Videojuicer::Asset do
     end
     
     it "should paginate" do
-      @assets = @klass.all(:offset => 19, :limit => 10)
+      @assets = @klass.all(:limit => 10, :page => 2)
       @assets.page_count.should > 2
       @assets.page_number.should == 2
       @assets.length.should == 10

data/spec/collection_spec.rb

@@ -38,4 +38,15 @@ describe Videojuicer::Resource::Collection do
     collection.page_number.should == 1
   end
   
+  it "provides a correct offset for a page number and limit when the page is 1" do
+    offset = Videojuicer::Resource::Collection.limit_from_page_number 1, 20
+    offset.should == 0
+  end
+  
+  it "should provide a correct offset" do
+    offset = Videojuicer::Resource::Collection.limit_from_page_number 2, 20
+    offset.should == 20
+  end
+  
+  
 end

data/vj-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab", "lamp"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-01-11}
   s.email = %q{dan@videojuicer.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vj-sdk
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - danski
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +00:00
+date: 2011-01-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency