added license header for src. Added changelog

CHANGELOG.md

@@ -1,14 +1,6 @@
 
 ---
 
-0.1.1+1  Updated pubspec and readme.md
-
----
-
-0.1.1  Updated pubspec
-
----
-
 0.1.0  Initial release
 
 ---

README.md

@@ -1,4 +1,4 @@
-# cherrypick
+# dart_di
 
 Experimental development of DI in the Dart language
 

doc/quick_start_en.md

@@ -65,7 +65,7 @@ Example:
 
 ```dart
     // open main scope
-    final rootScope =  Cherrypick.openRootScope();
+    final rootScope =  DartDi.openRootScope();
 
     // initializing scope with a custom module
     rootScope.installModules([AppModule()]);
@@ -76,7 +76,7 @@ Example:
     final str = rootScope.tryResolve<String>();
 
     // close main scope
-    Cherrypick.closeRootScope();
+    DartDi.closeRootScope();
 ```
 
 ## Example app
@@ -85,8 +85,8 @@ Example:
 ```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/experimental/scope.dart';
-import 'package:cherrypick/module.dart';
+import 'package:dart_di/experimental/module.dart';
 
 class AppModule extends Module {
   @override

doc/quick_start_ru.md

@@ -65,7 +65,7 @@ Scope - это контейнер, который хранит все дерев
 
 ```dart
     // открыть главный scope
-    final rootScope =  CherryPick.openRootScope();
+    final rootScope =  DartDi.openRootScope();
 
     // инициализация scope пользовательским модулем
     rootScope.installModules([AppModule()]);
@@ -76,7 +76,7 @@ Scope - это контейнер, который хранит все дерев
     final str = rootScope.tryResolve<String>();
 
     // закрыть главный scope
-    Cherrypick.closeRootScope();
+    DartDi.closeRootScope();
 ```
 
 ## Пример приложения
@@ -85,8 +85,8 @@ Scope - это контейнер, который хранит все дерев
 ```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/experimental/scope.dart';
-import 'package:cherrypick/module.dart';
+import 'package:dart_di/experimental/module.dart';
 
 class AppModule extends Module {
   @override

example/README.md

@@ -1,136 +0,0 @@
-## Example
-
-
-pubspec.yaml:
-
-```yaml
-name: example
-version: 1.0.0
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-
-
-dependencies:
-  cherrypick:
-    path: ../
-
-dev_dependencies:
-  test: ^1.16.8
-```
-
-
-main.dart:
-
-
-```dart
-import 'dart:async';
-import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
-import 'package:cherrypick/module.dart';
-
-class AppModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ApiClient>().withName("apiClientMock").toInstance(ApiClientMock());
-    bind<ApiClient>().withName("apiClientImpl").toInstance(ApiClientImpl());
-  }
-}
-
-class FeatureModule extends Module {
-  bool isMock;
-
-  FeatureModule({required this.isMock});
-
-  @override
-  void builder(Scope currentScope) {
-    bind<DataRepository>()
-        .withName("networkRepo")
-        .toProvide(
-          () => NetworkDataRepository(
-            currentScope.resolve<ApiClient>(
-              named: isMock ? "apiClientMock" : "apiClientImpl",
-            ),
-          ),
-        )
-        .singeltone();
-    bind<DataBloc>().toProvide(
-      () => DataBloc(
-        currentScope.resolve<DataRepository>(named: "networkRepo"),
-      ),
-    );
-  }
-}
-
-void main() async {
-  final scope = openRootScope().installModules([
-    AppModule(),
-  ]);
-
-  final subScope = scope
-      .openSubScope("featureScope")
-      .installModules([FeatureModule(isMock: true)]);
-
-  final dataBloc = subScope.resolve<DataBloc>();
-  dataBloc.data.listen((d) => print('Received data: $d'),
-      onError: (e) => print('Error: $e'), onDone: () => print('DONE'));
-
-  await dataBloc.fetchData();
-}
-
-class DataBloc {
-  final DataRepository _dataRepository;
-
-  Stream<String> get data => _dataController.stream;
-  StreamController<String> _dataController = new StreamController.broadcast();
-
-  DataBloc(this._dataRepository);
-
-  Future<void> fetchData() async {
-    try {
-      _dataController.sink.add(await _dataRepository.getData());
-    } catch (e) {
-      _dataController.sink.addError(e);
-    }
-  }
-
-  void dispose() {
-    _dataController.close();
-  }
-}
-
-abstract class DataRepository {
-  Future<String> getData();
-}
-
-class NetworkDataRepository implements DataRepository {
-  final ApiClient _apiClient;
-  final _token = 'token';
-
-  NetworkDataRepository(this._apiClient);
-
-  @override
-  Future<String> getData() async => await _apiClient.sendRequest(
-      url: 'www.google.com', token: _token, requestBody: {'type': 'data'});
-}
-
-abstract class ApiClient {
-  Future sendRequest({@required String url, String token, Map requestBody});
-}
-
-class ApiClientMock implements ApiClient {
-  @override
-  Future sendRequest(
-      {@required String? url, String? token, Map? requestBody}) async {
-    return 'Local Data';
-  }
-}
-
-class ApiClientImpl implements ApiClient {
-  @override
-  Future sendRequest(
-      {@required String? url, String? token, Map? requestBody}) async {
-    return 'Network data';
-  }
-}
-```

example/bin/main.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/scope.dart';
-import 'package:cherrypick/module.dart';
+import 'package:dart_di/module.dart';
 
 class AppModule extends Module {
   @override

example/pubspec.yaml

@@ -8,7 +8,7 @@ environment:
 
 
 dependencies:
-  cherrypick:
+  dart_di:
     path: ../
 
 dev_dependencies:

lib/dart_di.dart

@@ -13,7 +13,7 @@
 
 library dart_di;
 
-export 'package:cherrypick/scope.dart';
+export 'package:dart_di/scope.dart';
-export 'package:cherrypick/module.dart';
+export 'package:dart_di/module.dart';
-export 'package:cherrypick/binding.dart';
+export 'package:dart_di/binding.dart';
-export 'package:cherrypick/di.dart';
+export 'package:dart_di/di.dart';

lib/di.dart

@@ -10,11 +10,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/scope.dart';
 
 Scope? _rootScope = null;
 
-class CherryPick {
+class DartDi {
   /// RU: Метод открывает главный [Scope].
   /// ENG: The method opens the main [Scope].
   ///

lib/factory.dart

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/scope.dart';
 
 abstract class Factory<T> {
   T createInstance(Scope scope);

lib/module.dart

@@ -13,8 +13,8 @@
 
 import 'dart:collection';
 
-import 'package:cherrypick/binding.dart';
+import 'package:dart_di/binding.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/scope.dart';
 
 /// RU: Класс Module является основой для пользовательских модулей.
 ///  Этот класс нужен для инициализации [Scope].

lib/scope.dart

@@ -13,8 +13,8 @@
 
 import 'dart:collection';
 
-import 'package:cherrypick/binding.dart';
+import 'package:dart_di/binding.dart';
-import 'package:cherrypick/module.dart';
+import 'package:dart_di/module.dart';
 
 Scope openRootScope() => Scope(null);
 

pubspec.yaml

@@ -1,10 +1,8 @@
-name: cherrypick
+name: dart_di
-description: Cherrypick is a small dependency injection (DI) library for dart/flutter projects.
+description: Experimental Dependency Injection library.
-version: 0.1.1+1
+version: 0.1.0
-homepage: https://github.com/pese-git/cherrypick
+author: Sergey Penkovsky <sergey.penkovsky@gmail.com>
-documentation: https://github.com/pese-git/cherrypick/wiki
+homepage: locahost
-repository: https://github.com/pese-git/cherrypick
-issue_tracker: https://github.com/pese-git/cherrypick/issues
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

test/binding_test.dart

@@ -1,4 +1,4 @@
-import 'package:cherrypick/binding.dart';
+import 'package:dart_di/binding.dart';
 import 'package:test/test.dart';
 
 void main() {

test/scope_test.dart

@@ -1,5 +1,5 @@
-import 'package:cherrypick/module.dart';
+import 'package:dart_di/module.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:dart_di/scope.dart';
 import 'package:test/test.dart';
 
 void main() {