brutalismbot 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dbe0c2ce29ee2c8169e733c62706340465aaa1307e608f2e84888c4181e1b6b
-  data.tar.gz: a756eafc6077d900bde350dea0782b14ec988aacd0421f6b871d0c7ddedf83fb
+  metadata.gz: b1836d2eecd6d94c8d170223f7c8da3bbfe87909154d82492716d3ac1b3b411e
+  data.tar.gz: 825519ee45d36652e631310c38c0ce246c9e08e0f86987c4bfa42cc6345daa8a
 SHA512:
-  metadata.gz: 427d8332a5df819072e2932227836aa8a1c62163261f711d070ca89cf745e4ab2dc8510326d2d15e82a6bc8c802fd350630b3614f4e8943a46fcdf75cfbce608
-  data.tar.gz: e0ffb4aa085e92b6a6fafa2a0930992fd0ab9938ff7df3b36bb77dfce10766be0c78faefc2bee37fce66734f5ee7b6be2788e4f1b894f4c59ab83c083ae63707
+  metadata.gz: baed1a146152eb80401cbd75fd2e5265cd99fae63fb588db1ca66e233e52de8c06c6460abd099b6f046b4436923496d94bb7867b645382c81ec8857f9fb1a9f7
+  data.tar.gz: dde3ca496744cdf5e45c41be689c36587570c3cb4b79d7998a82d3ad002bc79e5e601aa09f21e246bc40bef00d46b2ec4b8affdc8595135f2ccac4cd5bd11617

data/README.md

@@ -1,39 +1,50 @@
-# Brutalismbot
+<img alt="brutalismbot" src="https://brutalismbot.com/banner.png"/>
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/brutalismbot`. To experiment with that code, run `bin/console` for an interactive prompt.
+[![Gem Version](https://badge.fury.io/rb/brutalismbot.svg)](http://badge.fury.io/rb/brutalismbot)
+[![Build Status](https://travis-ci.com/brutalismbot/gem.svg)](https://travis-ci.com/brutalismbot/gem)
+[![codecov](https://codecov.io/gh/brutalismbot/gem/branch/master/graph/badge.svg)](https://codecov.io/gh/brutalismbot/gem)
 
-TODO: Delete this and the text above, and describe your gem
+Brutalismbot RubyGem
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
 ```ruby
-gem 'brutalismbot'
+gem install brutalismbot
 ```
 
-And then execute:
-
-    $ bundle
+## Usage
 
-Or install it yourself as:
+```ruby
+require "aws-sdk-s3"
+require "brutalismbot"
 
-    $ gem install brutalismbot
+bucket  = Aws::S3::Bucket.new name: "my-bucket"
+brutbot = Brutalismbot::S3::Client.new bucket: bucket,
+                                       prefix: "my/prefix/"
 
-## Usage
+# Get new posts after a given time
+brutbot.subreddit.new_posts.after Time.parse("2019-06-01 12:00:00Z")
 
-TODO: Write usage instructions here
+# Get current top post
+brutbot.subreddit.top_post
 
-## Development
+# Get latest cached post
+brutbot.posts.latest
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+# Get max key in posts
+brutbot.posts.max_key
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/brutalismbot.
+Bug reports and pull requests are welcome on [GitHub](https://github.com/brutalismbot/gem).
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+### See Also
+
+- [Brutalismbot API](https://github.com/brutalismbot/api)
+- [Brutalismbot App](https://github.com/brutalismbot/brutalismbot)
+- [Brutalismbot Monitoring](https://github.com/brutalismbot/monitoring)

data/lib/brutalismbot/r.rb

@@ -1,112 +1,53 @@
-module R
-  class Subreddit
-    def initialize(endpoint:nil, user_agent:nil)
-      @endpoint   = endpoint
-      @user_agent = user_agent
-    end
-
-    def new_posts(**params)
-      url = File.join @endpoint, "new.json"
-      qry = URI.encode_www_form params
-      uri = URI.parse "#{url}?#{qry}"
-      PostCollection.new uri: uri, user_agent: @user_agent
-    end
+module Brutalismbot
+  module R
+    class Subreddit
+      attr_reader :endpoint, :user_agent
 
-    def top_post(**params)
-      url = File.join @endpoint, "top.json"
-      qry = URI.encode_www_form params
-      uri = URI.parse "#{url}?#{qry}"
-      PostCollection.new(uri: uri, user_agent: @user_agent).each do |post|
-        break post unless post.url.nil?
+      def initialize(endpoint:nil, user_agent:nil)
+        @endpoint   = endpoint
+        @user_agent = user_agent
       end
-    end
-  end
-
-  class PostCollection
-    include Enumerable
-
-    def initialize(uri:, user_agent:, min_time:nil)
-      @uri        = uri
-      @ssl        = uri.scheme == "https"
-      @user_agent = user_agent
-      @min_time   = min_time.to_i
-    end
-
-    def after(time)
-      PostCollection.new uri: @uri, user_agent: @user_agent, min_time: time
-    end
 
-    def each
-      puts "GET #{@uri}"
-      Net::HTTP.start(@uri.host, @uri.port, use_ssl: @ssl) do |http|
-        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 = R::Brutalism::Post[child]
-          yield post if post.created_after @min_time
-        end
+      def posts(resource, **params)
+        url = File.join @endpoint, "#{resource}.json"
+        qry = URI.encode_www_form params
+        uri = URI.parse "#{url}?#{qry}"
+        PostCollection.new uri: uri, user_agent: @user_agent
       end
     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}"
-    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
+    class PostCollection
+      include Enumerable
 
-      def permalink
-        dig "data", "permalink"
+      def initialize(uri:, user_agent:, min_time:nil)
+        @uri        = uri
+        @ssl        = uri.scheme == "https"
+        @user_agent = user_agent
+        @min_time   = min_time.to_i
       end
 
-      def title
-        dig "data", "title"
+      def each
+        Brutalismbot.logger.info "GET #{@uri}"
+        Net::HTTP.start(@uri.host, @uri.port, use_ssl: @ssl) do |http|
+          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
+          end
+        end
       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}>",
-                },
-              ],
-            },
-          ],
-        }
+      def since(time:)
+        PostCollection.new uri: @uri, user_agent: @user_agent, min_time: time
       end
