yourub 2.0.2 → 3.0.0

data/spec/yourub/meta_search_spec.rb

@@ -5,49 +5,107 @@ describe Yourub::MetaSearch do
   context 'Initialize the Request class if the given parameter are valid' do
 
     let(:client) { Yourub::Client.new() }
-    # let(:discovered_api) { double("youtube_api")}
-    #let(:discovered_api) { double("youtube_api")}
-    let(:response) {OpenStruct.new(data: {items: [{"statistics" => {"viewCount" => 2}}]}, status: 200)}
-    let(:videos_list_response) { fixture("videos_list.json")}
-    let(:search_list_response) { fixture("search_list.json")}
-    let(:categories_formatted) { fixture("categories_list_formatted.json") }
-    let(:single_video_response) { fixture("video_with_200_views.json") }
+    let(:videos_list_items) do
+      raw = fixture("videos_list.json")
+      raw.is_a?(Hash) && raw["items"] ? raw["items"] : raw
+    end
+    let(:videos_list_request) do
+      OpenStruct.new(status: 200, data: OpenStruct.new(items: videos_list_items))
+    end
+    let(:search_list_response) do
+      raw = fixture("search_list.json")
+      raw.is_a?(Hash) && raw["items"] ? raw["items"] : raw
+    end
     let(:result){ double }
 
     before do
-        # discovered_api.stub_chain(:data, :items).and_return(categories)
-        # discovered_api.stub_chain(:search, :list).and_return("search.list")
-        # discovered_api.stub_chain(:video_categories, :list).and_return("video_categories.list")
-        # allow(client).to receive(:youtube_api).and_return(discovered_api)
-        #allow(client).to receive(:execute!).and_return(response)
-        #allow(Yourub::REST::Request).to receive(:new).and_return(response)
+        allow(Yourub::Config).to receive(:developer_key).and_return('secret')
+        allow(Yourub::Config).to receive(:application_name).and_return('yourub')
+        allow(Yourub::Config).to receive(:application_version).and_return('1.0')
         allow(result).to receive(:status).and_return(200)
     end
 
     describe '#search' do
-      context 'forward the parameters to the request' do
+      context 'search.list for query nasa' do
         include_context "search list result load fixture", "search_list.json"
+
         before do
-          allow(Yourub::REST::Categories).to receive(
-            :for_country).and_return(categories_formatted)
-          allow(Yourub::REST::Videos).to receive(:list).and_return(response)
+          allow(Yourub::REST::Videos).to receive(:list).and_return(videos_list_request)
+        end
+
+        it 'calls Search.list with snippet video search and q' do
+          expect(Yourub::REST::Search).to receive(:list).with(
+            client,
+            {
+              part: "snippet",
+              type: "video",
+              order: "relevance",
+              safeSearch: "none",
+              q: "nasa",
+              maxResults: 5
+            }
+          )
+          client.search(query: "nasa", max_results: 5) { |_v| }
+        end
+      end
+
+      context 'category name resolves via list_video_categories' do
+        let(:de_category_response) do
+          items = fixture("categories_list.json").fetch("items").map do |h|
+            OpenStruct.new(
+              id: h["id"],
+              snippet: OpenStruct.new(title: h.dig("snippet", "title"))
+            )
+          end
+          OpenStruct.new(items: items)
+        end
+
+        include_context "search list result load fixture", "search_list.json"
+
+        before do
+          allow(client).to receive(:list_video_categories).and_return(de_category_response)
+          allow(Yourub::REST::Videos).to receive(:list).and_return(videos_list_request)
+        end
+
+        it 'loads default catalog when country omitted and sets videoCategoryId' do
+          expect(client).to receive(:list_video_categories).with(region_code: nil)
+          expect(Yourub::REST::Search).to receive(:list).with(
+            client,
+            hash_including(
+              q: "nasa",
+              order: "relevance",
+              videoCategoryId: 28
+            )
+          )
+          client.search(query: "nasa", category: "science") { |_v| }
         end
 
-        it 'creates a search list request with the expected parameters' do
+        it 'uses first country for the category catalog when country is set' do
+          expect(client).to receive(:list_video_categories).with(region_code: "DE")
           expect(Yourub::REST::Search).to receive(:list).with(
-                client,
-                {:part => "snippet",
-                 :type => "video",
-                 :order => "date",
-                 :safeSearch => "none",
-                 :category => "Sports",
-                 :maxResults => 5,
-                 :regionCode => "US",
-                 :videoCategoryId => 17}
+            client,
+            hash_including(
+              regionCode: "DE",
+              q: "goals",
+              videoCategoryId: 17
+            )
+          )
+          client.search(query: "goals", country: "DE", category: "sports") { |_v| }
+        end
+
+        it 'raises ArgumentError listing categories when name does not match' do
+          expect {
+            client.search(query: "x", category: "zznotacategoryzz") { |_v| }
+          }.to raise_error(ArgumentError, /category not found/)
+        end
+
+        it 'rejects category "all"' do
+          expect {
+            client.search(query: "nasa", category: "all") { |_v| }
+          }.to raise_error(
+            ArgumentError,
+            'category "all" is not supported; omit :category to search without a video category filter.'
           )
-          client.search(
-            country: 'US', category: 'Sports', order: 'date', max_results: 5
-          ) { |v| v }
         end
       end
 
@@ -60,7 +118,7 @@ describe Yourub::MetaSearch do
             :data, :items).and_return(search_list_response)
           search_result.data.items.each do |single_video|
             allow(single_video).to receive_message_chain(
-            :id, :videoId).and_return(1)
+            :id, :video_id).and_return(1)
           end
 
           allow(Yourub::REST::Search).to receive(:list).and_return(search_result)
@@ -75,7 +133,7 @@ describe Yourub::MetaSearch do
             videos.push(v)
           end
 
-          expect(videos.count).to eq(4)
+          expect(videos.count).to eq(5)
         end
 
        it 'retrieves no videos with more than 200 views' do
@@ -103,37 +161,16 @@ describe Yourub::MetaSearch do
       #   end
       # end
 
-      # context 'when the parameter category is == "all"' do
-      #   it 'it iterates through all the categories' do
-      #     videos = []
-      #     client.search(country: 'US', category: 'all') do |v|
-      #       videos.push v
-      #     end
-      #     expect(videos).to_not be_empty
-      #   end
-      # end
     end
 
     describe "methods used only for single video" do
-      include_context "result load fixture", "video_with_200_views.json"
+      include_context "result load fixture", 'video_with_200_views.json'
 
       describe '#get' do
         it 'send the request with the correct parameters' do
           expect(Yourub::REST::Request).to receive(:new)
-            .with(client, 'videos', 'list', :id => "mN0Dbj-xHY0", :part=>"snippet,statistics")
-          client.get('mN0Dbj-xHY0')
-        end
-      end
-
-      describe '#get_views' do
-        it 'send the request with the correct parameters' do
-          expect(Yourub::REST::Request).to receive(:new)
-            .with(client, 'videos', 'list', :id => "mN0Dbj-xHY0", :part => "statistics")
-          client.get_views('mN0Dbj-xHY0')
-        end
-
-        it 'return the number of view for the given video' do
-          expect(client.get_views('mN0Dbj-xHY0')).to eq(200)
+            .with(client, 'videos', 'list', { :id => "yIlTwwJv1Ac", :part=>"snippet,statistics" })
+          client.get('yIlTwwJv1Ac')
         end
       end
     end

data/spec/yourub/rest/categories_spec.rb

@@ -4,22 +4,46 @@ require_relative '../../spec_helper.rb'
 describe Yourub::REST::Categories do
   context 'Initialize the Request class if the given parameter are valid' do
     let(:category_request)     { double }
-    let(:client)               { Yourub::Client.new }
-    let(:categories)           { fixture('categories_list.json') }
-    let(:categories_formatted) { fixture('categories_list_formatted.json') }
+    let(:client)               { Yourub::Client.new(client_options) }
+    let(:client_options) do
+      { developer_key: 'secret',
+        application_name: 'yourub',
+        application_version: '1.0',
+        log_level: 'WARN' }
+    end
+    let(:category_items)       { fixture('categories_list.json').fetch('items') }
+    let(:categories_objects) do
+      category_items.map do |h|
+        OpenStruct.new(
+          id: h['id'],
+          snippet: OpenStruct.new(title: h.dig('snippet', 'title'))
+        )
+      end
+    end
+    let(:categories_formatted) do
+      category_items.map do |h|
+        title = h.dig('snippet', 'title')
+        slug = title.gsub("/", "-").downcase.gsub(/\s+/, "")
+        { h['id'] => slug }
+      end
+    end
 
     before do
       allow(category_request).to receive_message_chain(
         :data, :items
-      ).and_return(categories)
+      ).and_return(categories_objects)
       allow(Yourub::REST::Request).to receive(:new).and_return(category_request)
     end
 
     describe '.for_country' do
       it 'create a request with the correct parameters' do
         expect(Yourub::REST::Request).to receive(:new)
-          .with(client, 'video_categories', 'list',
-                'part' => 'snippet', 'regionCode' => ['US'])
+          .with(
+            client,
+            'video_categories',
+            'list',
+            { 'part' => 'snippet', 'regionCode' => 'US' }
+          )
         subject.for_country(client, ['US'])
       end
 

data/spec/yourub/rest/request_spec.rb

@@ -9,21 +9,21 @@ describe Yourub::REST::Request do
     describe 'the request object calls the execute! method on the client' do
       it 'execute the video list request on the client' do
         expect(client).to receive(:execute!).with(
-          api_method: 'video_categories.list', parameters: param
+          api_method: :video_categories_list, parameters: param
         )
         Yourub::REST::Request.new(client, 'video_categories', 'list', param)
       end
 
       it 'execute the search list request on the client' do
         expect(client).to receive(:execute!).with(
-          api_method: 'search.list', parameters: param
+          api_method: :search_list, parameters: param
         )
         Yourub::REST::Request.new(client, 'search', 'list', param)
       end
 
       it 'execute the video list request on the client' do
         expect(client).to receive(:execute!).with(
-          api_method: 'videos.list', parameters: param
+          api_method: :videos_list, parameters: param
         )
         Yourub::REST::Request.new(client, 'videos', 'list', param)
       end

data/spec/yourub/validator_spec.rb

@@ -6,30 +6,30 @@ describe Yourub::Validator do
   context 'passing an hash containing the search criteria' do
     context 'with some valid criteria' do
       context 'with an old hash syntax' do
-        let(:criteria) { { 'country' => 'US', 'category' => 'Sport' } }
+        let(:criteria) { { 'country' => 'US', 'category' => 'Sport', 'query' => 'highlights' } }
         it 'return the criteria in the sym: val format' do
-          expect(subject).to eq(country: ['US'], category: 'Sport')
+          expect(subject).to eq(country: ['US'], category: 'Sport', query: 'highlights')
         end
       end
 
       context 'with valid nation but unknown parameter city' do
-        let(:criteria) { { country: 'US', city: 'Berlin' } }
+        let(:criteria) { { country: 'US', city: 'Berlin', query: 'goals' } }
         it 'return criteria including nation but excluding the city' do
-          expect(subject).to eq(country: ['US'])
+          expect(subject).to eq(country: ['US'], query: 'goals')
         end
       end
 
       context 'with an invalid :order value' do
         let(:criteria) { { order: 'banane', query: 'roberto baggio' } }
         it 'raise an argument error' do
-          expect(lambda{ subject }).to raise_error(ArgumentError)
+          expect { subject }.to raise_error(ArgumentError)
         end
       end
 
       context 'with a given category without a country' do
-        let(:criteria) { { country: '', category: 'Sport' } }
-        it 'add the default country' do
-          expect(subject).to eq(category: 'Sport', :country => ['US'])
+        let(:criteria) { { category: 'Sport', query: 'highlights' } }
+        it 'does not add a country' do
+          expect(subject).to eq(category: 'Sport', query: 'highlights')
         end
       end
 
@@ -39,12 +39,32 @@ describe Yourub::Validator do
             category: 'Sport',
             max_results: 2,
             count_filter: {},
-            query: ''
+            query: 'goals'
           }
         end
         it 'return only them params that has a value' do
           expect(subject).to eq(
-            country: ['IT'], category: 'Sport', max_results: 2
+            country: ['IT'], category: 'Sport', max_results: 2, query: 'goals'
+          )
+        end
+      end
+
+      context 'without a query' do
+        let(:criteria) { { country: 'US', category: 'Sport' } }
+        it 'raises explaining that q is required' do
+          expect { subject }.to raise_error(
+            ArgumentError,
+            'search requires a :query parameter.'
+          )
+        end
+      end
+
+      context 'with a blank query' do
+        let(:criteria) { { query: '   ' } }
+        it 'raises' do
+          expect { subject }.to raise_error(
+            ArgumentError,
+            'search requires a :query parameter.'
           )
         end
       end
@@ -54,21 +74,21 @@ describe Yourub::Validator do
       context 'with non valid criteria' do
         let(:criteria) { { big: 1, bang: 2 } }
         it 'raise an argument error' do
-          expect(lambda{ subject }).to raise_error(ArgumentError)
+          expect { subject }.to raise_error(ArgumentError)
         end
       end
 
       context 'with criteria in the wrong format, like a string' do
         let(:criteria) { 'country = US' }
         it 'raise an argument error' do
-          expect(lambda{ subject }).to raise_error(ArgumentError)
+          expect { subject }.to raise_error(ArgumentError)
         end
       end
 
       context 'with an invalid country' do
-        let(:criteria) { { country: 'MOON' } }
+        let(:criteria) { { country: 'MOON', query: 'test' } }
         it 'raise an argument error' do
-          expect(lambda{ subject }).to raise_error(ArgumentError)
+          expect { subject }.to raise_error(ArgumentError)
         end
       end
     end
@@ -79,7 +99,7 @@ describe Yourub::Validator do
           { max_results: 10, count_filter: { views: '>= 100' } }
         end
         it 'raise an argument error' do
