From c2b251797f26a42d629044b8bef2d0e01e7b6aa4 Mon Sep 17 00:00:00 2001 From: Wito Chandra Date: Fri, 6 Apr 2018 22:17:43 +0700 Subject: [PATCH] reformat code --- analysis_options.yaml | 37 ++++++++++++++++++++++++++++++++++ example/main.dart | 3 +-- lib/domain/atom_category.dart | 2 +- lib/domain/atom_feed.dart | 14 ++++++++++--- lib/domain/atom_generator.dart | 2 +- lib/domain/atom_item.dart | 2 +- lib/domain/atom_link.dart | 2 +- lib/domain/atom_person.dart | 4 ++-- lib/domain/atom_source.dart | 2 +- lib/domain/rss_category.dart | 4 ++-- lib/domain/rss_feed.dart | 10 ++++----- lib/domain/rss_item.dart | 2 +- lib/webfeed.dart | 13 ++++++++++++ test/atom_test.dart | 11 +++++----- test/rss_test.dart | 5 +++-- 15 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 analysis_options.yaml create mode 100644 lib/webfeed.dart diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..0323d68 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,37 @@ +analyzer: + language: + enablePreviewDart2: true + strong-mode: true + errors: + unused_import: error + unused_local_variable: error + dead_code: error +linter: + rules: + # Errors + - avoid_empty_else + - comment_references + - control_flow_in_finally + - empty_statements + - hash_and_equals + - test_types_in_equals + - throw_in_finally + - unrelated_type_equality_checks + - valid_regexps + + # Style + - avoid_init_to_null + - avoid_return_types_on_setters + - await_only_futures + - camel_case_types + - directives_ordering + - empty_constructor_bodies + - library_names + - library_prefixes + - non_constant_identifier_names + - omit_local_variable_types + - prefer_final_fields + - prefer_is_not_empty + - prefer_typing_uninitialized_variables + - slash_for_doc_comments + - type_init_formals diff --git a/example/main.dart b/example/main.dart index 67bf2fd..81a0888 100644 --- a/example/main.dart +++ b/example/main.dart @@ -1,6 +1,5 @@ import 'package:http/http.dart' as http; -import 'package:webfeed/domain/atom_feed.dart'; -import 'package:webfeed/domain/rss_feed.dart'; +import 'package:webfeed/webfeed.dart'; void main() { var client = new http.Client(); diff --git a/lib/domain/atom_category.dart b/lib/domain/atom_category.dart index 7dd55e6..5364b60 100644 --- a/lib/domain/atom_category.dart +++ b/lib/domain/atom_category.dart @@ -22,4 +22,4 @@ class AtomCategory { label: $label '''; } -} \ No newline at end of file +} diff --git a/lib/domain/atom_feed.dart b/lib/domain/atom_feed.dart index 76039f5..090a5ed 100644 --- a/lib/domain/atom_feed.dart +++ b/lib/domain/atom_feed.dart @@ -3,8 +3,8 @@ import 'package:webfeed/domain/atom_generator.dart'; import 'package:webfeed/domain/atom_item.dart'; import 'package:webfeed/domain/atom_link.dart'; import 'package:webfeed/domain/atom_person.dart'; -import 'package:xml/xml.dart'; import 'package:webfeed/util/helpers.dart'; +import 'package:xml/xml.dart'; class AtomFeed { String id; @@ -23,7 +23,15 @@ class AtomFeed { String subtitle; AtomFeed(this.id, this.title, this.updated, this.items, - {this.links, this.authors, this.contributors, this.categories, this.generator, this.icon, this.logo, this.rights, this.subtitle}); + {this.links, + this.authors, + this.contributors, + this.categories, + this.generator, + this.icon, + this.logo, + this.rights, + this.subtitle}); factory AtomFeed.parse(String xmlString) { var document = parse(xmlString); @@ -36,7 +44,7 @@ class AtomFeed { var id = xmlGetString(feedElement, "id"); var title = xmlGetString(feedElement, "title"); var updated = xmlGetString(feedElement, "updated"); - + var items = feedElement.findElements("entry").map((element) { return new AtomItem.parse(element); }).toList(); diff --git a/lib/domain/atom_generator.dart b/lib/domain/atom_generator.dart index ad81a8f..d5d1098 100644 --- a/lib/domain/atom_generator.dart +++ b/lib/domain/atom_generator.dart @@ -22,4 +22,4 @@ class AtomGenerator { value: $value '''; } -} \ No newline at end of file +} diff --git a/lib/domain/atom_item.dart b/lib/domain/atom_item.dart index 9242716..e0b58b3 100644 --- a/lib/domain/atom_item.dart +++ b/lib/domain/atom_item.dart @@ -2,8 +2,8 @@ import 'package:webfeed/domain/atom_category.dart'; import 'package:webfeed/domain/atom_link.dart'; import 'package:webfeed/domain/atom_person.dart'; import 'package:webfeed/domain/atom_source.dart'; -import 'package:xml/xml.dart'; import 'package:webfeed/util/helpers.dart'; +import 'package:xml/xml.dart'; class AtomItem { String id; diff --git a/lib/domain/atom_link.dart b/lib/domain/atom_link.dart index 04fbb76..72d3e47 100644 --- a/lib/domain/atom_link.dart +++ b/lib/domain/atom_link.dart @@ -34,4 +34,4 @@ class AtomLink { length: $length '''; } -} \ No newline at end of file +} diff --git a/lib/domain/atom_person.dart b/lib/domain/atom_person.dart index 59547d1..ba24914 100644 --- a/lib/domain/atom_person.dart +++ b/lib/domain/atom_person.dart @@ -1,5 +1,5 @@ -import 'package:xml/xml.dart'; import 'package:webfeed/util/helpers.dart'; +import 'package:xml/xml.dart'; class AtomPerson { String name; @@ -23,4 +23,4 @@ class AtomPerson { email: $email '''; } -} \ No newline at end of file +} diff --git a/lib/domain/atom_source.dart b/lib/domain/atom_source.dart index 3304999..03d8a0b 100644 --- a/lib/domain/atom_source.dart +++ b/lib/domain/atom_source.dart @@ -24,4 +24,4 @@ class AtomSource { updated: $updated '''; } -} \ No newline at end of file +} diff --git a/lib/domain/rss_category.dart b/lib/domain/rss_category.dart index ef4da1e..6bf3dc1 100644 --- a/lib/domain/rss_category.dart +++ b/lib/domain/rss_category.dart @@ -7,8 +7,8 @@ class RssCategory { RssCategory(this.domain, this.value); factory RssCategory.parse(XmlElement node) { - String domain = node.getAttribute("domain"); - String value = node.text; + var domain = node.getAttribute("domain"); + var value = node.text; return new RssCategory(domain, value); } diff --git a/lib/domain/rss_feed.dart b/lib/domain/rss_feed.dart index 36690fb..ecd8a67 100644 --- a/lib/domain/rss_feed.dart +++ b/lib/domain/rss_feed.dart @@ -45,7 +45,7 @@ class RssFeed { this.ttl}); factory RssFeed.parse(String xmlString) { - XmlDocument document = parse(xmlString); + var document = parse(xmlString); XmlElement channelElement; try { channelElement = document.findAllElements("channel").first; @@ -56,7 +56,7 @@ class RssFeed { var description = xmlGetString(channelElement, "description"); var link = xmlGetString(channelElement, "link"); - List feeds = channelElement.findElements("item").map((element) { + var feeds = channelElement.findElements("item").map((element) { return new RssItem.parse(element); }).toList(); @@ -70,18 +70,18 @@ class RssFeed { cloud = new RssCloud.parse(channelElement.findElements("cloud").first); } on StateError {} - List categories = channelElement.findElements("category").map((element) { + var categories = channelElement.findElements("category").map((element) { return new RssCategory.parse(element); }).toList(); - List skipDays = new List(); + var skipDays = new List(); var skipDaysNodes = channelElement.findElements("skipDays"); if (skipDaysNodes.isNotEmpty) { skipDays = skipDaysNodes.first.findAllElements("day").map((element) { return element.text; }).toList(); } - List skipHours = new List(); + var skipHours = new List(); var skipHoursNodes = channelElement.findElements("skipHours"); if (skipHoursNodes.isNotEmpty) { skipHours = skipHoursNodes.first.findAllElements("hour").map((element) { diff --git a/lib/domain/rss_item.dart b/lib/domain/rss_item.dart index dfbbbcb..94abf5a 100644 --- a/lib/domain/rss_item.dart +++ b/lib/domain/rss_item.dart @@ -23,7 +23,7 @@ class RssItem { var description = xmlGetString(element, "description"); var link = xmlGetString(element, "link"); - List categories = element.findElements("category").map((element) { + var categories = element.findElements("category").map((element) { return new RssCategory.parse(element); }).toList(); diff --git a/lib/webfeed.dart b/lib/webfeed.dart new file mode 100644 index 0000000..94c2632 --- /dev/null +++ b/lib/webfeed.dart @@ -0,0 +1,13 @@ +export 'domain/atom_category.dart'; +export 'domain/atom_feed.dart'; +export 'domain/atom_generator.dart'; +export 'domain/atom_item.dart'; +export 'domain/atom_link.dart'; +export 'domain/atom_person.dart'; +export 'domain/atom_source.dart'; +export 'domain/rss_category.dart'; +export 'domain/rss_cloud.dart'; +export 'domain/rss_feed.dart'; +export 'domain/rss_image.dart'; +export 'domain/rss_item.dart'; +export 'domain/rss_source.dart'; diff --git a/test/atom_test.dart b/test/atom_test.dart index cf118da..421d50d 100644 --- a/test/atom_test.dart +++ b/test/atom_test.dart @@ -1,7 +1,8 @@ -import 'dart:io'; import 'dart:core'; +import 'dart:io'; + import 'package:test/test.dart'; -import 'package:webfeed/domain/atom_feed.dart'; +import 'package:webfeed/webfeed.dart'; void main() { test("parsing Invalid.xml", () { @@ -12,7 +13,7 @@ void main() { fail("Should throw Argument Error"); } on ArgumentError {} }); - + test("parsing Atom.xml", () { var xmlString = new File("test/xml/Atom.xml").readAsStringSync(); @@ -71,7 +72,7 @@ void main() { expect(item.links.first.href, "http://foo.bar.news/entry"); expect(item.links.first.title, "Foo bar news html"); expect(item.links.first.length, 1000); - + expect(item.categories.length, 2); expect(item.categories.first.term, "foo entry category"); expect(item.categories.first.scheme, "this-is-foo-entry-scheme"); @@ -87,4 +88,4 @@ void main() { expect(item.content, "This is content 1"); expect(item.rights, "This is rights 1"); }); -} \ No newline at end of file +} diff --git a/test/rss_test.dart b/test/rss_test.dart index f650ab4..3a41da5 100644 --- a/test/rss_test.dart +++ b/test/rss_test.dart @@ -1,7 +1,8 @@ -import 'dart:io'; import 'dart:core'; +import 'dart:io'; + import 'package:test/test.dart'; -import 'package:webfeed/domain/rss_feed.dart'; +import 'package:webfeed/webfeed.dart'; void main() { test("parsing Invalid.xml", () {