+    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")
+    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}"
       end
     end
   end

data/lib/brutalismbot/s3.rb

@@ -1,39 +1,17 @@
 module Brutalismbot
   module S3
-    class Client
-      VERSION = "v1"
-
-      def initialize(bucket:, prefix:nil)
-        @bucket = bucket
-        @prefix = prefix
-      end
-
-      def subreddit(endpoint:nil, user_agent:nil)
-        R::Brutalism.new endpoint:   endpoint,
-                         user_agent: user_agent
-      end
-
-      def auths
-        AuthCollection.new bucket: @bucket,
-                           prefix: "#{@prefix}oauth/#{VERSION}/"
-      end
-
-      def posts
-        PostCollection.new bucket: @bucket,
-                           prefix: "#{@prefix}posts/#{VERSION}/"
-      end
-    end
-
     class Collection
       include Enumerable
 
-      def initialize(bucket:, prefix:)
+      attr_reader :bucket, :prefix
+
+      def initialize(bucket:, prefix:nil)
         @bucket = bucket
         @prefix = prefix
       end
 
       def each
-        puts "GET s3://#{@bucket.name}/#{@prefix}*"
+        Brutalismbot.logger.info "GET s3://#{@bucket.name}/#{@prefix}*"
         @bucket.objects(prefix: @prefix).each do |object|
           yield object
         end
@@ -41,37 +19,52 @@ module Brutalismbot
 
       def put(body:, key:, dryrun:nil)
         if dryrun
-          puts "PUT DRYRUN s3://#{@bucket.name}/#{key}"
+          Brutalismbot.logger.info "PUT DRYRUN s3://#{@bucket.name}/#{key}"
         else
-          puts "PUT s3://#{@bucket.name}/#{key}"
+          Brutalismbot.logger.info "PUT s3://#{@bucket.name}/#{key}"
           @bucket.put_object key: key, body: body
         end
+      end
+    end
 
-        {bucket: @bucket.name, key: key}
+    class Client < Collection
+      def subreddit(endpoint:nil, user_agent:nil)
+        Brutalismbot::R::Brutalism.new endpoint:endpoint, user_agent: user_agent
+      end
+
+      def auths
+        AuthCollection.new bucket: @bucket, prefix: "#{@prefix}auths/"
+      end
+
+      def posts
+        PostCollection.new bucket: @bucket, prefix: "#{@prefix}posts/"
       end
     end
 
     class AuthCollection < Collection
       def each
         super do |object|
-          yield Brutalismbot::OAuth[JSON.parse object.get.body.read]
+          yield Brutalismbot::Auth[JSON.parse object.get.body.read]
         end
       end
 
-      def delete(team_id:, dryrun:nil)
-        prefix = "#{@prefix}team=#{team_id}/"
-        puts "GET s3://#{@bucket.name}/#{prefix}*"
+      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
-            puts "DELETE DRYRUN s3://#{@bucket.name}/#{object.key}"
-            {bucket: @bucket.name, key: object.key}
+            Brutalismbot.logger.info "DELETE DRYRUN s3://#{@bucket.name}/#{object.key}"
           else
-            puts "DELETE s3://#{@bucket.name}/#{object.key}"
+            Brutalismbot.logger.info "DELETE s3://#{@bucket.name}/#{object.key}"
             object.delete
           end
         end
       end
 
