cinch-lastfm 0.1.0 → 0.2.0

data/lib/cinch/plugins/lastfm.rb

@@ -1,16 +1,18 @@
 require 'cinch'
 require 'nokogiri'
 require 'open-uri'
+require 'redis'
+require 'redis-namespace'
 
 module Cinch
 	module Plugins
 		class Lastfm
 			include Cinch::Plugin
-			#attr_accessor :backend
+			attr_accessor :backend, :redis
 			# Redis backend
 
 			class << self
-				attr_accessor :lfmapi #:host, :port # Redis backend scrub
+				attr_accessor :lfmapi, :host, :port # Redis backend scrub
 
 				def configure(&block) 
 					yield self
@@ -19,11 +21,15 @@ module Cinch
 
 			def initialize(*args)
 				super
-				# @backend = Redis.new(self.class.host, self.class.port)
-				# Will feature a redis backend
+				@redis = Redis.new(:host => self.class.host, :port => self.class.port, :thread_safe => true)
+				@backend = Redis::Namespace.new("cinch-lastfm", :redis => redis)
+				# Redis backend
 			end
 
 			match %r{np ([a-zA-Z0-9]+)}, :method => :now_playing
+			match %r{link ([a-zA-Z0-9]+)}, :method => :link_account
+			match %r{np}, :method => :now_playing_user
+
 
 			# Gets Now Playing for an user
 			def now_playing(m, nick)
@@ -31,6 +37,21 @@ module Cinch
 				m.reply("#{nick} has recently played: #{artist} - #{track}")
 			end
 
+			# Gets Now Playing for a linked account
+			def now_playing_user(m)
+				nick = @backend.get(m.user)
+				if nick
+					artist, track = get_data(nick)
+					m.reply("#{nick} has recently played: #{artist} - #{track}")
+				end
+			end
+
+			# Links a designated Last Fm account
+			def link_account(m, nick)
+				@backend.set(m.user, nick)
+				m.reply("#{m.user} is now linked with account #{nick}!")
+			end
+			
 			def get_data(nick)
 				lfmXML = Nokogiri::XML(open("http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=#{nick}&api_key=#{self.class.lfmapi}"))
 				artist = lfmXML.xpath('//artist').first.content

data/spec/lastfm_spec.rb

@@ -4,6 +4,10 @@ describe Cinch::Plugins::Lastfm do
 	
 	before :each do
 		Cinch::Plugins::Lastfm.any_instance.stub(:__register).and_return(true)
+		Cinch::Plugins::Lastfm.configure do |c|
+			c.host = "localhost"
+			c.port = "6379"
+		end
 		@bot = double()
 	end
 	
@@ -12,11 +16,28 @@ describe Cinch::Plugins::Lastfm do
 			@lfmbot = Cinch::Plugins::Lastfm.new(@bot)
 			@message = double()
 			@lfmbot.stub(:get_data).and_return(["Artist","Track"])
-			@message.should_receive(:reply).with("czujechlodno has recently played: Artist - Track")
+			@message.should_receive(:reply).with("user has recently played: Artist - Track")
+		end
+
+		it "should get now_playing" do
+			@lfmbot.now_playing(@message, "user")
+		end
+	
+	end
+
+	context "#now_playing_user" do
+		before :each do
+			@lfmbot = Cinch::Plugins::Lastfm.new(@bot)
+			@message = double()
+			@message.stub(:user).and_return("testuser")
+			@lfmbot.stub(:get_data).and_return(["Artist","Track"])
+			@message.should_receive(:reply).with("testuser is now linked with account user!")
+			@message.should_receive(:reply).with("user has recently played: Artist - Track")
 		end
 
 		it "should get now_playing" do
-			@lfmbot.now_playing(@message, "czujechlodno")
+			@lfmbot.link_account(@message, "user")
+			@lfmbot.now_playing_user(@message)
 		end
 	
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-lastfm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement