reddit_bot 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b83643d990066b8e6a3922b71f065aabf02fa3
-  data.tar.gz: 23f386f95b1d0490e37c316b2823570f18114368
+  metadata.gz: afe3593cb266098860316251a4126efdccced3c0
+  data.tar.gz: bcf920ee2ccf254f5f84aeef64c5a5471400165d
 SHA512:
-  metadata.gz: 3ce7a59815a001eb2808edfbc3ca1672eaf17cd271d15c7621bca3621ca320baa0174567b0ac539f761f5bd9271a18e34f7e10a41598475028aa3bafc1486918
-  data.tar.gz: f0c4ee4fe8136d20461cb80fcbe95f08098ba72e545a02a430f675e7a17b08d8225a31dcf369ad93d1f9e90e0c179a978bd7f102dff910197c61c7b9fd188be8
+  metadata.gz: 00c876b7cde3299b2ec06ac5c8f7a34e2299a651ac91c7815d168e547c220c3c4a6317a4eab544c2e81656263ce9d2cf7687dcec062f90952a20d8092e2a6185
+  data.tar.gz: c74d1fac23dafb7ed17165875b164ceec1f2cde7f21f1defc590661f2f6de86c1ec4b446e69320d2dce72491b42a4081cda2b0e5d8d5e979537697de7d8cf6f0

data/examples/largeimages/Gemfile

@@ -2,14 +2,11 @@
 
 gem "json"
 
-gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.2.1"
-
-gem "reddit_bot", "~>1.6.3"
+gem "reddit_bot", git: "git@github.com:nakilon/reddit_bot.git"
 gem "nokogiri"
 
-gem "imgur2array", git: "git@github.com:Nakilon/imgur2array.git"
-gem "fastimage", git: "git@github.com:Nakilon/fastimage.git"
-gem "url2dimensions", git: "git@github.com:Nakilon/url2dimensions.git", tag: "v0.0.0.8"
+gem "fastimage", git: "git@github.com:sdsykes/fastimage.git", ref: "15bc4111c4c4e1af580b63c62e08decf2d5527d5"
+gem "directlink", git: "git@github.com:Nakilon/directlink.git"
 
 gem "gcplogger", git: "git@github.com:Nakilon/gcplogger.git", tag: "v0.1.1.0"
 gem "google-cloud-error_reporting"

data/examples/largeimages/Gemfile.lock

@@ -1,8 +1,10 @@
 GIT
-  remote: git@github.com:Nakilon/fastimage.git
-  revision: 1be9e5cd7a4ac9baa3c83efdd0bf111a52e69f48
+  remote: git@github.com:Nakilon/directlink.git
+  revision: 18b1544dcbdee3d9f5c2ad685e4eaf134773e5a1
   specs:
-    fastimage (2.1.1)
+    directlink (0.0.2.0)
+      fastimage (~> 2.1.3)
+      nethttputils (~> 0.2.4.0)
 
 GIT
   remote: git@github.com:Nakilon/gcplogger.git
@@ -14,24 +16,18 @@ GIT
       public_suffix (~> 2.0)
 
 GIT
-  remote: git@github.com:Nakilon/imgur2array.git
-  revision: 9d5e5c3d442e85ff13938b0e614e67ba03581c76
+  remote: git@github.com:nakilon/reddit_bot.git
+  revision: d2ab4765573ea153e34c99b6f6a4f7bca21df6a7
   specs:
-    imgur2array (0.0.3.2)
-
-GIT
-  remote: git@github.com:Nakilon/nethttputils.git
-  revision: 27777142af099556394691c772a33cf5f6548c4f
-  tag: v0.1.2.1
-  specs:
-    nethttputils (0.1.2.1)
+    reddit_bot (1.6.5)
+      json
 
 GIT
-  remote: git@github.com:Nakilon/url2dimensions.git
-  revision: c738e255ba3bbd38d142aebabbc0ea13abac4750
-  tag: v0.0.0.8
+  remote: git@github.com:sdsykes/fastimage.git
+  revision: 15bc4111c4c4e1af580b63c62e08decf2d5527d5
+  ref: 15bc4111c4c4e1af580b63c62e08decf2d5527d5
   specs:
-    url2dimensions (0.0.0.8)
+    fastimage (2.1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -87,12 +83,11 @@ GEM
     mini_portile2 (2.1.0)
     multi_json (1.13.1)
     multipart-post (2.0.0)
+    nethttputils (0.2.4.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     os (0.9.6)
     public_suffix (2.0.5)
-    reddit_bot (1.6.3)
-      json
     rly (0.2.3)
     signet (0.8.1)
       addressable (~> 2.3)
@@ -106,15 +101,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  directlink!
   fastimage!
   gcplogger!
   google-cloud-error_reporting
-  imgur2array!
   json
-  nethttputils!
   nokogiri
-  reddit_bot (~> 1.6.3)
-  url2dimensions!
+  reddit_bot!
 
 BUNDLED WITH
    1.16.1

data/examples/largeimages/main.rb

@@ -4,15 +4,14 @@
 require "gcplogger"
 logger = GCPLogger.logger "largeimagesbot"
 
-fail("no ENV['ERROR_REPORTING_KEYFILE'] specified") unless ENV["ERROR_REPORTING_KEYFILE"]
+fail "no ENV['ERROR_REPORTING_KEYFILE'] specified" unless ENV["ERROR_REPORTING_KEYFILE"]
 require "google/cloud/error_reporting"
 Google::Cloud::ErrorReporting.configure do |config|
-  config.project_id = (JSON.load File.read ENV["ERROR_REPORTING_KEYFILE"])["project_id"]
+  config.project_id = JSON.load(File.read ENV["ERROR_REPORTING_KEYFILE"])["project_id"]
 end
 
 
-require "url2dimensions"
-Imgur.logger = logger
+require "directlink"
 
 require "nokogiri"
 
@@ -84,34 +83,35 @@ loop do
       checked << id
       # next if Gem::Platform.local.os == "darwin" # prevent concurrent posting
       logger.debug "image url for #{id}: #{url}"
-      next logger.warn "skipped a post by /u/sjhill" if author == "sjhill"      # opt-out
-      next logger.warn "skipped a post by /u/bekalaki" if author == "bekalaki"  # 9 ways to divide karmawhore
-
-      next logger.warn "skipped (URL2Dimensions :skipped) #{url} from http://redd.it/#{id}" if :skipped == _ = begin
-        URL2Dimensions::get_dimensions CGI.unescape_html url
-      rescue URL2Dimensions::Error404
-        next logger.warn "skipped (URL2Dimensions::Error404) #{url} from http://redd.it/#{id}"
-      rescue URL2Dimensions::ErrorUnknown
-        next logger.warn "skipped (URL2Dimensions::ErrorUnknown) #{url} from http://redd.it/#{id}"
+      next logger.warn "skipped a post by /u/sjhill"       if author == "sjhill"        # opt-out
+      next logger.warn "skipped a post by /u/redisforever" if author == "redisforever"  # opt-out
+      next logger.warn "skipped a post by /u/bekalaki"     if author == "bekalaki"      # 9 ways to divide a karmawhore
+
+      t = begin
+        DirectLink url
+      rescue NetHTTPUtils::Error,
+             SocketError,
+             FastImage::UnknownImageType,
+             FastImage::ImageFetchFailure,
+             # DirectLink::ErrorMissingEnvVar,
+             DirectLink::ErrorNotFound,
+             DirectLink::ErrorBadLink => e
+        next logger.error "skipped (#{e}) #{url} from http://redd.it/#{id}"
       end
-      fail "unable #{url} from http://redd.it/#{id}" unless _
-      width, height, best_direct_url, *all_direct_urls = _
-      logger.info "URL2Dimensions: %p" % [[width, height, best_direct_url, all_direct_urls.size]]
-      unless min_resolution <= width * height
+      logger.info "DirectLink: %p" % t
+      tt = t.is_a?(Array) ? t : [t]
+      unless min_resolution <= tt.first.width * tt.first.height
         next logger.debug "skipped low resolution #{source}"
       end
-      # next if Gem::Platform.local.os == "darwin" # prevent concurrent posting
       # puts "https://www.reddit.com/r/LargeImages/search.json?q=url%3A#{CGI.escape url}&restrict_sr=on"
-      resolution = "[#{width}x#{height}]"
-      # require "cgi"
+      resolution = "[#{tt.first.width}x#{tt.first.height}]"
       next logger.warn "already submitted #{resolution} #{id}: '#{url}'" unless
         Gem::Platform.local.os == "darwin" || search_url[url].empty?
       logger.warn "resolution #{resolution} got from #{id}: #{url}"
-      # next if Gem::Platform.local.os == "darwin" # prevent concurrent posting
       title = "#{resolution}#{
-        " [#{all_direct_urls.size} images]" if all_direct_urls.size > 1
+        " [#{tt.size} images]" if tt.size > 1
       } #{
-        title.sub(/\s*\[?#{width}\s*[*x×]\s*#{height}\]?\s*/i, " ").
+        title.sub(/\s*\[?#{tt.first.width}\s*[*x×]\s*#{tt.first.height}\]?\s*/i, " ").
               sub("[OC]", " ").gsub(/\s+/, " ").strip.
               gsub(/(?<=.{190 - subreddit.size}).+/, "...")
       } /r/#{subreddit}".
@@ -137,11 +137,11 @@ loop do
         #      "id"=>"3a9rel",
         #      "name"=>"t3_3a9rel"}}}
       line1 = "[Original thread](#{permalink}) by /u/#{author}"
-      line2 = "Direct link#{" (the largest image)" if all_direct_urls.size > 1}: #{best_direct_url}"
+      line2 = "Direct link#{" (the largest image)" if tt.size > 1}: #{tt.first.url}"
       line3 = [
         "Direct links to all other images in album:",
-        all_direct_urls - [best_direct_url]
-      ] if all_direct_urls.size > 1
+        tt.map(&:url) - [tt.first.url]
+      ] if tt.size > 1
       text = [line1, line2, line3].compact.join("  \n")
       logger.info "new comment: #{text.inspect}"
       unless Gem::Platform.local.os == "darwin"
@@ -152,7 +152,7 @@ loop do
         end
       end
 
-      abort if ENV["TEST"]
+      abort if Gem::Platform.local.os == "darwin"
     end
   end
 

data/examples/realtimeww2/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "reddit_bot", "~>1.5.3"
+gem "reddit_bot", "~>1.6.4"
 gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.4"

data/examples/realtimeww2/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    reddit_bot (1.5.3)
+    reddit_bot (1.6.4)
       json
 
 PLATFORMS
@@ -17,7 +17,7 @@ PLATFORMS
 
 DEPENDENCIES
   nethttputils!
-  reddit_bot (~> 1.5.3)
+  reddit_bot (~> 1.6.4)
 
 BUNDLED WITH
    1.16.1

data/lib/reddit_bot.rb

@@ -225,7 +225,7 @@ module RedditBot
         end
       rescue NetHTTPUtils::Error => e
         sleep 5
-        raise unless e.code == 503
+        raise unless e.code == 503 || e.code == 502
         puts "API ERROR 503"
         retry
       end

data/lib/reddit_bot/version.rb

@@ -1,3 +1,3 @@
 module RedditBot
-  VERSION = "1.6.4" # :nodoc:
+  VERSION = "1.6.5" # :nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json