brutalismbot 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8083bff6e181d2ce309970c131600644d99fa239887aeb9fd1cba8dbc296171
-  data.tar.gz: 837c725df3d2fc0b6565eb1d386d581350c0881ef911e9c026178c2f5ae072b5
+  metadata.gz: fc9aa96ddf426ba53cd94234a85ab6b3b11237dcdfb8414ca522f983a58c807c
+  data.tar.gz: 87ccc44e65a2565e31a3e60c399ab2d6725f6594a12da582c273e9b95292020d
 SHA512:
-  metadata.gz: 886e816a00e86b60f31109dc8130388546f71acf2dc549815cc143040a7c828a159f38e5105ff62670115602cf1defda4cfc26ddfffd728afa3328b558792892
-  data.tar.gz: 5809c0a14b366fdf389da65d74579993ca6cf9ecace98c4cfff80562d643c26701a047ae709f2903d73477553850ba3bfb70ef2ef751ed62a3bb2e80f31f81b3
+  metadata.gz: a8160fd997677a8ab632be035009b1cea925c4791cc45109c9cba086eda92408b4d931394efa92a1b438357a9784206b2479ccf191397dd66f0beeb809af7d6f
+  data.tar.gz: bba9c3dda2a30a14209d74599a4bcd01e0cce55caa138970135fd001a0a9db79272c8acdb4d0bef6dce89970ac0cda8bbfca181d7d4febb0bcb8103e581e96f0

data/README.md

@@ -1,9 +1,9 @@
 <img alt="brutalismbot" src="https://brutalismbot.com/banner.png"/>
 
-[![rspec](https://github.com/brutalismbot/gem/workflows/rspec/badge.svg)](https://github.com/brutalismbot/gem/actions)
-[![Gem Version](https://badge.fury.io/rb/brutalismbot.svg)](http://badge.fury.io/rb/brutalismbot)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/83275cbdbf10f9fd2df7/test_coverage)](https://codeclimate.com/github/brutalismbot/gem/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/83275cbdbf10f9fd2df7/maintainability)](https://codeclimate.com/github/brutalismbot/gem/maintainability)
+![gem](https://img.shields.io/gem/v/brutalismbot?logo=rubygems&logoColor=eee&style=flat-square)
+[![rspec](https://img.shields.io/github/workflow/status/brutalismbot/gem/rspec?logo=github&style=flat-square)](https://github.com/brutalismbot/gem/actions)
+[![coverage](https://img.shields.io/codeclimate/coverage/brutalismbot/gem?logo=code-climate&style=flat-square)](https://codeclimate.com/github/brutalismbot/gem/test_coverage)
+[![maintainability](https://img.shields.io/codeclimate/maintainability/brutalismbot/gem?logo=code-climate&style=flat-square)](https://codeclimate.com/github/brutalismbot/gem/maintainability)
 
 Brutalismbot RubyGem
 

data/lib/brutalismbot/base.rb

@@ -5,7 +5,7 @@ module Brutalismbot
   module Parser
     def parse(source, opts = {})
       item = JSON.parse(source, opts)
-      new(**item)
+      new(**item.transform_keys(&:to_sym))
     end
   end
 

data/lib/brutalismbot/client.rb

@@ -14,16 +14,11 @@ module Brutalismbot
       @twitter = twitter || Twitter::Client.new
     end
 
-    def lag_time
-      lag = ENV["BRUTALISMBOT_LAG_TIME"].to_s
-      lag.empty? ? 9000 : lag.to_i
-    end
-
-    def pull(limit:nil, min_time:nil, max_time:nil, lag:nil, dryrun:nil)
+    def pull(limit:nil, min_time:nil, max_time:nil, min_age:nil, dryrun:nil)
       # Get time window for new posts
-      lag      ||= lag_time
+      min_age  ||= 9000
       min_time ||= @posts.max_time
-      max_time ||= Time.now.utc.to_i - lag
+      max_time ||= Time.now.utc.to_i - min_age.to_i
 
       # Get posts
       opts  = {q:"self:no AND nsfw:no", restrict_sr: true, sort: "new"}

data/lib/brutalismbot/reddit/post.rb

@@ -7,11 +7,6 @@ require "brutalismbot/base"
 module Brutalismbot
   module Reddit
     class Post < Base
-      def initialize(**item)
-        @mime_type = item.delete(:mime_type)
-        super
-      end
-
       def created_after?(time = nil)
         time.nil? || created_utc.to_i > time.to_i
       end
@@ -83,6 +78,10 @@ module Brutalismbot
         end
       end
 
+      def mime_type=(value)
+        @mime_type = value
+      end
+
       def path
         created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
       end
@@ -109,6 +108,19 @@ module Brutalismbot
         is_self? ? to_slack_text : to_slack_image
       end
 
+      def to_twitter
+        max = 280 - permalink.length - 1
+        status = title.length <= max ? title : "#{title[0...max - 1]}…"
+        status << "\n#{permalink}"
+        {status: status, media_url: is_self? ? nil : media_url}
+      end
+
+      def url
+        data["url"]
+      end
+
+      private
+
       def to_slack_image
         {
           blocks: [
@@ -153,16 +165,6 @@ module Brutalismbot
           ],
         }
       end
-
-      def to_twitter
-        max = 280 - permalink.length - 1
-        text = title.length <= max ? title : "#{title[0...max - 1]}…"
-        [text, permalink].join("\n")
-      end
-
-      def url
-        data["url"]
-      end
     end
   end
 end

data/lib/brutalismbot/reddit/resource.rb

@@ -24,7 +24,8 @@ module Brutalismbot
           response = JSON.parse(http.request(request).body)
           children = response.dig("data", "children") || []
           children.each do |child|
-            post = Post.new(**child)
+            item = child.transform_keys(&:to_sym)
+            post = Post.new(**item)
             Brutalismbot.logger.warn("NO PHOTO URL for #{post.permalink}") if post.url.nil?
             yield post
           end

data/lib/brutalismbot/reddit/stub.rb

@@ -4,13 +4,12 @@ module Brutalismbot
   module Reddit
     class Post
       class << self
-        def stub(created_utc:nil, post_id:nil, permalink_id:nil, image_id:nil, mime_type:nil)
+        def stub(created_utc:nil, post_id:nil, permalink_id:nil, image_id:nil)
           created_utc  ||= Time.now.utc - rand(86400) - 86400
           post_id      ||= SecureRandom.alphanumeric(6).downcase
           permalink_id ||= SecureRandom.alphanumeric.downcase
           image_id     ||= SecureRandom.alphanumeric
           new(
-            mime_type: mime_type,
             kind: "t3",
             data: {
               id:          post_id,

data/lib/brutalismbot/slack/auth.rb

@@ -20,22 +20,6 @@ module Brutalismbot
         File.join("team=#{team_id}", "channel=#{channel_id}", "oauth.json")
       end
 
-      def push(post, dryrun:nil)
-        body = post.to_slack.to_json
-        uri  = URI.parse(webhook_url)
-        Brutalismbot.logger.info("POST #{"DRYRUN " if dryrun}#{uri}")
-        unless dryrun
-          ssl = uri.scheme == "https"
-          req = Net::HTTP::Post.new(uri, "content-type" => "application/json")
-          req.body = body
-          Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
-            http.request(req)
-          end
-        else
-          Net::HTTPOK.new("1.1", "204", "ok")
-        end
-      end
-
       def team_id
         @item.dig("team_id")
       end

data/lib/brutalismbot/slack/client.rb

@@ -37,11 +37,16 @@ module Brutalismbot
         end
       end
 
-      def push(post, dryrun:nil)
-        list.map do |auth|
-          key = key_for(auth)
-          Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}s3://#{@bucket}/#{key}")
-          auth.push(post, dryrun: dryrun)
+      def push(body:, webhook_url:, dryrun:nil)
+        Brutalismbot.logger.info("POST #{"DRYRUN " if dryrun}#{webhook_url}")
+        unless dryrun
+          uri = URI.parse(webhook_url)
+          ssl = uri.scheme == "https"
+          req = Net::HTTP::Post.new(uri, "content-type" => "application/json")
+          req.body = body.to_json
+          Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) {|http| http.request(req) }
+        else
+          Net::HTTPOK.new("1.1", "204", "ok")
         end
       end
 

data/lib/brutalismbot/twitter/client.rb

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

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "1.6.1"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -24,118 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-- !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: