turntabler 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # master
 
+## 0.3.0 / 2013-02-23
+
+* Fix playlist order not being maintained properly in process
+* Rename Song#enqueue to Song#add and Song#dequeue to Song#remove
+* Song#dequeue and #move no longer allow the playlist to be specified since it's known upfront
+* Fix Song#load not getting metadata from the correct playlist
+* Add Song#playlist
+* Add room_description_updated event
+* Add song_skipped / song_moderated events
+* Add #started_at, #ends_at, and #seconds_remaining to Song
+* Add dj_escorted_off / dj_booed_off events
+* Add fan_added / fan_removed events
+* Add user_name_updated / user_avatar_updated / user_stickers_updated events
+
 ## 0.2.1 / 2013-02-16
 
 * Fix exceptions on initial connection not causing reconnection process to kick in

data/README.md

@@ -160,7 +160,7 @@ Turntabler.run do
   # Songs
   songs = client.search_song('Rolling Stones')      # => [#<Turntabler::Song @album="Tattoo You (2009 Remaster)" ...>, ...]
   songs.each do
-    song.enqueue                                    # => true
+    song.add                                        # => true
   end
 end
 ```

data/examples/Gemfile.lock

@@ -17,7 +17,7 @@ GEM
     faye-websocket (0.4.6)
       eventmachine (>= 0.12.0)
     http_parser.rb (0.5.3)
-    turntabler (0.2.1)
+    turntabler (0.3.0)
       em-http-request
       em-synchrony
       faye-websocket

data/lib/turntabler/authorized_user.rb

@@ -250,8 +250,11 @@ module Turntabler
     def update_status(status = self.status)
       assert_valid_values(status, *%w(available unavailable away))
 
+      now = Time.now.to_i
       result = api('presence.update', :status => status)
-      client.reset_keepalive(result['interval']) if result['interval']
+
+      client.reset_keepalive(result['interval'])
+      client.clock_delta = ((now + Time.now.to_i) / 2 - result['now']).round
       self.attributes = {'status' => status}
 
       true

data/lib/turntabler/client.rb

@@ -36,6 +36,10 @@ module Turntabler
     # @return [Fixnum]
     attr_reader :timeout
     
+    # The difference of time (in seconds) between this client and Turntable servers
+    # @return [Fixnum]
+    attr_accessor :clock_delta
+
     # Creates a new client for communicating with Turntable.fm with the given
     # email / password.
     # 
@@ -67,6 +71,7 @@ module Turntabler
       @timeout = options[:timeout]
       @reconnect = options[:reconnect]
       @reconnect_wait = options[:reconnect_wait]
+      @clock_delta = 0
 
       # Setup default event handlers
       on(:heartbeat) { on_heartbeat }
@@ -192,19 +197,27 @@ module Turntabler
     # == Room Events
     # 
     # * +:room_updated+ - Information about the room was updated
+    # * +:room_description_updated+ - The room's description was updated
     # 
     # @example
     #   client.on :room_updated do |room| # Room
     #     puts room.description
     #     # ...
     #   end
+    #   
+    #   client.on :room_description_updated do |room| # Room
+    #     puts room.description
+    #     # ...
+    #   end
     # 
     # == User Events
     # 
     # * +:user_entered+ - A user entered the room
     # * +:user_left+ - A user left the room
     # * +:user_booted+ - A user has been booted from the room
-    # * +:user_updated+ - A user's name / profile was updated
+    # * +:user_updated+ - A user's profile was updated
+    # * +:user_name_updated+ - A user's name was updated
+    # * +:user_avatar_updated+ - A user's avatar was updated
     # * +:user_spoke+ - A user spoke in the chat room
     # 
     # @example
@@ -225,7 +238,22 @@ module Turntabler
     #   end
     #   
     #   client.on :user_updated do |user| # User
-    #     puts user.laptop_name
+    #     puts user.name
+    #     # ...
+    #   end
+    #   
+    #   client.on :user_name_updated do |user| # User
+    #     puts user.name
+    #     # ...
+    #   end
+    #   
+    #   client.on :user_avatar_updated do |user| # User
+    #     puts user.avatar.id
+    #     # ...
+    #   end
+    #   
+    #   client.on :user_stickers_updated do |user| # User
+    #     puts user.stickers.map {|sticker| sticker.id}
     #     # ...
     #   end
     #   
@@ -236,8 +264,26 @@ module Turntabler
     #   
     # == DJ Events
     # 
-    # * +:dj_added+ - A new DJ was added to the booth
-    # * +:dj_removed+ - A DJ was removed from the booth
+    # * +:fan_added+ - A new fan was added by a user in the room
+    # * +:fan_removed+ - A fan was removed from a user in the room
+    # 
+    # @example
+    #   client.on :fan_added do |user, fan_of| # User, User
+    #     puts user.id
+    #     # ...
+    #   end
+    #   
+    #   client.on :fan_removed do |user, count| # User, Fixnum
+    #     puts user.id
+    #     # ...
+    #   end
+    # 
+    # == DJ Events
+    # 
+    # * +:dj_added+ - A new DJ was added to the stage
+    # * +:dj_removed+ - A DJ was removed from the stage
+    # * +:dj_escorted_off+ - A DJ was escorted off the stage by a moderator
+    # * +:dj_booed_off+ - A DJ was booed off the stage
     # 
     # @example
     #   client.on :dj_added do |user| # User
@@ -249,6 +295,16 @@ module Turntabler
     #     puts user.id
     #     # ...
     #   end
+    #   
+    #   client.on :dj_escorted_off do |user, moderator| # User, User
+    #     puts user.id
+    #     # ...
+    #   end
+    #   
+    #   client.on :dj_booed_off do |user| # User
+    #     puts user.id
+    #     # ...
+    #   end
     # 
     # == Moderator Events
     # 
@@ -273,8 +329,9 @@ module Turntabler
     # * +:song_ended+ - The current song has ended.  This is typically followed by a +:song_started+ or +:song_unavailable+ event.
     # * +:song_voted+ - One or more votes were cast for the song
     # * +:song_snagged+ - A user in the room has queued the current song onto their playlist
-    # * +:song_blocked+ - A song was skipped due to a copyright claim
-    # * +:song_limited+ - A song was skipped due to a limit on # of plays per hour
+    # * +:song_skipped+ - A song was skipped due to either the dj skipping it or too many downvotes
+    # * +:song_moderated+ - A song was forcefully skipped by a moderator
+    # * +:song_blocked+ - A song was prevented from playing due to a copyright claim
     # 
     # @example
     #   client.on :song_unavailable do
@@ -304,6 +361,17 @@ module Turntabler
     #     # ...
     #   end
     #   
+    #   client.on :song_skipped do |song| # Song
+    #     puts song.title
+    #     # ...
+    #   end
+    #   
+    #   client.on :song_moderated do |song, moderator| # Song, User
+    #     puts song.title
+    #     puts moderator.id
+    #     # ...
+    #   end
+    #   
     #   client.on :song_blocked do |song| # Song
     #     puts song.id
     #     # ...

data/lib/turntabler/event.rb

@@ -23,7 +23,7 @@ module Turntabler
       # @yieldreturn The typecasted data that should be passed into any handlers bound to the event
       # @return [nil]
       def handle(name, command = name, &block)
-        block ||= lambda {}
+        block ||= lambda { [args] }
         commands[command] = name
 
         define_method("typecast_#{command}_event", &block)
@@ -71,9 +71,17 @@ module Turntabler
     # Information about the room was updated
     handle :room_updated, :update_room do
       room.attributes = data
+
+      # Trigger detailed events for exactly what changed to make it easier to
+      # detect the various situations
+      client.trigger(:room_description_updated, room) if data['description']
+
       room
     end
 
+    # A room's description has been updated
+    handle :room_description_updated
+
     # One or more users have entered the room
     handle :user_entered, :registered do
       data['user'].map do |attrs|
@@ -101,43 +109,78 @@ module Turntabler
 
     # A user's name / profile has been updated
     handle :user_updated, :update_user do
-      fans_change = data.delete('fans')
+      fans_change = data.delete('fans') || 0
       user = room.build_user(data)
-      user.attributes = {'fans' => user.fans_count + fans_change} if fans_change
+      user.attributes = {'fans' => user.fans_count + fans_change}
+
+      # Trigger detailed events for exactly what changed to make it easier to
+      # detect the various situations
+      client.trigger(:user_name_updated, user) if data['name']
+      client.trigger(:user_avatar_updated, user) if data['avatarid']
+      client.trigger(:fan_added, user, room.build_user(:_id => data['fanid'])) if fans_change > 0
+      client.trigger(:fan_removed, user, fans_change.abs) if fans_change < 0
+
       user
     end
 
+    # A user's name has been updated
+    handle :user_name_updated
+
+    # A user's avatar has been updated
+    handle :user_avatar_updated
+
     # A user's stickers have been updated
     handle :user_updated, :update_sticker_placements do
-      room.build_user(data)
+      user = room.build_user(data)
+      client.trigger(:user_stickers_updated, user)
+      user
     end
 
+    # A user's stickers have been updated
+    handle :user_stickers_updated
+
     # A user spoke in the chat room
     handle :user_spoke, :speak do
       data['senderid'] = data.delete('userid')
       Message.new(client, data)
     end
 
-    # A new dj was added to the room
+    # A new fan was added by a user in the room
+    handle :fan_added
+
+    # A fan has been removed by a user in the room
+    handle :fan_removed
+
+    # A new dj was added to the stage
     handle :dj_added, :add_dj do
-      new_djs = []
-      data['user'].each_with_index do |attrs, index|
-        user = room.build_user(attrs.merge('placements' => data['placements'][index]))
-        new_djs << [user]
-        room.djs << user
-      end
-      new_djs
+      user = room.build_user(data['user'][0].merge('placements' => data['placements']))
+      room.djs << user
+      user
     end
 
-    # A dj was removed from the room
+    # A dj was removed from the stage
     handle :dj_removed, :rem_dj do
-      data['user'].map do |attrs|
-        user = room.build_user(attrs)
-        room.djs.delete(user)
-        [user]
+      user = room.build_user(data['user'][0])
+      room.djs.delete(user)
+
+      if moderator_id = data['modid']
+        if moderator_id == 1
+          client.trigger(:dj_booed_off, user)
+        else
+          moderator = room.build_user(:_id => data['user'][0])
+          client.trigger(:dj_escorted_off, user, moderator)
+        end
       end
+
+      [user]
     end
 
+    # A dj was escorted off the stage by a moderator
+    handle :dj_escorted_off
+
+    # A dj was booed off the stage
+    handle :dj_booed_off
+
     # A new moderator was added to the room
     handle :moderator_added, :new_moderator do
       user = room.build_user(data)
@@ -155,7 +198,8 @@ module Turntabler
     # There are no more songs to play in the room
     handle :song_unavailable, :nosong do
       client.trigger(:song_ended) if room.current_song
-      room.attributes = data['room'].merge('current_song' => nil)
+      data['room'].delete('current_song')
+      room.attributes = data['room']
       nil
     end
 
@@ -163,12 +207,20 @@ module Turntabler
     handle :song_started, :newsong do
       client.trigger(:song_ended) if room.current_song
       room.attributes = data['room']
-      room.current_song
+      current_song = room.current_song
+
+      # Update playlist order if it was played by the current user
+      current_song.dequeue if current_song.played_by == client.user
+
+      current_song
     end
 
     # The current song has ended
     handle :song_ended do
-      room.current_song
+      current_song = room.current_song
+      client.trigger(:song_skipped) if current_song.seconds_remaining > 10
+      room.attributes = {'current_song' => nil}
+      current_song
     end
 
     # A vote was cast for the song
@@ -201,6 +253,16 @@ module Turntabler
       Song.new(client, data)
     end
 
+    # A song was forcefully skipped by a moderator
+    handle :song_moderated, :stop_song do
+      moderator = room.build_user(:_id => data['skipperId'])
+      [[room.current_song, moderator]]
+    end
+
+    # A song was ended before it completed, either because the dj skipped it or
+    # it was booed off
+    handle :song_skipped
+
     # A private message was received from another user in the room
     handle :message_received, :pmmed do
       Message.new(client, data)
@@ -233,7 +295,8 @@ module Turntabler
     # Creates a new event triggered with the given data
     # 
     # @param [Turntabler::Client] client The client that this event is bound to
-    # @param [Hash] data The response data from Turntable
+    # @param [Symbol] command The name of the command that fired the event
+    # @param [Array] args The raw argument data from the event
     def initialize(client, command, args)
       @client = client
       @args = args

data/lib/turntabler/playlist.rb

@@ -16,7 +16,7 @@ module Turntabler
     # The songs that have been added to this playlist
     # @return [Array<Turntabler::Song>]
     attribute :songs, :list do |songs|
-      songs.map {|attrs| Song.new(client, attrs)}
+      songs.map {|attrs| Song.new(client, attrs.merge(:playlist => id))}
     end
 
     # Loads the attributes for this playlist.  Attributes will automatically load

data/lib/turntabler/song.rb

@@ -49,6 +49,16 @@ module Turntabler
     # @return [String]
     attribute :source_id, :sourceid
     
+    # The playlist this song is referenced from
+    # @return [Turntabler::Playlist]
+    attribute :playlist do |id|
+      client.user.playlists.build(:_id => id)
+    end
+    
+    # The time at which the song was started
+    # @return [Time]
+    attribute :started_at, :starttime
+
     # The number of up votes this song has received.
     # @note This is only available for the current song playing in a room
     # @return [Fixnum]
@@ -84,14 +94,33 @@ module Turntabler
     end
 
     # @api private
-    def initialize(*)
+    def initialize(client, *)
       @up_votes_count = 0
       @down_votes_count = 0
       @votes = []
       @score = 0
+      @playlist = client.user.playlists.build(:_id => 'default')
       super
     end
 
+    # The time at which this song will end playing.
+    # 
+    # @return [Time]
+    # @example
+    #   song.ends_at  # => 2013-01-05 12:14:25 -0500
+    def ends_at
+      started_at + client.clock_delta + length if started_at
+    end
+
+    # The number of seconds remaining to play in the song
+    # 
+    # @return [Fixnum]
+    # @example
+    #   song.seconds_remaining  # => 12
+    def seconds_remaining
+      ends_at ? (ends_at - started_at).round : 0
+    end
+
     # Loads the attributes for this song.  Attributes will automatically load
     # when accessed, but this allows data to be forcefully loaded upfront.
     # 
@@ -101,7 +130,7 @@ module Turntabler
     #   song.load     # => true
     #   song.title    # => "..."
     def load
-      data = api('playlist.get_metadata', :playlist_name => 'default', :files => [id])
+      data = api('playlist.get_metadata', :playlist_name => playlist.id, :files => [id])
       self.attributes = data['files'][id]
       super
     end
@@ -172,37 +201,35 @@ module Turntabler
     # Adds the song to one of the user's playlists.
     # 
     # @param [Hash] options The options for where to add the song
-    # @option options [String] :playlist ("default") The playlist to enqueue the song in
+    # @option options [String] :playlist ("default") The playlist to add the song in
     # @option options [Fixnum] :index (0) The location in the playlist to insert the song
     # @return [true]
     # @raise [ArgumentError] if an invalid option is specified
     # @raise [Turntabler::Error] if the command fails
     # @example
-    #   song.enqueue(:index => 1)   # => true
-    def enqueue(options = {})
+    #   song.add(:index => 1)   # => true
+    def add(options = {})
       assert_valid_keys(options, :playlist, :index)
-      options = {:playlist => 'default', :index => 0}.merge(options)
-      playlist, index = client.user.playlist(options[:playlist]), options[:index]
+      options = {:playlist => playlist.id, :index => 0}.merge(options)
+
+      # Create a copy of the song so that the playlist can get set properly
+      song = dup
+      song.attributes = {:playlist => options[:playlist]}
+      playlist, index = song.playlist, options[:index]
 
       api('playlist.add', :playlist_name => playlist.id, :song_dict => {:fileid => id}, :index => index)
-      playlist.songs.insert(index, self) if playlist.loaded?
+      playlist.songs.insert(index, song) if playlist.loaded?
       true
     end
     
     # Removes the song from the playlist at the given index.
     # 
-    # @param [Hash] options The options for where to remove the song
-    # @option options [String] :playlist ("default") The playlist to dequeue the song from
     # @return [true]
     # @raise [ArgumentError] if an invalid option is specified
     # @raise [Turntabler::Error] if the command fails
     # @example
-    #   song.dequeue    # => true
-    def dequeue(options = {})
-      assert_valid_keys(options, :playlist)
-      options = {:playlist => 'default'}.merge(options)
-      playlist, index = index(options[:playlist])
-
+    #   song.remove   # => true
+    def remove
       api('playlist.remove', :playlist_name => playlist.id, :index => index)
       playlist.songs.delete(self)
       true
@@ -211,22 +238,25 @@ module Turntabler
     # Move a song from one location in the playlist to another.
     # 
     # @param [Fixnum] to_index The index to move the song to
-    # @param [Hash] options The options for where to remove the song
-    # @option options [String] :playlist ("default") The playlist to move the song within
     # @return [true]
     # @raise [ArgumentError] if an invalid option is specified
     # @raise [Turntabler::Error] if the command fails
     #   song.move(5)    # => true
-    def move(to_index, options = {})
-      assert_valid_keys(options, :playlist)
-      options = {:playlist => 'default'}.merge(options)
-      playlist, index = index(options[:playlist])
-
+    def move(to_index)
       api('playlist.reorder', :playlist_name => playlist.id, :index_from => index, :index_to => to_index)
       playlist.songs.insert(to_index, playlist.songs.delete(self))
       true
     end
     
+    # Moves this song to the back of the playlist it's associated with.  If there
+    # are other songs in front of it, those will be moved to the back as well.
+    # 
+    # @api private
+    def dequeue
+      playlist.songs.concat(playlist.songs.slice!(0, index + 1))
+      true
+    end
+
     private
     # Asserts that this is the song currently being played in the room the user
     # is in.  Raises Turntabler::Error if this is not the case.
@@ -236,11 +266,10 @@ module Turntabler
     
     # Gets the index of this song within the given playlist.  Raises Turntabler::Error
     # if the song cannot be found in the playlist.
-    def index(playlist_id)
-      playlist = client.user.playlist(playlist_id)
+    def index
       index = playlist.songs.index(self)
       raise(APIError, "Song \"#{id}\" is not in playlist \"#{playlist.id}\"") unless index
-      return playlist, index
+      index
     end
   end
 end

data/lib/turntabler/user.rb

@@ -68,7 +68,8 @@ module Turntabler
 
     # The placements of stickers on the user's laptop
     # @return [Array<Turntabler::StickerPlacement>]
-    attribute :sticker_placements, :placements do |placements|
+    attribute :sticker_placements, :sticker_placements, :placements do |placements|
+      placements = placements.keys if placements.is_a?(Hash)
       placements.map {|attrs| StickerPlacement.new(client, attrs)}
     end
 

data/lib/turntabler/version.rb

@@ -2,8 +2,8 @@ module Turntabler
   # The current version of the library
   module Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
 end

data/lib/turntabler.rb

@@ -113,7 +113,7 @@ module Turntabler
         if Event.command?(name)
           raise ArgumentError, "Event :#{name} is already defined"
         else
-          Event.handle(name) { [args] }
+          Event.handle(name)
         end
       end
     end

metadata

@@ -1,94 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: turntabler
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Aaron Pfeifer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: em-synchrony
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: faye-websocket
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Turntable.FM API for Ruby
 email: aaron.pfeifer@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 - LICENSE
-files: 
+files:
 - .gitignore
 - .rspec
 - .yardopts
@@ -139,36 +166,33 @@ files:
 - turntabler.gemspec
 homepage: http://github.com/obrie/turntabler
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - turntabler
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Turntable.FM API for Ruby
 test_files: []
-
 has_rdoc: