ayadn 2.0.11 → 2.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/lib/ayadn/annotations.rb +24 -2
- data/lib/ayadn/cnx.rb +2 -1
- data/lib/ayadn/descriptions.rb +12 -4
- data/lib/ayadn/nicerank.rb +7 -1
- data/lib/ayadn/version.rb +1 -1
- data/spec/mock/ayadn.sqlite +0 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 838837a525197748fc18b25d93d90228061aa2e3
|
4
|
+
data.tar.gz: f62380908cbfdca3083ee7b04c581e8aa6e65198
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d35b5e8556aae6c3b0e45d1b0df5661caf6e8fdc70cd38e72809a51b99b15c812b388353469e1fb5438355583581a81a23289fc67ee1b367b8c8388619cc3858
|
7
|
+
data.tar.gz: 7c9e60bbc4adfe40dc63c57f5876a47229ad2f7c86d140a1d9f045b8f0d180b7f377355e68999e7955e4bd94e33b176ac03ca89a8a645a9bc381a111dd292092
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
## 2.0.12 - 2015-05-10 - 'Agent Carter'
|
2
|
+
|
3
|
+
- Fix: Youtube/Vimeo integration if video not found or unauthorized
|
4
|
+
- Fix: failsafe for NR API failures
|
5
|
+
- Fix: connexion timeout before retry
|
6
|
+
- Fix: list command description
|
7
|
+
|
1
8
|
## 2.0.11 - 2015-04-12 - 'Pink'
|
2
9
|
|
3
10
|
- New: add single words to the blacklist
|
data/lib/ayadn/annotations.rb
CHANGED
@@ -69,7 +69,22 @@ module Ayadn
|
|
69
69
|
def youtube(dic)
|
70
70
|
dic['link'] = dic[:options][:youtube][0]
|
71
71
|
req_url = "http://www.youtube.com/oembed?url=#{dic['link']}&format=json"
|
72
|
-
|
72
|
+
resp = CNX.download(req_url)
|
73
|
+
|
74
|
+
begin
|
75
|
+
decoded = JSON.parse(resp)
|
76
|
+
rescue => e
|
77
|
+
if resp == "Not Found"
|
78
|
+
Status.new.info("error", "video doesn't exist", "red")
|
79
|
+
elsif resp == "Unauthorized"
|
80
|
+
Status.new.info("error", "unauthorized", "red")
|
81
|
+
else
|
82
|
+
Status.new.info("error", resp, "red")
|
83
|
+
end
|
84
|
+
Errors.global_error({error: e, caller: caller, data: [resp, dic]})
|
85
|
+
end
|
86
|
+
|
87
|
+
dic.merge!(decoded)
|
73
88
|
[{
|
74
89
|
"type" => "net.app.core.oembed",
|
75
90
|
"value" => {
|
@@ -101,7 +116,14 @@ module Ayadn
|
|
101
116
|
def vimeo(dic)
|
102
117
|
dic[:link] = dic[:options][:vimeo][0]
|
103
118
|
req_url = "http://vimeo.com/api/oembed.json?url=#{dic[:link]}"
|
104
|
-
|
119
|
+
resp = CNX.download(req_url)
|
120
|
+
begin
|
121
|
+
decoded = JSON.parse(resp)
|
122
|
+
rescue => e
|
123
|
+
Status.new.info("error", resp, "red")
|
124
|
+
Errors.global_error({error: e, caller: caller, data: [resp, dic]})
|
125
|
+
end
|
126
|
+
dic.merge!(decoded)
|
105
127
|
[{
|
106
128
|
"type" => "net.app.core.oembed",
|
107
129
|
"value" => {
|
data/lib/ayadn/cnx.rb
CHANGED
@@ -69,7 +69,8 @@ module Ayadn
|
|
69
69
|
def self.get_response_from(url)
|
70
70
|
try_cnx = 1
|
71
71
|
begin
|
72
|
-
RestClient.get
|
72
|
+
RestClient::Request.execute(:method => :get, :url => url, :timeout => 20) do |response, request, result|
|
73
|
+
#RestClient.get(url) do |response, request, result| #, :verify_ssl => OpenSSL::SSL::VERIFY_NONE
|
73
74
|
Debug.http response, url
|
74
75
|
check response
|
75
76
|
end
|
data/lib/ayadn/descriptions.rb
CHANGED
@@ -561,6 +561,10 @@ module Ayadn
|
|
561
561
|
|
562
562
|
`ayadn -fwg -p me`
|
563
563
|
|
564
|
+
Sort the list by post date:
|
565
|
+
|
566
|
+
`ayadn -fwg -t -l me`
|
567
|
+
|
564
568
|
Reverse the list order:
|
565
569
|
|
566
570
|
`ayadn -fwg -r me`
|
@@ -573,7 +577,7 @@ module Ayadn
|
|
573
577
|
|
574
578
|
Show as JSON:
|
575
579
|
|
576
|
-
`ayadn -fwg me`
|
580
|
+
`ayadn -fwg -x me`
|
577
581
|
\n\n
|
578
582
|
USAGE
|
579
583
|
end
|
@@ -609,6 +613,10 @@ module Ayadn
|
|
609
613
|
|
610
614
|
`ayadn -fwr -p me`
|
611
615
|
|
616
|
+
Sort the list by post date:
|
617
|
+
|
618
|
+
`ayadn -fwr -t -l me`
|
619
|
+
|
612
620
|
Reverse the list order:
|
613
621
|
|
614
622
|
`ayadn -fwr -r me`
|
@@ -621,7 +629,7 @@ module Ayadn
|
|
621
629
|
|
622
630
|
Show as JSON:
|
623
631
|
|
624
|
-
`ayadn -fwr me`
|
632
|
+
`ayadn -fwr -x me`
|
625
633
|
\n\n
|
626
634
|
USAGE
|
627
635
|
end
|
@@ -665,7 +673,7 @@ module Ayadn
|
|
665
673
|
|
666
674
|
Show as JSON:
|
667
675
|
|
668
|
-
`ayadn -mtd`
|
676
|
+
`ayadn -mtd -x`
|
669
677
|
|
670
678
|
\n\n
|
671
679
|
USAGE
|
@@ -710,7 +718,7 @@ module Ayadn
|
|
710
718
|
|
711
719
|
Show as JSON:
|
712
720
|
|
713
|
-
`ayadn -bkd`
|
721
|
+
`ayadn -bkd -x`
|
714
722
|
\n\n
|
715
723
|
USAGE
|
716
724
|
end
|
data/lib/ayadn/nicerank.rb
CHANGED
@@ -29,7 +29,13 @@ module Ayadn
|
|
29
29
|
if got.nil? || got == ""
|
30
30
|
parsed = {'meta' => {'code' => 404}, 'data' => []}
|
31
31
|
else
|
32
|
-
|
32
|
+
|
33
|
+
begin
|
34
|
+
parsed = JSON.parse(got)
|
35
|
+
rescue JSON::ParserError => e
|
36
|
+
parsed = {'meta' => {'code' => 404}, 'data' => []}
|
37
|
+
end
|
38
|
+
|
33
39
|
end
|
34
40
|
parsed['data'].each do |obj|
|
35
41
|
res = @store[obj['user_id']]
|
data/lib/ayadn/version.rb
CHANGED
data/spec/mock/ayadn.sqlite
CHANGED
Binary file
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ayadn
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eric Dejonckheere
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-05-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|