zooniverse_social 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc43968cb6199ebf3112c1f6f91b329a081b4b0a
-  data.tar.gz: 0033248f277444b3556c88c99f84222ec1d2d439
+  metadata.gz: e2170887303b63833125fc8442597b5b40310bf0
+  data.tar.gz: b9b132c059cc39f2e5801e9e1158ba1e3596237d
 SHA512:
-  metadata.gz: 092f2528e5a8a89c5d7435f066b493249a43a1d5589812e37cc423fcd7d7743d910e40bdc19918f7785f53eb294754b4ea14d5491f20761f86db883be1efc04c
-  data.tar.gz: e485d2f4b1f52f3d8096466b5f836e7e51515d71b86aa9f4e3f684389bf9c3eb07c9681caf89860482a7a3630df383fece6c1f43fa3d7f91a3f138e8923a1a03
+  metadata.gz: 550e4e0a5ae8e3dd2fc3a48509065ec0ec9578206134601c76eb6ac962c81e439ea8f9b2ec72831d3faba79ceff2b74d1a8c6be0feac7408b7280afa05f2bb35
+  data.tar.gz: 686211f3d27eb7215a817bbc112ba56a3e1fbc4b741a89eaf4ec845ca10c781f1c51f677e2a3e6608ac5616dd19d02677176191274ca91adab44765c2c94b1ec

data/lib/zooniverse_social/data.rb

@@ -3,6 +3,7 @@ require 'concurrent'
 require 'zooniverse_social/posts'
 require 'zooniverse_social/statuses'
 require 'zooniverse_social/tweets'
+require 'zooniverse_social/task_observer'
 
 module ZooniverseSocial
   class Data
@@ -35,7 +36,8 @@ module ZooniverseSocial
     end
 
     def self.start
-      Concurrent::TimerTask.new(execution_interval: 600, run_now: true){ update }.execute
+      task = Concurrent::TimerTask.new(execution_interval: 600, timeout_interval: 20, run_now: true){ update }.execute
+      TaskObserver.new task, method(:start)
     end
   end
 end

data/lib/zooniverse_social/posts.rb

@@ -5,13 +5,20 @@ module ZooniverseSocial
     attr_reader :data
 
     def initialize
-      @updater = Updater.new 'https://public-api.wordpress.com', '/rest/v1.1/sites/36711287/posts'
+      @blog_updater = Updater.new 'https://public-api.wordpress.com', '/rest/v1.1/sites/36711287/posts'
+      @daily_updater = Updater.new 'https://public-api.wordpress.com', '/rest/v1.1/sites/57182749/posts'
       update
     end
 
     def update
-      response = @updater.update number: 3, fields: 'ID,URL,title,date'
-      @data = response.fetch('posts', []).collect do |post|
+      blog_data = _update @blog_updater
+      daily_data = _update @daily_updater
+      @data = (blog_data + daily_data).sort{ |a, b| b[:created_at] <=> a[:created_at] }.take 3
+    end
+
+    def _update(updater)
+      response = updater.update number: 3, fields: 'ID,URL,title,date'
+      response.fetch('posts', []).collect do |post|
         {
           id: post['ID'],
           title: post['title'],

data/lib/zooniverse_social/task_observer.rb

@@ -0,0 +1,16 @@
+module ZooniverseSocial
+  class TaskObserver
+    def initialize(task, restart)
+      @task = task
+      @restart = restart
+      @task.add_observer self
+    end
+
+    def update(time, result, error)
+      if error.is_a?(Concurrent::TimeoutError)
+        @task.shutdown
+        @restart.call
+      end
+    end
+  end
+end

data/lib/zooniverse_social/version.rb

@@ -1,3 +1,3 @@
 module ZooniverseSocial
-  VERSION = '0.1.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zooniverse_social
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -214,6 +214,7 @@ files:
 - lib/zooniverse_social/posts.rb
 - lib/zooniverse_social/server.rb
 - lib/zooniverse_social/statuses.rb
+- lib/zooniverse_social/task_observer.rb
 - lib/zooniverse_social/tweets.rb
 - lib/zooniverse_social/updater.rb
 - lib/zooniverse_social/version.rb