ayadn 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8855a888a4df8b8a2ce5faaec1b09a9e52a4eb0
-  data.tar.gz: 4fda3a6a7938cae52d79f8754d0d64aa0e528fd4
+  metadata.gz: 838837a525197748fc18b25d93d90228061aa2e3
+  data.tar.gz: f62380908cbfdca3083ee7b04c581e8aa6e65198
 SHA512:
-  metadata.gz: f80c1b862b0ffc912501739b8e5ec9ea1f13d3bd59cbc984999549d192133dac899f6a047a137d2187a94728d84303212bc400ff328ddfd364f3c7eef2a86353
-  data.tar.gz: 0b541f61aa144fcca671072e8d1d0ed729eb7a82013dfdbb0adae7ca1c274e070744f9ba894d48a8a27e993a73c973d2f2bb9ccda9f7f0dbf4eb41935f0dcf06
+  metadata.gz: d35b5e8556aae6c3b0e45d1b0df5661caf6e8fdc70cd38e72809a51b99b15c812b388353469e1fb5438355583581a81a23289fc67ee1b367b8c8388619cc3858
+  data.tar.gz: 7c9e60bbc4adfe40dc63c57f5876a47229ad2f7c86d140a1d9f045b8f0d180b7f377355e68999e7955e4bd94e33b176ac03ca89a8a645a9bc381a111dd292092

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.12 - 2015-05-10 - 'Agent Carter'
+
+- Fix: Youtube/Vimeo integration if video not found or unauthorized
+- Fix: failsafe for NR API failures
+- Fix: connexion timeout before retry
+- Fix: list command description
+
 ## 2.0.11 - 2015-04-12 - 'Pink'
 
 - New: add single words to the blacklist

data/lib/ayadn/annotations.rb

@@ -69,7 +69,22 @@ module Ayadn
     def youtube(dic)
       dic['link'] = dic[:options][:youtube][0]
       req_url = "http://www.youtube.com/oembed?url=#{dic['link']}&format=json"
-      dic.merge!(JSON.parse(CNX.download(req_url)))
+      resp = CNX.download(req_url)
+
+      begin
+        decoded = JSON.parse(resp)
+      rescue => e      
+        if resp == "Not Found"       
+          Status.new.info("error", "video doesn't exist", "red")
+        elsif resp == "Unauthorized"
+          Status.new.info("error", "unauthorized", "red")
+        else
+          Status.new.info("error", resp, "red")
+        end
+        Errors.global_error({error: e, caller: caller, data: [resp, dic]})
+      end
+      
+      dic.merge!(decoded)
       [{
         "type" => "net.app.core.oembed",
         "value" => {
@@ -101,7 +116,14 @@ module Ayadn
     def vimeo(dic)
       dic[:link] = dic[:options][:vimeo][0]
       req_url = "http://vimeo.com/api/oembed.json?url=#{dic[:link]}"
-      dic.merge!(JSON.parse(CNX.download(req_url)))
+      resp = CNX.download(req_url)
+      begin
+        decoded = JSON.parse(resp)
+      rescue => e
+        Status.new.info("error", resp, "red")
+        Errors.global_error({error: e, caller: caller, data: [resp, dic]})
+      end
+      dic.merge!(decoded)
       [{
         "type" => "net.app.core.oembed",
         "value" => {

data/lib/ayadn/cnx.rb

@@ -69,7 +69,8 @@ module Ayadn
     def self.get_response_from(url)
       try_cnx = 1
       begin
-        RestClient.get(url) do |response, request, result| #, :verify_ssl => OpenSSL::SSL::VERIFY_NONE
+        RestClient::Request.execute(:method => :get, :url => url, :timeout => 20) do |response, request, result|
+        #RestClient.get(url) do |response, request, result| #, :verify_ssl => OpenSSL::SSL::VERIFY_NONE
           Debug.http response, url
           check response
         end

data/lib/ayadn/descriptions.rb

@@ -561,6 +561,10 @@ module Ayadn
 
       `ayadn -fwg -p me`
 
+      Sort the list by post date:
+
+      `ayadn -fwg -t -l me`
+
       Reverse the list order:
 
       `ayadn -fwg -r me`
@@ -573,7 +577,7 @@ module Ayadn
 
       Show as JSON:
 
-      `ayadn -fwg me`
+      `ayadn -fwg -x me`
       \n\n
       USAGE
     end
@@ -609,6 +613,10 @@ module Ayadn
 
       `ayadn -fwr -p me`
 
+      Sort the list by post date:
+
+      `ayadn -fwr -t -l me`
+
       Reverse the list order:
 
       `ayadn -fwr -r me`
@@ -621,7 +629,7 @@ module Ayadn
 
       Show as JSON:
 
-      `ayadn -fwr me`
+      `ayadn -fwr -x me`
       \n\n
       USAGE
     end
@@ -665,7 +673,7 @@ module Ayadn
 
       Show as JSON:
 
-      `ayadn -mtd`
+      `ayadn -mtd -x`
 
       \n\n
       USAGE
@@ -710,7 +718,7 @@ module Ayadn
 
       Show as JSON:
 
-      `ayadn -bkd`
+      `ayadn -bkd -x`
       \n\n
       USAGE
     end

data/lib/ayadn/nicerank.rb

@@ -29,7 +29,13 @@ module Ayadn
       if got.nil? || got == ""
         parsed = {'meta' => {'code' => 404}, 'data' => []}
       else
-        parsed = JSON.parse(got)
+
+        begin
+          parsed = JSON.parse(got)
+        rescue JSON::ParserError => e
+          parsed = {'meta' => {'code' => 404}, 'data' => []}
+        end
+
       end
       parsed['data'].each do |obj|
         res = @store[obj['user_id']]

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "2.0.11"
+  VERSION = "2.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor