v3.0.1 Bug Fixes

Closed #17
Closed #18
Closed #19

Author: Revolucent

CoreDataQueryInterface/CustomExpressionConvertible.swift

@@ -52,7 +52,12 @@ extension CustomExpressionConvertible {
         var expressions = [AnyObject]()
         for elem in rhs {
             let o = elem as! AnyObject
-            let e = NSExpression(forConstantValue: o)
+            let e: NSExpression
+            if let c = o as? CustomExpressionConvertible {
+                e = c.expression
+            } else {
+                e = NSExpression(forConstantValue: o)                
+            }
             expressions.append(e)
         }
         return compare(NSExpression(forAggregate: expressions), type: .InPredicateOperatorType, options: options)

CoreDataQueryInterface/KeyAttribute.swift

@@ -11,6 +11,6 @@ import Foundation
 /**
  Use this subclass of `Attribute` for simple keys.
  */
-class KeyAttribute: Attribute, Aggregable {
-    typealias AggregateType = KeyAttribute
+public class KeyAttribute: Attribute, Aggregable {
+    public typealias AggregateType = KeyAttribute
 }

README.md

@@ -69,13 +69,15 @@ CDQI works its magic by creating proxy objects for each entity in your model, an
 // All of the code below is automatically generated by the cdqi tool.
 
 class DepartmentAttribute: Attribute, Aggregable {
-  private(set) lazy var name: KeyAttribute = { KeyAttribute("name", parent: self) }()  
+    private(set) lazy var name: KeyAttribute = { KeyAttribute("name", parent: self) }()
+    private(set) lazy var employees: EmployeeAttribute = { EmployeeAttribute("employees", parent: self) }()
 }
 
-// This assumes you have a managed entity called Department.
+// This assumes you have a managed object called Department.
 extension Department: EntityType {
-  typealias EntityAttributeType = DepartmentAttribute
+    typealias EntityAttributeType = DepartmentAttribute
 }
+
 ```
 
 Here are some examples of the use of `cdqi`:

bin/cdqi

@@ -127,11 +127,16 @@ end
 
 entities = []
 
-File::open(File::join(model_path, ".xccurrentversion")) do |fd|
-  xml = REXML::Document::new(fd)
-  model_path = File::join(model_path, REXML::XPath::first(xml, "//key[.='_XCCurrentVersionName']/following-sibling::string").text)
-  $stderr.puts "NOTICE: Using data model at #{model_path}."
-  model_path = File::join(model_path, 'contents')
+currentversion_path = File::join(model_path, '.xccurrentversion')
+if File::exists? currentversion_path
+  File::open(currentversion_path) do |fd|
+    xml = REXML::Document::new(fd)
+    model_path = File::join(model_path, REXML::XPath::first(xml, "//key[.='_XCCurrentVersionName']/following-sibling::string").text)
+    $stderr.puts "NOTICE: Using data model at #{model_path}."
+    model_path = File::join(model_path, 'contents')
+  end
+else
+  model_path = File::join(model_path, "#{model}.xcdatamodel/contents")
 end
 
 File::open(model_path) do |fd|
@@ -180,6 +185,8 @@ def write_file_header(io)
   io.puts "// Edit it at your own risk."
   io.puts "//"
   io.puts ""
+  io.puts "import CoreDataQueryInterface"
+  io.puts ""
 end
 
 if $options.merged