ruboty-youtube 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decdcda64ea5b12b48f08e535d3762cceb01090e
-  data.tar.gz: cf07f3b5e3bde8a16ffa75c151d9c3af0f5799d7
+  metadata.gz: 1aa78fe2e84056fbfd105a91c11c74f77545c0ba
+  data.tar.gz: 0fa67331fd1b867a40d91d1de05c894a335755d8
 SHA512:
-  metadata.gz: 16df76022c53f682bc58f752300e35968f66d0a0824d1db9f37e551174fbf5683f51e3ac6f94af37ad9ea4b191a0880af9bdecd27f31e78f982f55b512b3feaf
-  data.tar.gz: fa1f843c6faf9704bc676e86c709ce7d4452c3c310deaa2d8e13c9b9cca59f438fe7b530b0b4a17f340f79e4e8652af101c028277998a6576b85083e901abde8
+  metadata.gz: cb027275ed4ae4d04c5bb0fd7ce18b8c5f9a57d5f89e1bfad8790790917af01f7952a9c74662ecdf8ddafd06fbcb230d2bb3f9f8f5a9cc0991d9dd7789188f39
+  data.tar.gz: 0eb3fb79d8dae12cace2210b5c2ff7cd448e765e579530f888d7a79d0fe80f8baa64a3b719a960e42f460805137b28cac5677d684bbbc200085ff31adff011a7

data/README.md

@@ -13,10 +13,14 @@ gem 'ruboty-youtube'
 ## Usage
 
 ```
-@ruboty yt top <keyword>  - Search a movie from YouTube
-@ruboty yt rand <keyword> - Search a movie randomly from YouTube
-@ruboty yt pl <keyword>   - Search a playlist from YouTube
-@ruboty yt pls <keyword>  - Search a playlist randomly from YouTube
+@ruboty yt video top <keyword>  - Search a movie from YouTube
+@ruboty yt video rand <keyword> - Search a movie randomly from YouTube
+@ruboty yt pl top <keyword>     - Search a playlist from YouTube
+@ruboty yt pl rand <keyword>    - Search a playlist randomly from YouTube
+
+# 'video' is optional.
+@ruboty yt top <keyword>        - Search a movie from YouTube
+@ruboty yt rand <keyword>       - Search a movie randomly from YouTube
 ```
 
 ## Development

data/lib/ruboty/handlers/youtube.rb

@@ -1,18 +1,25 @@
 module Ruboty
   module Handlers
     class Youtube < Base
-      on /yt (?<mode>.+?) (?<keyword>.+)/, name: 'yt', description: 'Search from YouTube'
+      on /yt ((?<target>(video|pl)) )?(?<mode>(top|rand)) (?<keyword>.+)/, name: 'yt', description: 'Search from YouTube'
 
       def yt(message)
-        if url = search(message[:keyword], message[:mode].to_sym)
-          message.reply(url)
-        end
-      end
-
-      private
+        result =
+          if message[:target]
+            Ruboty::Youtube::Client.new(
+              message[:keyword],
+              message[:mode].to_sym,
+              message[:target].to_sym
+            ).search
+          else
+            Ruboty::Youtube::Client.new(
+              message[:keyword],
+              message[:mode].to_sym,
+              :video
+            ).search
+          end
 
-      def search(query, mode)
-        Ruboty::Youtube::Client.new(query, mode).get
+        message.reply(result) if result
       end
     end
   end

data/lib/ruboty/youtube/client.rb

@@ -8,16 +8,17 @@ module Ruboty
     class Client
       YOUTUBE_URL = 'https://www.youtube.com'
 
-      def initialize(query, mode)
+      def initialize(query, mode, target)
         @conn = Faraday.new(url: YOUTUBE_URL, ssl: { verify: false }) do |faraday|
           faraday.request :url_encoded
           faraday.adapter Faraday.default_adapter
         end
         @query = query
         @mode = mode
+        @target = target
       end
 
-      def get
+      def search
         response = @conn.get {|req|
           req.url '/results', params
         }.body
@@ -35,9 +36,9 @@ module Ruboty
         end
 
         case @mode
-        when :top, :pl
+        when :top
           YOUTUBE_URL + result.first
-        when:rand, :pls
+        when:rand
           YOUTUBE_URL + result.sample
         end
       end
@@ -48,12 +49,12 @@ module Ruboty
         }
 
         params =
-          case @mode
-          when :top, :rand
+          case @target
+          when :video
             {
               filters: 'video'
             }
-          when :pl, :pls
+          when :pl
             {
               filters: 'playlist'
             }

data/lib/ruboty/youtube/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Youtube
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/ruboty-youtube.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'ruboty'
   spec.add_runtime_dependency 'faraday'
-  spec.add_runtime_dependency 'mechanize'
+  spec.add_runtime_dependency 'nokogiri'
 
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-youtube
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kaihar4
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="