-          expect(lambda{ subject }).to raise_error(ArgumentError)
+          expect { subject }.to raise_error(ArgumentError)
         end
       end
     end
@@ -92,7 +112,7 @@ describe Yourub::Validator do
     context 'with an invalid category' do
       let(:selected_one) {"spaghetti"}
       it 'raise an argument error' do
-        expect(lambda{subject}).to raise_error(ArgumentError)
+        expect { subject }.to raise_error(ArgumentError)
       end
     end
 

data/yourub.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Davide Prati"]
   spec.email         = ["lastexxit@gmail.com "]
   spec.description   = %q{Youtube API v3 parser}
-  spec.summary       = %q{Yourub is a gem that search videos on youtebe using the YouTube API v3}
+  spec.summary       = %q{Yourub is a gem to search for videos on youtebe}
   spec.homepage      = "https://github.com/edap/yourub"
   spec.license       = "MIT"
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'google-api-client', '~> 0.7'
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency 'google-apis-youtube_v3', '>= 0.1', '< 2.0'
+  spec.add_development_dependency 'bundler', '>= 2.0'
 
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: yourub
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Davide Prati
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2026-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-youtube_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 description: Youtube API v3 parser
 email:
 - 'lastexxit@gmail.com '
@@ -58,6 +64,7 @@ files:
 - lib/yourub/client.rb
 - lib/yourub/config.rb
 - lib/yourub/count_filter.rb
+- lib/yourub/country_codes.rb
 - lib/yourub/default.rb
 - lib/yourub/logger.rb
 - lib/yourub/meta_search.rb
@@ -71,9 +78,7 @@ files:
 - lib/yourub/validator.rb
 - lib/yourub/version.rb
 - spec/fixtures/categories_list.json
-- spec/fixtures/categories_list_formatted.json
 - spec/fixtures/search_list.json
-- spec/fixtures/single_video.json
 - spec/fixtures/video_with_200_views.json
 - spec/fixtures/videos_list.json
 - spec/spec_helper.rb
@@ -95,7 +100,7 @@ homepage: https://github.com/edap/yourub
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,16 +115,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
-summary: Yourub is a gem that search videos on youtebe using the YouTube API v3
+summary: Yourub is a gem to search for videos on youtebe
 test_files:
 - spec/fixtures/categories_list.json
-- spec/fixtures/categories_list_formatted.json
 - spec/fixtures/search_list.json
-- spec/fixtures/single_video.json
 - spec/fixtures/video_with_200_views.json
 - spec/fixtures/videos_list.json
 - spec/spec_helper.rb
@@ -136,4 +138,3 @@ test_files:
 - spec/yourub/rest/request_spec.rb
 - spec/yourub/rest/videos_spec.rb
 - spec/yourub/validator_spec.rb
-has_rdoc: 

data/spec/fixtures/categories_list_formatted.json

@@ -1 +0,0 @@
-[{"1":"film&animation"}, {"2":"autos&vehicles"}, {"10":"music"}, {"15":"pets&animals"}, {"17":"sports"}, {"18":"shortmovies"}, {"19":"travel&events"}, {"20":"gaming"}, {"21":"videoblogging"}, {"22":"people&blogs"}, {"23":"comedy"}, {"24":"entertainment"}, {"25":"news&politics"}, {"26":"howto&style"}, {"27":"education"}, {"28":"science&technology"}, {"29":"nonprofits&activism"}, {"30":"movies"}, {"31":"anime-animation"}, {"32":"action-adventure"}, {"33":"classics"}, {"34":"comedy"}, {"35":"documentary"}, {"36":"drama"}, {"37":"family"}, {"38":"foreign"}, {"39":"horror"}, {"40":"sci-fi-fantasy"}, {"41":"thriller"}, {"42":"shorts"}, {"43":"shows"}, {"44":"trailers"}]

data/spec/fixtures/single_video.json

@@ -1 +0,0 @@
-[#<Google::APIClient::Schema::Youtube::V3::Video:0x3ff0d68e9aac DATA:{"id"=>"KDOLHClNTOI", "snippet"=>{"title"=>"When We Left Earth - The NASA Missions", "thumbnails"=>{"default"=>{"url"=>"https://i.ytimg.com/vi/KDOLHClNTOI/default.jpg", "width"=>120, "height"=>90}, "medium"=>{"url"=>"https://i.ytimg.com/vi/KDOLHClNTOI/mqdefault.jpg", "width"=>320, "height"=>180}, "high"=>{"url"=>"https://i.ytimg.com/vi/KDOLHClNTOI/hqdefault.jpg", "width"=>480, "height"=>360}}}, "statistics"=>{"viewCount"=>"767700"}}>]