vodpod 0.0.1 → 2.0.0

data/README

@@ -3,75 +3,57 @@ Vodpod - Ruby bindings for the Vodpod API.
 
 Vodpod is a web site that allows you to collect videos. This library lets you
 interact with those collections and videos over their REST-style API, using
-clean Ruby. Typically one interacts with the Vodpod API through javascript, but
-maybe you've got bigger plans. Maybe you want to integrate with a content
-management system, or copy videos automatically from a social bookmarking site.
-Be creative. :-)
+clean Ruby. Maybe you want to integrate with a content management system, or
+copy videos automatically from a social bookmarking site.  Be creative. :-)
 
-Right now you can search for videos across the site and in a specific pod,
-retrieve details on videos and pods, and page through videos in a pod. You can
-also post new videos to a pod, and update video attributes. Error handling is
-spotty thus far.
+You can search for videos, retrieve users, collections, videos, and their tags and comments. You can filter by tags, sort and paginate every dataset, and generally be awesome.
 
-Examples
---------
+Source code: http://github.com/aphyr/ruby-vodpod.
 
-Vodpod.start(:api_key => '...', :auth => '...') do |v|
-  # Get a pod
-  pod = v.pod('aphyr')
+Gem: gem install vodpod
 
-  # Basic information about a pod is loaded by default
-  pod.name   # => "aphyr's videos" 
-  pod.stats  # => {"total_views"=>23, "weekly_pod_views"=>2, ...}
+Examples
+--------
 
-  # Retrieve tags (also works on videos)
-  pod.tags   # => [<Vodpod::Tag neotokyo (1)>, <Vodpod::Tag game (1)>, ...]
+Vodpod.start(:api_key => '...', :auth_key => '...') do |v|
+  # View the user associated with this API key
+  v.me 
+  #=> #<Vodpod::User spencer {"name"=>"Spencer", "thumbnail"=>"http://s3.amazonaws.com/vodpod.com.users.image/8.medium.jpg", "videos_count"=>670, "description"=>"Co-founder and Engineer at Vodpod", "key"=>"spencer"}>
 
-  # Look at who's following this pod
-  pod.followers  # => [<Vodpod::User foo>, <Vodpod::User bar>, ...]
+  # Attributes are accessed like so...
+  v.me.name #=> "Spencer"
 
-  # Get a full dump of an object's contents (works on Tags, Users, Videos, ...)
-  pod.store      # => {"name"=>"aphyr's videos", "created_at" => ...}
+  # Get a user, with some extra attributes
+  v.user :aphyr, :include => [:collections, :followers] 
+  #=> #<Vodpod::User aphyr {"name"=>"aphyr", "collections"=>[#<Vodpod::User aphyr {"name"=>"aphyr's videos", "key"=>"aphyr"}>], "followers"=>[#<Vodpod::User spencer {"name"=>"Spencer", "thumbnail"=>"http://s3.amazonaws.com/vodpod.com.users.image/8.medium.jpg", "key"=>"spencer"}>, #<Vodpod::User pkulak {"name"=>"pkulak", "thumbnail"=>"http://s3.amazonaws.com/vodpod.com.users.image/11221.medium.jpg", "key"=>"pkulak"}>], "thumbnail"=>"http://s3.amazonaws.com/vodpod.com.users.image/493234.medium.jpg", "videos_count"=>69, "description"=>"I'm a developer here at Vodpod. I'm also a freelance photographer, Aikido nut, gamer, book enthusiast, and physics and math geek.", "key"=>"aphyr"}>
 
-  # List some videos
-  pod.videos.map { |video| video.title }
-  # => ["Official Neotokyo Trailer", "Kittens Attack!"]
+  # Associated objects are automatically instantiated.
+  v.user(:aphyr, :include => :collections).collections
+  # => [#<Vodpod::Collection aphyr {"name"=>"aphyr's videos", "key"=>"aphyr"}>]
 
-  # You can page through results and filter by tags
-  pod.videos(:tags => 'music', :page => 2, :per_page => 16)
-  # => [<Vodpod::Video ...>, <Vodpod::Video ...>, ...]
+  # You can get more detail about a collection with collection(user_key,
+  # collection_key). Let's build a tag cloud for aphyr's collection named
+  # "aphyr".
+  v.collection(:aphyr, :aphyr, :include => :tags).tags.map { |t| t.count, t.name }
+  # => [[16, "funny"], [12, "awesome"], [6, "music"], [4, "trailer"], [4, "game"], [3, "apple"], [3, "ruby"], [3, "_why"], [3, "math"], [3, "fail"], [3, "robot"], [3, "lego"], [3, "neotokyo"], [2, "future-occupation?"], [2, "microsoft"], [2, "gay"], [2, "cat"], [2, "evil"], [2, "parkour"], [2, "science fiction"]]
 
-  # Find videos by searching (Also works on pods)
-  v.search('obama', :per_page => 48)
-  # => [<Vodpod::Video ...>, <Vodpod::Video ...>, ...]
+  # You can find videos by searching...
+  v.search(:kittens, :limit => 1, :offset => 14).first
+  # => #<Vodpod::Video 29740 {"autoplay_embed"=>"<embed src=\"http://www.youtube.com/v/jn0Fo0Mt6xo&autoplay=1&fs=1&showinfo=0&showsearch=0&rel=0&\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" width=\"100%\" height=\"100%\" id=\"myytplayer\"></embed>", "total_views"=>77, "created_at"=>#<DateTime: 10602058157/4320,-5/24,2299161>, "title"=>"Samson the Kitten", "video_host"=>{"url"=>"http://www.youtube.com/v/jn0Fo0Mt6xo", "domain"=>"youtube.com", "description"=>"Zachary gets Samson nodding and shaking his head."}, "thumbnail"=>"http://assetscdn.vodpod.com/images/missing_video_100.gif", "down_votes"=>0, "url"=>"http://vodpod.com/watch/29740-samson-the-kitten", "up_votes"=>0, "embed"=>"<embed src=\"http://www.youtube.com/v/jn0Fo0Mt6xo&autoplay=&fs=1&showinfo=0&showsearch=0&rel=0&\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" width=\"100%\" height=\"100%\" id=\"myytplayer\"></embed>", "description"=>nil, "key"=>29740}>
 
-  # Get a specific video by ID
-  vid = v.video(1063027)   # => <Vodpod::Video ...>
+  # Or by tags...
+  v.videos(:tags => ['star trek', :bloopers]).total
+  # => 494
   
-  # Show the associated user
-  vid.user                 # => <Vodpod::User scarrfase>
-
-  # Post a new video to a pod. Returns the new video.
-  pod.post('http://www.youtube.com/watch?v=E0ewUBTSlvQ',
-    :title => 'Neotokyo Recon Demo',
-    :description => 'Demo footage of the in-development Neotokyo mod',
-    :tags => ['game', 'neotokyo', 'trailer']
-  )
-  # => <Vodpod::Video ...>
-
-  # Add a tag "sports" to every video in a pod about frisbee.
-  pod.search('frisbee').each do |video|
-    tags = "#{video.tags} sports"
-    video.update(:tags => tags)
-  end
+  # You can retrieve specific videos if you know their key
+  v.video(29740)
+  # => (same video as from search)
+
+  # You can also get CollectionVideos--the version of a video belonging to a
+  # specific user/collection.
+  v.videos(:spencer, :electro, :limit => 1).first
+  # => #<Vodpod::CollectionVideo 1002751 {"autoplay_embed"=>"<embed src=\"http://www.youtube.com/v/v-3jOg5QpJo&autoplay=1&fs=1&showinfo=0&showsearch=0&rel=0&autoplay=&border=0&rel=0\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" width=\"100%\" height=\"100%\" id=\"myytplayer\"></embed>", "total_views"=>3, "created_at"=>#<DateTime: 42417586163/17280,-5/24,2299161>, "title"=>"Crystal Castles - Knights", "video_host"=>{"url"=>"http://www.pitchforkmedia.com/article/download/145440-video-crystal-castles-knights", "domain"=>"pitchforkmedia.com", "description"=>""}, "thumbnail"=>"http://img.vodpod.com/1002751.medium100.jpg", "down_votes"=>0, "url"=>"http://vodpod.com/watch/1002751-crystal-castles-knights?pod=electro", "up_votes"=>1, "embed"=>"<embed src=\"http://www.youtube.com/v/v-3jOg5QpJo&autoplay=&fs=1&showinfo=0&showsearch=0&rel=0&autoplay=&border=0&rel=0\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" width=\"100%\" height=\"100%\" id=\"myytplayer\"></embed>", "description"=>"", "key"=>1002751}>
 end
 
-Roadmap
--------
-
-- Posting videos seems to work--the URL is correct in the returned video JSON,
-  but visiting the page doesn't seem to load. Perhaps a caching issue on
-  Vodpod's end?
-- Automatic casting for datetimes.
-- Better error handling
-- Iterators for acting on all results without thinking about pagination
+You can contact support@vodpod.com for help with the toolkit. Patches welcome
+on github!

data/lib/vodpod.rb

@@ -8,7 +8,7 @@ require 'uri'
 require 'net/http'
 
 module Vodpod
-  BASE_URI = 'http://api.vodpod.com/api/'
+  BASE_URI = 'http://api.vodpod.com/v2/'
   ROOT = File.dirname(__FILE__)
 
   # Load library
@@ -16,9 +16,12 @@ module Vodpod
   require "#{ROOT}/vodpod/error"
   require "#{ROOT}/vodpod/connection"
   require "#{ROOT}/vodpod/record"
+  require "#{ROOT}/vodpod/record_set"
+  require "#{ROOT}/vodpod/comment"
   require "#{ROOT}/vodpod/user"
   require "#{ROOT}/vodpod/tag"
-  require "#{ROOT}/vodpod/pod"
+  require "#{ROOT}/vodpod/collection"
+  require "#{ROOT}/vodpod/collection_video"
   require "#{ROOT}/vodpod/video"
 
   # Performs URI escaping so that you can construct proper
@@ -32,13 +35,15 @@ module Vodpod
   module_function :escape
 
   # Creates a connection with the provided parameter hash, and yields it in a
-  # block. Example:
+  # block if given. Returns the connection. Example:
   #
-  #   Vodpod.start(:api_key => api_key, :auth => auth) do |v|
+  #   Vodpod.start(:api_key => api_key, :auth_key => auth_key) do |v|
   #     pod = v.pod('aphyr')
   #     p pod.created_at
   #   end
   def self.start(params)
-    yield Connection.new(params) 
+    c = Connection.new params
+    yield c if block_given?
+    c 
   end
 end

data/lib/vodpod/collection.rb

@@ -0,0 +1,9 @@
+module Vodpod
+  # A collection of videos.
+  class Collection < Record
+    date :created_at
+    many :tags
+    date :updated_at
+    many :videos, :class => 'CollectionVideo'
+  end
+end

data/lib/vodpod/collection_video.rb

@@ -0,0 +1,11 @@
+module Vodpod
+  # A video.
+  class CollectionVideo < Record
+    one :collection
+    many :collection_comments
+    many :comments
+    date :created_at
+    many :tags
+    one :user
+  end
+end

data/lib/vodpod/comment.rb

@@ -0,0 +1,7 @@
+module Vodpod
+  # A comment on a video or collectionvideo.
+  class Comment < Record
+    date :created_at
+    one :user
+  end
+end

data/lib/vodpod/connection.rb

@@ -1,95 +1,189 @@
 module Vodpod
   # Connection to vodpod.com; retreives JSON data and handles API key/auth.
   class Connection
-
+    TIMEOUT = 5
     attr_accessor :api
     attr_accessor :auth
 
     # Creates a new connection. Parameters:
     #
     # :api_key => API key
-    # :auth => Auth key
+    # :auth_key => Auth key
+    # :timeout => How many seconds to wait before giving up on API calls.
     def initialize(params = {})
       @api_key = params[:api_key]
