ruboty-youtube 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86b5bd73c93e91658d17838358d507878b6352c5
-  data.tar.gz: 3e005e8a0fdebc43029c9750ff365f7320421d26
+  metadata.gz: 01271da19abfd2f82e2559926460a955ed4045ef
+  data.tar.gz: cfe2bb7b9da167a6f5c728e634731ac4093cf8a5
 SHA512:
-  metadata.gz: 59597a09dc05dd0320692926c4108cf832afe5877765cfcff8a4a9e531c3aa881314b9742a91c1ec859c07bb99e79536ae0922de5f39b0d00dff741aa475112a
-  data.tar.gz: a0a458be42b7da047e31e1a507956be165ffacdf693f79dfc7d884d4e99608712b5d60120e771306165d42e2305bffd913810ff755d551cf3b4a9c4ebf6f048d
+  metadata.gz: a46ebbef24baee29293c179d72cc826610afb35fb2db1109ae3daea6d3f714d4d6c91cae12f209b6d8e1bbf5bb3f9267ccf91a1680a75285e3c90faf2fa4ef2d
+  data.tar.gz: 6886af5e9036d931e6488459b010cf2beed9bbcebaa07b0db78452e69974b919bba21c5b34439ae38d533bfdce8024fd32f211e9d63aa8a88798b7d6e58eba48

data/README.md

@@ -1,6 +1,6 @@
 # Ruboty::Youtube
 
-Ruboty handler to search a movie from YouTube.
+Ruboty handler to search from YouTube.
 
 ## Installation
 
@@ -14,5 +14,6 @@ gem 'ruboty-youtube'
 
 ```
 @ruboty yt top <keyword>  - Search a movie from YouTube
-@ruboty yt rand <keyword> - Search a random movie from YouTube
+@ruboty yt rand <keyword> - Search a movie randomly from YouTube
+@ruboty yt pl <keyword>   - Search a playlist from YouTube
 ```

data/lib/ruboty/youtube/client.rb

@@ -1,13 +1,16 @@
 require 'json'
 
 require 'faraday'
+require 'mechanize'
 
 module Ruboty
   module Youtube
     class Client
+      YOUTUBE_URL = 'https://www.youtube.com'
       YOUTUBE_API_URL = 'http://gdata.youtube.com'
 
       def initialize(query, mode)
+        @agent = Mechanize.new
         @conn = Faraday.new(url: YOUTUBE_API_URL) do |faraday|
           faraday.request :url_encoded
           faraday.adapter Faraday.default_adapter
@@ -18,35 +21,65 @@ module Ruboty
 
       def get
         response = @conn.get do |req|
-          req.url '/feeds/api/videos', params
+          req.url api_path, params
         end.body
-        videos = JSON.parse(response)['feed']['entry']
-        # when @mode is :top -> videos.length is 1
-        videos.sample['link'].first['href']
+        parse_response(response)
       rescue
         nil
       end
 
       private
 
-      def params
+      def parse_response(response)
+        videos = JSON.parse(response)['feed']['entry']
+
         case @mode
-        when :top
-          {
-            orderBy: "relevance",
-            'max-results' => 1,
-            alt: 'json',
-            q: @query
-          }
-        when :rand
-          {
-            orderBy: "relevance",
-            'max-results' => 15,
-            alt: 'json',
-            q: @query
-          }
+        when :top, :rand
+          # when @mode is :top -> videos.length is 1
+          videos.sample['link'][0]['href']
+        when :pl
+          pl_url = videos.sample['link'][1]['href']
+          page = @agent.get(pl_url)
+          YOUTUBE_URL + page.link_with(href: /\/watch/).href
         end
       end
+
+      def api_path
+        case @mode
+        when :top, :rand
+          '/feeds/api/videos'
+        when :pl
+          '/feeds/api/playlists/snippets'
+        end
+      end
+
+      def params
+        default_params = {
+          alt: 'json',
+          q: @query
+        }
+
+        params =
+          case @mode
+          when :top
+            {
+              orderBy: "relevance",
+              'max-results' => 1
+            }
+          when :rand
+            {
+              orderBy: "relevance",
+              'max-results' => 15
+            }
+          when :pl
+            {
+              v: 2,
+              'max-results' => 1
+            }
+          end
+
+        default_params.merge(params)
+      end
     end
   end
 end

data/lib/ruboty/youtube/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Youtube
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/ruboty-youtube.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.version       = Ruboty::Youtube::VERSION
   spec.authors       = ['kaihar4']
   spec.email         = ['kaihar4@gmail.com']
-  spec.summary       = 'Search a movie from YouTube'
+  spec.summary       = 'Ruboty handler to search from YouTube.'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/kaihar4/ruboty-youtube'
   spec.license       = 'MIT'
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ruboty'
   spec.add_dependency 'faraday'
+  spec.add_dependency 'mechanize'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-youtube
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Search a movie from YouTube
+description: Ruboty handler to search from YouTube.
 email:
 - kaihar4@gmail.com
 executables: []
@@ -106,5 +120,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Search a movie from YouTube
+summary: Ruboty handler to search from YouTube.
 test_files: []