cinch-hangouts 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45fde4d2a553d57adc0da9c914d4523853acdbae
-  data.tar.gz: 4ff858cfa515f6f64465cf4cb524ae67c3a53125
+  metadata.gz: d59472f61e3eb012d61ac319e212dd3f2efc1bfb
+  data.tar.gz: 423e18cda5f5dc8e2557844af72449000055d57a
 SHA512:
-  metadata.gz: 8fe3adc17dfe6cd57258170d665a3b68c9944e3078f45c33d6184d51480e4c578f1b31bfaa84e6c416c6a3f1835d9addc3eeceaa4d77749f277fe2b7728e4fad
-  data.tar.gz: 02e10783b7f9486e16fb7b3498634eb30133f94108721d4dd5dae08ca3018255bc9851c62e8a53af2c82eabf2a0f5d5e56a67f62a6f11bd223022590b3fe03dd
+  metadata.gz: f5a1378fce4ab7bf4c9da05605d33091461f017910fcc57a97986a4a7d8c344155fb1f87377ec4980c0e5aa9fb6485262dd118cd072472232ff9dea3bdac6482
+  data.tar.gz: 41b3614c4d71c23ab7de801e608afc80304dbfafecc6fd89bb26afa47fb34e68f7d276433cbc410bae6d003ea8a67e12b89b1bef7d2b2bdccfecc9181b8ca96b

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

@@ -41,16 +41,14 @@ class Hangout < Cinch::Plugins::Hangouts
     read_file(files).data[:hangouts]
   end
 
-  def self.url(id, shorten = true)
-    url = "https://plus.google.com/hangouts/_/#{id}"
-    return url unless shorten
-    Cinch::Toolbox.shorten(url)
+  def self.url(id)
+    "https://plus.google.com/hangouts/_/#{id}"
   end
 
   private
 
   def self.read_file(files)
-    fail "No Hangout filename passed" unless files.key?(:hangouts) 
+    fail "No Hangout filename passed" unless files.key?(:hangouts)
     storage = Cinch::Storage.new(files[:hangouts])
     unless storage.data[:hangouts]
       storage.data[:hangouts] = {}

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

@@ -3,7 +3,7 @@ module Cinch
   module Plugins
     # Versioning Info
     class Hangouts
-      VERSION = '1.1.1'
+      VERSION = '1.1.2'
     end
   end
 end

data/spec/cinch-hangouts_spec.rb

@@ -19,16 +19,16 @@ describe Cinch::Plugins::Hangouts do
 
   describe 'posting a valid hangout link' do
     it 'captures the the link and stores it in @storage' do
-      msg = make_message(@bot, Hangout.url(random_hangout_id, false), { channel: '#foo' })
-      sleep 2
+      msg = make_message(@bot, Hangout.url(random_hangout_id), { channel: '#foo' })
       get_replies(msg)
+      sleep 2
       reply = get_replies(make_message(@bot, '!hangouts')).last.text
       expect(reply).to include('test started a hangout at')
       expect(reply).to match(/it was last linked \d seconds? ago/)
     end
 
     it 'captures even if it has trailing params' do
-      msg = make_message(@bot, Hangout.url(random_hangout_id + '?hl=en', false),
+      msg = make_message(@bot, Hangout.url(random_hangout_id + '?hl=en'),
                                { channel: '#foo' })
       get_replies(msg)
       sleep 2 # hack until 'time-lord' fix gets released
@@ -40,7 +40,7 @@ describe Cinch::Plugins::Hangouts do
 
     it 'recaptures a link' do
       id = random_hangout_id
-      msg = make_message(@bot, Hangout.url(id, false), { channel: '#foo' })
+      msg = make_message(@bot, Hangout.url(id), { channel: '#foo' })
       get_replies(msg)
       sleep 2 # hack until 'time-lord' fix gets released
       get_replies(msg)
@@ -50,7 +50,7 @@ describe Cinch::Plugins::Hangouts do
     end
 
     it 'capture a new short Hangout link and store it in @storage' do
-      msg = make_message(@bot, Hangout.url('7acpjrpcmgl00u0b665mu25b1g', false), { channel: '#foo' })
+      msg = make_message(@bot, Hangout.url('7acpjrpcmgl00u0b665mu25b1g'), { channel: '#foo' })
       expect(get_replies(msg)).to be_empty
       sleep 2 # hack until 'time-lord' fix gets released
       msg = make_message(@bot, '!hangouts')
@@ -58,12 +58,25 @@ describe Cinch::Plugins::Hangouts do
       expect(reply).to include('test started a hangout at')
       expect(reply).to match(/it was last linked \d seconds? ago/)
     end
+
+
+    it 'capture a link and return it' do
+      url = Hangout.url(random_hangout_id)
+      msg = make_message(@bot, url, { channel: '#foo' })
+      expect(get_replies(msg)).to be_empty
+      sleep 2 # hack until 'time-lord' fix gets released
+      msg = make_message(@bot, '!hangouts')
+      reply = get_replies(msg).last.text
+      expect(reply).to include(url)
+      puts reply
+      # expect(reply).to match(/it was last linked \d seconds? ago/)
+    end
   end
 
   describe 'posting an invalid hangout link does not log' do
     it 'when it is malformed (invalid chars)' do
-      msg = make_message(@bot, Hangout.url('82b5cc7f76b7a%19c180416c2f509027!!d8856d',
-                         false), { channel: '#foo' })
+      msg = make_message(@bot, Hangout.url('82b5cc7f76b7a%19c180416c2f509027!!d8856d'),
+                         { channel: '#foo' })
       expect(get_replies(msg)).to be_empty
       msg = make_message(@bot, '!hangouts')
       message = get_replies(msg).first.text
@@ -71,7 +84,7 @@ describe Cinch::Plugins::Hangouts do
     end
 
     it 'when it is malformed (wrong length)' do
-      msg = make_message(@bot, Hangout.url('82b5cc', false), { channel: '#foo' })
+      msg = make_message(@bot, Hangout.url('82b5cc'), { channel: '#foo' })
       expect(get_replies(msg)).to be_empty
       msg = make_message(@bot, '!hangouts')
       expect(get_replies(msg).first.text).to eq('No hangouts have been linked recently!')
@@ -108,18 +121,16 @@ describe Cinch::Plugins::Hangouts do
 
     #it 'should notify users when a new hangout is linked' do
     #  get_replies(make_message(@bot, '!hangouts subscribe'), { channel: '#foo', nick: 'joe' } )
-    #  msgs = get_replies(make_message(@bot, Hangout.url(random_hangout_id, false), { channel: '#foo', nick: 'josh' }))
+    #  msgs = get_replies(make_message(@bot, Hangout.url(random_hangout_id), { channel: '#foo', nick: 'josh' }))
     #  msgs.first.should_not be_nil
     #end
 
     it 'should not notify users when an old hangout is relinked' do
       get_replies(make_message(@bot, '!hangouts subscribe'), { channel: '#foo' } )
-      get_replies(make_message(@bot, Hangout.url(random_hangout_id, false), { channel: '#foo' }))
-      msg = make_message(@bot, Hangout.url(random_hangout_id, false), { channel: '#foo' })
+      get_replies(make_message(@bot, Hangout.url(random_hangout_id), { channel: '#foo' }))
+      msg = make_message(@bot, Hangout.url(random_hangout_id), { channel: '#foo' })
       expect(get_replies(msg)).to be_empty
     end
-
-
   end
 
   def random_hangout_id(len = 27)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-hangouts
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Brian Haberer