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

Merge pull request #3886 from r888888888/source-api-caching

Browse Source 
cache api clients
This commit is contained in:
Albert Yi
2018-09-11 17:34:25 -07:00
committed by GitHub
parent 486550c7dd 5f06952ed1
commit a5df178bcc
12 changed files with 101 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/models/upload_service_test.rb
View File

@@ -1121,7 +1121,7 @@ class UploadServiceTest < ActiveSupport::TestCase
context "for nijie" do
should "record the canonical source" do
page_url = "https://nijie.info/view.php?id=213043"
page_url = "https://nijie.info/view.php?id=728995"
image_url = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
upload = FactoryBot.create(:jpg_upload, file_size: 1000, md5: "12345", file_ext: "jpg", image_width: 100, image_height: 100, source: image_url, referer_url: page_url)

2
test/unit/downloads/tumblr_test.rb
View File

@@ -80,7 +80,7 @@ module Downloads
@source = "http://media.tumblr.com/tumblr_m24kbxqKAX1rszquso1_250.jpg"
@rewrite = "https://media.tumblr.com/tumblr_m24kbxqKAX1rszquso1_1280.jpg"
assert_rewritten(@rewrite, @source, @ref)
assert_downloaded(101869, @source, @ref)
assert_downloaded(105963, @source, @ref)
# assert_downloaded(296_399, @source)
end
end

6
test/unit/downloads/twitter_test.rb
View File

@@ -17,10 +17,10 @@ module Downloads
context "downloading a 'https://twitter.com/:user/status/:id/photo/:n' card url" do
should "download the orig file" do
skip "Twitter key is not set" unless Danbooru.config.twitter_api_key
@source = "https://twitter.com/paxiti/status/1035511366629568512/photo/1"
@rewrite = "https://pbs.twimg.com/media/Dl7f3G4VsAEoZXz.jpg:orig"
@source = "https://twitter.com/uroobnad/status/1039308544644763648/photo/1"
@rewrite = "https://danbooru.donmai.us/data/sample/sample-1cfa3153f9d5a546d055d5977905ebb4.jpg"
assert_rewritten(@rewrite, @source)
assert_downloaded(131_525, @source)
assert_downloaded(179493, @source)
end
end

8
test/unit/sources/pixiv_test.rb
View File

@@ -165,11 +165,9 @@ module Sources
end
context "fetching source data for a deleted work" do
should "raise a bad id error" do
assert_raise(::PixivApiClient::BadIDError) do
get_source("https://i.pximg.net/img-original/img/2017/11/22/01/06/44/65991677_p0.png")
@site.image_urls
end
should "return the same url" do
get_source("https://i.pximg.net/img-original/img/2017/11/22/01/06/44/65991677_p0.png")
assert_equal(["https://i.pximg.net/img-original/img/2017/11/22/01/06/44/65991677_p0.png"], @site.image_urls)
end
end