RubyGems - active_public_resources - Versions diffs - 0.1.3 → 0.1.4 - Mend

active_public_resources 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +13 -5
data/active_public_resources.gemspec +1 -0
data/lib/active_public_resources/drivers/youtube.rb +50 -36
data/lib/active_public_resources/request_criteria.rb +1 -1
data/lib/active_public_resources/version.rb +1 -1
metadata +24 -10

checksums.yaml CHANGED Viewed

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: dbbec7a8766492daa8e9975dfa8033cf22936348
-  data.tar.gz: bc647bf66fc5e299c87f94d843f8f046d9da1c69
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDA3ZjczNDA1MmRjMDhiMzdkNzMwNDkyY2I4NjZmZmMwNGFmN2YxYQ==
+  data.tar.gz: !binary |-
+    NDliYWYzMjQ3NmM0ZDIxOTA4NThlOTJmNTE3NjEwYTY4MDMyYzM5ZQ==
 SHA512:
-  metadata.gz: baa11d8f3a694013b11db6a572e83fcd6522427dc8191416aef414eee2852ad6bb998e0fb33bb8f4e5c04fec8f55bd0642f514d60e4832e3e66bb52715e0824c
-  data.tar.gz: dc8cf7025d196f1c58377f5b65637a91ae6d285761deb8c2f205cf34c84f88fbdd2802eb27014d912581a45d321123f211d9bec0f742f5106a658bc692afbb6a
+  metadata.gz: !binary |-
+    Yzk1Njk5MmY3NDhlY2U3MDFkMmNmZjQxZmI2Njk3ZWZhNzM1NjY0ZDA1NGNl
+    MWY3ODM3Y2JiY2Q5OTFmODY2MWJkMTRiYjk0OWRiZTUxYmU4ZWRiMjExNjkw
+    NTNhYmYxMGU2MTg5YmVhZmRmNzE5NTExNzYxNGZiMzExNWQ2YjM=
+  data.tar.gz: !binary |-
+    Yjk3MjFmMDY2MWI4YTcyYWYzMWJiNDZkNWVjZmUyN2YxNzgyY2Q0NzZhYzQw
+    YjJjMzAzZmFmYWU5NDk2ZmU3ODQ1YzU2ZDc2ZjViMjdjMjY0ZWI2OWIzODNk
+    NGE1ZTFmNTRmYWQyOWQ5YWRiZjNmY2IyODQ1NjIyYmM5M2M1ODI=

data/active_public_resources.gemspec CHANGED Viewed

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 4.0.0"
   spec.add_dependency "activemodel", ">= 4.0.0"
+  spec.add_dependency "iso8601", "~> 0.8.6"
   # Drivers
   spec.add_dependency "vimeo", "~> 1.5.3"

data/lib/active_public_resources/drivers/youtube.rb CHANGED Viewed

@@ -1,41 +1,53 @@
 require 'net/https'
+require 'iso8601'
 module ActivePublicResources
   module Drivers
     class Youtube < Driver
       DRIVER_NAME = "youtube"
+      API_KEY = ENV['YOUTUBE_API_KEY']
       def perform_request(request_criteria)
         request_criteria.validate_presence!([:query])
-        uri = URI('https://gdata.youtube.com/feeds/api/videos')
+        uri = URI('https://www.googleapis.com/youtube/v3/search')
         params = {
-          'v'           => 2,
           'q'           => request_criteria.query,
-          'orderby'     => sort(request_criteria.sort),
-          'alt'         => 'json',
+          'part' => 'snippet',
+          'type' => 'video',
+          'order'     => sort(request_criteria.sort),
           'safeSearch'  => content_filter(request_criteria.content_filter),
-          'start-index' => request_criteria.page || 1,
-          'max-results' => request_criteria.per_page || 25
+          'maxResults' => request_criteria.per_page || 25,
+          'key' => API_KEY
         }
+        params['pageToken'] = request_criteria.page if request_criteria.is_a? String
+        params['userIp'] = request_criteria.remote_ip if request_criteria.remote_ip
         uri.query = URI.encode_www_form(params)
         res = Net::HTTP.get_response(uri)
         results = JSON.parse(res.body)
-        return parse_results(request_criteria, results)
+        return video_details(request_criteria, results)
       end
     private
+      def video_details(request_criteria, results)
+        video_ids = results['items'].map { |item| item['id']['videoId']}
+        uri = URI('https://www.googleapis.com/youtube/v3/videos')
+        params = { 'part' => 'snippet,contentDetails,statistics', 'id' => video_ids.join(','), 'key' => API_KEY }
+        uri.query = URI.encode_www_form(params)
+        res = Net::HTTP.get_response(uri)
+        videos = JSON.parse(res.body)['items']
+        return parse_results(request_criteria, results, videos)
+      end
       def sort(val)
         case val
           when APR::RequestCriteria::SORT_RELEVANCE
             'relevance'
           when APR::RequestCriteria::SORT_RECENT
-            'published'
+            'date'
           when APR::RequestCriteria::SORT_POPULAR
             'viewCount'
           else
@@ -54,45 +66,47 @@ module ActivePublicResources
         end
       end
-      def parse_results(request_criteria, results)
+      def parse_results(request_criteria, results, videos)
         @driver_response = DriverResponse.new(
           :criteria      => request_criteria,
           :next_criteria => next_criteria(request_criteria, results),
-          :total_items   => results['feed']['openSearch$totalResults']['$t'].to_i,
-          :items         => results['feed']['entry'].map { |data| parse_video(data) }
+          :total_items   => results['pageInfo']['totalResults'].to_i,
+          :items         => videos.map { |video| parse_video(video) }
         )
       end
       def next_criteria(request_criteria, results)
-        start_index = results['feed']['openSearch$startIndex']['$t'].to_i
-        per_page    = results['feed']['openSearch$itemsPerPage']['$t'].to_i
-        total       = results['feed']['openSearch$totalResults']['$t'].to_i
-        if (start_index + per_page) < total
+        if results['nextPageToken']
           return RequestCriteria.new({
             :query    => request_criteria.query,
-            :page     => start_index + per_page,
-            :per_page => per_page
+            :page     => results['nextPageToken'],
+            :per_page => results['pageInfo']['resultsPerPage'].to_i
           })
         end
       end
-      def parse_video(data)
-        video_id = data['id']['$t'].split(':').last
+      def parse_video(item)
+        video_id = item['id']
+        snippet = item['snippet']
+        statistics = item['statistics']
+        details = item['contentDetails']
         video = APR::ResponseTypes::Video.new
-        video.id            = video_id
-        video.title         = data['title']['$t']
-        video.description   = data['media$group']['media$description']['$t']
-        video.thumbnail_url = data['media$group']['media$thumbnail'][0]['url']
-        video.url           = data['media$group']['media$player']['url']
-        video.embed_url     = "https://www.youtube.com/embed/#{video_id}?feature=oembed"
-        video.duration      = data['media$group']['yt$duration']['seconds'].to_i
-        video.num_views     = data['yt$statistics'] ? data['yt$statistics']['viewCount'].to_i : 0
-        video.num_likes     = data['yt$rating'] ? data['yt$rating']['numLikes'].to_i : 0
-        video.num_comments  = data['gd$comments'] ? data['gd$comments']['gd$feedLink']['countHint'] : 0
-        video.created_date  = Date.parse(data['published']['$t'])
-        video.username      = data['author'][0]['name']['$t']
-        video.width         = 640
-        video.height        = 360
+        video.id             = video_id
+        video.title          = snippet['title']
+        video.description    = snippet['description']
+        video.thumbnail_url  = snippet['thumbnails']['default']['url']
+        video.url            = "https://www.youtube.com/watch?v=#{video_id}&feature=youtube_gdata_player"
+        video.embed_url      = "https://www.youtube.com/embed/#{video_id}?feature=oembed"
+        video.duration       = ISO8601::Duration.new(details['duration']).to_seconds
+        video.num_views      = statistics['viewCount'] ? statistics['viewCount'].to_i : 0
+        video.num_likes      = statistics['likeCount'] ? statistics['likeCount'].to_i : 0
+        video.num_comments   = statistics['commentCount'] ? statistics['commentCount'] : 0
+        video.created_date   = Date.parse(snippet['publishedAt'])
+        video.username       = snippet['channelTitle']
+        video.width          = 640
+        video.height         = 360
         # Return Types
         video.return_types << APR::ReturnTypes::Url.new(
@@ -105,7 +119,7 @@ module ActivePublicResources
         video.return_types << APR::ReturnTypes::Iframe.new(
           :driver => DRIVER_NAME,
           :remote_id => video.id,
-          :url    => "https://www.youtube.com/embed/#{video.id}?feature=oembed",
+          :url    => video.embed_url,
           :text   => video.title,
           :title  => video.title,
           :width  => 640,

data/lib/active_public_resources/request_criteria.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module ActivePublicResources
       CONTENT_FILTER_STRICT = 'strict'
     ]
-    attr_accessor :query, :page, :per_page, :content_filter, :sort, :folder
+    attr_accessor :query, :page, :per_page, :content_filter, :sort, :folder, :remote_ip
     def initialize(args={})
       args.each do |k,v|

data/lib/active_public_resources/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module ActivePublicResources
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata CHANGED Viewed

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: active_public_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eric Berry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: iso8601
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: vimeo
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-description: ' Normalized searching and browsing of public resources '
+description: ! ' Normalized searching and browsing of public resources '
 email:
 - cavneb@gmail.com
 executables: []
@@ -148,17 +162,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: Normalized searching and browsing of public resources