jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tumblr: don't fail when api key isn't configured.

Browse Source
This commit is contained in:
evazion
2018-10-09 11:57:23 -05:00
parent 8aed1e19b9
commit 4c55c809b0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/sources/strategies/tumblr.rb
View File

@@ -8,6 +8,10 @@ module Sources::Strategies
IMAGE = %r!\Ahttps?://#{DOMAIN}/(?<dir>#{MD5}/)?#{FILENAME}_#{SIZES}\.#{EXT}\z!i IMAGE = %r!\Ahttps?://#{DOMAIN}/(?<dir>#{MD5}/)?#{FILENAME}_#{SIZES}\.#{EXT}\z!i
POST = %r!\Ahttps?://(?<blog_name>[^.]+)\.tumblr\.com/(?:post|image)/(?<post_id>\d+)!i POST = %r!\Ahttps?://(?<blog_name>[^.]+)\.tumblr\.com/(?:post|image)/(?<post_id>\d+)!i
def self.enabled?
Danbooru.config.tumblr_consumer_key.present?
end
def self.match?(*urls) def self.match?(*urls)
urls.compact.any? do |url| urls.compact.any? do |url|
blog_name, post_id = parse_info_from_url(url) blog_name, post_id = parse_info_from_url(url)
@@ -174,7 +178,7 @@ module Sources::Strategies
memoize :inline_images memoize :inline_images
def client def client
raise NotImplementedError.new("Tumblr support is not available (API key not configured).") if Danbooru.config.tumblr_consumer_key.nil? return {} unless self.class.enabled?
TumblrApiClient.new(Danbooru.config.tumblr_consumer_key) TumblrApiClient.new(Danbooru.config.tumblr_consumer_key)
end end

3
test/unit/sources/tumblr_test.rb
View File

@@ -3,8 +3,7 @@ require 'test_helper'
module Sources module Sources
class TumblrTest < ActiveSupport::TestCase class TumblrTest < ActiveSupport::TestCase
def setup def setup
super skip "Tumblr key is not configured" unless Sources::Strategies::Tumblr.enabled?
skip "Tumblr key is not configured" unless Danbooru.config.tumblr_consumer_key
end end
context "The source for a 'http://*.tumblr.com/post/*' photo post with a single image" do context "The source for a 'http://*.tumblr.com/post/*' photo post with a single image" do