Brought TopHits up to date.

Author: Revolucent

Examples/TopHits/TopHits/ArtistAttribute.swift

@@ -1,31 +1,14 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Gregory Higley (Prosumma)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//
+// Generated by CDQI on 2016-04-26.
+//
+// This file was generated by a tool. Further invocations of this tool will overwrite this file.
+// Edit it at your own risk.
+//
 
 import CoreDataQueryInterface
 
-class ArtistAttribute: Attribute, Aggregable {
-    private(set) lazy var name: KeyAttribute = { KeyAttribute("name", parent: self) }()
+class ArtistAttribute: EntityAttribute, Aggregable {
+    private(set) lazy var name: StringAttribute = { StringAttribute("name", parent: self) }()
     private(set) lazy var songs: SongAttribute = { SongAttribute("songs", parent: self) }()
 }
 

Examples/TopHits/TopHits/CoreDataController.swift

@@ -82,7 +82,7 @@ class CoreDataController {
                 let position = numberFormatter.numberFromString(fields[POSITION])!
                 let artistName = fields[ARTIST]
                 let songName = fields[SONG]
-                let artist = try! managedObjectContext.from(Artist).filter({$0.name == artistName}).first() ?? managedObjectContext.newEntity(Artist)
+                let artist = managedObjectContext.from(Artist).filter({$0.name == artistName}).first() ?? managedObjectContext.newEntity(Artist)
                 artist.name = artistName
                 let song = managedObjectContext.newEntity(Song)
                 song.year = year.intValue

Examples/TopHits/TopHits/SongAttribute.swift

@@ -1,33 +1,16 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Gregory Higley (Prosumma)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//
+// Generated by CDQI on 2016-04-26.
+//
+// This file was generated by a tool. Further invocations of this tool will overwrite this file.
+// Edit it at your own risk.
+//
 
 import CoreDataQueryInterface
 
-class SongAttribute: Attribute, Aggregable {
-    private(set) lazy var name: KeyAttribute = { KeyAttribute("name", parent: self) }()
-    private(set) lazy var position: KeyAttribute = { KeyAttribute("position", parent: self) }()
-    private(set) lazy var year: KeyAttribute = { KeyAttribute("year", parent: self) }()
+class SongAttribute: EntityAttribute, Aggregable {
+    private(set) lazy var name: StringAttribute = { StringAttribute("name", parent: self) }()
+    private(set) lazy var position: NumericAttribute = { NumericAttribute("position", parent: self, type: .Integer32AttributeType) }()
+    private(set) lazy var year: NumericAttribute = { NumericAttribute("year", parent: self, type: .Integer32AttributeType) }()
     private(set) lazy var artist: ArtistAttribute = { ArtistAttribute("artist", parent: self) }()
 }