lita-cricket 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfecadb970dc64839f1ddc5bc55733e6c9dae11f
-  data.tar.gz: ddde15366790faa03f50044e7f06e99c60e72cb5
+  metadata.gz: c638ba5ba8f85f6a7ec494d3dd863571b068cf5d
+  data.tar.gz: 47f8400449b02dedc21fb73b1423a1b314bd620d
 SHA512:
-  metadata.gz: 66ddcade9bde399e134029dff984b61bc70f2f1fd0d38e6f411568f1bc05c3e9c912c7c3bb00c8c6a0deefd9313475a7e4314713b9dab5b05752605a299d6bb7
-  data.tar.gz: 4a27ddfe693dd4dd654c0ad9fb63373b7d05827361b8b3830f5cfc5142a4fb392a346328234fbb448124bb3b63c3396fa7e4d0addd43e50c0ea2895322830a19
+  metadata.gz: 5a3e9bbdeb8b625047cd39704a7c020258895af0a095cccad3eac88c4249fa7e741f7f99d5dd3c5fcb6607833180575290639379f9c3decca6b62ad7e59a4518
+  data.tar.gz: bca90ad637245dd4c17a5c262f47708eb774acc7b661419d7cd0890bd5d4ea0eacb7b556518c5933105a891d1fcd3c550551babcbef44941a5d9d0e4230c0479

data/lib/lita/handlers/cricket.rb

@@ -2,7 +2,7 @@ module Lita
   module Handlers
     class Cricket < Handler
       # Version
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
 
       # Dependencies
       require 'json'
@@ -80,22 +80,22 @@ module Lita
       )
 
       def refresh_user(response)
-        my_favourites = get_my_favourites(response)
+        my_favourites = get_my_subscriptions(response,'favourite')
         if my_favourites.empty?
-          redis.set("#{response.user.id}-favourites",['Australia'].to_json)
+          set_my_subscriptions(response,['Australia'].to_json,'favourite')
           response.reply('I can give you live cricket updates! Type `help cricket` for more information.')
         elsif
           matches = get_list_of_live_matches
           matches.each do |m|
             unless ([ m['t1'], m['t2']] & my_favourites).empty?
-              subscribe_to_match(response,m['id'])
+              subscribe_to(response,m['id'],'match')
             end
           end
         end
       end
 
       def scores(response)
-        subs = get_my_subscriptions(response)
+        subs = get_my_subscriptions(response,'match')
         subs.each do |match|
           get_match_score(response,match)
         end
@@ -108,16 +108,16 @@ module Lita
 
       def subscribe(response)
         match = response.matches[0][0].to_i
-        subscribe_to_match(response,match)
+        subscribe_to(response,match,'match')
       end
 
       def unsubscribe(response)
         match = response.matches[0][0].to_i
-        subs = get_my_subscriptions(response)
+        subs = get_my_subscriptions(response,'match')
         if subs.delete(match) == nil
           response.reply("You weren't subscribed to match #{match}!")
         else
-          resp = set_my_subscriptions(response,subs)
+          resp = set_my_subscriptions(response,subs,'match')
           response.reply("Unsubscribed you to match #{match}: #{resp}")
         end
       end
@@ -135,45 +135,27 @@ module Lita
 
       def favourite(response)
         match = response.matches[0][0]
-        favs = get_my_favourites(response)
-        favs << match
-        favs.uniq!
-        resp = set_my_favourites(response,favs)
-        response.reply("Added #{match} to your favourites: #{resp}")
+        subscribe_to(response,match,'favourite')
       end
 
       def unfavourite(response)
         match = response.matches[0][0]
-        favs = get_my_favourites(response)
-        if favs.delete(match) == nil
-          response.reply("#{match} wasn't in your favourite list!")
-        else
-          resp = set_my_favourites(response,favs)
-          response.reply("Removed #{match} from your favourites: #{resp}")
-        end
+        unsubscribe_to(response,match,'favourite')
       end
 
       def info(response)
-        subs = get_my_subscriptions(response)
-        favs = get_my_favourites(response)
+        subs = get_my_subscriptions(response,'match')
+        favs = get_my_subscriptions(response,'favourite')
         response.reply("Subscriptions: #{subs.join(' | ')}")
         response.reply("Favourites: #{favs.join(' | ')}")
       end
 
-      def get_my_subscriptions(response)
-        JSON.parse(redis.get("#{response.user.id}-subscriptions")) rescue []
-      end
-
-      def set_my_subscriptions(response,subs)
-        redis.set("#{response.user.id}-subscriptions",subs)
-      end
-
-      def get_my_favourites(response)
-        JSON.parse(redis.get("#{response.user.id}-favourites")) rescue []
+      def get_my_subscriptions(response,type)
+        JSON.parse(redis.get("#{response.user.id}-#{type}")) rescue []
       end
 
-      def set_my_favourites(response,favs)
-        redis.set("#{response.user.id}-favourites",favs)
+      def set_my_subscriptions(response,subs,type)
+        redis.set("#{response.user.id}-#{type}",subs)
       end
 
       def get_list_of_live_matches
@@ -189,12 +171,22 @@ module Lita
         end
       end
 
-      def subscribe_to_match(response,id)
-        subs = get_my_subscriptions(response)
-        if (subs && [id]).empty?
+      def subscribe_to(response,id,type)
+        subs = get_my_subscriptions(response,type)
+        if (subs & [id]).empty?
           subs << id
-          resp = set_my_subscriptions(response,subs)
-          response.reply("Subscribed you to match #{id}: #{resp}")
+          resp = set_my_subscriptions(response,subs,type)
+          response.reply("Subscribed you to #{type} #{id}: #{resp}")
+        end
+      end
+
+      def unsubscribe_to(response,id,type)
+        subs = get_my_subscriptions(response,type)
+        if subs.delete(id) == nil
+          response.reply("#{id} wasn't in your #{type} list!")
+        else
+          resp = set_my_subscriptions(response,subs,type)
+          response.reply("Unsubscribed you from #{type} #{id}: #{resp}")
         end
       end
 

data/spec/lita/handlers/cricket_spec.rb

@@ -46,13 +46,15 @@ describe Lita::Handlers::Cricket, lita_handler: true do
 
   it 'adds or removes a favourite team and also updates your favourite teams if you mention cricket' do
     send_message('cricket -f Cromer Cricket Club')
-    expect(replies.last).to eq('Added Cromer Cricket Club to your favourites: OK')
+    expect(replies.last).to eq('Subscribed you to favourite Cromer Cricket Club: OK')
     send_message('cricket is grouse')
     # it is tricky to test this last feature
     send_message('cricket -r Cromer Cricket Club')
-    expect(replies.last).to eq('Removed Cromer Cricket Club from your favourites: OK')
+    expect(replies.last).to eq('Unsubscribed you from favourite Cromer Cricket Club: OK')
     send_message('cricket -r Dee Why Cricket Club')
     expect(replies.last).to eq('Dee Why Cricket Club wasn\'t in your favourite list!')
+    send_message('cricket -f Derbyshire')
+    send_message('cricket')
   end
 
   it 'lists your favourite teams and subscribed matches' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-cricket
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stuart Auld