Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmartinelli
vmartinelli committed May 21, 2018
2 parents aa95343 + e8382f1 commit 5132107
Show file tree
Hide file tree
Showing 21 changed files with 990 additions and 763 deletions.
2 changes: 1 addition & 1 deletion AlecrimCoreData.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "AlecrimCoreData"
s.version = "6.0-beta.3"
s.version = "6.0"
s.summary = "A powerful and elegant Core Data framework for Swift."
s.homepage = "https://www.alecrim.com/AlecrimCoreData"

Expand Down
3 changes: 3 additions & 0 deletions Package.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import PackageDescription

let package = Package(name: "AlecrimCoreData")
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Simple do that:
let query = persistentContainer.viewContext.people
.where { \.city == "Piracicaba" }
.orderBy { \.name }
for person in query.skip(20).take(10) {

for person in query.dropFirst(20).prefix(10) {
print(person.name, person.address)
}
```
Expand All @@ -30,7 +30,7 @@ persistentContainer.performBackgroundTask { context in
.filtered(using: \.country == "Brazil" && \.isContributor == true)
.sorted(by: .descending(\.contributionCount))
.sorted(by: \.name)

if let person = query.first() {
print(person.name, person.email)
}
Expand Down Expand Up @@ -60,7 +60,7 @@ Some well known features and functionalities may be reimplemented in a future re
## Contribute
If you have any problems or need more information, please open an issue using the provided GitHub link.

You can also contribute by fixing errors or creating new features. When doing this, please submit your pull requests to this repository as I do not have much time to "hunt" forks for not submited patches.
You can also contribute by fixing errors or creating new features. When doing this, please submit your pull requests to this repository as I do not have much time to "hunt" forks for not submitted patches.

- master - The production branch. Clone or fork this repository for the latest copy.
- develop - The active development branch. [Pull requests](https://help.github.com/articles/creating-a-pull-request) should be directed to this branch.
Expand Down
34 changes: 27 additions & 7 deletions Source/AlecrimCoreData.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

/* Begin PBXBuildFile section */
1420DF9E2054FFBC00B34160 /* AlecrimCoreData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1420DF9C2054FFBC00B34160 /* AlecrimCoreData.h */; settings = {ATTRIBUTES = (Public, ); }; };
1454786620B247F300831016 /* PersistentContainerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1454786520B247F300831016 /* PersistentContainerType.swift */; };
1454786820B2484900831016 /* PersistentContainerAuxiliarTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1454786720B2484800831016 /* PersistentContainerAuxiliarTypes.swift */; };
1454786A20B2487300831016 /* CustomPersistentContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1454786920B2487300831016 /* CustomPersistentContainer.swift */; };
146B042F208AEAE3002091BF /* FetchRequestController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 146B042E208AEAE3002091BF /* FetchRequestController+Extensions.swift */; };
14B9460020759D0D00A7CFFD /* NSTableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B945FF20759D0D00A7CFFD /* NSTableView+Extensions.swift */; };
14CC3374205B28CA00BA682A /* NSArrayController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14CC335E205B28CA00BA682A /* NSArrayController+Extensions.swift */; };
14CC3375205B28CA00BA682A /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14CC335F205B28CA00BA682A /* UITableView+Extensions.swift */; };
14CC3376205B28CA00BA682A /* UICollectionView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14CC3360205B28CA00BA682A /* UICollectionView+Extensions.swift */; };
Expand All @@ -32,6 +37,11 @@
1420DF992054FFBC00B34160 /* AlecrimCoreData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlecrimCoreData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1420DF9C2054FFBC00B34160 /* AlecrimCoreData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AlecrimCoreData.h; sourceTree = "<group>"; };
1420DF9D2054FFBC00B34160 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1454786520B247F300831016 /* PersistentContainerType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistentContainerType.swift; sourceTree = "<group>"; };
1454786720B2484800831016 /* PersistentContainerAuxiliarTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistentContainerAuxiliarTypes.swift; sourceTree = "<group>"; };
1454786920B2487300831016 /* CustomPersistentContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPersistentContainer.swift; sourceTree = "<group>"; };
146B042E208AEAE3002091BF /* FetchRequestController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FetchRequestController+Extensions.swift"; sourceTree = "<group>"; };
14B945FF20759D0D00A7CFFD /* NSTableView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTableView+Extensions.swift"; sourceTree = "<group>"; };
14CC335E205B28CA00BA682A /* NSArrayController+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSArrayController+Extensions.swift"; sourceTree = "<group>"; };
14CC335F205B28CA00BA682A /* UITableView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Extensions.swift"; sourceTree = "<group>"; };
14CC3360205B28CA00BA682A /* UICollectionView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Extensions.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -102,31 +112,36 @@
14CC335D205B28CA00BA682A /* Convenience */ = {
isa = PBXGroup;
children = (
14CC335E205B28CA00BA682A /* NSArrayController+Extensions.swift */,
14CC335F205B28CA00BA682A /* UITableView+Extensions.swift */,
146B042E208AEAE3002091BF /* FetchRequestController+Extensions.swift */,
14CC3360205B28CA00BA682A /* UICollectionView+Extensions.swift */,
14CC335F205B28CA00BA682A /* UITableView+Extensions.swift */,
14CC335E205B28CA00BA682A /* NSArrayController+Extensions.swift */,
14CC3361205B28CA00BA682A /* NSCollectionView+Extensions.swift */,
14B945FF20759D0D00A7CFFD /* NSTableView+Extensions.swift */,
);
path = Convenience;
sourceTree = "<group>";
};
14CC3362205B28CA00BA682A /* Core */ = {
isa = PBXGroup;
children = (
14CC3363205B28CA00BA682A /* Container */,
14CC3363205B28CA00BA682A /* Persistent Container */,
14CC3367205B28CA00BA682A /* Query */,
);
path = Core;
sourceTree = "<group>";
};
14CC3363205B28CA00BA682A /* Container */ = {
14CC3363205B28CA00BA682A /* Persistent Container */ = {
isa = PBXGroup;
children = (
14CC3364205B28CA00BA682A /* PersistentContainer.swift */,
1454786920B2487300831016 /* CustomPersistentContainer.swift */,
1454786720B2484800831016 /* PersistentContainerAuxiliarTypes.swift */,
1454786520B247F300831016 /* PersistentContainerType.swift */,
14CC3365205B28CA00BA682A /* ManagedObjectContext.swift */,
14CC3366205B28CA00BA682A /* ManagedObject.swift */,
);
path = Container;
path = "Persistent Container";
sourceTree = "<group>";
};
14CC3367205B28CA00BA682A /* Query */ = {
Expand Down Expand Up @@ -237,15 +252,20 @@
14CC337E205B28CA00BA682A /* Predicate.swift in Sources */,
14CC337D205B28CA00BA682A /* FetchRequest.swift in Sources */,
14CC3381205B28CA00BA682A /* KeyPath.swift in Sources */,
14B9460020759D0D00A7CFFD /* NSTableView+Extensions.swift in Sources */,
146B042F208AEAE3002091BF /* FetchRequestController+Extensions.swift in Sources */,
14CC337F205B28CA00BA682A /* SortDescriptor.swift in Sources */,
14CC337A205B28CA00BA682A /* ManagedObject.swift in Sources */,
1454786A20B2487300831016 /* CustomPersistentContainer.swift in Sources */,
14CC3382205B28CA00BA682A /* Queryable.swift in Sources */,
14CC3374205B28CA00BA682A /* NSArrayController+Extensions.swift in Sources */,
14CC3385205B28CA00BA682A /* FetchedResultsControllerDelegate.swift in Sources */,
14CC337C205B28CA00BA682A /* Expression.swift in Sources */,
14CC3380205B28CA00BA682A /* Config.swift in Sources */,
14CC3377205B28CA00BA682A /* NSCollectionView+Extensions.swift in Sources */,
1454786820B2484900831016 /* PersistentContainerAuxiliarTypes.swift in Sources */,
14CC3378205B28CA00BA682A /* PersistentContainer.swift in Sources */,
1454786620B247F300831016 /* PersistentContainerType.swift in Sources */,
14CC337B205B28CA00BA682A /* Query.swift in Sources */,
14CC3384205B28CA00BA682A /* FetchedResultsSectionInfo.swift in Sources */,
14CC3375205B28CA00BA682A /* UITableView+Extensions.swift in Sources */,
Expand Down Expand Up @@ -392,7 +412,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1798;
CURRENT_PROJECT_VERSION = 1815;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -424,7 +444,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1798;
CURRENT_PROJECT_VERSION = 1815;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down
20 changes: 20 additions & 0 deletions Source/AlecrimCoreData/Convenience/FetchRequestController+Extensions.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// FetchRequestController+Extensions.swift
// AlecrimCoreData
//
// Created by Vanderlei Martinelli on 21/04/18.
// Copyright © 2018 Alecrim. All rights reserved.
//

import Foundation

extension FetchRequestController {

internal enum Change<T> {
case insert(T)
case delete(T)
case update(T)
case move(T, T) // from, to
}

}
Loading

0 comments on commit 5132107

Please sign in to comment.