funky 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da54bfb41c5753645c1a7c563b097bea1e95485a
-  data.tar.gz: 92fcb13e252a300a1d06b65bc776ae1b6edbd70e
+  metadata.gz: f79e490243da7655f0de7e622a6888db059af5a3
+  data.tar.gz: ac848b830fe8ddc6e1acb4dfe195157f366f25c4
 SHA512:
-  metadata.gz: f966f16d954f34554c4adbe39edae84683d259e9d59ea66e8c891d0747c00b4b77f4837716cefc7e04f4e7eded27d9bb7a2051b87180a43d4407e54ddaed14a3
-  data.tar.gz: 10e4b65adc153b6c884611ca281fe30e4a82bba35d3f9d8ceba9649549df8d813242e134b9db1f59203a2d8b190b175ecf8eab158eddfe2ad09c799b296c0081
+  metadata.gz: eb7519f9f86c6b71a9feb16824fb89030a5c06be77167c5b8c9ddb1ab7e6ad25ba2364c54d883f034728c76c9a8e3d8ba385cb7e0a234000826c75379ceb9751
+  data.tar.gz: 3f5d7a338a2b22631d088fff7b50d86bdcca35a4b7b810b6e8ed76c8f292daa76a813a634d6243211e03c79a784fdfe24c522692a7477f263defb3a4f55165da

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.2.18 - 2017/04/19
+
+* [ENHANCEMENT] `Funky::Page#videos` now fetches more videos by time-based pagination.
+
 ## 0.2.17 - 2017/04/17
 
 * [FEATURE] Add `Funky::Page.find` class method to find a page by its page ID.

data/lib/funky/connections/api.rb

@@ -7,16 +7,34 @@ module Funky
     class API < Base
       def self.fetch(path_query, is_array: false)
         uri = URI "https://#{host}/v2.8/#{path_query}&limit=100&access_token=#{app_id}%7C#{app_secret}"
-        is_array ? fetch_multiple_pages(uri) : json_for(uri)
+        is_array ? fetch_multiple_pages(uri).uniq : json_for(uri)
       end
 
       def self.fetch_multiple_pages(uri)
         json = json_for(uri)
-        if json[:paging][:next]
-          next_paging_uri = URI json[:paging][:next]
-          json[:data] + fetch_multiple_pages(next_paging_uri)
+        if json[:data].empty?
+          @try_count ||= 0
+          if @previous_timestamp && @try_count < 1 && (Date.parse @previous_timestamp rescue nil)
+            timestamp = (Date.parse(@previous_timestamp) - 1).strftime('%F')
+            @try_count += 1
+            @previous_timestamp = timestamp
+            new_query = URI.decode_www_form(uri.query).to_h.merge('until' => timestamp)
+            uri.query = URI.encode_www_form(new_query)
+            json[:data] + fetch_multiple_pages(uri)
+          else
+            []
+          end
         else
-          json[:data]
+          timestamp = if json[:data].count == 1
+              Date.parse(json[:data][-1][:created_time]).strftime('%F')
+            else
+              Time.parse(json[:data][-1][:created_time]).to_i
+            end
+          @try_count = 0
+          @previous_timestamp = timestamp
+          new_query = URI.decode_www_form(uri.query).to_h.merge('until' => timestamp)
+          uri.query = URI.encode_www_form(new_query)
+          json[:data] + fetch_multiple_pages(uri)
         end
       end
 

data/lib/funky/version.rb

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

metadata

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