oysteikt/unofficial_jisho_api_dart
oysteikt
/
unofficial_jisho_api_dart
mirror of https://github.com/h7x4/unofficial_jisho_api_dart.git
1
0
Fork 0
Code Issues Releases Activity

Fix some bugs

This commit is contained in:
Oystein Kristoffer Tveit 2020-06-11 11:50:16 +02:00
parent 763924531f
commit 03e9182cb1
4 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/src/objects.dart
View File

@ -98,9 +98,9 @@ class Radical {
Map<String, dynamic> toJson() => Map<String, dynamic> toJson() =>
{ {
'symbol': symbol, if (symbol != null) 'symbol': symbol,
'forms': forms, if (forms != null) 'forms': forms,
'meaning': meaning if (meaning != null) 'meaning': meaning
}; };
} }
@ -116,14 +116,42 @@ class KanjiResult {
String meaning; String meaning;
List<String> kunyomi; List<String> kunyomi;
List<String> onyomi; List<String> onyomi;
List<YomiExample> onyomiExamples;
List<YomiExample> kunyomiExamples; List<YomiExample> kunyomiExamples;
List<YomiExample> onyomiExamples;
Radical radical; Radical radical;
List<String> parts; List<String> parts;
String strokeOrderDiagramUri; String strokeOrderDiagramUri;
String strokeOrderSvgUri; String strokeOrderSvgUri;
String strokeOrderGifUri; String strokeOrderGifUri;
String uri; String uri;
Map<String, dynamic> toJson() {
if (found == false) return {
'query': query,
'found': found
};
return {
'query': query,
'found': found,
'taughtIn': taughtIn,
'jlptLevel': jlptLevel,
'newspaperFrequencyRank': newspaperFrequencyRank.toString(),
'strokeCount': strokeCount,
'meaning': meaning,
'kunyomi': kunyomi,
'onyomi': onyomi,
'onyomiExamples': onyomiExamples.map((onyomiExample) => onyomiExample.toJson()).toList(),
'kunyomiExamples': kunyomiExamples.map((kunyomiExample) => kunyomiExample.toJson()).toList(),
'radical': radical.toJson(),
'parts': parts,
'strokeOrderDiagramUri': strokeOrderDiagramUri,
'strokeOrderSvgUri': strokeOrderSvgUri,
'strokeOrderGifUri': strokeOrderGifUri,
'uri': uri
};
}
} }
class ExampleSentencePiece { class ExampleSentencePiece {

6
lib/src/unofficial_jisho_api_base.dart
View File

@ -8,9 +8,9 @@ final htmlUnescape = html_entities.HtmlUnescape();
// TODO: Put public facing types in this file. // TODO: Put public facing types in this file.
const String JISHO_API = 'https://jisho.org/api/v1/search/words'; const String JISHO_API = 'http://jisho.org/api/v1/search/words';
const String SCRAPE_BASE_URI = 'https://jisho.org/search/'; const String SCRAPE_BASE_URI = 'http://jisho.org/search/';
const String STROKE_ORDER_DIAGRAM_BASE_URI = 'https://classic.jisho.org/static/images/stroke_diagrams/'; const String STROKE_ORDER_DIAGRAM_BASE_URI = 'http://classic.jisho.org/static/images/stroke_diagrams/';
/* KANJI SEARCH FUNCTIONS START */ /* KANJI SEARCH FUNCTIONS START */

14
test/local_function_test_cases.dart
View File

@ -17,20 +17,20 @@ void test_local_functions() async {
test('uriForKanjiSearch', () { test('uriForKanjiSearch', () {
final result = uriForKanjiSearch('時'); final result = uriForKanjiSearch('時');
expect(result, 'https://jisho.org/search/%E6%99%82%23kanji'); expect(result, 'http://jisho.org/search/%E6%99%82%23kanji');
}); });
test('getUriForStrokeOrderDiagram', () { test('getUriForStrokeOrderDiagram', () {
final result = getUriForStrokeOrderDiagram('時'); final result = getUriForStrokeOrderDiagram('時');
expect(result, 'https://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'); expect(result, 'http://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png');
}); });
test('uriForPhraseSearch', () { test('uriForPhraseSearch', () {
final result = uriForPhraseSearch('時間'); final result = uriForPhraseSearch('時間');
expect(result, 'https://jisho.org/api/v1/search/words?keyword=%E6%99%82%E9%96%93'); expect(result, 'http://jisho.org/api/v1/search/words?keyword=%E6%99%82%E9%96%93');
}); });
final kanjiPage = (await http.get('https://jisho.org/search/%E6%99%82%23kanji')).body; final kanjiPage = (await http.get('http://jisho.org/search/%E6%99%82%23kanji')).body;
test('containsKanjiGlyph', () { test('containsKanjiGlyph', () {
final result = containsKanjiGlyph(kanjiPage, '時'); final result = containsKanjiGlyph(kanjiPage, '時');
@ -277,10 +277,10 @@ void test_local_functions() async {
meaning: 'sun, day' meaning: 'sun, day'
); );
expectedResult.parts = ['土', '寸', '日']; expectedResult.parts = ['土', '寸', '日'];
expectedResult.strokeOrderDiagramUri = 'https://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'; 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.strokeOrderSvgUri = 'http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg';
expectedResult.strokeOrderGifUri = 'https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/3c.gif'; expectedResult.strokeOrderGifUri = 'https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6642.gif';
expectedResult.uri = 'https://jisho.org/search/%E6%99%82%23kanji'; expectedResult.uri = 'http://jisho.org/search/%E6%99%82%23kanji';
expect( expect(
json.encode(result), json.encode(result),

2
test/unofficial_jisho_api_test.dart
View File

@ -22,7 +22,7 @@ void runTestCases(List<String> testCaseFiles, String apiFunction) async {
switch(apiFunction) { switch(apiFunction) {
case 'searchForKanji': { case 'searchForKanji': {
final result = await jisho.searchForKanji(testCase['query']); final result = await jisho.searchForKanji(testCase['query']);
expect(result, jsonDecode(testCase['expectedResult'])); expect(result.toJson(), testCase['expectedResult']);
break; break;
} }
case 'searchForExamples': { case 'searchForExamples': {