active_public_resources 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d3ce1f36d3fa7105c64a1b3ea1d40d31d53a80
-  data.tar.gz: dc691ba007d31feedd149d2e61af45caddbfa160
+  metadata.gz: 750a849ad37794a269bab5b663992a2ee9101a10
+  data.tar.gz: 17a0f5735242ebd52b93b020a3deb4a931ae3376
 SHA512:
-  metadata.gz: 5ac6ae00e93f87bb890ae4ef42b883f54dec4219da4484b72177011c70f5e367a30b0173366b1a0ca5bb335093b9ff79ecf12bcbd45fce79ef0b2a91263bdb16
-  data.tar.gz: 4c7985ebe114f26c931abba3f162c305211a395caacfb7836c8df12f35d7ad25b6028e9e076d0c875ab343914a22540d969990d3c5654e9bae0150b4ded1cf14
+  metadata.gz: d859e2ffb42e9b9dfa2b0e2bca4401de468d0e5aa34aeeb65e90b5a622436af796fadfe6014c1104b45fd12bdf10b77f10e032c8cd4c205f62aff20977b0e37d
+  data.tar.gz: 9953aebb19aa8ea776f35d8b98e74d4e90115781f0cb8f8e47390baa67965231be473f841b4047dde577fadb4d7fa495d99bb0259dd66838d4f16a37713f55c5

data/lib/active_public_resources/drivers/youtube.rb

@@ -18,21 +18,21 @@ module ActivePublicResources
       def perform_request(request_criteria)
         request_criteria.set_default_criteria!(@default_request_criteria)
         unless request_criteria.validate_presence(:query) || request_criteria.validate_presence(:channel)
-          raise ArgumentError "you must specify at least a query or a channel"
+          raise ArgumentError "You must specify at least a query or channel"
         end
 
         uri = URI('https://www.googleapis.com/youtube/v3/search')
         params = {
-          'q' => request_criteria.query,
-          'part' => 'snippet',
-          'type' => 'video',
-          'order' => sort(request_criteria.sort),
-          'safeSearch' => content_filter(request_criteria.content_filter),
-          'maxResults' => request_criteria.per_page || 25,
-          'key' => API_KEY
+          q: request_criteria.query,
+          part: 'snippet',
+          type: 'video',
+          order: sort(request_criteria.sort),
+          safeSearch: content_filter(request_criteria.content_filter),
+          maxResults: request_criteria.per_page || 25,
+          key: API_KEY
         }
 
-        params['pageToken'] = request_criteria.page if request_criteria.is_a? String
+        params['pageToken'] = request_criteria.page if request_criteria.page && request_criteria.page != 1
         params['userIp'] = request_criteria.remote_ip if request_criteria.remote_ip
         params['channelId'] = channel_id(request_criteria.channel_name) if channel_id(request_criteria.channel_name)
 
@@ -50,10 +50,10 @@ module ActivePublicResources
         if channel_name
           uri = URI('https://www.googleapis.com/youtube/v3/search')
           params = {
-            'q' => channel_name,
-            'part' => 'id',
-            'type' => 'channel',
-            'key' => API_KEY
+            q: channel_name,
+            part: 'id',
+            type: 'channel',
+            key: API_KEY
           }
           uri.query = URI.encode_www_form(params)
           res = Net::HTTP.get_response(uri)
@@ -64,7 +64,6 @@ module ActivePublicResources
         return false
       end
 
-
       def video_details(request_criteria, results)
         video_ids = results['items'].map { |item| item['id']['videoId']}
         uri = URI('https://www.googleapis.com/youtube/v3/videos')
@@ -101,25 +100,23 @@ module ActivePublicResources
 
       def parse_results(request_criteria, results, videos)
         @driver_response = DriverResponse.new(
-          :criteria      => request_criteria,
-          :next_criteria => next_criteria(request_criteria, results),
-          :total_items   => results['pageInfo']['totalResults'].to_i,
-          :items         => videos.map { |video| parse_video(video) }
+          criteria: request_criteria,
+          next_criteria: next_criteria(request_criteria, results),
+          total_items: results['pageInfo']['totalResults'].to_i,
+          items: videos.map { |video| parse_video(video) }
         )
       end
 
       def next_criteria(request_criteria, results)
         if results['nextPageToken']
           return RequestCriteria.new({
-            :query    => request_criteria.query,
-            :page     => results['nextPageToken'],
-            :per_page => results['pageInfo']['resultsPerPage'].to_i
+            query: request_criteria.query,
+            page: results['nextPageToken'],
+            per_page: results['pageInfo']['resultsPerPage'].to_i
           })
         end
       end
 
-
-
       def parse_video(item)
         video_id = item['id']
         snippet = item['snippet']
@@ -143,20 +140,20 @@ module ActivePublicResources
 
         # Return Types
         video.return_types << APR::ReturnTypes::Url.new(
-          :driver => DRIVER_NAME,
-          :remote_id => video.id,
-          :url   => video.url,
-          :text  => video.title,
-          :title => video.title
+          driver: DRIVER_NAME,
+          remote_id: video.id,
+          url: video.url,
+          text: video.title,
+          title: video.title
         )
         video.return_types << APR::ReturnTypes::Iframe.new(
-          :driver => DRIVER_NAME,
-          :remote_id => video.id,
-          :url    => video.embed_url,
-          :text   => video.title,
-          :title  => video.title,
-          :width  => 640,
-          :height => 360
+          driver: DRIVER_NAME,
+          remote_id: video.id,
+          url: video.embed_url,
+          text: video.title,
+          title: video.title,
+          width: 640,
+          height: 360
         )
 
         video

data/lib/active_public_resources/version.rb

@@ -1,3 +1,3 @@
 module ActivePublicResources
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_public_resources
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Eric Berry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport