From 8e4be01565c95a341946cc70d07150306c5052cd Mon Sep 17 00:00:00 2001 From: thomashii Date: Mon, 17 May 2021 22:50:37 +0800 Subject: [PATCH] Moved inflection2 to inflection3 --- packages/inflection2/pubspec.yaml | 11 ---------- .../{inflection2 => inflection3}/AUTHORS.md | 0 .../{inflection2 => inflection3}/CHANGELOG.md | 4 +--- packages/{inflection2 => inflection3}/LICENSE | 0 .../{inflection2 => inflection3}/README.md | 21 +++++++------------ .../analysis_options.yaml | 0 .../example/main.dart | 4 ++-- .../lib/inflection3.dart} | 2 +- .../lib/src/irregular_past_verbs.dart | 0 .../lib/src/irregular_plural_nouns.dart | 0 .../lib/src/irregular_plural_verbs.dart | 0 .../lib/src/is_tense.dart | 2 +- .../lib/src/past.dart | 0 .../lib/src/plural.dart | 0 .../lib/src/plural_verb.dart | 0 .../lib/src/singular.dart | 0 .../lib/src/singular_verb.dart | 0 .../lib/src/snake_case.dart | 0 .../lib/src/spinal_case.dart | 0 .../lib/src/uncountable_nouns.dart | 0 .../lib/src/util.dart | 0 .../lib/src/verbs_ending_with_ed.dart | 0 packages/inflection3/pubspec.yaml | 8 +++++++ .../test/all_test.dart | 0 .../test/inflection_test.dart | 4 ++-- .../test/is_tense_test.dart | 4 ++-- .../test/past_test.dart | 2 +- .../test/plural_test.dart | 4 ++-- .../test/plural_verb_test.dart | 2 +- .../test/singular_test.dart | 2 +- .../test/singular_verb_test.dart | 2 +- .../test/snake_case_test.dart | 2 +- .../test/spinal_case_test.dart | 2 +- 33 files changed, 33 insertions(+), 43 deletions(-) delete mode 100644 packages/inflection2/pubspec.yaml rename packages/{inflection2 => inflection3}/AUTHORS.md (100%) rename packages/{inflection2 => inflection3}/CHANGELOG.md (96%) rename packages/{inflection2 => inflection3}/LICENSE (100%) rename packages/{inflection2 => inflection3}/README.md (79%) rename packages/{inflection2 => inflection3}/analysis_options.yaml (100%) rename packages/{inflection2 => inflection3}/example/main.dart (95%) rename packages/{inflection2/lib/inflection2.dart => inflection3/lib/inflection3.dart} (98%) rename packages/{inflection2 => inflection3}/lib/src/irregular_past_verbs.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/irregular_plural_nouns.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/irregular_plural_verbs.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/is_tense.dart (83%) rename packages/{inflection2 => inflection3}/lib/src/past.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/plural.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/plural_verb.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/singular.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/singular_verb.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/snake_case.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/spinal_case.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/uncountable_nouns.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/util.dart (100%) rename packages/{inflection2 => inflection3}/lib/src/verbs_ending_with_ed.dart (100%) create mode 100644 packages/inflection3/pubspec.yaml rename packages/{inflection2 => inflection3}/test/all_test.dart (100%) rename packages/{inflection2 => inflection3}/test/inflection_test.dart (89%) rename packages/{inflection2 => inflection3}/test/is_tense_test.dart (82%) rename packages/{inflection2 => inflection3}/test/past_test.dart (98%) rename packages/{inflection2 => inflection3}/test/plural_test.dart (97%) rename packages/{inflection2 => inflection3}/test/plural_verb_test.dart (97%) rename packages/{inflection2 => inflection3}/test/singular_test.dart (98%) rename packages/{inflection2 => inflection3}/test/singular_verb_test.dart (97%) rename packages/{inflection2 => inflection3}/test/snake_case_test.dart (94%) rename packages/{inflection2 => inflection3}/test/spinal_case_test.dart (94%) diff --git a/packages/inflection2/pubspec.yaml b/packages/inflection2/pubspec.yaml deleted file mode 100644 index 902a793a..00000000 --- a/packages/inflection2/pubspec.yaml +++ /dev/null @@ -1,11 +0,0 @@ -name: inflection2 -version: 1.0.0 -description: Grammatical Inflection encoders. -homepage: https://github.com/thosakwe/dart-inflection -publish_to: none -environment: - sdk: '>=2.12.0 <3.0.0' -dependencies: - -dev_dependencies: - test: ^1.17.3 diff --git a/packages/inflection2/AUTHORS.md b/packages/inflection3/AUTHORS.md similarity index 100% rename from packages/inflection2/AUTHORS.md rename to packages/inflection3/AUTHORS.md diff --git a/packages/inflection2/CHANGELOG.md b/packages/inflection3/CHANGELOG.md similarity index 96% rename from packages/inflection2/CHANGELOG.md rename to packages/inflection3/CHANGELOG.md index 9f0157ce..2954f02d 100644 --- a/packages/inflection2/CHANGELOG.md +++ b/packages/inflection3/CHANGELOG.md @@ -1,6 +1,4 @@ -# Changelog - -# 1.0.0 +## 1.0.0 * Migrated to support Dart SDK 2.12.x NNBD ## 0.4.3 diff --git a/packages/inflection2/LICENSE b/packages/inflection3/LICENSE similarity index 100% rename from packages/inflection2/LICENSE rename to packages/inflection3/LICENSE diff --git a/packages/inflection2/README.md b/packages/inflection3/README.md similarity index 79% rename from packages/inflection2/README.md rename to packages/inflection3/README.md index b57ccbeb..e006b917 100644 --- a/packages/inflection2/README.md +++ b/packages/inflection3/README.md @@ -1,10 +1,6 @@ -# Forked -**IMPORTANT NOTE**: This is a *hard fork* of the original `inflection` package, -as the former is now archived, and abandoned. - -# Inflection - -[![Build Status](https://travis-ci.org/thosakwe/dart-inflection.svg)](https://travis-ci.org/thosakwe/dart-inflection) +# Inflection3 +[![version](https://img.shields.io/badge/pub-v1.0.0-brightgreen)](https://pub.dartlang.org/packages/inflection3) +[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) In grammar, inflection or inflexion is the modification of a word to express different grammatical categories such as tense, mood, voice, aspect, person, @@ -12,14 +8,17 @@ number, gender and case. A port of the Rails/ActiveSupport inflector library to Dart. +**IMPORTANT NOTE**: This is a *hard fork* of the original `inflection2` package, +as the former is now archived, and abandoned. + ## Usage A simple usage example: ```dart -import 'package:inflection2/inflection2.dart'; +import 'package:inflection3/inflection3.dart'; -main() { +void main() { // Using 'shortcut' functions. print(pluralize("house")); // => "houses" @@ -43,7 +42,3 @@ main() { } ``` -## Features and bugs - -Please file feature requests and bugs at the -[issue tracker](https://github.com/thosakwe/dart-inflection/issues). diff --git a/packages/inflection2/analysis_options.yaml b/packages/inflection3/analysis_options.yaml similarity index 100% rename from packages/inflection2/analysis_options.yaml rename to packages/inflection3/analysis_options.yaml diff --git a/packages/inflection2/example/main.dart b/packages/inflection3/example/main.dart similarity index 95% rename from packages/inflection2/example/main.dart rename to packages/inflection3/example/main.dart index a11cd80e..58479834 100644 --- a/packages/inflection2/example/main.dart +++ b/packages/inflection3/example/main.dart @@ -1,6 +1,6 @@ -import '../lib/inflection2.dart'; +import '../lib/inflection3.dart'; -main() { +void main() { // Using 'shortcut' functions. print(pluralize("house")); // => "houses" diff --git a/packages/inflection2/lib/inflection2.dart b/packages/inflection3/lib/inflection3.dart similarity index 98% rename from packages/inflection2/lib/inflection2.dart rename to packages/inflection3/lib/inflection3.dart index 3af1618b..0c2bab0a 100644 --- a/packages/inflection2/lib/inflection2.dart +++ b/packages/inflection3/lib/inflection3.dart @@ -4,7 +4,7 @@ /// /// [ActiveSupport Inflector](https://github.com/rails/rails/tree/master/activesupport/lib/active_support/inflector) /// [Letter case](http://en.wikipedia.org/wiki/Letter_case#Special_case_styles) -library inflection2; +library inflection3; import 'src/past.dart'; import 'src/plural.dart'; diff --git a/packages/inflection2/lib/src/irregular_past_verbs.dart b/packages/inflection3/lib/src/irregular_past_verbs.dart similarity index 100% rename from packages/inflection2/lib/src/irregular_past_verbs.dart rename to packages/inflection3/lib/src/irregular_past_verbs.dart diff --git a/packages/inflection2/lib/src/irregular_plural_nouns.dart b/packages/inflection3/lib/src/irregular_plural_nouns.dart similarity index 100% rename from packages/inflection2/lib/src/irregular_plural_nouns.dart rename to packages/inflection3/lib/src/irregular_plural_nouns.dart diff --git a/packages/inflection2/lib/src/irregular_plural_verbs.dart b/packages/inflection3/lib/src/irregular_plural_verbs.dart similarity index 100% rename from packages/inflection2/lib/src/irregular_plural_verbs.dart rename to packages/inflection3/lib/src/irregular_plural_verbs.dart diff --git a/packages/inflection2/lib/src/is_tense.dart b/packages/inflection3/lib/src/is_tense.dart similarity index 83% rename from packages/inflection2/lib/src/is_tense.dart rename to packages/inflection3/lib/src/is_tense.dart index ec391e75..29cfcde3 100644 --- a/packages/inflection2/lib/src/is_tense.dart +++ b/packages/inflection3/lib/src/is_tense.dart @@ -1,4 +1,4 @@ -import '../inflection2.dart'; +import '../inflection3.dart'; /// returns true if this word is in the past tense bool isPastTense(String word) { diff --git a/packages/inflection2/lib/src/past.dart b/packages/inflection3/lib/src/past.dart similarity index 100% rename from packages/inflection2/lib/src/past.dart rename to packages/inflection3/lib/src/past.dart diff --git a/packages/inflection2/lib/src/plural.dart b/packages/inflection3/lib/src/plural.dart similarity index 100% rename from packages/inflection2/lib/src/plural.dart rename to packages/inflection3/lib/src/plural.dart diff --git a/packages/inflection2/lib/src/plural_verb.dart b/packages/inflection3/lib/src/plural_verb.dart similarity index 100% rename from packages/inflection2/lib/src/plural_verb.dart rename to packages/inflection3/lib/src/plural_verb.dart diff --git a/packages/inflection2/lib/src/singular.dart b/packages/inflection3/lib/src/singular.dart similarity index 100% rename from packages/inflection2/lib/src/singular.dart rename to packages/inflection3/lib/src/singular.dart diff --git a/packages/inflection2/lib/src/singular_verb.dart b/packages/inflection3/lib/src/singular_verb.dart similarity index 100% rename from packages/inflection2/lib/src/singular_verb.dart rename to packages/inflection3/lib/src/singular_verb.dart diff --git a/packages/inflection2/lib/src/snake_case.dart b/packages/inflection3/lib/src/snake_case.dart similarity index 100% rename from packages/inflection2/lib/src/snake_case.dart rename to packages/inflection3/lib/src/snake_case.dart diff --git a/packages/inflection2/lib/src/spinal_case.dart b/packages/inflection3/lib/src/spinal_case.dart similarity index 100% rename from packages/inflection2/lib/src/spinal_case.dart rename to packages/inflection3/lib/src/spinal_case.dart diff --git a/packages/inflection2/lib/src/uncountable_nouns.dart b/packages/inflection3/lib/src/uncountable_nouns.dart similarity index 100% rename from packages/inflection2/lib/src/uncountable_nouns.dart rename to packages/inflection3/lib/src/uncountable_nouns.dart diff --git a/packages/inflection2/lib/src/util.dart b/packages/inflection3/lib/src/util.dart similarity index 100% rename from packages/inflection2/lib/src/util.dart rename to packages/inflection3/lib/src/util.dart diff --git a/packages/inflection2/lib/src/verbs_ending_with_ed.dart b/packages/inflection3/lib/src/verbs_ending_with_ed.dart similarity index 100% rename from packages/inflection2/lib/src/verbs_ending_with_ed.dart rename to packages/inflection3/lib/src/verbs_ending_with_ed.dart diff --git a/packages/inflection3/pubspec.yaml b/packages/inflection3/pubspec.yaml new file mode 100644 index 00000000..8a52504a --- /dev/null +++ b/packages/inflection3/pubspec.yaml @@ -0,0 +1,8 @@ +name: inflection3 +version: 1.0.0 +description: Grammatical Inflection encoders. +homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/inflection3 +environment: + sdk: '>=2.12.0 <3.0.0' +dev_dependencies: + test: ^1.17.4 diff --git a/packages/inflection2/test/all_test.dart b/packages/inflection3/test/all_test.dart similarity index 100% rename from packages/inflection2/test/all_test.dart rename to packages/inflection3/test/all_test.dart diff --git a/packages/inflection2/test/inflection_test.dart b/packages/inflection3/test/inflection_test.dart similarity index 89% rename from packages/inflection2/test/inflection_test.dart rename to packages/inflection3/test/inflection_test.dart index 1fd3f33e..ec7f4391 100644 --- a/packages/inflection2/test/inflection_test.dart +++ b/packages/inflection3/test/inflection_test.dart @@ -1,8 +1,8 @@ -library inflection.test; +library inflection3.test; import 'package:test/test.dart'; -import '../lib/inflection2.dart'; +import '../lib/inflection3.dart'; void main() { group("The inflection library", () { diff --git a/packages/inflection2/test/is_tense_test.dart b/packages/inflection3/test/is_tense_test.dart similarity index 82% rename from packages/inflection2/test/is_tense_test.dart rename to packages/inflection3/test/is_tense_test.dart index 51ff35b9..e324d240 100644 --- a/packages/inflection2/test/is_tense_test.dart +++ b/packages/inflection3/test/is_tense_test.dart @@ -1,8 +1,8 @@ -library inflection.is_tense.test; +library inflection3.is_tense.test; import 'package:test/test.dart'; -import '../lib/inflection2.dart'; +import '../lib/inflection3.dart'; void main() { group("isTense", () { diff --git a/packages/inflection2/test/past_test.dart b/packages/inflection3/test/past_test.dart similarity index 98% rename from packages/inflection2/test/past_test.dart rename to packages/inflection3/test/past_test.dart index fd466b48..112536a5 100644 --- a/packages/inflection2/test/past_test.dart +++ b/packages/inflection3/test/past_test.dart @@ -1,4 +1,4 @@ -library inflection.past.test; +library inflection3.past.test; import 'package:test/test.dart'; diff --git a/packages/inflection2/test/plural_test.dart b/packages/inflection3/test/plural_test.dart similarity index 97% rename from packages/inflection2/test/plural_test.dart rename to packages/inflection3/test/plural_test.dart index fba9dabe..e00bcd1b 100644 --- a/packages/inflection2/test/plural_test.dart +++ b/packages/inflection3/test/plural_test.dart @@ -1,8 +1,8 @@ -library inflection.plural.test; +library inflection3.plural.test; import 'package:test/test.dart'; -import '../lib/inflection2.dart'; +import '../lib/inflection3.dart'; import '../lib/src/uncountable_nouns.dart'; void main() { diff --git a/packages/inflection2/test/plural_verb_test.dart b/packages/inflection3/test/plural_verb_test.dart similarity index 97% rename from packages/inflection2/test/plural_verb_test.dart rename to packages/inflection3/test/plural_verb_test.dart index 9d7c3539..170e67a2 100644 --- a/packages/inflection2/test/plural_verb_test.dart +++ b/packages/inflection3/test/plural_verb_test.dart @@ -1,4 +1,4 @@ -library inflection.plural_verb.test; +library inflection3.plural_verb.test; import 'package:test/test.dart'; diff --git a/packages/inflection2/test/singular_test.dart b/packages/inflection3/test/singular_test.dart similarity index 98% rename from packages/inflection2/test/singular_test.dart rename to packages/inflection3/test/singular_test.dart index f55cc7eb..a5ece2cd 100644 --- a/packages/inflection2/test/singular_test.dart +++ b/packages/inflection3/test/singular_test.dart @@ -1,4 +1,4 @@ -library inflection.singular.test; +library inflection3.singular.test; import 'package:test/test.dart'; diff --git a/packages/inflection2/test/singular_verb_test.dart b/packages/inflection3/test/singular_verb_test.dart similarity index 97% rename from packages/inflection2/test/singular_verb_test.dart rename to packages/inflection3/test/singular_verb_test.dart index de1dcf41..2b8eb443 100644 --- a/packages/inflection2/test/singular_verb_test.dart +++ b/packages/inflection3/test/singular_verb_test.dart @@ -1,4 +1,4 @@ -library inflection.singular_verb.test; +library inflection3.singular_verb.test; import 'package:test/test.dart'; diff --git a/packages/inflection2/test/snake_case_test.dart b/packages/inflection3/test/snake_case_test.dart similarity index 94% rename from packages/inflection2/test/snake_case_test.dart rename to packages/inflection3/test/snake_case_test.dart index 94492f4b..bf55047f 100644 --- a/packages/inflection2/test/snake_case_test.dart +++ b/packages/inflection3/test/snake_case_test.dart @@ -1,4 +1,4 @@ -library inflection.snake_case.test; +library inflection3.snake_case.test; import 'package:test/test.dart'; diff --git a/packages/inflection2/test/spinal_case_test.dart b/packages/inflection3/test/spinal_case_test.dart similarity index 94% rename from packages/inflection2/test/spinal_case_test.dart rename to packages/inflection3/test/spinal_case_test.dart index d140b677..7a21cd46 100644 --- a/packages/inflection2/test/spinal_case_test.dart +++ b/packages/inflection3/test/spinal_case_test.dart @@ -1,4 +1,4 @@ -library inflection.spinal_case.test; +library inflection3.spinal_case.test; import 'package:test/test.dart';