From 1e35cde24d883f739310ef68b3616b03d0a19508 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 15 Jun 2020 11:17:10 +0200 Subject: [PATCH] Update URIs to https --- lib/src/objects.dart | 4 ++-- lib/src/unofficial_jisho_api_base.dart | 8 ++++---- test/example_test_cases/0.json | 2 +- test/example_test_cases/1.json | 2 +- test/example_test_cases/2.json | 2 +- test/example_test_cases/3.json | 6 +++--- test/example_test_cases/4.json | 2 +- test/example_test_cases/5.json | 2 +- test/kanji_test_cases/0.json | 6 +++--- test/kanji_test_cases/1.json | 6 +++--- test/kanji_test_cases/2.json | 6 +++--- test/kanji_test_cases/4.json | 6 +++--- test/kanji_test_cases/7.json | 6 +++--- test/local_function_test_cases.dart | 16 ++++++++-------- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/lib/src/objects.dart b/lib/src/objects.dart index dea1926..248ae7d 100644 --- a/lib/src/objects.dart +++ b/lib/src/objects.dart @@ -157,8 +157,8 @@ class KanjiResult { 'meaning': meaning, 'kunyomi': kunyomi, 'onyomi': onyomi, - 'onyomiExamples': onyomiExamples.map((onyomiExample) => onyomiExample.toJson()).toList(), - 'kunyomiExamples': kunyomiExamples.map((kunyomiExample) => kunyomiExample.toJson()).toList(), + 'onyomiExamples': onyomiExamples, + 'kunyomiExamples': kunyomiExamples, 'radical': radical.toJson(), 'parts': parts, 'strokeOrderDiagramUri': strokeOrderDiagramUri, diff --git a/lib/src/unofficial_jisho_api_base.dart b/lib/src/unofficial_jisho_api_base.dart index c481fd9..14307cb 100644 --- a/lib/src/unofficial_jisho_api_base.dart +++ b/lib/src/unofficial_jisho_api_base.dart @@ -9,9 +9,9 @@ final htmlUnescape = html_entities.HtmlUnescape(); // TODO: Put public facing types in this file. -const String JISHO_API = 'http://jisho.org/api/v1/search/words'; -const String SCRAPE_BASE_URI = 'http://jisho.org/search/'; -const String STROKE_ORDER_DIAGRAM_BASE_URI = 'http://classic.jisho.org/static/images/stroke_diagrams/'; +const String JISHO_API = 'https://jisho.org/api/v1/search/words'; +const String SCRAPE_BASE_URI = 'https://jisho.org/search/'; +const String STROKE_ORDER_DIAGRAM_BASE_URI = 'https://classic.jisho.org/static/images/stroke_diagrams/'; /* KANJI SEARCH FUNCTIONS START */ @@ -185,7 +185,7 @@ List getParts(String pageHtml) { String getSvgUri(String pageHtml) { var svgRegex = RegExp('\/\/.*?.cloudfront.net\/.*?.svg'); final regexResult = svgRegex.firstMatch(pageHtml).group(0).toString(); - return regexResult.isNotEmpty ? 'http:${regexResult}' : null; + return regexResult.isNotEmpty ? 'https:${regexResult}' : null; } String getGifUri(String kanji) { diff --git a/test/example_test_cases/0.json b/test/example_test_cases/0.json index 3babdd2..f75becf 100644 --- a/test/example_test_cases/0.json +++ b/test/example_test_cases/0.json @@ -1065,7 +1065,7 @@ ] } ], - "uri": "http://jisho.org/search/%E8%BB%8A%23sentences", + "uri": "https://jisho.org/search/%E8%BB%8A%23sentences", "phrase": "車" } } \ No newline at end of file diff --git a/test/example_test_cases/1.json b/test/example_test_cases/1.json index 2fc5c7f..1952289 100644 --- a/test/example_test_cases/1.json +++ b/test/example_test_cases/1.json @@ -885,7 +885,7 @@ ] } ], - "uri": "http://jisho.org/search/%E6%97%A5%E6%9C%AC%E4%BA%BA%23sentences", + "uri": "https://jisho.org/search/%E6%97%A5%E6%9C%AC%E4%BA%BA%23sentences", "phrase": "日本人" } } \ No newline at end of file diff --git a/test/example_test_cases/2.json b/test/example_test_cases/2.json index a4ca9dd..6a87961 100644 --- a/test/example_test_cases/2.json +++ b/test/example_test_cases/2.json @@ -4,7 +4,7 @@ "query": "彼＊叩く", "found": false, "results": [], - "uri": "http://jisho.org/search/%E5%BD%BC%EF%BC%8A%E5%8F%A9%E3%81%8F%23sentences", + "uri": "https://jisho.org/search/%E5%BD%BC%EF%BC%8A%E5%8F%A9%E3%81%8F%23sentences", "phrase": "彼＊叩く" } } \ No newline at end of file diff --git a/test/example_test_cases/3.json b/test/example_test_cases/3.json index 1064459..1b46ae9 100644 --- a/test/example_test_cases/3.json +++ b/test/example_test_cases/3.json @@ -719,7 +719,7 @@ { "english": "\"I've heard about it, Koichi\" \"You don't need to say anything more, I know. It's the summer festival incident at the shrine, right?\"", "kanji": "「聞いたよ、光一」「まあ皆までいうなって。分かってる。神社の夏祭りの一件でしょ？」", - "kana": "「きいたよ、光一」「まあみなまでいうなって。わかかってる。じんじゃの夏祭りのいっけんでしょ？」", + "kana": "「きいたよ、光一」「まあ皆までいうなって。わかかってる。じんじゃの夏祭りのいっけんでしょ？」", "pieces": [ { "lifted": "き", @@ -734,7 +734,7 @@ "unlifted": "まあ" }, { - "lifted": "みな", + "lifted": "", "unlifted": "皆までいうな" }, { @@ -1209,7 +1209,7 @@ ] } ], - "uri": "http://jisho.org/search/%E7%9A%86%23sentences", + "uri": "https://jisho.org/search/%E7%9A%86%23sentences", "phrase": "皆" } } \ No newline at end of file diff --git a/test/example_test_cases/4.json b/test/example_test_cases/4.json index f573034..0fb9b6e 100644 --- a/test/example_test_cases/4.json +++ b/test/example_test_cases/4.json @@ -4,7 +4,7 @@ "query": "ネガティブ", "found": false, "results": [], - "uri": "http://jisho.org/search/%E3%83%8D%E3%82%AC%E3%83%86%E3%82%A3%E3%83%96%23sentences", + "uri": "https://jisho.org/search/%E3%83%8D%E3%82%AC%E3%83%86%E3%82%A3%E3%83%96%23sentences", "phrase": "ネガティブ" } } \ No newline at end of file diff --git a/test/example_test_cases/5.json b/test/example_test_cases/5.json index 9cb94dc..3a749ed 100644 --- a/test/example_test_cases/5.json +++ b/test/example_test_cases/5.json @@ -4,7 +4,7 @@ "query": "grlgmregmneriireg", "found": false, "results": [], - "uri": "http://jisho.org/search/grlgmregmneriireg%23sentences", + "uri": "https://jisho.org/search/grlgmregmneriireg%23sentences", "phrase": "grlgmregmneriireg" } } \ No newline at end of file diff --git a/test/kanji_test_cases/0.json b/test/kanji_test_cases/0.json index bd5f1e5..515b657 100644 --- a/test/kanji_test_cases/0.json +++ b/test/kanji_test_cases/0.json @@ -60,9 +60,9 @@ "parts": [ "車" ], - "strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/36554_frames.png", - "strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08eca.svg", + "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/36554_frames.png", + "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08eca.svg", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/8eca.gif", - "uri": "http://jisho.org/search/%E8%BB%8A%23kanji" + "uri": "https://jisho.org/search/%E8%BB%8A%23kanji" } } \ No newline at end of file diff --git a/test/kanji_test_cases/1.json b/test/kanji_test_cases/1.json index afe0914..ec976cb 100644 --- a/test/kanji_test_cases/1.json +++ b/test/kanji_test_cases/1.json @@ -119,9 +119,9 @@ "宀", "豕" ], - "strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/23478_frames.png", - "strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/05bb6.svg", + "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/23478_frames.png", + "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/05bb6.svg", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/5bb6.gif", - "uri": "http://jisho.org/search/%E5%AE%B6%23kanji" + "uri": "https://jisho.org/search/%E5%AE%B6%23kanji" } } \ No newline at end of file diff --git a/test/kanji_test_cases/2.json b/test/kanji_test_cases/2.json index f883db4..7f961b8 100644 --- a/test/kanji_test_cases/2.json +++ b/test/kanji_test_cases/2.json @@ -91,9 +91,9 @@ "木", "白" ], - "strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/27005_frames.png", - "strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/0697d.svg", + "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/27005_frames.png", + "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/0697d.svg", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/697d.gif", - "uri": "http://jisho.org/search/%E6%A5%BD%23kanji" + "uri": "https://jisho.org/search/%E6%A5%BD%23kanji" } } \ No newline at end of file diff --git a/test/kanji_test_cases/4.json b/test/kanji_test_cases/4.json index 900c53c..f16ce86 100644 --- a/test/kanji_test_cases/4.json +++ b/test/kanji_test_cases/4.json @@ -44,9 +44,9 @@ "貝", "辛" ], - "strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/36100_frames.png", - "strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08d04.svg", + "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/36100_frames.png", + "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08d04.svg", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/8d04.gif", - "uri": "http://jisho.org/search/%E8%B4%84%23kanji" + "uri": "https://jisho.org/search/%E8%B4%84%23kanji" } } \ No newline at end of file diff --git a/test/kanji_test_cases/7.json b/test/kanji_test_cases/7.json index 3bc2ead..0ab1cb9 100644 --- a/test/kanji_test_cases/7.json +++ b/test/kanji_test_cases/7.json @@ -70,9 +70,9 @@ "parts": [ "水" ], - "strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/27700_frames.png", - "strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06c34.svg", + "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/27700_frames.png", + "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06c34.svg", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6c34.gif", - "uri": "http://jisho.org/search/%E6%B0%B4%23kanji" + "uri": "https://jisho.org/search/%E6%B0%B4%23kanji" } } \ No newline at end of file diff --git a/test/local_function_test_cases.dart b/test/local_function_test_cases.dart index d02c1e3..62b6919 100644 --- a/test/local_function_test_cases.dart +++ b/test/local_function_test_cases.dart @@ -17,20 +17,20 @@ void test_local_functions() async { test('uriForKanjiSearch', () { final result = uriForKanjiSearch('時'); - expect(result, 'http://jisho.org/search/%E6%99%82%23kanji'); + expect(result, 'https://jisho.org/search/%E6%99%82%23kanji'); }); test('getUriForStrokeOrderDiagram', () { final result = getUriForStrokeOrderDiagram('時'); - expect(result, 'http://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'); + expect(result, 'https://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'); }); test('uriForPhraseSearch', () { final result = uriForPhraseSearch('時間'); - expect(result, 'http://jisho.org/api/v1/search/words?keyword=%E6%99%82%E9%96%93'); + expect(result, 'https://jisho.org/api/v1/search/words?keyword=%E6%99%82%E9%96%93'); }); - final kanjiPage = (await http.get('http://jisho.org/search/%E6%99%82%23kanji')).body; + final kanjiPage = (await http.get('https://jisho.org/search/%E6%99%82%23kanji')).body; test('containsKanjiGlyph', () { final result = containsKanjiGlyph(kanjiPage, '時'); @@ -199,7 +199,7 @@ void test_local_functions() async { test('getSvgUri', () { final result = getSvgUri(kanjiPage); - expect(result, 'http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg'); + expect(result, 'https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg'); }); test('getGifUri', () { @@ -277,10 +277,10 @@ void test_local_functions() async { meaning: 'sun, day' ); expectedResult.parts = ['土', '寸', '日']; - expectedResult.strokeOrderDiagramUri = 'http://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'; - expectedResult.strokeOrderSvgUri = 'http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg'; + expectedResult.strokeOrderDiagramUri = 'https://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'; + expectedResult.strokeOrderSvgUri = 'https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg'; expectedResult.strokeOrderGifUri = 'https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6642.gif'; - expectedResult.uri = 'http://jisho.org/search/%E6%99%82%23kanji'; + expectedResult.uri = 'https://jisho.org/search/%E6%99%82%23kanji'; expect( json.encode(result),