funky 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79e490243da7655f0de7e622a6888db059af5a3
-  data.tar.gz: ac848b830fe8ddc6e1acb4dfe195157f366f25c4
+  metadata.gz: d0cc82139ba77645ca8723e3aa7ca8ffd5fdb4e0
+  data.tar.gz: 2dbead2613813de4aea2dd1ef1f067fd07482298
 SHA512:
-  metadata.gz: eb7519f9f86c6b71a9feb16824fb89030a5c06be77167c5b8c9ddb1ab7e6ad25ba2364c54d883f034728c76c9a8e3d8ba385cb7e0a234000826c75379ceb9751
-  data.tar.gz: 3f5d7a338a2b22631d088fff7b50d86bdcca35a4b7b810b6e8ed76c8f292daa76a813a634d6243211e03c79a784fdfe24c522692a7477f263defb3a4f55165da
+  metadata.gz: 72c3b1d0fe5ca08a8eb6e4c0406ec715b8973f0e2fd9d3f7496fff1f01a8c63df5eb5e46cd8de3b969f113394612d9fc9abf7fd0bf5682c11d37809ec777c8d8
+  data.tar.gz: 2e889e3efb8e57161daa8a6e384628b62d18bd44cf9b2ac7b5290115d01a7a543bff9a1e3f79f4a39f40081b70a219bdae511769127d859e4f777fedd0fc044d

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.2.19 - 2017/04/20
+
+* [IMPROVEMENT] Retry 3 times after a server error or a socket error, to fetch
+  data even with any temporary issue from Facebook.
+
 ## 0.2.18 - 2017/04/19
 
 * [ENHANCEMENT] `Funky::Page#videos` now fetches more videos by time-based pagination.

data/README.md

@@ -47,12 +47,12 @@ There are two ways to configure Funky with your App ID and App Secret:
     end
     ```
 
-##API Overview
+## API Overview
 
 Funky consists of 2 different surface APIs - one to fetch video data
 from Facebook and one to fetch page data from Facebook.
 
-##Pages API
+## Pages API
 
 ### Use #where clause to get an array of videos
 
@@ -65,7 +65,7 @@ pages.first.username      # => 'SonyPicturesGlobal'
 
 ```
 
-##Videos API
+## Videos API
 
 ### Use #where clause to get an array of videos
 

data/lib/funky/connections/api.rb

@@ -1,5 +1,7 @@
-require 'funky/connections/base'
 require 'json'
+require 'time'
+
+require 'funky/connections/base'
 
 module Funky
   # @api private

data/lib/funky/connections/base.rb

@@ -9,23 +9,34 @@ module Funky
         Net::HTTP::Get.new(uri.request_uri)
       end
 
-      def self.response_for(http_request, uri)
+      def self.response_for(http_request, uri, max_retries = 3)
         response = Net::HTTP.start(uri.host, 443, use_ssl: true) do |http|
           http.request http_request
         end
-        response
+        if response.is_a? Net::HTTPSuccess
+          response
+        elsif response.is_a? Net::HTTPServerError
+          sleep_and_retry_response_for(http_request, uri, max_retries, response.body)
+        else
+          raise ContentNotFound, "Error #{response.code}: #{response.body}"
+        end
       rescue SocketError => e
-        raise ConnectionError, e.message
+        sleep_and_retry_response_for(http_request, uri, max_retries, e.message)
       end
 
-      def self.json_for(uri)
-        response = response_for(get_http_request(uri), uri)
-        if response.code == '200'
-          JSON.parse(response.body, symbolize_names: true)
+      def self.sleep_and_retry_response_for(http_request, uri, retries, message)
+        if retries > 0
+          sleep (4 - retries) ** 2
+          response_for http_request, uri, retries - 1
         else
-          raise ContentNotFound, "Error #{response.code}: #{response.body}"
+          raise ConnectionError, message
         end
       end
+
+      def self.json_for(uri, max_retries = 3)
+        response = response_for(get_http_request(uri), uri)
+        JSON.parse(response.body, symbolize_names: true)
+      end
     end
   end
 end

data/lib/funky/version.rb

@@ -1,3 +1,3 @@
 module Funky
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funky
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Philip Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler