robut 0.2.0 → 0.2.1

data/Gemfile

@@ -11,7 +11,7 @@ end
 group :plugin do
   gem 'calc'
   gem 'twss'
-  gem 'rdio'
+  gem 'rdio', '0.0.91' # .92 is horked
   gem 'sinatra'
   gem 'meme_generator'
 end

data/lib/robut/connection.rb

@@ -93,7 +93,7 @@ class Robut::Connection
         rsp = plugin.handle(time, nick, message)
         break if rsp == true
       rescue => e
-        reply("I just pooped myself trying to run #{plugin.class.name}. AWK-WAAAARD!")
+        reply("UH OH! #{plugin.class.name} just crashed!")
         if config.logger
           config.logger.error e
           config.logger.error e.backtrace.join("\n")

data/lib/robut/plugin/rdio.rb

@@ -19,6 +19,20 @@ class Robut::Plugin::Rdio < Robut::Plugin::Base
 
     # The host the Rdio web player will run on. Defaults to localhost.
     attr_accessor :host
+
+    # The playback token for +domain+. If you're accessing Rdio on
+    # localhost, you shouldn't need to change this. Otherwise,
+    # download the rdio-python plugin:
+    #
+    #   https://github.com/rdio/rdio-python
+    #
+    # and generate a new token for your domain:
+    #
+    #   ./rdio-call --consumer-key=YOUR_CONSUMER_KEY --consumer-secret=YOUR_CONSUMER_SECRET getPlaybackToken domain=YOUR_DOMAIN
+    attr_accessor :token
+    
+    # The domain associated with +token+. Defaults to localhost.
+    attr_accessor :domain
   end
 
   # Starts a Robut::Plugin::Rdio::Server server for communicating with
@@ -26,6 +40,8 @@ class Robut::Plugin::Rdio < Robut::Plugin::Base
   # you plan on using this gem.
   def self.start_server
     @server = Thread.new { Server.run! :host => (host || "localhost"), :port => (port || 4567) }
+    Server.token = self.token || "GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc="
+    Server.domain = self.domain || "localhost"
   end
 
   # Queues songs into the Rdio web player. @nick play search query

data/lib/robut/plugin/rdio/public/index.html

@@ -34,7 +34,8 @@
   
   <script src="https://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
-	<script src="/js/rdio.js"></script>
+  <script src="/js/vars.js"></script>
+	<script src="/js/rdio.js"></script>
 	<!--[if lt IE 7 ]>
 	<script src="js/libs/dd_belatedpng.js"></script>
 	<script> DD_belatedPNG.fix('img, .png_bg');</script>

data/lib/robut/plugin/rdio/public/js/rdio.js

@@ -120,8 +120,8 @@ RdioPlayer = (function () {
 
 $(document).ready(function () {
   window.rdio = new RdioPlayer({
-    token: "GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc=",
-    domain: "localhost",
+    token: rdio_token,
+    domain: rdio_domain,
     elementId: 'apiswf',
     callbackName: 'rdio_callback'
   });

data/lib/robut/plugin/rdio/server.rb

@@ -15,6 +15,20 @@ class Robut::Plugin::Rdio < Robut::Plugin::Base
       # A list of items that haven't been fetched by the web playback
       # API yet.
       attr_accessor :queue
+
+      # The playback token for +domain+. If you're accessing Rdio over
+      # localhost, you shouldn't need to change this. Otherwise,
+      # download the rdio-python plugin:
+      #
+      #   https://github.com/rdio/rdio-python
+      #
+      # and generate a new token for your domain:
+      #
+      #   ./rdio-call --consumer-key=YOUR_CONSUMER_KEY --consumer-secret=YOUR_CONSUMER_SECRET getPlaybackToken domain=YOUR_DOMAIN
+      attr_accessor :token
+
+      # The domain associated with +token+. Defaults to localhost.
+      attr_accessor :domain
     end
     self.queue = []
 
@@ -23,6 +37,14 @@ class Robut::Plugin::Rdio < Robut::Plugin::Base
       File.read(File.expand_path('public/index.html', File.dirname(__FILE__)))
     end
 
+    get '/js/vars.js' do
+      content_type 'text/javascript'
+      <<END
+var rdio_token = '#{self.class.token}';
+var rdio_domain = '#{self.class.domain}';
+END
+    end
+
     # Returns the sources that haven't been fetched yet.
     get '/queue.json' do
       queue = self.class.queue.dup

data/lib/robut/version.rb

@@ -1,4 +1,4 @@
 module Robut # :nodoc:
   # Robut's version number.
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: robut
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Justin Weiss
@@ -10,11 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -07:00
+date: 2011-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xmpp4r
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,7 +23,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 description: A simple plugin-enabled HipChat bot
 email: 
@@ -99,23 +99,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -555971066717655202
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -555971066717655202
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: robut
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple plugin-enabled HipChat bot