-      @auth = params[:auth]
+      @auth_key = params[:auth_key]
+      @timeout = params[:timeout] || TIMEOUT
+    end
+
+    # Gets a collection by user and collection key.
+    def collection(user, collection, *args)
+      Collection.new self, get(:users, user, :collections, collection, *args)
+    end
+
+    # Gets collections belonging to a user.
+    def collections(user, *args)
+      RecordSet.new self, Collection, get(:users, user, :collections, *args)
     end
 
     # Request via GET
-    def get(path, params = {})
-      request :get, path, params
+    def get(*args)
+      request :get, *args
     end
  
-    # Returns a pod by ID.
-    def pod(id)
-      Pod.load(self, 'pod_id' => id)
+    # Returns the user associated with this API key.
+    def me(*args)
+      User.new self, get(:me, *args)
     end
 
     # Request via POST
-    def post(path, params = {})
-      request :post, path, params
+    def post(*args)
+      request :post, *args
+    end
+
+    # Pings the API with our API key to check whether or not we are ready to
+    # make requests.
+    def ready?
+      get or false
     end
 
     # Perform a JSON request to the Vodpod API for a given path and parameter
     # hash. Returns a parsed JSON document. Automatically provides api_key and
     # auth params if you do not specify them. Method should be one of :get or
-    # :post--you should use the #get or #post methods for convenience.
-    def request(method, path, params = {})
+    # :post--you should use the #get or #post methods for convenience. Array
+    # values for parameters are joined by commas.
+    #
+    # Example
+    #   request :get, :users, :aphyr, :include => [:name]
+    def request(method, *args)
       defaults = {
         :api_key => @api_key,
-        :auth => @auth
+        :auth_key => @auth
       }
 
+      # Get parameters
+      if args.last.kind_of? Hash
+        params = args.pop
+      else
+        params = {}
+      end
+
       # Construct query fragment
       query = defaults.merge(params).inject('?') { |s, (k, v)|
+        if v.kind_of? Array
+          v = v.join(',')
+        end
         s << "#{Vodpod::escape(k)}=#{Vodpod::escape(v)}&"
       }[0..-2]
 
+      # Join path fragments
+      path = Vodpod::BASE_URI + args.map{|e| Vodpod::escape(e)}.join('/') + '.json'
+
       begin
         # Get URI
         case method
         when :get
           # GET request
-          uri = URI.parse(Vodpod::BASE_URI + path + '.js' + query)
-          JSON.parse Net::HTTP.get(uri)
+          uri = URI.parse(path + query)
+          res = Net::HTTP.start(uri.host, uri.port) do |http|
+            http.open_timeout = @timeout
+            http.read_timeout = @timeout
+            http.get(uri.path + query)
+          end
         when :post
           # POST request
-          uri = URI.parse(Vodpod::BASE_URI + path + '.js')
+          uri = URI.parse(path)
           res = Net::HTTP.start(uri.host, uri.port) do |http|
+            http.open_timeout = @timeout
+            http.read_timeout = @timeout
             http.post(uri.path, query[1..-1])
           end
-          JSON.parse res.body
         else
           # Don't know how to do that kind of request
           raise Error.new("Unsupported request method #{method.inspect}; should be one of :get, :post.")
         end
       rescue => e
-        # Error somewhere in the request/parse process.
         raise Error.new("Error retrieving #{uri.path}#{query}: #{e.message}")
       end
-    end
 
-    # Searches for videos. Optionally specify :per_page and :page.
-    def search(query, params = {})
-      list = get('video/search', params.merge(:query => query))['videos']['items']
-      return [] unless list
-
-      # Map results to Videos
-      list.map do |item|
-        # These results use Video.1234... as the ID, so we need to strip.
-        store = item['video']
-        store['video_id'] = store['video_id'].sub(/^Video\./, '').to_i
-        Video.new(self, store)
+      # Parse response as JSON
+      begin
+        data = JSON.parse res.body
+      rescue => e
+        raise Error, "server returned invalid json: #{e.message}" + "\n\n" + res
+      end
+
+      # Check for errors
+      if data[0] == false
+        raise Error, data[1]['message']
       end
+
+      # Return data section
+      data[1]
+    end
+
+    # Searches for videos
+    def search(query, opts = {})
+      opts = {:query => query}.merge opts
+      RecordSet.new self, Video, get(:search, opts)
+    end
+
+    # Gets a user by key
+    def user(key, *args)
+      User.new self, get(:users, key, *args)
     end
 
-    # Returns a user by ID.
-    def user(id)
-      User.new(self, 'user_id' => id)
+    # Retrieves a specific video by key.
+    # Three senses:
+    #
+    # 1. video(video) => Video
+    # 2. video(user, video) => CollectionVideo
+    # 2. video(user, collection, video) => CollectionVideo
+    #
+    # Which sense is determined by the index of the integer video key, so
+    # you can safely chain calls like:
+    #
+    #   video(123, :comments, :page => 2)
+    #
+    # to get the 2nd page of comments associated with the video.
+    def video(*args)
+      key = args.find { |e| Integer === e }
+      i = args.index(key)
+      
+      case i
+      when 0
+        Video.new self, get(:videos, *args)
+      when 1
+        CollectionVideo.new self, get(:users, args.shift, :videos, *args)
+      when 2 
+        CollectionVideo.new self, get(:users, args.shift, :collections, args.shift, :videos, *args)
+      else
+        raise ArgumentError, "usage: video(video), video(user, video), video(user, collection, video)"
+      end
     end
 
-    # Returns a video by ID.
-    def video(id)
-      Video.load(self, 'video_id' => id)
+    # Gets a list of videos
+    # Three senses:
+    #
+    # 1. videos() => An array of Videos
+    # 2. videos(user) => An array of CollectionVideos
+    # 3. videos(user, collection) => An array of CollectionVideos
+    #
+    # The sense is determined by the number of arguments before a hash (or if
+    # no options hash is given, the number of arguments).
+    def videos(*args)
+      opts = args.find { |e| Hash === e }
+      i = args.index(opts) || args.size
+      case i
+      when 0
+        RecordSet.new self, Video, get(:videos, *args)
+      when 1
+        RecordSet.new self, CollectionVideo, get(:users, args.shift, :videos, *args)
+      when 2
+        RecordSet.new self, CollectionVideo, get(:users, args.shift, :collections, args.shift, :videos, *args)
+      else
+        raise ArgumentError, "usage: videos(), videos(user), videos(user, collection)"
+      end
     end
   end
 end

data/lib/vodpod/record.rb

@@ -7,27 +7,83 @@ module Vodpod
   # Records are instantiated with a connection object and a default store of an
   # empty hash. 
   class Record
-    attr_accessor :store
+    attr_accessor :values
 
-    # Like Record.new, but also calls load!
-    def self.load(*params)
-      record = new(*params)
-      record.load! if record.respond_to? :load!
-      record
+    def self.casters
+      @casters ||= {}
+    end
+
+    # Association metaprogramming!
+    def self.cast(name, opts = {})
+      # Total hack :)
+      opts[:class] ||= name.to_s.sub(/s$/, '').capitalize
+      casters[name] = opts
+    end
+
+    # The given attribute is casted to a DateTime
+    def self.date(name, opts = {})
+      cast name, opts.merge(:type => :parse, :class => DateTime)
+    end
+
+    def self.one(name, opts = {})
+      cast name, opts.merge(:type => :one)
+    end
+
+    def self.many(name, opts = {})
+      cast name, opts.merge(:type => :many)
     end
 
     # Create a new Record. Takes two parameters: a Connection object so the
     # record can perform further requests, and an optional default value for
-    # the store. 
-    def initialize(connection, store = {})
+    # the value hash
+    def initialize(connection, values = {})
       @connection = connection
-      @store = store
+      @values = values
+
+      self.class.casters.each do |name, cast|
+        if values = @values[name.to_s]
+          # Lazily load classes
+          unless cast[:class].kind_of? Class
+            cast[:class] = Vodpod.const_get(cast[:class])
+          end
+
+          # Convert sub-values to objects
+          @values[name.to_s] = case cast[:type]
+          when :one
+            cast[:class].new(@connection, values)
+          when :many
+            values.map do |value|
+              cast[:class].new(@connection, value)
+            end
+          when :parse
+            cast[:class].parse(values)
+          end
+        end
+      end
+    end
+
+    def ==(other)
+      self.class == other.class and self.key == other.key rescue false
+    end
+
+    def inspect
+      "#<#{self.class} #{key} #{@values.inspect}>"
+    end
+
+    def to_s
+      if respond_to? :title
+        title.to_s
+      elsif respond_to? :name
+        name.to_s
+      else
+        key.to_s
+      end
     end
 
     # Pass requests to store by default.
     def method_missing(meth, *args)
-      if @store.include? meth.to_s
-        @store[meth.to_s]
+      if @values.include? meth.to_s
+        @values[meth.to_s]
       end
     end
   end

data/lib/vodpod/record_set.rb

@@ -0,0 +1,17 @@
+module Vodpod
+  class RecordSet < Array
+    # An Array, with an extra method #total which returns the total number of
+    # records available for the query which generated this recordset.
+
+    def initialize(connection, klass, results)
+      @total = results['total']
+      replace(results['results'].map { |result|
+        klass.new connection, result
+      })
+    end
+
+    def total
+      @total
+    end
+  end
+end

data/lib/vodpod/tag.rb

@@ -1,13 +1,9 @@
 module Vodpod
-  # A Tag, attached to a video. There isn't a way yet to go from tags to videos
-  # that I'm aware of, but it might happen in the future.
+  # A Tag, attached to a video.
   class Tag < Record
-    def inspect
-      "<Vodpod::Tag #{@store['_value']} (#{count})>"
-    end
-
-    def to_s
-      @store['_value']
-    end
+    many :collection_videos, :class => 'CollectionVideo'
+    many :collections
+    many :users
+    many :videos
   end
 end

data/lib/vodpod/user.rb

@@ -1,22 +1,13 @@
 module Vodpod
   # A Vodpod user, associated with a pod and with videos.
   class User < Record
-    # Returns recent activity by people related to this user. Not working
-    # yet--maybe a Vodpod bug?
-    def network_activity
-      @connection.get('user/network_activity', :user_id => user_id)
-    end
-
-    def inspect
-      if @store
-        "<Vodpod::User #{@store['username']}>"
-      else
-        "<Vodpod::User>"
-      end
-    end
-
-    def to_s
-      @store['username']
-    end
+    one  :collection
+    many :collections
+    date :created_at
+    many :followers, :class => User
+    many :following, :class => User
+    many :tags
+    date :updated_at
+    many :videos
   end
 end

data/lib/vodpod/version.rb

@@ -1,8 +1,8 @@
 module Vodpod
   APP_NAME = 'Vodpod'
-  APP_VERSION = '0.0.1'
+  APP_VERSION = '2.0.0'
   APP_AUTHOR = 'Kyle Kingsbury'
-  APP_EMAIL = 'aphyr@aphyr.com'
-  APP_URL = 'http://aphyr.com/projects/ruby-vodpod'
+  APP_EMAIL = 'support@vodpod.com'
+  APP_URL = 'http://aphyr.com/projects/show/ruby-vodpod-bindings'
   APP_COPYRIGHT = 'Copyright (c) 2009 Kyle Kingsbury <aphyr@aphyr.com>. All rights reserved.'
 end

data/lib/vodpod/video.rb

@@ -1,34 +1,11 @@
 module Vodpod
   # A video.
   class Video < Record
-    # Loads information on this video by video_id
-    def load!
-      if video_id
-        @store.merge! @connection.get('video/details', :video_id => video_id)["video"]
-      end
-    end
-
-    def to_s
-      @store['title']
-    end
-
-    # Update the title, description, and/or tags for this video. Returns
-    # the updated video. Seems to create video records okay, but they aren't
-    # viewable and don't appear in collections for editing immediately.
-    def update(params)
-      new_params = params.merge(
-        :video_id => @store['video_id']
-      )
-
-      # Post
-      Video.new(@connection.post('video/update', new_params)['video'])
-    end
-
-    # Returns the User for this video.
-    def user
-      return nil unless @store['user']
-
-      User.new(@connection, @store['user'])
-    end
+    many :collections
+    many :comments
+    date :created_at
+    many :tags
+    date :updated_at
+    many :users
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vodpod
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 2.0.0
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-08 00:00:00 -05:00
+date: 2009-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,10 +20,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.1.9
     version: 
 description: 