+      def mirror(body:, dryrun:nil)
+        map{|auth| auth.post body: body, dryrun: dryrun }
+      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
@@ -81,23 +74,23 @@ module Brutalismbot
     class PostCollection < Collection
       def each
         super do |object|
-          yield R::Brutalism::Post[JSON.parse object.get.body.read]
+          yield Brutalismbot::Post[JSON.parse object.get.body.read]
         end
       end
 
       def latest
-        R::Brutalism::Post[JSON.parse max_key.get.body.read]
+        Brutalismbot::Post[JSON.parse max_key.get.body.read]
       end
 
       def max_key
         # Dig for max key
-        prefix = prefix_for Time.now.utc
-        puts "GET s3://#{@bucket.name}/#{prefix}*"
+        prefix = prefix_for time: Time.now.utc
+        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?
           prefix = prefix.split(/[^\/]+\/\z/).first
-          puts "GET s3://#{@bucket.name}/#{prefix}*"
+          Brutalismbot.logger.info "GET s3://#{@bucket.name}/#{prefix}*"
         end
 
         # Return max by key
@@ -108,7 +101,7 @@ module Brutalismbot
         max_key.key.match(/(\d+).json\z/).to_a.last.to_i
       end
 
-      def prefix_for(time)
+      def prefix_for(time:)
         time  = Time.at(time.to_i).utc
         year  = time.strftime '%Y'
         month = time.strftime '%Y-%m'
@@ -117,9 +110,13 @@ module Brutalismbot
       end
 
       def put(post:, dryrun:nil)
-        key = "#{prefix_for post.created_utc}#{post.created_utc.to_i}.json"
+        key = "#{prefix_for time: post.created_utc}#{post.created_utc.to_i}.json"
         super key: key, body: post.to_json, dryrun: dryrun
       end
+
+      def update(posts:, dryrun:nil)
+        posts.map{|post| put post: post, dryrun: dryrun }
+      end
     end
   end
 end

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/brutalismbot.rb

@@ -1,10 +1,114 @@
-require "brutalismbot/event"
-require "brutalismbot/oauth"
 require "brutalismbot/r"
 require "brutalismbot/s3"
 require "brutalismbot/version"
+require "logger"
+require "net/https"
 
 module Brutalismbot
+  class << self
+    @@config = {}
+    @@logger = Logger.new File::NULL
+
+    def config
+      @@config
+    end
+
+    def config=(config)
+      @@config = config || {}
+    end
+
+    def logger
+      config[:logger] || @@logger
+    end
+
+    def logger=(logger)
+      config[:logger] = logger
+    end
+  end
+
   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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 description: 'A Slack app that mirrors posts from /r/brutalism to a #channel of your
   choosing using incoming webhooks.'
 email:
@@ -92,8 +120,6 @@ files:
 - README.md
 - Rakefile
 - lib/brutalismbot.rb
-- lib/brutalismbot/event.rb
-- lib/brutalismbot/oauth.rb
 - lib/brutalismbot/r.rb
 - lib/brutalismbot/s3.rb
 - lib/brutalismbot/version.rb

data/lib/brutalismbot/event.rb

@@ -1,30 +0,0 @@
-module Brutalismbot
-  module Event
-    class RecordCollection < Hash
-      include Enumerable
-
-      def each
-        puts "EVENT #{to_json}"
-        dig("Records").each{|x| yield x }
-      end
-    end
-
-    class SNS < RecordCollection
-      def each
-        super do |record|
-          yield JSON.parse record.dig("Sns", "Message")
-        end
-      end
-    end
-
-    class S3 < RecordCollection
-      def each
-        super do |record|
-          bucket = URI.unescape record.dig("s3", "bucket", "name")
-          key    = URI.unescape record.dig("s3", "object", "key")
-          yield bucket: bucket, key: key
-        end
-      end
-    end
-  end
-end

data/lib/brutalismbot/oauth.rb

@@ -1,32 +0,0 @@
-module Brutalismbot
-  class OAuth < Hash
-    def channel_id
-      dig "incoming_webhook", "channel_id"
-    end
-
-    def post(body:, dryrun:nil)
-      uri = URI.parse webhook_url
-      ssl = uri.scheme == "https"
-      res = Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
-        if dryrun
-          puts "POST DRYRUN #{uri}"
-          OpenStruct.new code: 200, body: JSON.parse(body)
-        else
-          puts "POST #{uri}"
-          req = Net::HTTP::Post.new uri, "content-type" => "application/json"
-          req.body = body
-          http.request req
-        end
-      end
-      {statusCode: res.code, body: res.body}
-    end
-
-    def team_id
-      dig "team_id"
-    end
-
-    def webhook_url
-      dig "incoming_webhook", "url"
-    end
-  end
-end