brutalismbot 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adaf818709e409365f83810ea0ac9a883a0e24c5d91432adcce5c567fe0085d
-  data.tar.gz: 54010b835fdb82d057b21961fcd14be8e14087c31b49d3084849a101e95126bf
+  metadata.gz: 0cf18d4d7ec09728b41cd4bc32f1208565ee8a8e29df981a950cc12a022ebe05
+  data.tar.gz: a57aeccee651d4bbd95c8f775af885400b33c00b817759d65ae36129c0e9eaa5
 SHA512:
-  metadata.gz: bfe6c521032918f9f0a5f908a4c14cf3f8cb0a8564168c08246c9600146fe8bdd92efd5b910720041d825fc4b8da4bfc72a8b8c6b27faca32fba67f16b488574
-  data.tar.gz: f8653819c8375a31ac16cd041a82f9d026d1b0e09792b2a99e77946c598a31d25f49cd499fc7349833348368a6253655537d83dfc6dbf6c38611e550f0cd9e7c
+  metadata.gz: 19a19b76a2102521cd1280c9b079013adbacc9828e10f1af5983a717e09e6c4f608777e485ab37ba670602d9119e6c29e06c5e67781002143dd93e20f28de652
+  data.tar.gz: 7263c86e3380544e031843c750e20f69a7eade16bbea7d73c8953b9eadef8930d846a2b186cdadf1d74b45620127272118abe80dbaaa0f6ae462801eb485ea5d

data/README.md

@@ -15,26 +15,27 @@ gem install brutalismbot
 ## Usage
 
 ```ruby
-require "aws-sdk-s3"
-require "brutalismbot"
+require "brutalismbot/s3"
 
-bucket  = Aws::S3::Bucket.new name: "my-bucket"
-brutbot = Brutalismbot::S3::Client.new bucket: bucket, prefix: "my/prefix/"
+brutbot = Brutalismbot::S3::Client.new bucket: "my-bucket", prefix: "my/prefix/"
 
 # Get latest cached post
-brutbot.posts.latest
+post = brutbot.posts.last
 
-# Get latest post as S3 Object
-brutbot.posts.max_key
+# Get newest posts
+brutbot.subreddit.posts(:new).all
 
-# Get post-time of latest cached post
-limit = brutbot.posts.max_time
-
-# Get newest post after a given time
-brutbot.subreddit.posts(:new).since(time: limit).first
+# Get new posts since latest
+brutbot.subreddit.posts(:new, before: post.fullname).all
 
 # Get current top post
-brutbot.subreddit.posts(:top).first
+brutbot.subreddit.posts(:top, limit: 1).first
+
+# Pull latest posts
+brutbot.posts.pull
+
+# Mirror a post to all clients
+brutbot.auths.mirror post
 ```
 
 ## Contributing

data/lib/brutalismbot/auth.rb

@@ -0,0 +1,57 @@
+module Brutalismbot
+  class Auth < Hash
+    def channel_id
+      dig "incoming_webhook", "channel_id"
+    end
+
+    def post(body:, dryrun:nil)
+      uri = URI.parse webhook_url
+      ssl = uri.scheme == "https"
+      req = Net::HTTP::Post.new uri, "content-type" => "application/json"
+      req.body = body
+      Brutalismbot.logger.info "POST #{dryrun ? "DRYRUN " : ""}#{uri}"
+      if dryrun
+        Net::HTTPOK.new "1.1", "204", "ok"
+      else
+        Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
+          http.request req
+        end
+      end
+    end
+
+    def team_id
+      dig "team_id"
+    end
+
+    def webhook_url
+      dig "incoming_webhook", "url"
+    end
+
+    class << self
+      def stub
+        bot_id     = "B#{SecureRandom.alphanumeric(8).upcase}"
+        channel_id = "C#{SecureRandom.alphanumeric(8).upcase}"
+        team_id    = "T#{SecureRandom.alphanumeric(8).upcase}"
+        user_id    = "U#{SecureRandom.alphanumeric(8).upcase}"
+        Auth[{
+          "ok"           => true,
+          "access_token" => "<token>",
+          "scope"        => "identify,incoming-webhook",
+          "user_id"      => user_id,
+          "team_name"    => "My Team",
+          "team_id"      => team_id,
+          "incoming_webhook" => {
+            "channel"           => "#brutalism",
+            "channel_id"        => channel_id,
+            "configuration_url" => "https://my-team.slack.com/services/#{bot_id}",
+            "url"               => "https://hooks.slack.com/services/#{team_id}/#{bot_id}/1234567890abcdef12345678",
+          },
+          "scopes" => [
+            "identify",
+            "incoming-webhook",
+          ],
+        }]
+      end
+    end
+  end
+end

data/lib/brutalismbot/post.rb

@@ -0,0 +1,94 @@
+module Brutalismbot
+  class Post < Hash
+    def created_after?(time)
+      created_utc.to_i > time.to_i
+    end
+
+    def created_utc
+      Time.at(dig("data", "created_utc").to_i).utc
+    end
+
+    def fullname
+      "#{kind}_#{id}"
+    end
+
+    def id
+      dig "data", "id"
+    end
+
+    def kind
+      dig "kind"
+    end
+
+    def permalink
+      dig "data", "permalink"
+    end
+
+    def title
+      dig "data", "title"
+    end
+
+    def to_slack
+      {
+        blocks: [
+          {
+            type: "image",
+            title: {
+              type: "plain_text",
+              text: "/r/brutalism",
+              emoji: true,
+            },
+            image_url: url,
+            alt_text: title,
+          },
+          {
+            type: "context",
+            elements: [
+              {
+                type: "mrkdwn",
+                text: "<https://reddit.com#{permalink}|#{title}>",
+              },
+            ],
+          },
+        ],
+      }
+    end
+
+    def url
+      images = dig "data", "preview", "images"
+      source = images.map{|x| x["source"] }.compact.max do |a,b|
+        a.slice("width", "height").values <=> b.slice("width", "height").values
+      end
+      CGI.unescapeHTML source.dig("url")
+    rescue NoMethodError
+      dig("data", "media_metadata")&.values&.first&.dig("s", "u")
+    end
+
+    class << self
+      def stub
+        created_utc  = Time.now.utc - rand(86400) - 86400
+        post_id      = SecureRandom.alphanumeric(6).downcase
+        permalink_id = SecureRandom.alphanumeric.downcase
+        image_id     = SecureRandom.alphanumeric
+        Post[{
+          "kind" => "t3",
+          "data" => {
+            "id"          => post_id,
+            "created_utc" => created_utc.to_i,
+            "permalink"   => "/r/brutalism/comments/#{permalink_id}/test/",
+            "title"       => "Post to /r/brutalism",
+            "preview" => {
+              "images" => [
+                {
+                  "source" => {
+                    "url" => "https://preview.redd.it/#{image_id}.jpg",
+                  }
+                }
+              ]
+            }
+          }
+        }]
+      end
+    end
+  end
+end

data/lib/brutalismbot/r.rb

@@ -5,10 +5,10 @@ module Brutalismbot
 
       def initialize(endpoint:nil, user_agent:nil)
         @endpoint   = endpoint
-        @user_agent = user_agent
+        @user_agent = user_agent || "Brutalismbot #{VERSION}"
       end
 
-      def posts(resource, **params)
+      def posts(resource, params = {})
         url = File.join @endpoint, "#{resource}.json"
         qry = URI.encode_www_form params
         uri = URI.parse "#{url}?#{qry}"
@@ -19,11 +19,10 @@ module Brutalismbot
     class PostCollection
       include Enumerable
 
-      def initialize(uri:, user_agent:, min_time:nil)
+      def initialize(uri:, user_agent:)
         @uri        = uri
         @ssl        = uri.scheme == "https"
         @user_agent = user_agent
-        @min_time   = min_time.to_i
       end
 
       def each
@@ -32,22 +31,26 @@ module Brutalismbot
           request  = Net::HTTP::Get.new @uri, "user-agent" => @user_agent
           response = JSON.parse http.request(request).body
           children = response.dig("data", "children") || []
-          children.reverse.each do |child|
-            post = Brutalismbot::Post[child]
-            yield post if post.created_after time: @min_time
+          children.each do |child|
+            post = Post[child]
+            yield post
           end
         end
       end
 
-      def since(time:)
-        PostCollection.new uri: @uri, user_agent: @user_agent, min_time: time
+      def all
+        to_a
+      end
+
+      def last
+        to_a.last
       end
     end
 
     class Brutalism < Subreddit
       def initialize(endpoint:nil, user_agent:nil)
-        super endpoint:   endpoint   || "https://www.reddit.com/r/brutalism",
-              user_agent: user_agent || "Brutalismbot #{Brutalismbot::VERSION}"
+        endpoint ||= "https://www.reddit.com/r/brutalism"
+        super
       end
     end
   end

data/lib/brutalismbot/s3.rb

@@ -1,121 +1,173 @@
+require "aws-sdk-s3"
+
+require "brutalismbot"
+
 module Brutalismbot
   module S3
-    class Collection
+    class Prefix
       include Enumerable
 
-      attr_reader :bucket, :prefix
-
-      def initialize(bucket:nil, prefix:nil)
-        @bucket = bucket || ::Aws::S3::Bucket.new(name: ENV["S3_BUCKET"])
-        @prefix = prefix || ENV["S3_PREFIX"]
-      end
-
-      def each
-        Brutalismbot.logger.info "GET s3://#{@bucket.name}/#{@prefix}*"
-        @bucket.objects(prefix: @prefix).each do |object|
-          yield object
+      attr_reader :prefix, :client
+
+      def initialize(bucket:nil, prefix:nil, client:nil, stub_responses:nil)
+        @bucket = bucket || "brutalismbot"
+        @prefix = prefix || "data/v1/"
+        @client = client || Aws::S3::Client.new(stub_responses: stub_responses || false)
+        if stub_responses
+          @auths = 3.times.map{ Auth.stub }
+          @posts = 3.times.map{ Post.stub }.sort{|a,b| a.created_utc <=> b.created_utc }
+          @client.stub_responses :delete_object
+          @client.stub_responses :list_objects, -> (context) { stub_list_objects context }
+          @client.stub_responses :get_object,   -> (context) { stub_get_object context }
         end
       end
 
-      def put(body:, key:, dryrun:nil)
-        if dryrun
-          Brutalismbot.logger.info "PUT DRYRUN s3://#{@bucket.name}/#{key}"
-        else
-          Brutalismbot.logger.info "PUT s3://#{@bucket.name}/#{key}"
-          @bucket.put_object key: key, body: body
-        end
+      def each
+        bucket.objects(prefix: @prefix).each{|x| yield x }
+      end
+
+      def all
+        to_a
+      end
+
+      def bucket(options = {})
+        options[:name]   ||= @bucket
+        options[:client] ||= @client
+        Aws::S3::Bucket.new options
+      end
+
+      def delete(object)
+        key = key_for object
+        Brutalismbot.logger.info "DELETE #{"DRYRUN " if stubbed?}s3://#{@bucket}/#{key}"
+        bucket.delete_objects delete: {objects: [{key: key}]}
+      end
+
+      def put(object)
+        key = key_for object
+        Brutalismbot.logger.info "PUT #{"DRYRUN " if stubbed?}s3://#{@bucket}/#{key}"
+        bucket.put_object key: key, body: object.to_json
+      end
+
+      def stubbed?
+        @client.config.stub_responses
+      end
+
+      def stub_list_objects(context)
+        {
+          contents: if context.params[:prefix] =~ /auths\//
+            @auths.map do |auth|
+              File.join(
+                @prefix,
+                "auths",
+                "team=#{auth.team_id}",
+                "channel=#{auth.channel_id}",
+                "oauth.json",
+              )
+            end
+          elsif context.params[:prefix] =~ /posts\//
+            @posts.map do |post|
+              File.join(
+                @prefix,
+                "posts",
+                post.created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json"),
+              )
+            end
+          end.select do |key|
+            key.start_with? context.params[:prefix]
+          end.map do |key|
+            {
+              key: key
+            }
+          end
+        }
+      end
+
+      def stub_get_object(context)
+        {
+          body: if context.params[:key] =~ /auths\//
+            @auths.select do |auth|
+              File.join(
+                @prefix,
+                "auths",
+                "team=#{auth.team_id}",
+                "channel=#{auth.channel_id}",
+                "oauth.json",
+              ) == context.params[:key]
+            end.first
+          elsif context.params[:key] =~ /posts\//
+            @posts.select do |post|
+              File.join(
+                @prefix,
+                "posts",
+                post.created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json"),
+              ) == context.params[:key]
+            end.first
+          end.to_json
+        }
       end
     end
 
-    class Client < Collection
-      def subreddit(endpoint:nil, user_agent:nil)
-        Brutalismbot::R::Brutalism.new endpoint:endpoint, user_agent: user_agent
-      end
-
+    class Client < Prefix
       def auths
-        AuthCollection.new bucket: @bucket, prefix: "#{@prefix}auths/"
+        prefix = File.join @prefix, "auths/"
+        AuthCollection.new bucket: @bucket, prefix: prefix, client: @client
       end
 
       def posts
-        PostCollection.new bucket: @bucket, prefix: "#{@prefix}posts/"
+        prefix = File.join @prefix, "posts/"
+        PostCollection.new bucket: @bucket, prefix: prefix, client: @client
       end
-    end
 
-    class AuthCollection < Collection
-      def each
-        super do |object|
-          yield Brutalismbot::Auth[JSON.parse object.get.body.read]
-        end
+      def subreddit(endpoint:nil, user_agent:nil)
+        R::Brutalism.new endpoint:endpoint, user_agent: user_agent
       end
+    end
 
-      def remove(team:, dryrun:nil)
-        prefix = "#{@prefix}team=#{team}/"
-        Brutalismbot.logger.info "GET s3://#{@bucket.name}/#{prefix}*"
-        @bucket.objects(prefix: prefix).map do |object|
-          if dryrun
-            Brutalismbot.logger.info "DELETE DRYRUN s3://#{@bucket.name}/#{object.key}"
-          else
-            Brutalismbot.logger.info "DELETE s3://#{@bucket.name}/#{object.key}"
-            object.delete
-          end
-        end
+    class AuthCollection < Prefix
+      def each
+        super{|x| yield Auth[JSON.parse x.get.body.read] }
       end
 
-      def mirror(body:, dryrun:nil)
-        map{|auth| auth.post body: body, dryrun: dryrun }
+      def key_for(auth)
+        File.join @prefix, "team=#{auth.team_id}/channel=#{auth.channel_id}/oauth.json"
       end
 
-      def put(auth:, dryrun:nil)
-        key = "#{@prefix}team=#{auth.team_id}/channel=#{auth.channel_id}/oauth.json"
-        super key: key, body: auth.to_json, dryrun: dryrun
+      def mirror(post, options = {})
+        options[:body] = post.to_slack.to_json
+        map{|x| x.post options }
       end
     end
 
-    class PostCollection < Collection
+    class PostCollection < Prefix
       def each
-        super do |object|
-          yield Brutalismbot::Post[JSON.parse object.get.body.read]
-        end
+        super{|x| yield Post[JSON.parse x.get.body.read] }
       end
 
-      def latest
-        Brutalismbot::Post[JSON.parse max_key.get.body.read]
+      def key_for(post)
+        File.join @prefix, post.created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
       end
 
-      def max_key
+      def last
         # Dig for max key
-        prefix = prefix_for time: Time.now.utc
-        Brutalismbot.logger.info "GET s3://#{@bucket.name}/#{prefix}*"
+        prefix = Time.now.utc.strftime "#{@prefix}year=%Y/month=%Y-%m/day=%Y-%m-%d/"
+        Brutalismbot.logger.info "GET s3://#{@bucket}/#{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.split(/[^\/]+\/\z/).first
-          Brutalismbot.logger.info "GET s3://#{@bucket.name}/#{prefix}*"
+          Brutalismbot.logger.info "GET s3://#{@bucket}/#{prefix}*"
         end
 
-        # Return max by key
-        keys.max{|a,b| a.key <=> b.key }
-      end
-
-      def max_time
-        max_key.key.match(/(\d+).json\z/).to_a.last.to_i
-      end
-
-      def prefix_for(time:)
-        time  = Time.at(time.to_i).utc
-        year  = time.strftime '%Y'
-        month = time.strftime '%Y-%m'
-        day   = time.strftime '%Y-%m-%d'
-        "#{@prefix}year=#{year}/month=#{month}/day=#{day}/"
-      end
+        # Get max by key
+        max_key = keys.max{|a,b| a.key <=> b.key }
 
-      def put(post:, dryrun:nil)
-        key = "#{prefix_for time: post.created_utc}#{post.created_utc.to_i}.json"
-        super key: key, body: post.to_json, dryrun: dryrun
+        # Parse as Post
+        Post[JSON.parse max_key.get.body.read]
       end
 
-      def update(posts:, dryrun:nil)
-        posts.map{|post| put post: post, dryrun: dryrun }
+      def pull(options = {})
+        options[:before] ||= last.fullname
+        R::Brutalism.new.posts(:new, options).reverse_each.map{|x| put x }
       end
     end
   end

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/brutalismbot.rb

@@ -1,9 +1,12 @@
-require "brutalismbot/r"
-require "brutalismbot/s3"
-require "brutalismbot/version"
 require "logger"
+require "securerandom"
 require "net/https"
 
+require "brutalismbot/auth"
+require "brutalismbot/post"
+require "brutalismbot/r"
+require "brutalismbot/version"
+
 module Brutalismbot
   class << self
     @@config = {}
@@ -28,87 +31,4 @@ module Brutalismbot
 
   class Error < StandardError
   end
-
-  class Auth < Hash
-    def channel_id
-      dig "incoming_webhook", "channel_id"
-    end
-
-    def post(body:, dryrun:nil)
-      uri = URI.parse webhook_url
-      ssl = uri.scheme == "https"
-      Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
-        if dryrun
-          Brutalismbot.logger.info "POST DRYRUN #{uri}"
-        else
-          Brutalismbot.logger.info "POST #{uri}"
-          req = Net::HTTP::Post.new uri, "content-type" => "application/json"
-          req.body = body
-          http.request req
-        end
-      end
-    end
-
-    def team_id
-      dig "team_id"
-    end
-
-    def webhook_url
-      dig "incoming_webhook", "url"
-    end
-  end
-
-  class Post < Hash
-    def created_after(time:)
-      created_utc.to_i > time.to_i
-    end
-
-    def created_utc
-      Time.at(dig("data", "created_utc").to_i).utc
-    end
-
-    def permalink
-      dig "data", "permalink"
-    end
-
-    def title
-      dig "data", "title"
-    end
-
-    def to_slack
-      {
-        blocks: [
-          {
-            type: "image",
-            title: {
-              type: "plain_text",
-              text: "/r/brutalism",
-              emoji: true,
-            },
-            image_url: url,
-            alt_text: title,
-          },
-          {
-            type: "context",
-            elements: [
-              {
-                type: "mrkdwn",
-                text: "<https://reddit.com#{permalink}|#{title}>",
-              },
-            ],
-          },
-        ],
-      }
-    end
-
-    def url
-      images = dig "data", "preview", "images"
-      source = images.map{|x| x["source"] }.compact.max do |a,b|
-        a.slice("width", "height").values <=> b.slice("width", "height").values
-      end
-      CGI.unescapeHTML source.dig("url")
-    rescue NoMethodError
-      dig("data", "media_metadata")&.values&.first&.dig("s", "u")
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 description: 'A Slack app that mirrors posts from /r/brutalism to a #channel of your
   choosing using incoming webhooks.'
 email:
@@ -119,6 +133,8 @@ files:
 - LICENSE.txt
 - README.md
 - lib/brutalismbot.rb
+- lib/brutalismbot/auth.rb
+- lib/brutalismbot/post.rb
 - lib/brutalismbot/r.rb
 - lib/brutalismbot/s3.rb
 - lib/brutalismbot/version.rb