-email: aphyr@aphyr.com
+email: support@vodpod.com
 executables: []
 
 extensions: []
@@ -35,17 +35,20 @@ files:
 - lib/vodpod
 - lib/vodpod/record.rb
 - lib/vodpod/tag.rb
-- lib/vodpod/pod.rb
+- lib/vodpod/comment.rb
+- lib/vodpod/collection_video.rb
 - lib/vodpod/version.rb
+- lib/vodpod/record_set.rb
 - lib/vodpod/user.rb
 - lib/vodpod/video.rb
 - lib/vodpod/error.rb
 - lib/vodpod/connection.rb
+- lib/vodpod/collection.rb
 - example/test.rb
 - LICENSE
 - README
 has_rdoc: true
-homepage: http://aphyr.com/projects/ruby-vodpod
+homepage: http://aphyr.com/projects/show/ruby-vodpod-bindings
 post_install_message: 
 rdoc_options: []
 

data/lib/vodpod/pod.rb

@@ -1,119 +0,0 @@
-module Vodpod
-  # Represents a pod.
-  class Pod < Record
-    # Administrative users
-    def admins
-      if items = @store['users']['admins']
-        case items
-        when {}
-          # No results
-          []
-        when Array
-          # More than one result
-          items.map do |item|
-            User.new(@connection, item['user'])
-          end
-        else
-          # One result
-          [User.new(@connection, items['user'])]
-        end
-      else
-        []
-      end
-    end
-
-    # Following users
-    def followers
-      if items = @store['users']['followers']
-        case items
-        when {}
-          # No results
-          []
-        when Array
-          # More than one result
-          items.map do |item|
-            User.new(@connection, item['user'])          
-          end
-        else
-          # One result
-          [User.new(@connection, items['user'])]
-        end
-      else
-        []
-      end
-    end
-
-    # Loads information for this pod from the API.
-    def load!
-      if pod_id
-        @store.merge! @connection.get('pod/details', :pod_id => pod_id)["pod"]
-      end
-    end
-
-    # Posts a new video to a pod. Returns the video posted.
-    # 
-    # Optional parameters:
-    #   :title       => 'Cats with captions!'
-    #   :description => 'Ahh the internet...'
-    #   :tags        => 'foo bar baz' or ['foo', 'bar', 'baz']
-    def post(url, params = {})
-      new_params = params.merge(
-        :pod_id => @store['pod_id'],
-        :url => url
-      )
-      # Convert tags to string if necessary
-      if new_params[:tags].kind_of? Array
-        new_params[:tags] = new_params[:tags].join(' ')
-      end
-
-      # Post
-      Video.new(@connection.post('video/post', new_params)['video'])
-    end
-    
-    # Searches for videos. Optionally specify :per_page and :page.
-    def search(query, params = {})
-      # Get list of videos
-      params = params.merge(:pod_id => @store['pod_id'], :query => query)
-      list = @connection.get('pod/search', params)['videos']['items']
-
-      return [] unless list
-
-      # Map results to Videos
-      list.map do |item|
-        store = item['video']
-        #store['video_id'].sub!(/^Video\./, '')
-        Video.new(@connection, store)
-      end
-    end
-
-    # Returns an array of Tags associated with this pod, by frequency of use.
-    def tags
-      list = @connection.get('pod/tags', :pod_id => pod_id)['tags']['items']
-      list.map do |item|
-        Tag.new(@connection, item['t'])
-      end
-    end
-
-    # Returns the associated user for this pod.
-    def user
-      return nil unless @store['user']
-
-      User.new(@connection, @store['user'])
-    end
-
-    # Videos in a pod. You can use :sort, :per_page, :page, and :tag_id to
-    # paginate and filter.
-    def videos(params = {})
-      # Get list of videos
-      params = params.merge(:pod_id => @store['pod_id'])
-      list = @connection.get('pod/videos', params)['videos']['items']
-
-      return [] unless list      
-
-      # Map to objects
-      list.map do |item|
-        Video.new(@connection, item['video'])
-      end
-    end
-  end
-end