lita-youtube-me 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69c15d7418f23826ab51582155b6a0f5aeefea6
-  data.tar.gz: 85623f1c85cb60c6e29bfa91389f8479e706406d
+  metadata.gz: d57dd7c41c391ea30dc027af62f5842eb24a78e8
+  data.tar.gz: e410dbb8d7e0029891fb66ab494506079b2102fa
 SHA512:
-  metadata.gz: cbc9658f85ca27ce1c7aee9c4bf5b7de6c0b348e90a12edb4611d08ab331d7fc1a6385b74a907f86e6984eaee2adfefd895dd48f3e735d27b68d32ed18cbf030
-  data.tar.gz: 65a7a70f4f42160aa0a6b0de9699634d6069630262ffb3c2701b1bace3dda6ec695520b64d8f8f92644f112917ffeab3d83c3a4a899fc6f255832f3ca352b61c
+  metadata.gz: aee0edf7fd63f1467ed66d8700219121ab2f725911b546e18db21fa7c6f7ea252e54081cd232ff2c648a1b53ee8e53d71d77f80653b43b78eeb38ed3f81b01c8
+  data.tar.gz: 20d3b8395457c4b9949ec2975a886ab3c8afa4c9e51766ce8be1cd68755fe73121c59ebca79b740ec48e9ac6f4eb0e3a57616459405fa074619e2bc7bbd9bd96

data/lib/lita/handlers/youtube_me.rb

@@ -1,4 +1,6 @@
 require "date"
+require "uri"
+require "cgi"
 require "iso8601"
 
 module Lita
@@ -15,8 +17,8 @@ module Lita
         "youtube (me) QUERY" => "Gets a YouTube video."
       })
       # Detect YouTube links in non-commands and display video info
-      route(/\byoutube\.com\/watch\?v=([^?&#\s]+)/i, :display_info, command: false)
-      route(/\byoutu\.be\/([^?&#\s]+)/i, :display_info, command: false)
+      route(/\b(youtube\.com\/watch\S+)\s*/i, :display_info, command: false)
+      route(/\b(youtu\.be\/\S+)\s*/i, :display_info, command: false)
 
       def find_video(response)
         query = response.matches[0][0]
@@ -38,9 +40,15 @@ module Lita
         end
       end
 
+      # The video id is found in the 'v' query parameter
+      def extract_video_id(url_string)
+        query = CGI.parse URI(url_string).query
+        query['v'].first
+      end
+
       def display_info(response)
         if config.detect_urls
-          id = response.matches[0][0]
+          id = extract_video_id(response.matches[0][0])
           info_string = info(id)
           unless info_string.nil?
             response.reply info_string

data/lita-youtube-me.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-youtube-me"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Taylor Lapeyre"]
   spec.email         = ["taylorlapeyre@gmail.com"]
   spec.description   = %q{A Lita handler that replies with a youtube URL when given a query.}

data/spec/lita/handlers/youtube_me_spec.rb

@@ -63,6 +63,12 @@ describe Lita::Handlers::YoutubeMe, lita_handler: true do
     expect(replies.first).to match(/10 minutes of DJ Mbenga saying Tacos \[10:02\] by RickFreeloader on 2011-09-12 \(\S+ views, \d+% liked\)/)
   end
 
+  it 'will respond with video info when given a url with multiple query params' do
+    registry.config.handlers.youtube_me.detect_urls = true
+    send_message("burrito burrito https://www.youtube.com/watch?t=81&v=wv7DfebpL7E")
+    expect(replies.first).to_not be_nil
+  end
+
   it "does not display video info for detected YouTube URLs when the detect_urls config variable is false" do
     registry.config.handlers.youtube_me.detect_urls = false
     send_message("https://www.youtube.com/watch?v=nG7RiygTwR4")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-youtube-me
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Taylor Lapeyre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita