removed SwiftCF dependency and organized project for Linux

PureSwift · Dec 11, 2015 · e9ef81d · e9ef81d
1 parent 4f6dd5d
commit e9ef81d
Show file tree

Hide file tree

Showing 24 changed files with 444 additions and 1,135 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1 @@
-github "PureSwift/SwiftFoundation" "develop"
-github "PureSwift/SwiftCF" "master"
+github "PureSwift/SwiftFoundation" "develop"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,2 @@
-github "PureSwift/json-c" "8a9d5ea3a504928017abad54ff5a4187d204ef43"
-github "PureSwift/libb64" "b946994a9e748b3d4d2c75affb2c6b8545c2c20c"
-github "PureSwift/SwiftFoundation" "827cb3224afd11769a6903bd203d5e150cb5a2c8"
+github "PureSwift/SwiftFoundation" "93ea515fdfb8935752ad6765a57ca2808bb4d95e"
 github "PureSwift/SwiftCF" "7641a0b6110470133c1d4e30f6b1f99a971ce770"
diff --git a/CoreModel/CoreModel.xcodeproj/project.pbxproj b/CoreModel/CoreModel.xcodeproj/project.pbxproj
diff --git a/CoreModel/CoreModel.xcodeproj/project.xcworkspace/xcshareddata/CoreModel.xccheckout b/CoreModel/CoreModel.xcodeproj/project.xcworkspace/xcshareddata/CoreModel.xccheckout
diff --git a/CoreModel/CoreModel.xcodeproj/xcshareddata/xcschemes/CoreModel OS X.xcscheme b/CoreModel/CoreModel.xcodeproj/xcshareddata/xcschemes/CoreModel OS X.xcscheme
diff --git a/CoreModel/CoreModel.xcodeproj/xcshareddata/xcschemes/CoreModel WatchOS.xcscheme b/CoreModel/CoreModel.xcodeproj/xcshareddata/xcschemes/CoreModel WatchOS.xcscheme
diff --git a/CoreModel/CoreModelTests/CoreModelTests.swift b/CoreModel/CoreModelTests/CoreModelTests.swift
diff --git a/CoreModel/CoreModelTests/Info.plist b/CoreModel/CoreModelTests/Info.plist
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+    name: "CoreModel",
+    dependencies: [
+        .Package(url: "https://github.com/PureSwift/SwiftFoundation.git", majorVersion: 1),
+    ]
+)
diff --git a/Darwin Support/CoreDataExtensions.swift → Source/CoreDataExtensions.swift b/Darwin Support/CoreDataExtensions.swift → Source/CoreDataExtensions.swift
diff --git a/Darwin Support/CoreDataFetchRequest.swift → Source/CoreDataFetchRequest.swift b/Darwin Support/CoreDataFetchRequest.swift → Source/CoreDataFetchRequest.swift
diff --git a/Darwin Support/CoreDataModel.swift → Source/CoreDataModel.swift b/Darwin Support/CoreDataModel.swift → Source/CoreDataModel.swift
diff --git a/Darwin Support/CoreDataStore.swift → Source/CoreDataStore.swift b/Darwin Support/CoreDataStore.swift → Source/CoreDataStore.swift
diff --git a/Darwin Support/CoreDataValues.swift → Source/CoreDataValues.swift b/Darwin Support/CoreDataValues.swift → Source/CoreDataValues.swift
@@ -174,7 +174,7 @@ public extension AttributeValue {
             self = .Number(.Boolean(value))
         }
 
-        else if let value = CoreDataValue as? Int {
+        else if let value = CoreDataValue as? Int64 {
 
             self = .Number(.Integer(value))
         }
@@ -208,7 +208,7 @@ public extension AttributeValue {
             switch number {
 
             case .Boolean(let value): return NSNumber(bool: value)
-            case .Integer(let value): return NSNumber(integer: value)
+            case .Integer(let value): return NSNumber(integer: Int(value))
             case .Double(let value): return NSNumber(double: value)
             }
         }

diff --git a/Source/FetchRequest.swift b/Source/FetchRequest.swift
@@ -87,12 +87,12 @@ public extension FetchRequest {
 
         if self.fetchLimit > 0 {
 
-            jsonObject[JSONKey.FetchLimit.rawValue] = JSON.Value.Number(.Integer(self.fetchLimit))
+            jsonObject[JSONKey.FetchLimit.rawValue] = JSON.Value.Number(.Integer(Int64(self.fetchLimit)))
         }
 
         if self.fetchOffset > 0 {
 
-            jsonObject[JSONKey.FetchOffset.rawValue] = JSON.Value.Number(.Integer(self.fetchOffset))
+            jsonObject[JSONKey.FetchOffset.rawValue] = JSON.Value.Number(.Integer(Int64(self.fetchOffset)))
         }
 
         return JSON.Value.Object(jsonObject)

diff --git a/Source/Value.swift b/Source/Value.swift
@@ -55,7 +55,7 @@ public enum NumberValue {
 
     case Boolean(Bool)
 
-    case Integer(Int)
+    case Integer(Int64)
 
     case Double(DoubleValue)
 

diff --git a/Source/ValueJSON.swift b/Source/ValueJSON.swift
@@ -7,9 +7,6 @@
 //
 
 import SwiftFoundation
-import SwiftCF
-
-private let ISO8601DateFormatter = DateFormatter(format: "yyyy-MM-dd'T'HH:mm:ssZZZZ")
 
 /// Converts the values object to JSON
 public extension Entity {
@@ -53,10 +50,10 @@ public extension Entity {
 
                 case let (JSON.Value.Number(.Double(value)), AttributeType.Number(.Double)):
                     attributeValue = AttributeValue.Number(.Double(value))
+
+                case let (JSON.Value.Number(.Double(value)), AttributeType.Date):
 
-                case let (JSON.Value.String(value), AttributeType.Date):
-
-                    guard let date = ISO8601DateFormatter.valueFromString(value) else { return nil }
+                    let date = Date(timeIntervalSince1970: value)
 
                     attributeValue = AttributeValue.Date(date)
 
@@ -169,9 +166,7 @@ public extension Value {
 
         case let .Attribute(.Date(value)):
 
-            let dateString = ISO8601DateFormatter.stringFromValue(value)
-
-            return JSON.Value.String(dateString)
+            return JSON.Value.Number(.Double(value.timeIntervalSince1970))
 
         case let .Relationship(.ToOne(value)):