kappa 0.1.3.pre → 0.1.4.pre

data/README.md

@@ -1,9 +1,14 @@
-# <img src="http://static-cdn.jtvnw.net/jtv_user_pictures/chansub-global-emoticon-ddc6e3a8732cb50f-25x28.png" /> Kappa
+# <img src="https://raw.github.com/schmich/kappa/master/assets/kappa.png" /> Kappa
 
-Kappa is a Ruby library for interfacing with the [Twitch.tv Kraken API](https://github.com/justintv/Twitch-API).
+Kappa is a Ruby library for interfacing with the [Twitch.tv API](https://github.com/justintv/Twitch-API).
+
+[![Gem Version](https://badge.fury.io/rb/kappa.png)](https://badge.fury.io/rb/kappa.png)
+[![Build Status](https://secure.travis-ci.org/schmich/tome.png)](http://travis-ci.org/schmich/tome)
+[![Dependency Status](https://gemnasium.com/schmich/kappa.png)](https://gemnasium.com/schmich/kappa)
+[![Coverage Status](https://coveralls.io/repos/schmich/kappa/badge.png?branch=master)](https://coveralls.io/r/schmich/kappa?branch=master)
+[![Code Climate](https://codeclimate.com/github/schmich/kappa.png)](https://codeclimate.com/github/schmich/kappa)
 
 ## Getting Started
-============
 
 `gem install kappa --pre`
 
@@ -12,15 +17,65 @@ require 'kappa'
 
 include Kappa::V2
 
-grubby = Channel.new('followgrubby')
+grubby = Channel.get('followgrubby')
 puts grubby.streaming?
 ```
 
-## API
-============
+## Examples
+
+### Channels
+
+Channels serve as the home location for a [user's](#users) content. Channels have a [stream](#streams), can run commercials, store [videos](#videos), display information and status, and have a customized page including banners and backgrounds.
+
+```ruby
+c = Channel.get('destiny')
+
+c.nil?                # Does the requested channel not exist? (ex: false)
+c.name                # Unique Twitch name (ex: "destiny")
+c.display_name        # Display name, e.g. name used for page title (ex: "Destiny")
+c.stream              # The currently live stream for this channel (ex: #<Kappa::V2::Stream> object)
+c.url                 # The URL for the channel's main page (ex: "http://www.twitch.tv/destiny")
+c.status              # Current status (ex: "Destiny - Diamond I ADC  - Number 1 Draven player in the entire Omaha (NE) metro area -watch from http://www.destiny.gg")
+c.streaming?          # Is the channel currently streaming? (ex: true)
+c.game_name           # Name of the primary game for this channel (ex: "League of Legends")
+c.mature?             # Does the channel have mature content? (ex: true)
+c.id                  # Unique Twitch ID (ex: 18074328)
+c.created_at          # When the channel was created (ex: #<DateTime: 2010-11-22T04:14:56+00:00 ((2455523j,15296s,0n),+0s,2299161j)>)
+c.updated_at          # When the channel was last updated, e.g. last stream time (ex: #<DateTime: 2013-05-11T19:57:29+00:00 ((2456424j,71849s,0n),+0s,2299161j)>)
+c.background_url      # URL for background image (ex: "http://static-cdn.jtvnw.net/jtv_user_pictures/destiny-channel_background_image-ab706db77853e079.jpeg")
+c.banner_url          # URL for banner image (ex: "http://static-cdn.jtvnw.net/jtv_user_pictures/destiny-channel_header_image-d2b9b2452f67ec00-640x125.jpeg")
+c.logo_url            # URL for logo image (ex: "http://static-cdn.jtvnw.net/jtv_user_pictures/destiny-profile_image-168e66661c484c5e-300x300.jpeg")
+c.video_banner_url    # URL for the image shown when the stream is offline (ex: "http://static-cdn.jtvnw.net/jtv_user_pictures/destiny-channel_offline_image-7a21fd1bd88c4ac3-640x360.jpeg")
+
+c.videos
+c.teams
+c.subscribers
+c.editors
+c.followers
+c.has_subscriber?
+```
+
+### Streams
+
+Streams are video broadcasts that are currently live. They have a [broadcaster](#users) and are part of a [channel](#channels).
+
+### Users
+
+These are members of the Twitch community who have a Twitch account. If broadcasting, they can own a [stream](#streams) that they can broadcast on their [channel](#channels). If mainly viewing, they might follow or subscribe to channels.
+
+### Videos
+
+Videos are broadcasts or highlights owned by a [channel](#channels). Broadcasts are unedited videos that are saved after a streaming session. Highlights are videos edited from broadcasts by the channel's owner.
+
+### Teams
+
+Teams are an organization of [channels](#channels).
+
+### Games
+
+Games are categories (e.g. League of Legends, Diablo 3) used by [streams](#streams) and [channels](#channels). Games can be searched for by query.
 
 ## Contributing
-============
 
 ## License
 

data/lib/kappa.rb

@@ -8,7 +8,6 @@ require 'kappa/team'
 require 'kappa/user'
 require 'kappa/images'
 require 'kappa/twitch'
-require 'kappa/base'
 require 'kappa/version'
 
 # TODO

data/lib/kappa/channel.rb

@@ -1,49 +1,73 @@
+require 'cgi'
+
 module Kappa
+  # @private
   class ChannelBase
     include IdEquality
 
-    def initialize(arg, connection)
-      @connection = connection
-
-      case arg
-        when Hash
-          parse(arg)
-        when String
-          json = @connection.get("channels/#{arg}")
-          parse(json)
-        else
-          raise ArgumentError
+    def self.get(channel_name)
+      encoded_name = CGI.escape(channel_name)
+      json = connection.get("channels/#{encoded_name}")
+      if !json || json['status'] == 404
+        nil
+      else
+        new(json)
       end
     end
   end
 end
 
 module Kappa::V2
-  # TODO:
-  # c.subscriptions
-  # c.start_commercial
-  # c.reset_stream_key
-  # c.foo = 'bar' ; c.save!
-  # Current user's channel
   class Channel < Kappa::ChannelBase
-    def initialize(arg, connection = Connection.instance)
-      super(arg, connection)
+    # TODO:
+    # c.subscriptions
+    # c.start_commercial
+    # c.reset_stream_key
+    # c.foo = 'bar' ; c.save!
+    # Current user's channel
+    include Connection
+
+    def initialize(hash)
+      @id = hash['_id']
+      @background_url = hash['background']
+      @banner_url = hash['banner']
+      @created_at = DateTime.parse(hash['created_at'])
+      @display_name = hash['display_name']
+      @game_name = hash['game']
+      @logo_url = hash['logo']
+      @mature = hash['mature'] || false
+      @name = hash['name']
+      @status = hash['status']
+      @updated_at = DateTime.parse(hash['updated_at'])
+      @url = hash['url']
+      @video_banner_url = hash['video_banner']
+
+      @teams = []
+      teams = hash['teams']
+      teams.each do |team_json|
+        @teams << Team.new(team_json)
+      end
     end
 
+    # This flag is specified by the owner of the channel.
+    # @return [Boolean] `true` if the channel has mature content, `false` otherwise.
     def mature?
       @mature
     end
 
-    # TODO: Move these into derived classes?
+    # Get the live stream associated with this channel.
+    # @return [Stream] Live stream object for this channel, or `nil` if the channel is not currently streaming.
+    # @see #streaming?
     def stream
-      # TODO: Use _links instead of hard-coding.
-      json = @connection.get("streams/#{@name}")
-      stream_json = json['stream']
-      Stream.new(stream_json, @connection)
+      Stream.get(@name)
     end
 
+    # This makes a separate request to get the channel's stream. If you want to actually use
+    # the stream object, you should call `#stream` instead.
+    # @return [Boolean] `true` if the channel currently has a live stream, `false` otherwise.
+    # @see #stream
     def streaming?
-      stream.live?
+      !stream.nil?
     end
 
     #
@@ -67,29 +91,25 @@ module Kappa::V2
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/channels.md#get-channelschannelfollows
     # TODO: Warning: this set can be very large, this can run for very long time, recommend using :limit/:offset.
     #
-    def followers(params = {})
-      limit = params[:limit] || 0
-
-      followers = []
-      ids = Set.new
-
-      @connection.paginated("channels/#{@name}/follows", params) do |json|
-        current_followers = json['follows']
-        current_followers.each do |follow_json|
-          user_json = follow_json['user']
-          user = User.new(user_json, @connection)
-          if ids.add?(user.id)
-            followers << user
-            if followers.count == limit
-              return followers
-            end
-          end
-        end
-
-        !current_followers.empty?
+    def followers(args = {})
+      params = {}
+
+      limit = args[:limit]
+      if limit && (limit < 100)
+        params[:limit] = limit
+      else
+        params[:limit] = 100
+        limit = 0
       end
 
-      followers
+      return connection.accumulate(
+        :path => "channels/#{@name}/follows",
+        :params => params,
+        :json => 'follows',
+        :sub_json => 'user',
+        :class => User,
+        :limit => limit
+      )
     end
 
     # TODO: Requires authentication.
@@ -105,36 +125,42 @@ module Kappa::V2
       # Support User object or username (string)
     end
 
+    # @return [Fixnum] Unique Twitch ID.
     attr_reader :id
+
+    # @return [String] URL for background image.
     attr_reader :background_url
+
+    # @return [String] URL for banner image.
     attr_reader :banner_url
+
+    # @return [DateTime] When the channel was created.
     attr_reader :created_at
-    attr_reader :stream_delay_sec
+
+    # @return [String] Display name, e.g. name used for page title.
     attr_reader :display_name
+
+    # @return [String] Name of the primary game for this channel.
     attr_reader :game_name
+
+    # @return [String] URL for the logo image.
     attr_reader :logo_url
+
+    # @return [String] Unique Twitch name.
     attr_reader :name
+
+    # @return [String] Current status.
     attr_reader :status
+
+    # @return [DateTime] When the channel was last updated, e.g. last stream time.
     attr_reader :updated_at
+
+    # @return [String] The URL for the channel's main page.
     attr_reader :url
+
+    # @return [String] URL for the image shown when the stream is offline.
     attr_reader :video_banner_url
 
-  private
-    def parse(hash)
-      @id = hash['_id']
-      @background_url = hash['background']
-      @banner_url = hash['banner']
-      @created_at = DateTime.parse(hash['created_at'])
-      @stream_delay_sec = hash['delay']
-      @display_name = hash['display_name']
-      @game_name = hash['game']
-      @logo_url = hash['logo']
-      @mature = hash['mature'] || false
-      @name = hash['name']
-      @status = hash['status']
-      @updated_at = DateTime.parse(hash['updated_at'])
-      @url = hash['url']
-      @video_banner_url = hash['video_banner']
-    end
+    attr_reader :teams
   end
 end

data/lib/kappa/connection.rb

@@ -2,8 +2,11 @@ require 'httparty'
 require 'addressable/uri'
 require 'securerandom'
 require 'json'
+require 'singleton'
+require 'set'
 
 module Kappa
+  # @private
   class ConnectionBase
     include HTTParty
 
@@ -17,12 +20,6 @@ module Kappa
       @last_request_time = Time.now - RATE_LIMIT_SEC
     end
 
-    def self.instance
-      @connection ||= self.class_eval do
-        self.new
-      end
-    end
-
     def get(path, query = nil)
       request_url = @base_url + path
 
@@ -42,6 +39,36 @@ module Kappa
       return JSON.parse(json)
     end
 
+    def accumulate(args)
+      path = args[:path]
+      params = args[:params]
+      json = args[:json]
+      sub_json = args[:sub_json]
+      klass = args[:class]
+      limit = args[:limit]
+
+      objects = []
+      ids = Set.new
+
+      paginated(path, params) do |response_json|
+        current_objects = response_json[json]
+        current_objects.each do |object_json|
+          object_json = object_json[sub_json] if sub_json
+          object = klass.new(object_json)
+          if ids.add?(object.id)
+            objects << object
+            if objects.count == limit
+              return objects
+            end
+          end
+        end
+
+        !current_objects.empty?
+      end
+
+      return objects
+    end
+
     def paginated(path, params = {})
       limit = [params[:limit] || 100, 100].min
       offset = params[:offset] || 0
@@ -100,19 +127,29 @@ module Kappa
 end
 
 module Kappa::V2
-  class Connection < Kappa::ConnectionBase
-  private
-    def custom_headers
-      { 'Accept' => 'application/vnd.twitchtv.v2+json' }
+  # @private
+  module Connection
+    class Impl < Kappa::ConnectionBase
+      include Singleton
+
+    private
+      def custom_headers
+        { 'Accept' => 'application/vnd.twitchtv.v2+json' }
+      end
     end
-  end
-end
 
-module Kappa::V3
-  class Connection < Kappa::ConnectionBase
-  private
-    def custom_headers
-      { 'Accept' => 'application/vnd.twitchtv.v3+json' }
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def connection
+      Impl.instance
+    end
+
+    module ClassMethods
+      def connection
+        Impl.instance
+      end
     end
   end
 end

data/lib/kappa/game.rb

@@ -1,43 +1,18 @@
 module Kappa
+  # @private
   class GameBase
     include IdEquality
-
-    def initialize(arg)
-      case arg
-        when Hash
-          parse(arg)
-        else
-          raise ArgumentError
-      end
-    end
   end
 
+  # @private
   class GameSuggestionBase
     include IdEquality
-
-    def initialize(arg)
-      case arg
-        when Hash
-          parse(arg)
-        else
-          raise ArgumentError
-      end
-    end
   end
 end
 
 module Kappa::V2
   class Game < Kappa::GameBase
-    attr_reader :id
-    attr_reader :name
-    attr_reader :giantbomb_id
-    attr_reader :box_images
-    attr_reader :logo_images
-    attr_reader :channel_count
-    attr_reader :viewer_count
-
-  private
-    def parse(hash)
+    def initialize(hash)
       @channel_count = hash['channels']
       @viewer_count = hash['viewers']
 
@@ -48,18 +23,18 @@ module Kappa::V2
       @box_images = Images.new(game['box'])
       @logo_images = Images.new(game['logo'])
     end
-  end
 
-  class GameSuggestion < Kappa::GameSuggestionBase
     attr_reader :id
     attr_reader :name
     attr_reader :giantbomb_id
-    attr_reader :popularity
     attr_reader :box_images
     attr_reader :logo_images
+    attr_reader :channel_count
+    attr_reader :viewer_count
+  end
 
-  private
-    def parse(hash)
+  class GameSuggestion < Kappa::GameSuggestionBase
+    def initialize(hash)
       @id = hash['_id']
       @name = hash['name']
       @giantbomb_id = hash['giantbomb_id']
@@ -67,47 +42,54 @@ module Kappa::V2
       @box_images = Images.new(hash['box'])
       @logo_images = Images.new(hash['logo'])
     end
+
+    attr_reader :id
+    attr_reader :name
+    attr_reader :giantbomb_id
+    attr_reader :popularity
+    attr_reader :box_images
+    attr_reader :logo_images
   end
 
   class Games
+    include Connection
+
     #
     # GET /games/top
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/games.md#get-gamestop
     #
-    def top(params = {})
-      limit = params[:limit] || 0
-
-      games = []
-      ids = Set.new
+    def self.top(args = {})
+      params = {}
 
-      @conn.paginated('games/top', params) do |json|
-        current_games = json['top']
-        current_games.each do |game_json|
-          game = Game.new(game_json)
-          if ids.add?(game.id)
-            games << game
-            if games.count == limit
-              return games
-            end
-          end
-        end
+      limit = args[:limit]
+      if limit && (limit < 100)
+        params[:limit] = limit
+      else
+        params[:limit] = 100
+        limit = 0
       end
 
-      games
+      return connection.accumulate(
+        :path => 'games/top',
+        :params => params,
+        :json => 'top',
+        :class => Game,
+        :limit => limit
+      )
     end
     
     #
     # GET /search/games
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/search.md#get-searchgames
     #
-    def search(params = {})
+    def self.search(params = {})
       live = params[:live] || false
       name = params[:name]
 
       games = []
       ids = Set.new
 
-      json = @conn.get('search/games', :query => name, :type => 'suggest', :live => live)
+      json = connection.get('search/games', :query => name, :type => 'suggest', :live => live)
       all_games = json['games']
       all_games.each do |game_json|
         game = GameSuggestion.new(game_json)

data/lib/kappa/id_equality.rb

@@ -1,4 +1,5 @@
 module Kappa
+  # @private
   module IdEquality
     def hash
       @id.hash

data/lib/kappa/images.rb

@@ -1,33 +1,19 @@
-module Kappa
-  class ImagesBase
-    def initialize(arg)
-      case arg
-        when Hash
-          parse(arg)
-        else
-          raise ArgumentError
-      end
+module Kappa::V2
+  class Images
+    def initialize(hash)
+      @large_url = hash['large']
+      @medium_url = hash['medium']
+      @small_url = hash['small']
+      @template_url = hash['template']
     end
-  end
-end
 
-module Kappa::V2
-  class Images < Kappa::ImagesBase
     def url(width, height)
-      @template_url.gsub('{width}', width.to_s, '{height}', height.to_s)
+      @template_url.gsub('{width}', width.to_s).gsub('{height}', height.to_s)
     end
 
     attr_reader :large_url
     attr_reader :medium_url
     attr_reader :small_url
     attr_reader :template_url
-
-  private
-    def parse(hash)
-      @large_url = hash['large']
-      @medium_url = hash['medium']
-      @small_url = hash['small']
-      @template_url = hash['template']
-    end
   end
 end

data/lib/kappa/stream.rb

@@ -1,54 +1,46 @@
-require 'set'
-
 module Kappa
+  # @private
   class StreamBase
     include IdEquality
 
-    def initialize(hash, connection = self.class.default_connection)
-      @connection = connection
-      parse(hash)
-    end
-
-    def self.get(stream_name, connection = default_connection)
+    def self.get(stream_name)
       json = connection.get("streams/#{stream_name}")
       stream = json['stream']
       if json['status'] == 404 || !stream
         nil
       else
-        new(stream, connection)
+        new(stream)
       end
     end
-
-  private
-    def self.default_connection
-      self.class.module_class(:Connection).instance
-    end
   end
 end
 
 module Kappa::V2
   class Stream < Kappa::StreamBase
-    attr_reader :id
-    attr_reader :broadcaster
-    attr_reader :game_name
-    attr_reader :name
-    attr_reader :viewer_count
-    attr_reader :preview_url
-    attr_reader :channel
+    include Connection
 
-  private
-    def parse(hash)
+    def initialize(hash)
       @id = hash['_id']
       @broadcaster = hash['broadcaster']
       @game_name = hash['game']
       @name = hash['name']
       @viewer_count = hash['viewers']
       @preview_url = hash['preview']
-      @channel = Channel.new(hash['channel'], @connection)
+      @channel = Channel.new(hash['channel'])
     end
+
+    attr_reader :id
+    attr_reader :broadcaster
+    attr_reader :game_name
+    attr_reader :name
+    attr_reader :viewer_count
+    attr_reader :preview_url
+    attr_reader :channel
   end
 
   class Streams
+    include Connection
+
     def self.all
     end
 
@@ -76,76 +68,45 @@ module Kappa::V2
       end
 
       limit = args[:limit]
-      if limit && (limit < 25)
+      if limit && (limit < 100)
         params[:limit] = limit
       else
-        params[:limit] = 25
+        params[:limit] = 100
         limit = 0
       end
 
-      streams = []
-      ids = Set.new
-
-      connection = Connection.instance
-      connection.paginated('streams', params) do |json|
-        current_streams = json['streams']
-        current_streams.each do |stream_json|
-          stream = Stream.new(stream_json, connection)
-          if ids.add?(stream.id)
-            streams << stream
-            if streams.count == limit
-              return streams
-            end
-          end
-        end
-
-        !current_streams.empty?
-      end
-
-      streams
+      return connection.accumulate(
+        :path => 'streams',
+        :params => params,
+        :json => 'streams',
+        :class => Stream,
+        :limit => limit
+      )
     end
 
     #
     # GET /streams/featured
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/streams.md#get-streamsfeatured
     #
-    def self.featured(params = {})
-      limit = params[:limit] || 0
-
-      streams = []
-      ids = Set.new
-
-      connection = Connection.instance
-      connection.paginated('streams/featured', params) do |json|
-        current_streams = json['featured']
-        current_streams.each do |featured_json|
-          # TODO: Capture more information from the featured_json structure (need a FeaturedStream class?)
-          stream_json = featured_json['stream']
-          stream = Stream.new(stream_json, connection)
-          if ids.add?(stream.id)
-            streams << stream
-            if streams.count == limit
-              return streams
-            end
-          end
-        end
+    def self.featured(args = {})
+      params = {}
 
-        !current_streams.empty?
+      limit = args[:limit]
+      if limit && (limit < 100)
+        params[:limit] = limit
+      else
+        params[:limit] = 100
+        limit = 0
       end
 
-      streams
-    end
-  end
-end
-
-module Kappa::V3
-  class Stream < Kappa::StreamBase
-    def initialize(arg, connection = Connection.instance)
-      super(arg, connection)
-    end
-
-  private
-    def parse(hash)
+      return connection.accumulate(
+        :path => 'streams/featured',
+        :params => params,
+        :json => 'featured',
+        :sub_json => 'stream',
+        :class => Stream,
+        :limit => limit
+      )
     end
   end
 end

data/lib/kappa/team.rb

@@ -1,17 +1,18 @@
 module Kappa
+  # @private
   class TeamBase
     include IdEquality
 
-    def initialize(arg, connection)
-      @connection = connection
-
-      case arg
-        when Hash
-          parse(arg)
-        when String
-          json = @connection.get("teams/#{arg}")
-        else
-          raise ArgumentError
+    #
+    # GET /teams/:team
+    # https://github.com/justintv/Twitch-API/blob/master/v2_resources/teams.md#get-teamsteam
+    #
+    def self.get(team_name)
+      json = connection.get("teams/#{team_name}")
+      if json['status'] == 404
+        nil
+      else
+        new(json)
       end
     end
   end
@@ -19,26 +20,9 @@ end
 
 module Kappa::V2
   class Team < Kappa::TeamBase
-    #
-    # GET /teams/:team
-    # https://github.com/justintv/Twitch-API/blob/master/v2_resources/teams.md#get-teamsteam
-    #
-    def intialize(arg, connection = Connection.instance)
-      super(arg, connection)
-    end
-
-    attr_reader :id
-    attr_reader :info
-    attr_reader :background_url
-    attr_reader :banner_url
-    attr_reader :logo_url
-    attr_reader :name
-    attr_reader :display_name
-    attr_reader :updated_at
-    attr_reader :created_at
+    include Connection
     
-  private
-    def parse(hash)
+    def initialize(hash)
       @id = hash['_id']
       @info = hash['info']
       @background_url = hash['background']
@@ -49,35 +33,43 @@ module Kappa::V2
       @updated_at = DateTime.parse(hash['updated_at'])
       @created_at = DateTime.parse(hash['created_at'])
     end
+
+    attr_reader :id
+    attr_reader :info
+    attr_reader :background_url
+    attr_reader :banner_url
+    attr_reader :logo_url
+    attr_reader :name
+    attr_reader :display_name
+    attr_reader :updated_at
+    attr_reader :created_at
   end
 
   class Teams
+    include Connection
+
     #
     # GET /teams
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/teams.md#get-teams
     #
-    def all(params = {})
-      limit = params[:limit] || 0
-
-      teams = []
-      ids = Set.new
-
-      @conn.paginated('teams', params) do |json|
-        teams_json = json['teams']
-        teams_json.each do |team_json|
-          team = Team.new(team_json, @conn)
-          if ids.add?(team.id)
-            teams << team
-            if teams.count == limit
-              return teams
-            end
-          end
-        end
+    def self.all(args = {})
+      params = {}
 
-        !teams_json.empty?
+      limit = args[:limit]
+      if limit && (limit < 100)
+        params[:limit] = limit
+      else
+        params[:limit] = 100
+        limit = 0
       end
 
-      teams
+      return connection.accumulate(
+        :path => 'teams',
+        :params => params,
+        :json => 'teams',
+        :class => Team,
+        :limit => limit
+      )
     end
   end
 end

data/lib/kappa/user.rb

@@ -1,34 +1,37 @@
 module Kappa
+  # @private
   class UserBase
     include IdEquality
 
-    def initialize(hash, connection = self.class.default_connection)
-      @connection = connection
-      parse(hash)
-    end
-
     #
     # GET /users/:user
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/users.md#get-usersuser
     #
-    def self.get(user_name, connection = default_connection)
+    def self.get(user_name)
       json = connection.get("users/#{user_name}")
       if json['status'] == 404
         nil
       else
-        new(json, connection)
+        new(json)
       end
     end
-
-  private
-    def self.default_connection
-      self.class.module_class(:Connection).instance
-    end
   end
 end
 
 module Kappa::V2
   class User < Kappa::UserBase
+    include Connection
+
+    def initialize(hash)
+      @id = hash['_id']
+      @created_at = DateTime.parse(hash['created_at'])
+      @display_name = hash['display_name']
+      @logo_url = hash['logo']
+      @name = hash['name']
+      @staff = hash['staff'] || false
+      @updated_at = DateTime.parse(hash['updated_at'])
+    end
+
     def channel
       # TODO
     end
@@ -54,28 +57,24 @@ module Kappa::V2
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/follows.md#get-usersuserfollowschannels
     #
     def following(params = {})
-      limit = params[:limit] || 0
-
-      channels = []
-      ids = Set.new
-
-      @connection.paginated("users/#{@name}/follows/channels", params) do |json|
-        current_channels = json['follows']
-        current_channels.each do |follow_json|
-          channel_json = follow_json['channel']
-          channel = Channel.new(channel_json, @connection)
-          if ids.add?(channel.id)
-            channels << channel
-            if channels.count == limit
-              return channels
-            end
-          end
-        end
+      params = {}
 
-        !current_channels.empty?
+      limit = args[:limit]
+      if limit && (limit < 100)
+        params[:limit] = limit
+      else
+        params[:limit] = 100
+        limit = 0
       end
 
-      channels
+      return connection.accumulate(
+        :path => "users/#{@name}/follows/channels",
+        :params => params,
+        :json => 'follows',
+        :sub_json => 'channel',
+        :class => Channel,
+        :limit => limit
+      )
     end
 
     #
@@ -83,7 +82,7 @@ module Kappa::V2
     # https://github.com/justintv/Twitch-API/blob/master/v2_resources/follows.md#get-usersuserfollowschannelstarget
     #
     def following?(channel_name)
-      json = @connection.get("users/#{@name}/follows/channels/#{channel_name}")
+      json = connection.get("users/#{@name}/follows/channels/#{channel_name}")
       status = json['status']
       return !status || (status != 404)
     end
@@ -98,16 +97,5 @@ module Kappa::V2
     # TODO: Authenticated user attributes.
     # attr_reader :email
     # def partnered?
-    
-  private
-    def parse(hash)
-      @id = hash['_id']
-      @created_at = DateTime.parse(hash['created_at'])
-      @display_name = hash['display_name']
-      @logo_url = hash['logo']
-      @name = hash['name']
-      @staff = hash['staff'] || false
-      @updated_at = DateTime.parse(hash['updated_at'])
-    end
   end
 end

data/lib/kappa/version.rb

@@ -1 +1 @@
-$version = '0.1.3.pre'
+$version = '0.1.4.pre'

data/lib/kappa/video.rb

@@ -1,31 +1,35 @@
 module Kappa
+  # @private
   class VideoBase
     include IdEquality
 
-    def initialize(arg, connection)
-      @connection = connection
-
-      case arg
-        when Hash
-          parse(arg)
-        when String
-          json = @connection.get("videos/#{arg}")
-          parse(json)
-        else
-          raise ArgumentError
-      end
+    def self.get(id)
+      json = connection.get("videos/#{id}")
+      new(json)
     end
   end
 end
 
 module Kappa::V2
   class Video < Kappa::VideoBase
-    def initialize(arg)
-      super(arg, Connection.instance)
+    include Connection
+
+    def initialize(hash)
+      @id = hash['id']
+      @title = hash['title']
+      @recorded_at = DateTime.parse(hash['recorded_at'])
+      @url = hash['url']
+      @view_count = hash['views']
+      @description = hash['description']
+      @length_sec = hash['length']
+      @game_name = hash['game']
+      @preview_url = hash['preview']
+      @channel_name = hash['channel']['name']
+      # @channel_display_name = json['channel']['display_name']
     end
 
     def channel
-      Channel.new(@conn.get("channels/#{@channel_name}"), @conn)
+      Channel.new(connection.get("channels/#{@channel_name}"))
     end
 
     attr_reader :id
@@ -40,23 +44,6 @@ module Kappa::V2
     attr_reader :preview_url
     # TODO: Move this under "v.channel.name" and force the query if other attributes are requested.
     attr_reader :channel_name
-
-  private
-    def parse(hash)
-      @conn = conn
-
-      @id = hash['id']
-      @title = hash['title']
-      @recorded_at = DateTime.parse(hash['recorded_at'])
-      @url = hash['url']
-      @view_count = hash['views']
-      @description = hash['description']
-      @length_sec = hash['length']
-      @game_name = hash['game']
-      @preview_url = hash['preview']
-      @channel_name = hash['channel']['name']
-      # @channel_display_name = json['channel']['display_name']
-    end
   end
 
   class Videos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kappa
 version: !ruby/object:Gem::Version
-  version: 0.1.3.pre
+  version: 0.1.4.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    A Ruby library for interfacing with the Twitch.tv Kraken API\n
   \   including users, channels, streams, and followers.\n"
 email: schmch@gmail.com
@@ -98,7 +114,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/kappa/base.rb
 - lib/kappa/channel.rb
 - lib/kappa/connection.rb
 - lib/kappa/game.rb
@@ -137,3 +152,4 @@ signing_key:
 specification_version: 3
 summary: Ruby library for interfacing with the Twitch.tv Kraken API.
 test_files: []
+has_rdoc: 

data/lib/kappa/base.rb

@@ -1,9 +0,0 @@
-class Class
-  def module_class(sym)
-    parts = name.split('::')
-    parts[-1] = sym
-    parts.inject(Kernel) { |const, part|
-      const.const_get(part)
-    }
-  end
-end