cinch-hangouts 1.0.1 → 1.0.2

data/lib/cinch-hangouts.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'cinch/plugins/hangouts'
 require 'cinch/plugins/hangouts/version'
 require 'cinch/plugins/hangouts/hangout'

data/lib/cinch/plugins/hangouts.rb

@@ -5,6 +5,7 @@ require 'cinch/toolbox'
 require 'time-lord'
 
 module Cinch::Plugins
+  # Plugin to track Google Hangout links
   class Hangouts
     include Cinch::Plugin
     @@hangout_filename = ''
@@ -12,7 +13,8 @@ module Cinch::Plugins
 
     attr_accessor :storage
 
-    self.help = "Use .hangouts to see the info for any recent hangouts. You can also use .hangouts subscribe to sign up for notifications."
+    self.help = 'Use .hangouts to see the info for any recent hangouts. You ' +
+                'can also use .hangouts subscribe to sign up for notifications'
 
     match /hangouts\z/,           method: :list_hangouts
     match /hangouts subscribe/,   method: :subscribe
@@ -20,72 +22,74 @@ module Cinch::Plugins
 
     listen_to :channel
 
-    # This is the regex that captures hangout links in the following format:
-    #   https://plus.google.com/hangouts/_/fbae432b70a47bdf7786e53a16f364895c09d9f8
-    #
-    # The regex will need to be updated if the url scheme changes in the future.
-    HANGOUTS_REGEX = /plus\.google\.com\/hangouts\/_\/([a-z0-9]{10,40})(\?|$)/
+    # This is the regex that captures hangout links
+    # The regex will need to be updated if the url scheme changes in the future
+    HANGOUTS_REGEX = %r(plus\.google\.com/hangouts/_/([a-z0-9]{10,40})(\?|$))
 
     def initialize(*args)
       super
-      @@hangout_filename = config[:hangout_filename]           || 'yaml/hangouts.yml'
-      @@subscription_filename = config[:subscription_filename] || 'yaml/hangout_subscriptions.yml'
+      @@subscription_filename = config[:subscription_filename] ||
+                                'yaml/hangout_subscriptions.yml'
+      @@hangout_filename = config[:hangout_filename] ||
+                           'yaml/hangouts.yml'
 
-      @expire_period     = config[:expire_period] || 120
-      @response_type     = config[:response_type] || :notice
+      @expire = config[:expire_period] || 120
+      @response_type = config[:response_type] || :notice
     end
 
     def listen(m)
-      if hangout_id = m.message[HANGOUTS_REGEX, 1]
-        debug "#{hangout_id}"
-        if hangout = Hangout.find_by_id(hangout_id)
-          # If it's an old hangout capture a new expiration time
-          hangout.time = Time.now
-          hangout.save
-        else
-          hangout = Hangout.new(m.user.nick, hangout_id, Time.now)
-          hangout.save
-          Subscription.notify(hangout_id, @bot)
-        end
+      hangout_id = m.message[HANGOUTS_REGEX, 1]
+      process_hangout(hangout_id, m) if hangout_id
+    end
+
+    def process_hangout(hangout_id, m)
+      if Hangout.find_by_id(hangout_id)
+        # If it's an old hangout capture a new expiration time
+        hangout.time = Time.now
+        hangout.save
+      else
+        hangout = Hangout.new(m.user.nick, hangout_id, Time.now)
+        hangout.save
+        Subscription.notify(hangout_id, @bot)
       end
     end
 
     def subscribe(m)
       nick = m.user.nick
       if Subscription.for_user(nick)
-        msg = "You are already subscribed. "
+        msg = 'You are already subscribed. '
       else
         sub = Subscription.new(nick)
         sub.save
-        msg = "You are now subscribed. I will let you know when a hangout is linked. "
+        msg = 'You are now subscribed.' +
+              'I will let you know when a hangout is linked. '
       end
-      m.user.notice msg + "To unsubscribe use `.hangouts unsubscribe`."
+      m.user.notice msg + 'To unsubscribe use `.hangouts unsubscribe`.'
     end
 
     def unsubscribe(m)
       nick = m.user.nick
       if Subscription.for_user(nick)
         Subscription.for_user(nick).delete
-        msg = "You are now unsubscribed, and will no longer receive a messages. "
+        msg = 'You are now unsubscribed, and will no ' +
+              'longer receive a messages. '
       else
-        msg = "You are not subscribed. "
+        msg = 'You are not subscribed. '
       end
-      m.user.notice msg + "To subscribe use `.hangouts subscribe`."
+      m.user.notice msg + 'To subscribe use `.hangouts subscribe`.'
     end
 
     def list_hangouts(m)
-      Hangout.delete_expired(@expire_period)
+      Hangout.delete_expired(@expire)
       hangouts = Hangout.sorted
+      m.user.notice 'No hangouts have been linked recently!' if hangouts.empty?
 
-      if hangouts.empty?
-        m.user.notice "No hangouts have been linked recently!"
-      else
-        m.user.notice "These hangouts have been linked in the last #{@expire_period} minutes. " +
-                   "They may or may not still be going."
-        hangouts.each do |hangout|
-          m.user.notice "#{hangout.nick} started a hangout at #{Hangout.url(hangout.id)} " +
-                     "it was last linked #{hangout.time.ago.to_words}"
-        end
+      m.user.notice 'These hangouts have been linked in the last ' +
+                    "#{@expire} minutes. They may or may not still be going."
+      hangouts.each do |hangout|
+        m.user.notice "#{hangout.nick} started a hangout at " +
+                      Hangout.url(hangout.id) +
+                      " it was last linked #{hangout.time.ago.to_words}"
       end
     end
 

data/lib/cinch/plugins/hangouts/hangout.rb

@@ -1,5 +1,7 @@
+# -*- encoding : utf-8 -*-
+# Class to manage Hangout information
 class Hangout < Cinch::Plugins::Hangouts
-  attr_accessor :nick, :id, :time
+  attr_accessor :nick, :id, :time, :hangout_filename
 
   def initialize(nick, id, time)
     @nick = nick
@@ -9,8 +11,8 @@ class Hangout < Cinch::Plugins::Hangouts
 
   def save
     storage = CinchStorage.new(@@hangout_filename)
-    storage.data[:hangouts] ||= Hash.new
-    storage.data[:hangouts][self.id] = self
+    storage.data[:hangouts] ||= {}
+    storage.data[:hangouts][id] = self
     storage.save
   end
 
@@ -33,8 +35,8 @@ class Hangout < Cinch::Plugins::Hangouts
 
   def self.sorted
     hangouts = listing.values
-    hangouts.sort! { |x,y| y.time <=> x.time }
-    return hangouts
+    hangouts.sort! { |x, y| y.time <=> x.time }
+    hangouts
   end
 
   def self.listing
@@ -52,7 +54,7 @@ class Hangout < Cinch::Plugins::Hangouts
   def self.read_file
     storage = CinchStorage.new(@@hangout_filename)
     unless storage.data[:hangouts]
-      storage.data[:hangouts] = Hash.new
+      storage.data[:hangouts] = {}
       storage.save
     end
     storage

data/lib/cinch/plugins/hangouts/subscription.rb

@@ -1,8 +1,10 @@
+# -*- encoding : utf-8 -*-
+# Class to handle user subscriptions
 class Subscription < Cinch::Plugins::Hangouts
   attr_accessor :nick, :all_links
 
   def to_yaml
-    { }
+    {}
   end
 
   def initialize(nick)
@@ -13,13 +15,13 @@ class Subscription < Cinch::Plugins::Hangouts
 
   def save
     subs = Subscription.storage
-    subs.data[self.nick] = self
+    subs.data[nick] = self
     subs.save
   end
 
   def delete
     subs = Subscription.storage
-    subs.data[self.nick] = nil
+    subs.data[nick] = nil
     subs.save
   end
 
@@ -38,7 +40,8 @@ class Subscription < Cinch::Plugins::Hangouts
       # Don't link the person who linked it.
       if nick != sub.nick
         user = Cinch::User.new(sub.nick, bot)
-        respond(user, "#{nick} just linked a new hangout at: #{Hangout.url(hangout_id)}")
+        respond(user, "#{nick} just linked a new hangout at: " +
+                      "#{Hangout.url(hangout_id)}")
       end
     end
   end
@@ -49,4 +52,3 @@ class Subscription < Cinch::Plugins::Hangouts
     CinchStorage.new(@@subscription_filename)
   end
 end
-

data/lib/cinch/plugins/hangouts/version.rb

@@ -1,7 +1,9 @@
+# -*- encoding : utf-8 -*-
 module Cinch
   module Plugins
+    # Versioning Info
     class Hangouts
-      VERSION = "1.0.1"
+      VERSION = '1.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-hangouts
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake