Merge pull request #2 from utopia-dart/feat-refactor

Feat refactor

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.2
+
+- Refactor methods
+
 ## 0.0.1
 
 - Initial version.

README.md

@@ -41,4 +41,4 @@ void main() {
 
 ## Copyright and license
 
-The MIT License (MIT) [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php)
+The MIT License (MIT) [https://www.opensource.org/licenses/mit-license.php](https://www.opensource.org/licenses/mit-license.php)

example/utopia_di_example.dart

@@ -2,15 +2,15 @@ import 'package:utopia_di/utopia_di.dart';
 
 void main() {
   final di = DI.i;
-  di.setResource('resource1', () => 'this is resource 1');
-  di.setResource('number1', () => 10);
-  di.setResource(
+  di.set('resource1', () => 'this is resource 1');
+  di.set('number1', () => 10);
+  di.set(
     'dependentResource',
     (String resource1, int number1) => '$resource1 and $number1',
     injections: ['resource1', 'number1'],
   );
 
-  print(di.getResource('resource1'));
-  print(di.getResource('number1'));
-  print(di.getResource('dependentResource'));
+  print(di.get('resource1'));
+  print(di.get('number1'));
+  print(di.get('dependentResource'));
 }

lib/src/di.dart

@@ -10,7 +10,7 @@ class DI {
 
   static DI get i => DI.instance;
 
-  void setResource(
+  void set(
     String name,
     Function callback, {
     List<String> injections = const [],
@@ -19,23 +19,25 @@ class DI {
         _ResourceCallback(name, injections, callback, reset: true);
   }
 
-  Map<String, dynamic> getResources(List<String> names) {
+  Map<String, dynamic> getAll(List<String> names) {
     final resources = <String, dynamic>{};
     for (final name in names) {
-      resources[name] = getResource(name);
+      resources[name] = get(name);
     }
     return resources;
   }
 
-  dynamic getResource(String name, {bool fresh = false}) {
+  dynamic g(String name, {bool fresh = false}) => get(name, fresh: fresh);
+
+  dynamic get(String name, {bool fresh = false}) {
     if (_resources[name] == null ||
         fresh ||
         (_resourceCallbacks[name]?.reset ?? true)) {
       if (_resourceCallbacks[name] == null) {
         throw Exception('Failed to find resource: "$name"');
       }
 
-      final params = getResources(_resourceCallbacks[name]!.injections);
+      final params = getAll(_resourceCallbacks[name]!.injections);
       _resources[name] = Function.apply(
         _resourceCallbacks[name]!.callback,
         [...params.values],

pubspec.yaml

@@ -1,11 +1,11 @@
 name: utopia_di
 description: Light & Fast Dart Dependency Injection library. Easy to use and powerful for all kinds of needs, with no external dependencies.
-version: 0.0.1
+version: 0.0.2
 repository: https://github.com/utopia-dart/utopia_di
 
 environment:
   sdk: '>=2.19.2 <3.0.0'
 
 dev_dependencies:
-  lints: ^2.0.0
-  test: ^1.21.0
+  lints: ^2.1.1
+  test: ^1.24.6

test/unit/di_test.dart

@@ -5,23 +5,23 @@ import 'package:utopia_di/utopia_di.dart';
 
 void main() async {
   final di = DI();
-  di.setResource('rand', () => Random().nextInt(100));
-  di.setResource(
+  di.set('rand', () => Random().nextInt(100));
+  di.set(
     'first',
     (String second) => 'first-$second',
     injections: ['second'],
   );
-  di.setResource('second', () => 'second');
+  di.set('second', () => 'second');
 
   group('App', () {
     test('resource', () async {
-      expect(di.getResource('second'), 'second');
-      expect(di.getResource('first'), 'first-second');
-      final resource = di.getResource('rand');
+      expect(di.get('second'), 'second');
+      expect(di.get('first'), 'first-second');
+      final resource = di.get('rand');
       assert(resource != null);
-      expect(di.getResource('rand'), resource);
-      expect(di.getResource('rand'), resource);
-      expect(di.getResource('rand'), resource);
+      expect(di.get('rand'), resource);
+      expect(di.get('rand'), resource);
+      expect(di.get('rand'), resource);
     });
   });
 }