lita-coffee 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f3c2966d0ee2fdcc9072297d548acc55fec26f4
-  data.tar.gz: c06d43de74adbc4afa51eb4041cfeaf2493466d5
+  metadata.gz: 6f20f6086ab2a71bf756506e1964a3f96304a5b2
+  data.tar.gz: effaa5303e6209961d13031bf5ed9398297ef28b
 SHA512:
-  metadata.gz: af83ca4771b336750659ae91cb24656fbc419102fd7abbb3269132213611251795b9e2db6dbf9f53f08f798fb9496181007db1261b12352194814fb221efb843
-  data.tar.gz: 5c7f3581c1bd5d8f70c82f7e5a9e8dac12adfd46add2bce7935d53fcbb38c84deacce1a795595225e9e1e35b1250ac5c39b600662eccccbfa6f21d4f1130b2f0
+  metadata.gz: 31acb6fa3fafd17a10698d669035fa615a79eb560e7ba4bf0be501f4d5341a4f27a62cd6a8d620e795ef7db1a9dc61d360c00fb5986b750ef655b35ee873cba8
+  data.tar.gz: b3c7d86f03856f53e03d56cf051f516eb1e81be511419917e6fc4e67bf72b5cd5f061cfa3ee5b57a3b0bef5ea56092bcfd16f36f8d622f1580bb2a1c2b2c06c7

data/README.md

@@ -10,6 +10,8 @@ Add lita-coffee to your Lita instance's Gemfile:
 gem "lita-coffee"
 ```
 
+[![Code Climate](https://codeclimate.com/github/sjauld/lita-coffee/badges/gpa.svg)](https://codeclimate.com/github/sjauld/lita-coffee)
+
 ## Configuration
 
 Set the default settings in your lita_config.rb (if you like)

data/lib/lita-coffee/version.rb

@@ -1,6 +1,6 @@
 module LitaCoffee
   # lita-coffee version
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   # lita-github version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)
 end

data/lib/lita/handlers/coffee.rb

@@ -68,18 +68,10 @@ module Lita
 
       # Set preferences
       route(
-        /^\s*\(?coffee\)?\s+\-s\s+(.*)$/i,
+        /^\s*\(?coffee\)?\s+\-([sg])\s+(.*)$/i,
         :set_prefs,
         help: {
           'coffee -s Colombian Filter'  => "Set your coffee preference",
-        }
-      )
-
-      # Set group
-      route(
-        /^\s*\(?coffee\)?\s+\-g\s+(.*)$/i,
-        :set_group,
-        help: {
           'coffee -g Cool Kids'  => "Change your group",
         }
       )
@@ -179,25 +171,10 @@ module Lita
       # Set coffee preference
       # TODO: a single method to update user info
       def set_prefs(response)
-        preference = response.matches[0][0].strip rescue nil
-        result = update_user_coffee(response.user.name,preference)
-        if result == "OK"
-          response.reply("Coffee set to #{preference}")
-        else
-          response.reply("(sadpanda) Failed to set your coffee for some reason: #{result.inspect}")
-        end
-      end
-
-      # Set coffee group
-      # TODO: merge with coffee preference
-      def set_group(response)
-        preference = response.matches[0][0].strip rescue nil
-        result = set_coffee_group(response.user.name,preference)
-        if result == "OK"
-          response.reply("Group set to #{preference}")
-        else
-          response.reply("(sadpanda) Failed to set your coffee group for some reason: #{result.inspect}")
-        end
+        mapping = {'g' => :group, 's' => :coffee}
+        setting = mapping.detect{|k,v| k == response.matches[0][0]}[1]
+        preference = response.matches[0][1].strip rescue nil
+        update_preference(response,setting,preference)
       end
 
       # Buy all the coffee for your group
@@ -246,7 +223,21 @@ module Lita
       def show_stats(response)
         group = response.matches[0][0].strip rescue get_group(response.user.name)
         stats = get_coffee_stats(group)
-        response.reply("Who owes whom?\n--\n#{stats.map{|s| "#{s[0]}: #{s[1]}"}.join("\n")}")
+        owing = []
+        owed = []
+        stats.each do |stat|
+          # owing first
+          if stat[1] <= 0
+            owing << stat
+          else
+            owed << stat
+          end
+        end
+        owing.sort!{|a,b| a[1] <=> b[1]} # Negative for owing, ergo sort in ascending order
+        owed.sort!{|a,b| b[1] <=> a[1]}  # Positive for owed, ergo sort in descending order to show who is owed most
+        # Provide a response
+        response.reply("Coffees owed to others\n--\n#{owing.map{|s| "#{s[0]}: #{s[1]}"}.join("\n")}")
+        response.reply("Coffees to be repaid\n--\n#{owed.map{|s| "#{s[0]}: #{s[1]}"}.join("\n")}")
       end
 
       #######
@@ -287,16 +278,15 @@ module Lita
         JSON.parse(redis.get("settings:#{user}"))['group'] rescue @@DEFAULT_GROUP
       end
 
-      def update_user_coffee(user,coffee)
-        my_settings = get_settings(user)
-        my_settings[:coffee] = coffee
-        redis.set("settings:#{user}",my_settings.to_json)
-      end
-
-      def set_coffee_group(user,group)
-        my_settings = get_settings(user)
-        my_settings[:group] = group
-        redis.set("settings:#{user}",my_settings.to_json)
+      def update_preference(response,setting,preference)
+        my_settings = get_settings(response.user.name)
+        my_settings[setting] = preference
+        result = redis.set("settings:#{response.user.name}",my_settings.to_json)
+        if result == "OK"
+          response.reply("Updated your #{setting} to #{preference}")
+        else
+          response.reply("(sadpanda) Failed to update your #{setting} for some reason: #{result.inspect}")
+        end
       end
 
       def clear_orders(group)

data/spec/lita/handlers/coffee_spec.rb

@@ -22,7 +22,7 @@ describe Lita::Handlers::Coffee, lita_handler: true do
   it { is_expected.to route('coffee -c').to(:cancel_order)}
   it { is_expected.to route('coffee -i').to(:display_profile)}
   it { is_expected.to route('coffee -s Latte').to(:set_prefs)}
-  it { is_expected.to route('coffee -g Testers').to(:set_group)}
+  it { is_expected.to route('coffee -g Testers').to(:set_prefs)}
   it { is_expected.to route('coffee -b This one is on me :)').to(:buy_coffees)}
   it { is_expected.to route('coffee -t').to(:system_settings)}
   it { is_expected.to route('coffee -d').to(:delete_me)}
@@ -60,14 +60,14 @@ describe Lita::Handlers::Coffee, lita_handler: true do
 
     it 'sets my coffee preference' do
       send_message("coffee -s decaf soy cappuccino")
-      expect(replies.last).to eq("Coffee set to decaf soy cappuccino")
+      expect(replies.last).to eq("Updated your coffee to decaf soy cappuccino")
       send_message("coffee -i")
       expect(replies.last).to start_with("Your current coffee is decaf soy cappuccino")
     end
 
     it 'changes my coffee group' do
       set_prefs('stu',{group: 'testing team'})
-      expect(replies.last).to eq("Group set to testing team")
+      expect(replies.last).to eq("Updated your group to testing team")
       check_prefs('stu')
       expect(replies.last).to end_with("You are in the testing team group.")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-coffee
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stuart Auld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita