tumblr_draftking 0.10.0 → 0.10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e41e4944fa26486bda43f3878307b7b400b67a
-  data.tar.gz: d5e11a2fcd4e12760460d75a9144b81c4a091796
+  metadata.gz: baf83276f4bba8b2a25431e0a28f6d177252bc19
+  data.tar.gz: af32e44ef1e49c5e99f1f4247c28db78a57025f9
 SHA512:
-  metadata.gz: 9457b1402c0e86adcd0078e1d158924e233885a7174e7875c7fc755736b9e69afde064e06464397611c2acf5fbce5f14097ce2dcf724eaabfe3bda76be6202e5
-  data.tar.gz: efae44606eba41deb21fd78ee9a5d05de205c2873fb67865cdae19861da5c36b23d7d650433b4ccda8eec0b8f8631eefb1974fdb956d14926648b24adab85377
+  metadata.gz: f736833a732b2bd5a72ac312c302ec93a5d984547b0db2144517138f9b337241f83c5c6e431ef8c7120df6238ca274c66018e94eb30e50d36572469b651270fd
+  data.tar.gz: 25353c3a70bc1d534894e9da8a55bd16c22687bf473788e254f378af5929a5b28f191dbd7f5cb40823b035a91fe47d08ddc585d08abfa900cc4ab08e2c123d8e

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog :: tumblr_draftking
+## Version 0.10.0.1
++ Fix for Faraday::ConnectionFailed when trying to reach Tumblr
+
 ## Version 0.10.0
 + Enhanced get_posts logic to handle retrieval of published posts. Set `dk.source = DK::PUBLISH` before calling `dk.get_posts`.
 

data/README.md

@@ -15,8 +15,8 @@ DraftKing for Tumblr takes the hassle out of managing your draft queue!
 + **Randomize post order to add variety.**
 + **Manage multiple accounts.**
 
-Version 0.10.0
-+ Enhanced get_posts logic to handle retrieval of published posts. Set `dk.source = DK::PUBLISH` before calling `dk.get_posts`.
+Version 0.10.0.1
++ Fix for Faraday::ConnectionFailed when trying to reach Tumblr
 
 + Please report any [issues] you encounter!
 + [Change Log](./CHANGELOG.md)

data/lib/draftking/client.rb

@@ -65,7 +65,7 @@ module DK
     # @param name [String] Name of blog to target
     def act_on_blog(name: nil)
       return unless connected?
-      @user = JSON.parse(@client.info['user'].to_json, object_class: OpenStruct)
+      @user = client_user_info_to_ostruct
       @blog_name = name ? name.gsub('.tumblr.com', '') : @user.blogs.first.name
       @blog_url  = tumblr_url(@blog_name)
       @user.blogs.each do |blog|
@@ -77,6 +77,21 @@ module DK
       end
     end
 
+    def client_user_info_to_ostruct
+      info = block_with_retry { |_| @client.info['user'].to_json }
+      JSON.parse(info, object_class: OpenStruct)
+    end
+
+    def block_with_retry(opts = {}, &block)
+      retries = 0
+      begin
+        return block.call(opts)
+      rescue
+        retry unless (retries += 1) > MAX_RETRY
+        return nil
+      end
+    end
+
     def connected?
       @client && @client.info['status'] != 401
     end

data/lib/draftking/constants.rb

@@ -17,7 +17,7 @@ module DK
 
   # Scaling
   MAX_THREADS = 3
-  MAX_RETRY   = 2
+  MAX_RETRY   = 3
 
   # PostReporter
   REPORT_TITLE  = 'Post Report'.freeze

data/lib/draftking/posts.rb

@@ -157,8 +157,12 @@ module DK
 
     # Dashboard integration
     def call_source(options)
-      return @client.send(@source, options).first[1] if dashboard? || likes?
-      @client.send(check_for_publish(@source), @blog_url, options)
+      begin
+        return @client.send(@source, options).first[1] if dashboard? || likes?
+        @client.send(check_for_publish(@source), @blog_url, options)
+      rescue
+        retry
+      end
     end
 
     def check_for_publish(source)

data/lib/draftking/posts/post.rb

@@ -96,10 +96,17 @@ module DK
     # @param simulate [Bool] Simulate Action?
     def reblog(client:, simulate: nil)
       return 1 if simulate
-      client.reblog @blog_url,
-                    id: id,
-                    reblog_key: @reblog_key,
-                    comment: @comment
+      retries = 0
+      begin
+        client.reblog @blog_url,
+                      id: id,
+                      reblog_key: @reblog_key,
+                      comment: @comment
+      rescue
+        retries += 1
+        retry unless retries > MAX_RETRY
+        raise IOError, 'Connection to Tumblr timed-out!'
+      end
     end
 
     # Save a post
@@ -108,13 +115,20 @@ module DK
     def save(client:, simulate: nil)
       return 0 unless @changed
       return @saved = 1 if simulate
-      res = client.edit @blog_url,
-                        id:                 id,
-                        reblog_key:         @reblog_key,
-                        state:              validate_state,
-                        attach_reblog_tree: @keep_tree,
-                        tags:               @tags.join(','),
-                        caption:            @comment
+      retries = 0
+      begin
+        res = client.edit @blog_url,
+                          id:                 id,
+                          reblog_key:         @reblog_key,
+                          state:              validate_state,
+                          attach_reblog_tree: @keep_tree,
+                          tags:               @tags.join(','),
+                          caption:            @comment
+      rescue
+        retries += 1
+        retry unless retries > MAX_RETRY
+        raise IOError, 'Connection to Tumblr timed-out!'
+      end
       return 0 unless res && res['id']
       @changed = false
       @saved   = 1

data/lib/draftking/version.rb

@@ -1,3 +1,3 @@
 module DK
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_draftking
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.0.1
 platform: ruby
 authors:
 - Meissa Dia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_client