lolcommits-tumblr 0.2.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e61d5a9e763a85d55004451b8cfb030c88e1e41a7e7f817874bfc1b365f8cae4
-  data.tar.gz: 05774e798d7fe003a7ef8d01a22d9463607a48e955244ed157a7ed1f40dcba57
+  metadata.gz: f3a707d534f095ce7fab54dc773c1b8897dd75e2dcf58dfe700d2290f76d2377
+  data.tar.gz: cccfb490b45d0bc65a2eb2cc0b906cf55dee263f306ca732c5e11b4525f9c2d2
 SHA512:
-  metadata.gz: 8bf47271fe1030e962f6edf27f8150790e2c831113d8bc96ac0c919a8fef966a70edb723c91f68ee1e54b34c1d8fcce953c1598e754f3cabe96ec0f2519270cb
-  data.tar.gz: b3d28aca7147c9160301f16164048fb64a694c3a716586bd29189ec364fde0b1094a25ee5320c3b9a2cfdef3cb86fcde61438eaee2151628227abaad11f94f23
+  metadata.gz: e5d907e02eb2fdf7735b2e928441de5758fdaa922da75d0ba2803c6ffb39060850ceb54c502cd18e859a412905f2380ff06217a883252ae9904f990d7986672a
+  data.tar.gz: e039e75a37569b641b03481076e3e18e4bf9c6344685ba0f14aa2c165e2a4ebdbec93012e827ec5b5b2905a0bb958367267d0820798fa2f05e5d66f4e682d0d6

data/.travis.yml

@@ -2,17 +2,16 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
- - 2.3.6
- - 2.4.3
- - 2.5.1
- - ruby-head
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
+  - ruby-head
 
 before_install:
- - gem update --system
- - gem install bundler
- - git --version
- - git config --global user.email "lol@commits.org"
- - git config --global user.name "Lolcommits"
+  - git --version
+  - git config --global user.email "lol@commits.org"
+  - git config --global user.name "Lolcommits"
 
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -2,13 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](KeepAChangelog) and this project
-adheres to [Semantic Versioning](Semver).
+The format is based on [Keep a Changelog][KeepAChangelog] and this
+project adheres to [Semantic Versioning][Semver].
 
 ## [Unreleased]
 
 - Your contribution here!
 
+## [0.5.1] - 2021-02-06
+## Added
+- Support for Ruby 3.0 (ditch tumblr_client gem, use faraday with simple_oauth)
+
+## [0.5.0] - 2020-01-24
+### Removed
+- Support for Ruby < 2.4 (older rubies no longer supported)
+
+## [0.4.1] - 2019-08-16
+### Added
+- allow erb captions, thanks to @xurizaemon
+
+## [0.4.0] - 2019-05-20
+### Changed
+- lolcommits gem is a runtime dependency
+- Use `lolcommit_path` (instead of `main_image`)
+- Requires at least lolcommits >= `0.14.2`
+- Updated README and gemspec
+
+### Removed
+- Support for lolcommits < `0.14.2`
+
+## [0.3.0] - 2019-04-24
+### Removed
+- Support for Ruby < 2.3 (older rubies no longer supported)
+
+### Added
+- `frozen_string_literal: true` to all ruby files
+
 ## [0.2.0] - 2018-17-06
 ### Changed
 - Require at least Ruby 2.3 (webrick requires it)
@@ -46,7 +75,12 @@ adheres to [Semantic Versioning](Semver).
 ### Changed
 - Initial release
 
