turntabler 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # master
 
+## 0.1.4 / 2012-01-08
+
+* Fix Bop / ChatBot / Switch examples not working
+* Fix Message#sender not set properly on user_spoke events
+* Fix Client#room not being reset when leaving a room
+* Fix roomid / section not being specify consistently in room APIs
+
 ## 0.1.3 / 2012-12-25
 
 * Fix references from Message#text to Message#content in examples

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.1.3)
+    turntabler (0.1.4)
       em-http-request
       em-synchrony
       faye-websocket

data/examples/bop.rb

@@ -9,7 +9,7 @@ ROOM = ENV['ROOM']          # 'xxxxxxxxxxxxxxxxxxxxxxxx'
 TT.run(EMAIL, PASSWORD, :room => ROOM) do
   on :user_spoke do |message|
     if message.content =~ /bop/
-      client.room.current_song.vote
+      room.current_song.vote
     end
   end
 end

data/examples/chat_bot.rb

@@ -10,7 +10,7 @@ TT.run(EMAIL, PASSWORD, :room => ROOM) do
   on :user_spoke do |message|
     # Respond to "/hello" command
     if (message.content =~ /^\/hello$/)
-      client.user.say("Hey! How are you @#{message.sender.name}?")
+      room.say("Hey! How are you @#{message.sender.name}?")
     end
   end
 end

data/examples/switch.rb

@@ -15,22 +15,22 @@ TT.run(EMAIL, PASSWORD, :room => ROOM) do
       # The bot is on
       case message.content
       when /^\/status$/
-        user.say 'The bot is currently turned on.'
+        room.say 'The bot is currently turned on.'
       when /^\/off$/
-        user.say 'The bot is now turned off.'
+        room.say 'The bot is now turned off.'
         is_on = false
       when /^\/hello$/
         # Add other logic here for when the bot is turned on. For example:
         # Respond to "/hello" command
-        user.say "Hey! How are you #{message.sender.name}?"
+        room.say "Hey! How are you #{message.sender.name}?"
       end
     else
       # The bot is off
       case message.content
       when /^\/status$/
-        user.say 'The bot is currently turned on.'
+        room.say 'The bot is currently turned off.'
       when /^\/on$/
-        user.say 'The bot is now turned off.'
+        room.say 'The bot is now turned on.'
         is_on = true
       end
 

data/lib/turntabler/event.rb

@@ -114,6 +114,7 @@ module Turntabler
 
     # A user spoke in the chat room
     handle :user_spoke, :speak do
+      data['senderid'] = data.delete('userid')
       Message.new(client, data)
     end
 

data/lib/turntabler/room.rb

@@ -160,7 +160,7 @@ module Turntabler
       client = @client.url == url ? @client : Turntabler::Client.new(@client.user.id, @client.user.auth, :url => url, :timeout => @client.timeout)
 
       begin
-        data = client.api('room.info', :roomid => id, :section => section, :extended => options[:song_log])
+        data = api('room.info', :extended => options[:song_log])
         self.attributes = data['room'].merge('users' => data['users'])
         super()
       ensure
@@ -219,7 +219,7 @@ module Turntabler
         client.connect(url)
         begin
           client.room = self
-          data = api('room.register', :roomid => id, :section => nil)
+          data = api('room.register', :section => nil)
           self.attributes = {'section' => data['section']}
         rescue Exception
           client.room = nil
@@ -237,7 +237,8 @@ module Turntabler
     # @example
     #   room.leave    # => true
     def leave
-      api('room.deregister', :roomid => id, :section => section)
+      api('room.deregister')
+      client.room = nil
       true
     end
 
@@ -248,7 +249,7 @@ module Turntabler
     # @example
     #   room.add_as_favorite    # => true
     def add_as_favorite
-      api('room.add_favorite', :roomid => id, :section => section)
+      api('room.add_favorite')
       true
     end
 
@@ -259,7 +260,7 @@ module Turntabler
     # @example
     #   room.remove_as_favorite   # => true
     def remove_as_favorite
-      api('room.rem_favorite', :roomid => id, :section => section)
+      api('room.rem_favorite')
       true
     end
 
@@ -306,7 +307,7 @@ module Turntabler
     #   room.become_dj    # => true
     def become_dj
       enter
-      api('room.add_dj', :roomid => id, :section => section)
+      api('room.add_dj')
       true
     end
 
@@ -368,11 +369,17 @@ module Turntabler
     # @example
     #   room.report('Name abuse ...')   # => true
     def report(reason = '')
-      api('room.report', :roomid => id, :section => section, :reason => reason)
+      api('room.report', :reason => reason)
       true
     end
 
     private
+    def api(command, options = {})
+      options[:roomid] = id unless options.include?(:roomid)
+      options[:section] = section unless options.include?(:section)
+      super
+    end
+
     # Sets the sticker placements for each dj
     def sticker_placements=(user_placements)
       user_placements.each do |user_id, placements|

data/lib/turntabler/version.rb

@@ -3,7 +3,7 @@ module Turntabler
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 3
+    PATCH = 4
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
 end

metadata

@@ -1,118 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: turntabler
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Aaron Pfeifer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-08 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 
-        hash: 3
-        segments: 
-        - 0
-        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 
-        hash: 3
-        segments: 
-        - 0
-        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 
-        hash: 3
-        segments: 
-        - 0
-        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 
-        hash: 3
-        segments: 
-        - 0
-        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 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        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 
-        hash: 3
-        segments: 
-        - 0
-        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
@@ -162,42 +165,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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Turntable.FM API for Ruby
 test_files: []
-
 has_rdoc: