ayadn 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08a202fea9f47db0c64d1c9d0b1a12b809a25650
-  data.tar.gz: f620955c6f10034e69ee9969e51e1601d146275e
+  metadata.gz: 4844f6ffe9a330e65f8af4cdd518fe7753e36890
+  data.tar.gz: e9b0f90c5add38d0a938303a89908efe1ea7bf2b
 SHA512:
-  metadata.gz: 9790a6fdc3958a4329ac873d3aefeddbe86291215eca8e07cd8b863903673721062d166d2ff876703447b28902b1970c17c14679acc5e21ec780baa5209220b5
-  data.tar.gz: b167b9aae1d9f9535a380dd51d96823efd375356465ee055aeefe6b27c01d32a769e8755bc085875784864bfaf24aeb59293824468ddb41da26f9891b1a2ee07
+  metadata.gz: ed02423f52ee4cafe6836b95e7d8a1b3babd71a3314ff2efb0fe657663302b2a732f74f7f71b790a9b116577603427a6e7633d8d8f2ef0633ae3e022b1328a40
+  data.tar.gz: 2bd08d85a8c479e23cd048579505c54fb757c3eb3b689e13005119137ac02a7962a8e60b1604509c305c324387ef78bc61daa89993117293527dfb99932f9bf8

data/CHANGELOG.md

@@ -1,6 +1,11 @@
-# 1.4.1 - Fixes
+# 1.4.2 - CNX
 
-- A few fixes here and there
+- Ayadn is more resilient to connectivity errors
+- Better handling of filenames when uploading
+
+# 1.4.1 - NowPlaying
+
+- A few fixes in the NowPlaying section
 
 # 1.4.0 - 'Florian'
 

data/lib/ayadn/cnx.rb

@@ -17,15 +17,7 @@ module Ayadn
           Debug.http response, url
           check_nr response, url
         end
-      rescue SocketError => e
-        if working == true
-          working = false
-          sleep 0.5
-          retry
-        end
-        Errors.nr "URL: #{url}"
-        return {'meta' => {'code' => 666}, 'data' => "#{e}"}.to_json
-      rescue SystemCallError => e
+      rescue SocketError, SystemCallError, OpenSSL::SSL::SSLError, RestClient::RequestTimeout => e
         if working == true
           working = false
           sleep 0.5
@@ -57,20 +49,13 @@ module Ayadn
           Debug.http response, url
           check response
         end
-      rescue SocketError => e
+      rescue SocketError, SystemCallError, OpenSSL::SSL::SSLError, RestClient::RequestTimeout => e
         if try_cnx < 4
           try_cnx = retry_adn 10, try_cnx
           retry
         end
         puts "\nConnection error.".color(:red)
         Errors.global_error("cnx.rb/get_response_from", url, e)
-      rescue SystemCallError => e
-        if try_cnx < 4
-          try_cnx = retry_adn 15, try_cnx
-          retry
-        end
-        puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/get_response_from", url, e)
       rescue => e
         Errors.global_error("cnx.rb/get_response_from", url, e)
       end

data/lib/ayadn/fileops.rb

@@ -41,17 +41,15 @@ module Ayadn
       end
     end
 
-    def self.upload(path, token)
+    def self.upload(file, token)
       begin
-        temp = Regexp.escape(path).gsub('\.', '.')
-        file = temp.gsub('\-', '-')
-        case File.extname(path).downcase
+        case File.extname(file).downcase
         when ".png"
-          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/png" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@'#{file}';type=image/png" -F 'public=true' -X POST`
         when ".gif"
-          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/gif" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@'#{file}';type=image/gif" -F 'public=true' -X POST`
         else #jpg or jpeg or JPG or JPEG, automatically recognized as such
-          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F content=@#{file} -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F content=@'#{file}' -F 'public=true' -X POST`
         end
       rescue Errno::ENOENT
         abort(Status.no_curl)

data/lib/ayadn/nicerank.rb

@@ -45,10 +45,16 @@ module Ayadn
 
       unless get_these.empty?
         got = CNX.get "#{@url}#{get_these.join(',')}&show_details=Y"
-        unless got.code != 200
-          resp = JSON.parse(got)
+        blank = JSON.parse({'meta' => {'code' => 404}, 'data' => []}.to_json)
+        if got.nil? || got == ""
+          parsed = blank
         else
-          resp = JSON.parse({'meta' => {'code' => got.code}}.to_json)
+          parsed = JSON.parse(got)
+        end
+        if parsed['meta']['code'] != 200
+          resp = blank
+        else
+          resp = parsed
         end
 
         if resp['meta']['code'] != 200

data/lib/ayadn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor