Merge branch 'cdqi5'

Author: Revolucent

CoreDataQueryInterface.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name = 'CoreDataQueryInterface'
-  s.version = '4.3.2'
+  s.version = '5.0'
   s.license = 'MIT'
   s.summary = 'A type-safe, fluent Swift library for working with Core Data.'
   s.homepage = 'https://github.com/Prosumma/CoreDataQueryInterface'
   s.social_media_url = 'http://twitter.com/prosumma'
   s.authors = { 'Gregory Higley' => 'code@revolucent.net' }
   s.source = { :git => "#{s.homepage}.git", :tag => "v#{s.version}" }
-  s.ios.deployment_target = '8.1'
-  s.osx.deployment_target = '10.9'
+  s.ios.deployment_target = '9.0'
+  s.osx.deployment_target = '10.11'
   s.watchos.deployment_target = '2.0'
   s.tvos.deployment_target = '9.0'
   s.source_files = 'CoreDataQueryInterface/*.swift'

CoreDataQueryInterface.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "NO">
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CoreDataQueryInterface.xcodeproj/xcshareddata/xcschemes/CoreDataQueryInterface watchOS.xcscheme

@@ -0,0 +1,55 @@
+//
+//  Attribute.swift
+//  CoreDataQueryInterface
+//
+//  Created by Gregory Higley on 9/25/16.
+//  Copyright © 2016 Prosumma LLC. All rights reserved.
+//
+
+import CoreData
+import Foundation
+
+open class EntityAttribute: PredicateComparableTypedExpressionConvertible, KeyPathExpressionConvertible, PropertyConvertible {
+    public typealias CDQIComparisonType = NSManagedObjectID
+    
+    public let cdqiKey: String?
+    public let cdqiParent: KeyPathExpressionConvertible?
+    
+    public required init(key: String? = nil, parent: KeyPathExpressionConvertible? = nil) {
+        // You can have a key without a parent, but you can't have a parent without a key.
+        assert(key != nil || parent == nil, "Parent without key in Attribute.")
+        // If key is a variable, i.e., starts with a $, it can't have a parent.
+        assert(!(key?.hasPrefix("$") ?? false) || parent == nil, "Variable with parent in Attribute.")
+        cdqiKey = key
+        cdqiParent = parent
+    }
+    
+    public required convenience init(variable: String) {
+        self.init(key: "$\(variable)")
+    }
+}
+
+public struct ScalarAttribute<E: TypedExpressionConvertible>: PredicateComparableTypedExpressionConvertible, KeyPathExpressionConvertible, PropertyConvertible {
+    public typealias CDQIComparisonType = E.CDQIComparisonType
+    
+    public let cdqiKey: String?
+    public let cdqiParent: KeyPathExpressionConvertible?
+    public let cdqiType: NSAttributeType = E.cdqiStaticType
+    
+    public init(key: String, parent: KeyPathExpressionConvertible) {
+        assert(!key.hasPrefix("$"), "Variable used as key for ScalarAttribute.")
+        cdqiKey = key
+        cdqiParent = parent
+    }
+}
+
+public typealias BoolAttribute = ScalarAttribute<Bool>
+public typealias StringAttribute = ScalarAttribute<String>
+public typealias Integer16Attribute = ScalarAttribute<Int16>
+public typealias Integer32Attribute = ScalarAttribute<Int32>
+public typealias Integer64Attribute = ScalarAttribute<Int64>
+public typealias DoubleAttribute = ScalarAttribute<Double>
+public typealias DataAttribute = ScalarAttribute<Data>
+public typealias DateAttribute = ScalarAttribute<Date>
+public typealias DecimalAttribute = ScalarAttribute<Decimal>
+public typealias FloatAttribute = ScalarAttribute<Float>