ruboty-youtube 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 936be7ef0fc77c3364df0a6903bcfd1d7620ea93
-  data.tar.gz: 23f464843114b392339e8a58cd33d47768843e8d
+  metadata.gz: decdcda64ea5b12b48f08e535d3762cceb01090e
+  data.tar.gz: cf07f3b5e3bde8a16ffa75c151d9c3af0f5799d7
 SHA512:
-  metadata.gz: a0bd2a5ce8c9f7836842630c35f48f77202eb927626f7c45a90aa88258746a77ffa74a25e8931022bb1d1b6d5279e32741d79a816337e40474c3a774e00d0624
-  data.tar.gz: 01bb40fd01dadfa942d48db6b51ac10719a6bfd929e0c59bb094bf13be8b10cb81cd68dd53f4a59e1291e06f5eb01bcff5c535177414e4e87045992431a0e84d
+  metadata.gz: 16df76022c53f682bc58f752300e35968f66d0a0824d1db9f37e551174fbf5683f51e3ac6f94af37ad9ea4b191a0880af9bdecd27f31e78f982f55b512b3feaf
+  data.tar.gz: fa1f843c6faf9704bc676e86c709ce7d4452c3c310deaa2d8e13c9b9cca59f438fe7b530b0b4a17f340f79e4e8652af101c028277998a6576b85083e901abde8

data/.gitignore

@@ -7,8 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/LICENSE.txt

@@ -1,22 +1,21 @@
-Copyright (c) 2014 kaihar4
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2015 kaihar4
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -4,7 +4,7 @@ Ruboty handler to search from YouTube.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your ruboty's Gemfile:
 
 ```ruby
 gem 'ruboty-youtube'
@@ -18,3 +18,17 @@ gem 'ruboty-youtube'
 @ruboty yt pl <keyword>   - Search a playlist from YouTube
 @ruboty yt pls <keyword>  - Search a playlist randomly from YouTube
 ```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+1. Fork it ( https://github.com/kaihar4/ruboty-youtube/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'ruboty/youtube'
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install --path vendor/bundle

data/lib/ruboty/youtube/client.rb

@@ -1,17 +1,15 @@
 require 'json'
 
 require 'faraday'
-require 'mechanize'
+require 'nokogiri'
 
 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|
+        @conn = Faraday.new(url: YOUTUBE_URL, ssl: { verify: false }) do |faraday|
           faraday.request :url_encoded
           faraday.adapter Faraday.default_adapter
         end
@@ -20,9 +18,9 @@ module Ruboty
       end
 
       def get
-        response = @conn.get do |req|
-          req.url api_path, params
-        end.body
+        response = @conn.get {|req|
+          req.url '/results', params
+        }.body
         parse_response(response)
       rescue
         nil
@@ -31,56 +29,33 @@ module Ruboty
       private
 
       def parse_response(response)
-        videos = JSON.parse(response)['feed']['entry']
-
-        case @mode
-        when :top, :rand
-          # when @mode is :top -> videos.length is 1
-          videos.sample['link'][0]['href']
-        when :pl, :pls
-          # when @mode is :pl -> videos.length is 1
-          pl_url = videos.sample['link'][1]['href']
-          page = @agent.get(pl_url)
-          YOUTUBE_URL + page.link_with(href: /\/watch/).href
+        video_links = Nokogiri::HTML(response).css('.yt-lockup-thumbnail a')
+        result = video_links.each_with_object([]) do |video_link, array|
+          array << video_link.attribute('href').content
         end
-      end
 
-      def api_path
         case @mode
-        when :top, :rand
-          '/feeds/api/videos'
-        when :pl, :pls
-          '/feeds/api/playlists/snippets'
+        when :top, :pl
+          YOUTUBE_URL + result.first
+        when:rand, :pls
+          YOUTUBE_URL + result.sample
         end
       end
 
       def params
         default_params = {
-          alt: 'json',
-          q: @query
+          search_query: @query
         }
 
         params =
           case @mode
-          when :top
-            {
-              orderBy: "relevance",
-              'max-results' => 1
-            }
-          when :rand
-            {
-              orderBy: "relevance",
-              'max-results' => 15
-            }
-          when :pl
+          when :top, :rand
             {
-              v: 2,
-              'max-results' => 1
+              filters: 'video'
             }
-          when :pls
+          when :pl, :pls
             {
-              v: 2,
-              'max-results' => 15
+              filters: 'playlist'
             }
           end
 

data/lib/ruboty/youtube/version.rb

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

data/ruboty-youtube.gemspec

@@ -1,4 +1,5 @@
-$LOAD_PATH << File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ruboty/youtube/version'
 
 Gem::Specification.new do |spec|
@@ -6,20 +7,20 @@ Gem::Specification.new do |spec|
   spec.version       = Ruboty::Youtube::VERSION
   spec.authors       = ['kaihar4']
   spec.email         = ['kaihar4@gmail.com']
-  spec.summary       = 'Ruboty handler to search 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'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ruboty'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'mechanize'
+  spec.add_runtime_dependency 'ruboty'
+  spec.add_runtime_dependency 'faraday'
+  spec.add_runtime_dependency 'mechanize'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-youtube
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Ruboty handler to search from YouTube.
+description: Ruboty handler to search from YouTube
 email:
 - kaihar4@gmail.com
 executables: []
@@ -92,6 +92,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - lib/ruboty/handlers/youtube.rb
 - lib/ruboty/youtube.rb
 - lib/ruboty/youtube/client.rb
@@ -117,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Ruboty handler to search from YouTube.
+summary: Ruboty handler to search from YouTube
 test_files: []