brutalismbot 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f0cc2d8f65ce4d6e52cd68fba606fd17c9bb7467b7897d33f24687a298b50a
-  data.tar.gz: a0759a82b139ae7c700eede3a0360d85c521c8d79cd3d97370b8b6597a6b3d02
+  metadata.gz: 2b1a53227321c1d498e19fadd19c6672765235e10de63d5182028ef88e97f6ea
+  data.tar.gz: 7412d9894367b09119948295333c7e5d40444b1cdca4e686a045de33bcabd20a
 SHA512:
-  metadata.gz: 1441ac4a1edd40e508838855702555a0b7e45c8281dc46b3890217b9228154bb5c254781c93bf2e7df8e95a4a9920a816be96bd078454d7157c61d5a7774b110
-  data.tar.gz: 6d12e3c06bcc3fdaaa5e958002f4c4b2ef82bc8c0f33bd4a85f882003ad35d83b474015138e2370a8d2b54e86caa71f8c4c40a3eb915a37dcbc7077b30ea113b
+  metadata.gz: 52ee57689c45dd034e4660ebe2923edd424ee3bf47181d3e858ad023d12ca7937fef43a0f2acb2eeedf2b7bc350675b945c1ed5da24abadd440531091aa6ecd1
+  data.tar.gz: 1df7a1413841387e689078238a2ee786ea06a682b39a80865d856f408f91aa2419647def2ba33910f32e37dd91b589690867dc386234631103b3005768bcea2b

data/lib/brutalismbot/posts/client.rb

@@ -18,8 +18,8 @@ module Brutalismbot
         File.join(@prefix, post.path)
       end
 
-      def get(key)
-        super {|object| Reddit::Post.parse(object.get.body.read) }
+      def get(**options)
+        super {|object| Reddit::Post.parse(object.body.read) }
       end
 
       def last
@@ -28,7 +28,7 @@ module Brutalismbot
 
       def list(**options)
         super(**options) do |object|
-          Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{object.key}")
+          Brutalismbot.logger.info("GET s3://#{@bucket}/#{object.key}")
           Reddit::Post.parse(object.get.body.read)
         end
       end
@@ -36,12 +36,12 @@ module Brutalismbot
       def max_key
         # Dig for max key
         prefix = Time.now.utc.strftime("#{@prefix}year=%Y/month=%Y-%m/day=%Y-%m-%d/")
-        Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{prefix}*")
+        Brutalismbot.logger.info("GET s3://#{@bucket}/#{prefix}*")
 
         # Go up a level in prefix if no keys found
-        until (keys = @bucket.objects(prefix: prefix)).any? || prefix == @prefix
+        until (keys = bucket.objects(prefix: prefix)).any? || prefix == @prefix
           prefix = prefix.split(/[^\/]+\/\z/).first
-          Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{prefix}*")
+          Brutalismbot.logger.info("GET s3://#{@bucket}/#{prefix}*")
         end
 
         # Return max by key
@@ -54,9 +54,9 @@ module Brutalismbot
       end
 
       def push(post, dryrun:nil)
-        options = post.to_s3(bucket: @bucket.name, prefix: @prefix)
+        options = post.to_s3(bucket: @bucket, prefix: @prefix)
         Brutalismbot.logger.info("PUT #{"DRYRUN " if dryrun}s3://#{options[:bucket]}/#{options[:key]}")
-        @bucket.put_object(**options.slice(:key, :body, :metadata)) unless dryrun
+        @client.put_object(**options) unless dryrun
         options.slice(:bucket, :key, :metadata)
       end
     end

data/lib/brutalismbot/posts/stub.rb

@@ -10,7 +10,6 @@ module Brutalismbot
         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] }

data/lib/brutalismbot/s3/client.rb

@@ -3,27 +3,33 @@ require "aws-sdk-s3"
 module Brutalismbot
   module S3
     class Client
-      attr_reader :bucket, :prefix, :client
+      attr_reader :prefix, :client
 
       def initialize(bucket:nil, prefix:nil, client:nil)
-        bucket ||= ENV["S3_BUCKET"] || "brutalismbot"
-        prefix ||= ENV["S3_PREFIX"] || "data/v1/"
-        client ||= Aws::S3::Client.new
-        @bucket = Aws::S3::Bucket.new(name: bucket, client: client)
-        @client = client
-        @prefix = prefix
+        @client = client || Aws::S3::Client.new
+        @bucket = bucket || ENV["S3_BUCKET"] || "brutalismbot"
+        @prefix = prefix || ENV["S3_PREFIX"] || "data/v1/"
       end
 
-      def get(key, &block)
-        Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{key}")
-        object = @bucket.object(key)
+      def bucket(**options)
+        options[:name] ||= @bucket
+        options[:client] ||= @client
+        Aws::S3::Bucket.new(**options)
+      end
+
+      def get(key:, bucket:nil, **options, &block)
+        bucket ||= @bucket
+        Brutalismbot.logger.info("GET s3://#{@bucket}/#{key}")
+        object = @client.get_object(bucket: bucket, key: key, **options)
         block_given? ? yield(object) : object
       end
 
-      def list(**options, &block)
-        options[:prefix] ||= @prefix
-        Brutalismbot.logger.info("LIST s3://#{@bucket.name}/#{options[:prefix]}*")
-        Prefix.new(@bucket.objects(options), &block)
+      def list(bucket:nil, prefix:nil, **options, &block)
+        bucket ||= @bucket
+        prefix ||= @prefix
+        Brutalismbot.logger.info("LIST s3://#{@bucket}/#{prefix}*")
+        result = self.bucket(name: bucket).objects(prefix: prefix, **options)
+        Prefix.new(result, &block)
       end
     end
   end

data/lib/brutalismbot/slack/auth.rb

@@ -12,12 +12,8 @@ module Brutalismbot
         @item.dig("incoming_webhook", "channel_id")
       end
 
-      def team_id
-        @item.dig("team_id")
-      end
-
-      def webhook_url
-        @item.dig("incoming_webhook", "url")
+      def inspect
+        "#<#{self.class} #{team_id}/#{channel_id}>"
       end
 
       def path
@@ -39,6 +35,14 @@ module Brutalismbot
           Net::HTTPOK.new("1.1", "204", "ok")
         end
       end
+
+      def team_id
+        @item.dig("team_id")
+      end
+
+      def webhook_url
+        @item.dig("incoming_webhook", "url")
+      end
     end
   end
 end

data/lib/brutalismbot/slack/client.rb

@@ -16,21 +16,21 @@ module Brutalismbot
 
       def install(auth, dryrun:nil)
         key = key_for(auth)
-        Brutalismbot.logger.info("PUT #{"DRYRUN " if dryrun}s3://#{@bucket.name}/#{key}")
-        @bucket.put_object(key: key, body: auth.to_json) unless dryrun
+        Brutalismbot.logger.info("PUT #{"DRYRUN " if dryrun}s3://#{@bucket}/#{key}")
+        @client.put_object(bucket: @bucket, key: key, body: auth.to_json) unless dryrun
       end
 
       def key_for(auth)
         File.join(@prefix, auth.path)
       end
 
-      def get(key)
-        super {|object| Auth.parse(object.get.body.read) }
+      def get(**options)
+        super {|object| Auth.parse(object.body.read) }
       end
 
       def list(**options)
         super(**options) do |object|
-          Brutalismbot.logger.info("GET s3://#{@bucket.name}/#{object.key}")
+          Brutalismbot.logger.info("GET s3://#{@bucket}/#{object.key}")
           Auth.parse(object.get.body.read)
         end
       end
@@ -38,16 +38,16 @@ module Brutalismbot
       def push(post, dryrun:nil)
         list.map do |auth|
           key = key_for(auth)
-          Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}s3://#{@bucket.name}/#{key}")
+          Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}s3://#{@bucket}/#{key}")
           auth.push(post, dryrun: dryrun)
         end
       end
 
       def uninstall(auth, dryrun:nil)
         prefix = File.join(@prefix, "team=#{auth.team_id}/")
-        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}")
+        Brutalismbot.logger.info("LIST s3://#{@bucket}/#{prefix}*")
+        bucket.objects(prefix: prefix).map do |object|
+          Brutalismbot.logger.info("DELETE #{"DRYRUN " if dryrun}s3://#{@bucket}/#{object.key}")
           object.delete unless dryrun
         end
       end

data/lib/brutalismbot/slack/stub.rb

@@ -12,7 +12,6 @@ module Brutalismbot
         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] }

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexander Mancevice