-[Unreleased]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.5.1...HEAD
+[0.5.1]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.4.1...v0.5.0
+[0.4.1]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.4.0...v0.4.1
+[0.4.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/lolcommits/lolcommits-tumblr/compare/v0.0.5...v0.1.0

data/README.md

@@ -1,7 +1,7 @@
 # Lolcommits Tumblr
 
 [![Gem](https://img.shields.io/gem/v/lolcommits-tumblr.svg?style=flat)](http://rubygems.org/gems/lolcommits-tumblr)
-[![Travis](https://travis-ci.org/lolcommits/lolcommits-tumblr.svg?branch=master)](https://travis-ci.org/lolcommits/lolcommits-tumblr)
+[![Travis](https://img.shields.io/travis/com/lolcommits/lolcommits-tumblr/master.svg?style=flat)](https://travis-ci.com/lolcommits/lolcommits-tumblr)
 [![Depfu](https://img.shields.io/depfu/lolcommits/lolcommits-tumblr.svg?style=flat)](https://depfu.com/github/lolcommits/lolcommits-tumblr)
 [![Maintainability](https://api.codeclimate.com/v1/badges/0c289196d8504223c31a/maintainability)](https://codeclimate.com/github/lolcommits/lolcommits-tumblr/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/0c289196d8504223c31a/test_coverage)](https://codeclimate.com/github/lolcommits/lolcommits-tumblr/test_coverage)
@@ -15,7 +15,7 @@ Tumblr access token and secret (the plugin will guide you through this process).
 
 ## Requirements
 
-* Ruby >= 2.0.0
+* Ruby >= 2.4
 * A webcam
 * [ImageMagick](http://www.imagemagick.org)
 * [ffmpeg](https://www.ffmpeg.org) (optional) for animated gif capturing
@@ -34,6 +34,7 @@ to visit Tumblr to authenticate and allow access.
     # set enabled to `true`
     # confirm access for this plugin at tumblr.com (link opens automatically)
     # click 'allow' then return to the console to set your Tumblr name
+    # optionally set a caption for each post (ERB friendly, see below)
     # optionally set the plugin to auto-open each created Tumblr post
 
 That's it! Your next lolcommit will automatically be posted to your Tumblr blog.
@@ -42,6 +43,21 @@ To disable use:
     $ lolcommits --config -p tumblr
     # and set enabled to `false`
 
+### ERB friendly captions
+
+You can optionally configure a caption string for each Tumblr post
+`caption_erb`. The ERB bind has these variables available:
+
+* `message` - commit message string
+* `sha` - commit sha (shortened)
+* `branch` - commit branch name
+* `repo` - vcs respository name
+* `vcs_info` - [vcs_info](https://github.com/lolcommits/lolcommits/blob/master/lib/lolcommits/vcs_info.rb) instance (from lolcommits)
+
+This allows you to set caption strings like this:
+
+    Committed <%= sha %> in <%= repo %> on <%= branch %> - <%= message %>
+
 ## Development
 
 Check out this repo and run `bin/setup`, this will install all dependencies and
@@ -72,8 +88,8 @@ Generate docs for this gem with:
 ## Troubles?
 
 If you think something is broken or missing, please raise a new
-[issue](https://github.com/lolcommits/lolcommits-tumblr/issues). Take
-a moment to check it hasn't been raised in the past (and possibly closed).
+[issue](https://github.com/lolcommits/lolcommits-tumblr/issues). Take a moment
+to check it hasn't been raised in the past (and possibly closed).
 
 ## Contributing
 
@@ -83,14 +99,13 @@ GitHub.
 
 When submitting pull requests, remember to add tests covering any new behaviour,
 and ensure all tests are passing on [Travis
-CI](https://travis-ci.org/lolcommits/lolcommits-tumblr). Read the
-[contributing
+CI](https://travis-ci.com/lolcommits/lolcommits-tumblr). Read the [contributing
 guidelines](https://github.com/lolcommits/lolcommits-tumblr/blob/master/CONTRIBUTING.md)
 for more details.
 
 This project is intended to be a safe, welcoming space for collaboration, and
 contributors are expected to adhere to the [Contributor
-Covenant](http://contributor-covenant.org) code of conduct. See
+Covenant](http://contributor-covenant.org) code of conduct.  See
 [here](https://github.com/lolcommits/lolcommits-tumblr/blob/master/CODE_OF_CONDUCT.md)
 for more details.
 
@@ -101,7 +116,7 @@ The gem is available as open source under the terms of
 
 ## Links
 
-* [Travis CI](https://travis-ci.org/lolcommits/lolcommits-tumblr)
+* [Travis CI](https://travis-ci.com/lolcommits/lolcommits-tumblr)
 * [Code Climate](https://codeclimate.com/github/lolcommits/lolcommits-tumblr)
 * [Test Coverage](https://codeclimate.com/github/lolcommits/lolcommits-tumblr/coverage)
 * [RDoc](http://rdoc.info/projects/lolcommits/lolcommits-tumblr)

data/lib/lolcommits/plugin/tumblr.rb

@@ -1,44 +1,53 @@
-require 'lolcommits/plugin/base'
-require 'lolcommits/cli/launcher'
-require 'oauth'
-require 'webrick'
-require 'cgi'
-require 'tumblr_client'
+# frozen_string_literal: true
+
+require "lolcommits/plugin/base"
+require "lolcommits/cli/launcher"
+require "oauth"
+require "webrick"
+require "cgi"
+require "erb"
+require "faraday"
+require "faraday_middleware"
 
 module Lolcommits
   module Plugin
     class Tumblr < Base
 
-      TUMBLR_API_ENDPOINT    = 'https://www.tumblr.com'.freeze
-      TUMBLR_CONSUMER_KEY    = '2FtMEDpEPkxjoUdkpHh42h9wqTu9IVS7Ra0QyNZGixdCvhllN2'.freeze
-      TUMBLR_CONSUMER_SECRET = 'qWuvxgFUR2YyWKtbWOkDTMAiBEbj7ZGaNLaNQPba0PI1N4JpBs'.freeze
+      TUMBLR_API_HOST        = "api.tumblr.com".freeze
+      TUMBLR_API_ENDPOINT    = "https://www.tumblr.com".freeze
+      TUMBLR_CONSUMER_KEY    = "2FtMEDpEPkxjoUdkpHh42h9wqTu9IVS7Ra0QyNZGixdCvhllN2".freeze
+      TUMBLR_CONSUMER_SECRET = "qWuvxgFUR2YyWKtbWOkDTMAiBEbj7ZGaNLaNQPba0PI1N4JpBs".freeze
 
       ##
-      # Post-capture hook, runs after lolcommits captures a snapshot. Uploads
-      # the lolcommit image to the remote server with an optional Authorization
-      # header and the following request params.
-      #
-      # `file`    - captured lolcommit image file
-      # `message` - the commit message
-      # `repo`    - repository name e.g. mroth/lolcommits
-      # `sha`     - commit SHA
-      # `key`     - key (string) from plugin configuration (optional)
-      # `author_name` - the commit author name
-      # `author_email` - the commit author email address
+      # Post-capture hook, runs after lolcommits captures a snapshot.
       #
-      # @return [RestClient::Response] response object from POST request
-      # @return [Nil] if any error occurs
+      # Posts the lolcommit main image to Tumblr, printing success or
+      # failure message to stdout.
       #
       def run_capture_ready
+        if runner.capture_video && !runner.capture_gif
+          debug "unable to post videos, (Tumblr API only supports images)"
+          return
+        end
+
         print "*** Posting to Tumblr ... "
-        post = client.photo(configuration[:tumblr_name], data: runner.main_image)
+        response = tumblr_api.post do |req|
+          req.url "v2/blog/#{configuration[:tumblr_name]}/post"
+          req.body = {
+            caption: tumblr_caption,
+            type: "photo",
+            data: Faraday::FilePart.new(lolcommit_path, lolcommit_mime_type)
+          }
+        end
+
+        post = response.body["response"] || {}
 
         if post.key?('id')
           post_url = tumblr_post_url(post)
           open_url(post_url) if configuration[:open_url]
           print "done! #{post_url}\n"
         else
-          print "Post FAILED! #{post.inspect}"
+          print "Post FAILED! #{response.inspect}"
         end
       rescue Faraday::Error => e
         print "Post FAILED! #{e.message}"
@@ -78,11 +87,47 @@ module Lolcommits
 
       private
 
+      def lolcommit_path
+        runner.capture_image? ? runner.lolcommit_path : runner.lolcommit_gif_path
+      end
+
+      def lolcommit_mime_type
+        runner.capture_image? ?  "image/jpeg" : "image/gif"
+      end
+
+      def tumblr_api
+        # TODO: maybe remove faraday, just use Net::HTTP and simpler code for
+        # Oauth1.0 auth (so we can remove a few runtime deps)
+        @tumblr_api ||= Faraday.new(url: "https://#{TUMBLR_API_HOST}/", headers: api_headers) do |conn|
+          conn.request :oauth, api_oauth
+          conn.request :multipart
+          conn.request :url_encoded
+          conn.response :json, :content_type => /\bjson$/
+          conn.adapter Faraday.default_adapter
+        end
+      end
+
+      def api_headers
+        {
+          accept: "application/json",
+          user_agent: "lolcommits-tumblr/#{Lolcommits::Tumblr::VERSION}"
+        }
+      end
+
+      def api_oauth
+        {
+          consumer_key: TUMBLR_CONSUMER_KEY,
+          consumer_secret: TUMBLR_CONSUMER_SECRET,
+          token: configuration[:access_token],
+          token_secret: configuration[:secret]
+        }
+      end
+
       def configure_auth!
-        puts ''
-        puts '----------------------------------------'
-        puts '    Need to grab Tumblr Oauth token     '
-        puts '----------------------------------------'
+        puts ""
+        puts "----------------------------------------"
+        puts "    Need to grab Tumblr Oauth token     "
+        puts "----------------------------------------"
 
         request_token = oauth_consumer.get_request_token(exclude_callback: true)
         puts "\nOpening this url to authorize lolcommits:"
@@ -90,9 +135,9 @@ module Lolcommits
         open_url(request_token.authorize_url)
         puts "\nLaunching local webbrick server to complete the OAuth process ...\n"
         begin
-          trap('INT') { local_server.shutdown }
-          trap('SIGTERM') { local_server.shutdown }
-          local_server.mount_proc '/', server_callback
+          trap("INT") { local_server.shutdown }
+          trap("SIGTERM") { local_server.shutdown }
+          local_server.mount_proc "/", server_callback
           local_server.start
           debug "Requesting Tumblr OAuth Token with verifier: #{@verifier}"
           access_token = request_token.get_access_token(oauth_verifier: @verifier)
@@ -105,10 +150,10 @@ module Lolcommits
         end
         return unless access_token.token && access_token.secret
 
-        puts ''
-        puts '----------------------------------------'
-        puts 'Thanks! Lolcommits Tumblr Auth Succeeded'
-        puts '----------------------------------------'
+        puts ""
+        puts "----------------------------------------"
+        puts "Thanks! Lolcommits Tumblr Auth Succeeded"
+        puts "----------------------------------------"
 
         {
           access_token: access_token.token,
@@ -119,18 +164,12 @@ module Lolcommits
       def configure_tumblr
         print "\n* What's your Tumblr name? (i.e. 'http://[THIS PART HERE].tumblr.com'): "
         tumblr_name = parse_user_input(gets.strip)
+        print "\n* Optional caption (ERB friendly with vars message, sha, repo, branch, vcs_info)"
+        print "\n  e.g. Committed <%= sha %> in <%= repo %> on <%= branch %> - <%= message %>\n\n"
+        caption_erb = parse_user_input(gets.strip)
         print "\n* Automatically open Tumblr URL after posting (y/N): "
         open_url = ask_yes_or_no?
-        { tumblr_name: tumblr_name, open_url: open_url }
-      end
-
-      def client
-        @client ||= ::Tumblr.new(
-          consumer_key: TUMBLR_CONSUMER_KEY,
-          consumer_secret: TUMBLR_CONSUMER_SECRET,
-          oauth_token: configuration[:access_token],
-          oauth_token_secret: configuration[:secret]
-        )
+        { tumblr_name: tumblr_name, open_url: open_url, caption_erb: caption_erb }
       end
 
       def oauth_consumer
@@ -150,7 +189,22 @@ module Lolcommits
       end
 
       def tumblr_post_url(post)
-        "https://#{configuration[:tumblr_name]}.tumblr.com/post/#{post['id']}"
+        "https://#{configuration[:tumblr_name]}.tumblr.com/post/#{post["id"]}"
+      end
+
+      def tumblr_caption
+        return if configuration[:caption_erb].to_s.strip.empty?
+
+        ERB.new(configuration[:caption_erb]).result(
+          binding.tap do |bind|
+            vcs_info = runner.vcs_info
+            bind.local_variable_set(:message, vcs_info.message)
+            bind.local_variable_set(:sha, vcs_info.sha)
+            bind.local_variable_set(:repo, vcs_info.repo)
+            bind.local_variable_set(:branch, vcs_info.branch)
+            bind.local_variable_set(:vcs_info, vcs_info)
+          end
+        )
       end
 
       def open_url(url)
@@ -223,8 +277,8 @@ module Lolcommits
           query = req.request_uri.query
           query = CGI.parse(req.request_uri.query) if query
 
-          if query && query['oauth_verifier']
-            @verifier = query['oauth_verifier'][0]
+          if query && query["oauth_verifier"]
+            @verifier = query["oauth_verifier"][0]
             res.body = oauth_response(
               "Lolcommits Authorization Complete",
               "Please return to your console to complete the <a href=\"https://github.com/lolcommits/lolcommits-tumblr\">lolcommits-tumblr</a> plugin setup"

data/lib/lolcommits/tumblr.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'lolcommits/tumblr/version'
 require 'lolcommits/plugin/tumblr'

data/lib/lolcommits/tumblr/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Lolcommits
   module Tumblr
-    VERSION = "0.2.0".freeze
+    VERSION = "0.5.1".freeze
   end
 end

data/lolcommits-tumblr.gemspec

@@ -1,51 +1,44 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'lolcommits/tumblr/version'
+require "lolcommits/tumblr/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "lolcommits-tumblr"
-  spec.version       = Lolcommits::Tumblr::VERSION
-  spec.authors       = ["Matthew Hutchinson"]
-  spec.email         = ["matt@hiddenloop.com"]
-  spec.summary       = %q{Post lolcommits to Tumblr}
-  spec.homepage      = "https://github.com/lolcommits/lolcommits-tumblr"
-  spec.license       = "LGPL-3"
-
-  spec.description = <<-EOF
-  A simple plugin to post lolcommits to your Tumblr. Configure it with a Tumblr
-  access token and secret.
-  EOF
+  spec.name     = "lolcommits-tumblr"
+  spec.version  = Lolcommits::Tumblr::VERSION
+  spec.authors  = ["Matthew Hutchinson"]
+  spec.email    = ["matt@hiddenloop.com"]
+  spec.summary  = %q{Post lolcommits to Tumblr}
+  spec.homepage = "https://github.com/lolcommits/lolcommits-tumblr"
+  spec.license  = "LGPL-3.0"
+
+  spec.description = <<-DESC
+  A simple plugin to post lolcommits to your Tumblr. Configure it with a
+  Tumblr access token and secret.
+  DESC
 
   spec.metadata = {
-    "homepage_uri"    => "https://github.com/lolcommits/lolcommits-tumblr",
-    "changelog_uri"   => "https://github.com/lolcommits/lolcommits-tumblr/blob/master/CHANGELOG.md",
-    "source_code_uri" => "https://github.com/lolcommits/lolcommits-tumblr",
-    "bug_tracker_uri" => "https://github.com/lolcommits/lolcommits-tumblr/issues",
+    "homepage_uri"      => "https://github.com/lolcommits/lolcommits-tumblr",
+    "changelog_uri"     => "https://github.com/lolcommits/lolcommits-tumblr/blob/master/CHANGELOG.md",
+    "source_code_uri"   => "https://github.com/lolcommits/lolcommits-tumblr",
+    "bug_tracker_uri"   => "https://github.com/lolcommits/lolcommits-tumblr/issues",
+    "allowed_push_host" => "https://rubygems.org"
   }
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(assets|test|features)/}) }
   spec.test_files    = `git ls-files -- {test,features}/*`.split("\n")
   spec.bindir        = "bin"
   spec.executables   = []
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.4"
 
-  spec.add_runtime_dependency('tumblr_client')
-  spec.add_runtime_dependency('webrick')
-  spec.add_runtime_dependency('oauth')
+  spec.add_runtime_dependency "lolcommits", ">= 0.14.2"
+  spec.add_runtime_dependency("faraday")
+  spec.add_runtime_dependency("faraday_middleware")
+  spec.add_runtime_dependency("simple_oauth")
+  spec.add_runtime_dependency("oauth")
+  spec.add_runtime_dependency("webrick")
 
-  spec.add_development_dependency "lolcommits", ">= 0.12.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"

data/test/lolcommits/plugin/tumblr_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "json"
 require 'net/http'
 require "test_helper"
@@ -12,7 +14,7 @@ describe Lolcommits::Plugin::Tumblr do
     def runner
       # a simple lolcommits runner with an empty configuration Hash
       @runner ||= Lolcommits::Runner.new(
-        main_image: Tempfile.new("main_image.jpg").path
+        lolcommit_path: Tempfile.new("lolcommit.jpg").path
       )
     end
 
@@ -32,12 +34,12 @@ describe Lolcommits::Plugin::Tumblr do
 
     describe "#enabled?" do
       it "is false by default" do
-        plugin.enabled?.must_equal false
+        _(plugin.enabled?).must_equal false
       end
 
       it "is true when configured" do
         plugin.configuration = valid_enabled_config
-        plugin.enabled?.must_equal true
+        _(plugin.enabled?).must_equal true
       end
     end
 
@@ -45,11 +47,11 @@ describe Lolcommits::Plugin::Tumblr do
       before { commit_repo_with_message("first commit!") }
       after { teardown_repo }
 
-      it "posts lolcommit image to tumblr showing link to new photo post" do
+      it "posts lolcommit to tumblr showing link to new photo post" do
         in_repo do
           plugin.configuration = valid_enabled_config
 
-          stub_request(:post, "https://api.tumblr.com/v2/blog/my-tumblr.tumblr.com/post").to_return(
+          stub_request(:post, "https://api.tumblr.com/v2/blog/my-tumblr/post").to_return(
             body: {
               "meta" => { "status" => 201, "msg" => "Created"},
               "response" => { "id" => 123456789 }
@@ -59,11 +61,11 @@ describe Lolcommits::Plugin::Tumblr do
           )
 
           output = fake_io_capture { plugin.run_capture_ready }
-          output.must_match "done! https://my-tumblr.tumblr.com/post/123456789"
+          _(output).must_match "done! https://my-tumblr.tumblr.com/post/123456789"
 
-          assert_requested :post, "https://api.tumblr.com/v2/blog/my-tumblr.tumblr.com/post", times: 1,
+          assert_requested :post, "https://api.tumblr.com/v2/blog/my-tumblr/post", times: 1,
             headers: { "Content-Type" => /multipart\/form-data/, "Accept" => "application/json" } do |req|
-            req.body.must_match 'filename="main_image.jpg'
+            _(req.body).must_match 'filename="lolcommit.jpg'
           end
         end
       end
@@ -72,12 +74,12 @@ describe Lolcommits::Plugin::Tumblr do
     describe "valid_configuration?" do
       it "returns invalid config when partially configured" do
         plugin.configuration = { tumblr_name: "fire" }
-        plugin.valid_configuration?.must_equal false
+        _(plugin.valid_configuration?).must_equal false
       end
 
       it "returns true with a valid configuration" do
         plugin.configuration = valid_enabled_config
-        plugin.valid_configuration?.must_equal true
+        _(plugin.valid_configuration?).must_equal true
       end
     end
 
@@ -86,8 +88,8 @@ describe Lolcommits::Plugin::Tumblr do
         # allow requests to localhost for this test
         WebMock.disable_net_connect!(allow_localhost: true)
 
-        # enabled tumblr_name open_url
-        inputs = %w(true my-tumblr Y)
+        # enabled tumblr_name caption_erb open_url
+        inputs = [true, 'my-tumblr', ' ', 'Y']
         configured_plugin_options = {}
 
         # stub Oauth token request flow
@@ -116,12 +118,13 @@ describe Lolcommits::Plugin::Tumblr do
           configured_plugin_options = plugin.configure_options!
         end
 
-        configured_plugin_options.must_equal({
+        _(configured_plugin_options).must_equal({
           enabled: true,
           access_token: "tumblr-access-token",
           secret: "tumblr-secret",
           tumblr_name: "my-tumblr",
-          open_url: true
+          open_url: true,
+          caption_erb: nil
         })
 
         WebMock.disable_net_connect!

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 # lolcommits gem

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits-tumblr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matthew Hutchinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tumblr_client
+  name: lolcommits
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+- !ruby/object:Gem::Dependency
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: lolcommits
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,8 +179,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
-    A simple plugin to post lolcommits to your Tumblr. Configure it with a Tumblr
-    access token and secret.
+    A simple plugin to post lolcommits to your Tumblr. Configure it with a
+    Tumblr access token and secret.
 email:
 - matt@hiddenloop.com
 executables: []
@@ -180,14 +208,14 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/lolcommits/lolcommits-tumblr
 licenses:
-- LGPL-3
+- LGPL-3.0
 metadata:
   homepage_uri: https://github.com/lolcommits/lolcommits-tumblr
   changelog_uri: https://github.com/lolcommits/lolcommits-tumblr/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/lolcommits/lolcommits-tumblr
   bug_tracker_uri: https://github.com/lolcommits/lolcommits-tumblr/issues
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,16 +223,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Post lolcommits to Tumblr
 test_files: