brutalismbot 1.0.0.beta.1 → 1.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0300595812c2edd2e92f2f192eef2c8a3b69cad1e7b335e3f969aa8301d90006'
-  data.tar.gz: 8ea2640345f8c912b4596b0545c5d98306fb301ab956d2d2133ce3cb04d49e6a
+  metadata.gz: 057aa6155c1a5f25a7f27392384ca6d1ad2610bb1c930d0d0e7bd293e7ef1140
+  data.tar.gz: 5e610795ea0c3ccb8cbf96d3b332c0031640632c1b07ad405102dddacc2ee312
 SHA512:
-  metadata.gz: 34bd0c9f5d52de396494e4f60dddfb971df9aa4f2edb521acd1585cab75c2d77ce982ec4f7d7fe660f49855b1e0abc83a034e8bcc70c6a4f7965c05c8ead8132
-  data.tar.gz: 8936ced573ccf98e970a2bf7b20562101489d0f9c6e5c12e8c232a2cdb8fb0005bf8a20f1e2382f62c57ac165364689bf025c3c1350e91572fa9f8aa6a36cfee
+  metadata.gz: ca0daf3e9ceca0db0841f8bd235cc73fec57c91d4908d609dea9699f0006aaf3a14f3986cc70adf96b447f3f9711c0dc13d6560316bf58ef1e54e56bce5a6d9f
+  data.tar.gz: d11f03af3411f675538fb9c8061289191c0b865874caabcc0379888b526b3ef7ac91089c290f9f5956fa5edb9295197b8154eca8e7946befcade8a7f4ed8cb33

data/lib/brutalismbot/client.rb

@@ -16,7 +16,7 @@ module Brutalismbot
 
     def lag_time
       lag = ENV["BRUTALISMBOT_LAG_TIME"].to_s
-      lag.empty? ? 7200 : lag.to_i
+      lag.empty? ? 9000 : lag.to_i
     end
 
     def pull(min_time:nil, max_time:nil, dryrun:nil)

data/lib/brutalismbot/posts/client.rb

@@ -35,7 +35,7 @@ module Brutalismbot
         Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{prefix}*")
 
         # Go up a level in prefix if no keys found
-        until (keys = @bucket.objects(prefix: prefix)).any?
+        until (keys = @bucket.objects(prefix: prefix)).any? || prefix == @prefix
           prefix = prefix.split(/[^\/]+\/\z/).first
           Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{prefix}*")
         end
@@ -46,6 +46,7 @@ module Brutalismbot
 
       def max_time
         max_key.key[/(\d+).json\z/, -1].to_i
+      rescue NoMethodError
       end
 
       def push(post, dryrun:nil)

data/lib/brutalismbot/posts/stub.rb

@@ -1,26 +1,34 @@
+require "aws-sdk-s3"
+
 require "brutalismbot/reddit/post"
 
 module Brutalismbot
   module Posts
     class Client
-      class << self
-        def stub(&block)
-          client = new(prefix: "data/test/posts/")
-          client.instance_variable_set(:@stubbed, true)
+      def stub!(items = nil)
+        items ||= [Reddit::Post.stub]
+        items   = items.map{|x| [key_for(x), x.to_h] }.to_h
+
+        @client = Aws::S3::Client.new(stub_responses: true)
+        @bucket = Aws::S3::Bucket.new(name: @bucket.name, client: @client)
+
+        @client.stub_responses :list_objects_v2, -> (context) do
+          keys = items.keys.select{|x| x.start_with? context.params[:prefix] }
+          {contents: keys.map{|x| {key:x} }}
+        end
 
-          block = -> { [Reddit::Post.stub] } unless block_given?
-          items = block.call.map{|x| [client.key_for(x), x.to_h] }.to_h
+        @client.stub_responses :get_object, -> (context) do
+          {body: StringIO.new(items.fetch(context.params[:key]).to_json)}
+        end
 
-          client.client.stub_responses :list_objects, -> (context) do
-            keys = items.keys.select{|x| x.start_with? context.params[:prefix] }
-            {contents: keys.map{|x| {key:x} }}
-          end
+        @stubbed = true
 
-          client.client.stub_responses :get_object, -> (context) do
-            {body: StringIO.new(items.fetch(context.params[:key]).to_json)}
-          end
+        self
+      end
 
-          client
+      class << self
+        def stub(items = nil)
+          new(prefix: "data/test/posts/").stub!(items)
         end
       end
     end

data/lib/brutalismbot/reddit/post.rb

@@ -61,45 +61,51 @@ module Brutalismbot
       end
 
       def to_slack
+        url.nil? ? to_slack_text : to_slack_image
+      end
+
+      def to_slack_image
         {
-          blocks: unless url.nil?
-            [
-              {
-                type: "image",
-                title: {
-                  type: "plain_text",
-                  text: "/r/brutalism",
-                  emoji: true,
-                },
-                image_url: url,
-                alt_text: title,
-              },
-              {
-                type: "context",
-                elements: [
-                  {
-                    type: "mrkdwn",
-                    text: "<#{permalink}|#{title}>",
-                  },
-                ],
+          blocks: [
+            {
+              type: "image",
+              title: {
+                type: "plain_text",
+                text: "/r/brutalism",
+                emoji: true,
               },
-            ]
-          else
-            [
-              {
-                type: "section",
-                text: {
+              image_url: url,
+              alt_text: title,
+            },
+            {
+              type: "context",
+              elements: [
+                {
                   type: "mrkdwn",
                   text: "<#{permalink}|#{title}>",
                 },
-                accessory: {
-                  type: "image",
-                  image_url: "https://brutalismbot.com/logo-red-ppl.png",
-                  alt_text: "/r/brutalism"
-                }
-              }
-            ]
-          end
+              ],
+            },
+          ],
+        }
+      end
+
+      def to_slack_text
+        {
+          blocks: [
+            {
+              type: "section",
+              text: {
+                type: "mrkdwn",
+                text: "<#{permalink}|#{title}>",
+              },
+              accessory: {
+                type: "image",
+                image_url: "https://brutalismbot.com/logo-red-ppl.png",
+                alt_text: "/r/brutalism",
+              },
+            },
+          ],
         }
       end
 

data/lib/brutalismbot/slack/client.rb

@@ -41,7 +41,8 @@ module Brutalismbot
 
       def uninstall(auth, dryrun:nil)
         prefix = File.join(@prefix, "team=#{auth.team_id}/")
-        @bucket.objects(prefix: prefix).each do |object|
+        Brutalismbot.logger.info("LIST s3://#{@bucket.name}/#{prefix}*")
+        @bucket.objects(prefix: prefix).map do |object|
           Brutalismbot.logger.info("DELETE #{"DRYRUN " if dryrun}s3://#{@bucket.name}/#{object.key}")
           object.delete unless dryrun
         end

data/lib/brutalismbot/slack/stub.rb

@@ -1,25 +1,40 @@
 require "securerandom"
 
+require "aws-sdk-s3"
+
+require "brutalismbot/slack/auth"
+
 module Brutalismbot
   module Slack
     class Client
-      class << self
-        def stub(&block)
-          client = new(prefix: "data/test/auths/")
-          client.instance_variable_set(:@stubbed, true)
+      def stub!(items = nil)
+        items ||= [Auth.stub]
+        items   = items.map{|x| [key_for(x), x.to_h] }.to_h
 
-          block = -> { [Auth.stub] } unless block_given?
-          items = block.call.map{|x| [client.key_for(x), x.to_h] }.to_h
+        @client = Aws::S3::Client.new(stub_responses: true)
+        @bucket = Aws::S3::Bucket.new(name: @bucket.name, client: @client)
 
-          client.client.stub_responses :list_objects, -> (context) do
-            {contents: items.keys.map{|x| {key:x} }}
-          end
+        @client.stub_responses :list_objects_v2, -> (context) do
+          keys = items.keys.select{|x| x.start_with? context.params[:prefix] }
+          {contents: keys.map{|x| {key:x} }}
+        end
 
-          client.client.stub_responses :get_object, -> (context) do
-            {body: StringIO.new(items.fetch(context.params[:key]).to_json)}
-          end
+        @client.stub_responses :get_object, -> (context) do
+          {body: StringIO.new(items.fetch(context.params[:key]).to_json)}
+        end
 
-          client
+        @client.stub_responses :delete_object, -> (context) do
+          {version_id: context.params[:key]}
+        end
+
+        @stubbed = true
+
+        self
+      end
+
+      class << self
+        def stub(items = nil)
+          new(prefix: "data/test/auths/").stub!(items)
         end
       end
     end

data/lib/brutalismbot/stub.rb

@@ -7,12 +7,17 @@ Aws.config.update(stub_responses: true)
 
 module Brutalismbot
   class Client
+    def stub!(posts:nil, slack:nil)
+      @posts   = Posts::Client.stub(posts)
+      @slack   = Slack::Client.stub(posts)
+      @stubbed = true
+
+      self
+    end
+
     class << self
-      def stub
-        new(
-          posts: Posts::Client.stub,
-          slack: Slack::Client.stub,
-        )
+      def stub(posts:nil, slack:nil)
+        new.stub!(posts: posts, slack: slack)
       end
     end
   end

data/lib/brutalismbot/twitter/client.rb

@@ -21,15 +21,21 @@ module Brutalismbot
 
       def push(post, dryrun:nil)
         Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
+        method = post.url.nil? ? :push_text : :push_image
+        send(method, post, dryrun: dryrun)
+      end
+
+      def push_text(post, dryrun:nil)
+        status = post.to_twitter
+        @client.update(status) unless dryrun
+      end
+
+      def push_image(post, dryrun:nil)
         status = post.to_twitter
-        if post.url.nil?
-          @client.update(status) unless dryrun
-        else
-          uri = URI.parse(post.url)
-          Brutalismbot.logger.info("GET #{uri}")
-          uri.open do |media|
-            @client.update_with_media(status, media) unless dryrun
-          end
+        uri    = URI.parse(post.url)
+        Brutalismbot.logger.info("GET #{uri}")
+        uri.open do |media|
+          @client.update_with_media(status, media) unless dryrun
         end
       end
     end

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "1.0.0.beta.1"
+  VERSION = "1.0.0.beta.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Alexander Mancevice
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.0.pre3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Mirror posts from /r/brutalism to Slack