Adds default values for the service parameter.

Note that this isn't working yet. Cocoapods isn't replciating the
changes in the demo/test app, so I'm hoping this push will make it
behave properly.

.travis.yml

@@ -11,5 +11,5 @@ language: objective-c
 install:
 - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
 script:
-- set -o pipefail && xcodebuild test -workspace Example/Locksmith.xcworkspace -scheme Locksmith -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
+- set -o pipefail && xcodebuild test -workspace Example/Locksmith.xcworkspace -scheme Locksmith-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
 - pod lib lint --quick

Example/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Expecta (0.3.1)
-  - Locksmith (1.2.0)
+  - Locksmith (1.1.1)
   - Specta (0.2.1)
 
 DEPENDENCIES:
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expecta: 03aabd0a89d8dea843baecb19a7fd7466a69a31d
-  Locksmith: 392ae330eb455e824dab5b714b6719eb29ef5038
+  Locksmith: c2b5a219b27d0317b71a7b1a70f0148cee03a9f6
   Specta: 9141310f46b1f68b676650ff2854e1ed0b74163a
 
 COCOAPODS: 0.36.0.beta.1

Example/Pods/Local Podspecs/Locksmith.podspec

@@ -1,37 +0,0 @@
-#
-# Be sure to run `pod lib lint Locksmith.podspec' to ensure this is a
-# valid spec and remove all comments before submitting the spec.
-#
-# Any lines starting with a # are optional, but encouraged
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
-#
-
-Pod::Spec.new do |s|
-  s.name             = "Locksmith"
-  s.version          = "1.2.0"
-  s.summary          = "Locksmith is a sane way to work with the iOS Keychain in Swift."
-  s.description      = <<-DESC
-                       Locksmith is a sane way to work with the iOS Keychain in Swift.
-                       It provides a fast and intuitive way to work with the C Keychain API.
-                       Results are provided as tuples, and errors are informative and easily detected.
-                       DESC
-  s.homepage         = "https://github.com/matthewpalmer/Locksmith"
-  # s.screenshots     = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
-  s.license          = 'MIT'
-  s.author           = { "matthewpalmer" => "matt@matthewpalmer.net" }
-  s.source           = { :git => "https://github.com/matthewpalmer/Locksmith.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/_matthewpalmer'
-
-  s.platform     = :ios, '8.0'
-  s.requires_arc = true
-
-  s.source_files = 'Pod/Classes'
-  s.resource_bundles = {
-    'Locksmith' => ['Pod/Assets/*.png']
-  }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
-end

Example/Pods/Local Podspecs/Locksmith.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "Locksmith",
-  "version": "1.2.0",
+  "version": "1.1.1",
   "summary": "Locksmith is a sane way to work with the iOS Keychain in Swift.",
   "description": "                       Locksmith is a sane way to work with the iOS Keychain in Swift.\n                       It provides a fast and intuitive way to work with the C Keychain API.\n                       Results are provided as tuples, and errors are informative and easily detected.\n",
   "homepage": "https://github.com/matthewpalmer/Locksmith",
@@ -10,7 +10,7 @@
   },
   "source": {
     "git": "https://github.com/matthewpalmer/Locksmith.git",
-    "tag": "1.2.0"
+    "tag": "1.1.1"
   },
   "social_media_url": "https://twitter.com/_matthewpalmer",
   "platforms": {

Example/Pods/Manifest.lock

@@ -1,6 +1,6 @@
 PODS:
   - Expecta (0.3.1)
-  - Locksmith (1.2.0)
+  - Locksmith (1.1.1)
   - Specta (0.2.1)
 
 DEPENDENCIES:
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expecta: 03aabd0a89d8dea843baecb19a7fd7466a69a31d
-  Locksmith: 392ae330eb455e824dab5b714b6719eb29ef5038
+  Locksmith: c2b5a219b27d0317b71a7b1a70f0148cee03a9f6
   Specta: 9141310f46b1f68b676650ff2854e1ed0b74163a
 
 COCOAPODS: 0.36.0.beta.1

Example/Pods/Target Support Files/Pods-Locksmith-Locksmith/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.2.0</string>
+  <string>1.1.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Example/Pods/Target Support Files/Pods-Locksmith-Locksmith/Pods-Locksmith-Locksmith-Private.xcconfig

@@ -3,7 +3,7 @@ CONFIGURATION_BUILD_DIR = $PODS_FRAMEWORK_BUILD_PATH
 FRAMEWORK_SEARCH_PATHS = "$PODS_FRAMEWORK_BUILD_PATH"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Locksmith" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Locksmith" "${PODS_ROOT}/Headers/Public/Specta"
-OTHER_LDFLAGS = -ObjC
+OTHER_LDFLAGS = ${PODS_LOCKSMITH_LOCKSMITH_OTHER_LDFLAGS} -ObjC
 OTHER_SWIFT_FLAGS = "-D COCOAPODS"
 PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods-Locksmith
 PODS_ROOT = ${SRCROOT}

Example/Pods/Target Support Files/Pods-Locksmith-Locksmith/Pods-Locksmith-Locksmith.xcconfig

@@ -0,0 +1 @@
+PODS_LOCKSMITH_LOCKSMITH_OTHER_LDFLAGS = -framework "Security" -framework "UIKit"

Example/Pods/Target Support Files/Pods-Locksmith/Pods-Locksmith-environment.h

@@ -9,6 +9,6 @@
 // Locksmith
 #define COCOAPODS_POD_AVAILABLE_Locksmith
 #define COCOAPODS_VERSION_MAJOR_Locksmith 1
-#define COCOAPODS_VERSION_MINOR_Locksmith 2
-#define COCOAPODS_VERSION_PATCH_Locksmith 0
+#define COCOAPODS_VERSION_MINOR_Locksmith 1
+#define COCOAPODS_VERSION_PATCH_Locksmith 1
 

Example/Pods/Target Support Files/Pods-Tests-Locksmith/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.2.0</string>
+  <string>1.1.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Example/Pods/Target Support Files/Pods-Tests-Locksmith/Pods-Tests-Locksmith-Private.xcconfig

@@ -3,7 +3,7 @@ CONFIGURATION_BUILD_DIR = $PODS_FRAMEWORK_BUILD_PATH
 FRAMEWORK_SEARCH_PATHS = "$PODS_FRAMEWORK_BUILD_PATH"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Locksmith" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Locksmith" "${PODS_ROOT}/Headers/Public/Specta"
-OTHER_LDFLAGS = -ObjC
+OTHER_LDFLAGS = ${PODS_TESTS_LOCKSMITH_OTHER_LDFLAGS} -ObjC
 OTHER_SWIFT_FLAGS = "-D COCOAPODS"
 PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods-Tests
 PODS_ROOT = ${SRCROOT}

Example/Pods/Target Support Files/Pods-Tests-Locksmith/Pods-Tests-Locksmith.xcconfig

@@ -0,0 +1 @@
+PODS_TESTS_LOCKSMITH_OTHER_LDFLAGS = -framework "Security" -framework "UIKit"

Example/Pods/Target Support Files/Pods-Tests/Pods-Tests-environment.h

@@ -15,8 +15,8 @@
 // Locksmith
 #define COCOAPODS_POD_AVAILABLE_Locksmith
 #define COCOAPODS_VERSION_MAJOR_Locksmith 1
-#define COCOAPODS_VERSION_MINOR_Locksmith 2
-#define COCOAPODS_VERSION_PATCH_Locksmith 0
+#define COCOAPODS_VERSION_MINOR_Locksmith 1
+#define COCOAPODS_VERSION_PATCH_Locksmith 1
 
 // Specta
 #define COCOAPODS_POD_AVAILABLE_Specta

Example/Tests/LocksmithTests.swift

@@ -9,10 +9,6 @@ import UIKit
 import XCTest
 import Locksmith
 
-let myService = "myService"
-let sampleData = ["key": "value"]
-let myUserAccount = "myUserAccount"
-
 class LocksmithTests: XCTestCase {
     
     override func setUp() {
@@ -26,64 +22,53 @@ class LocksmithTests: XCTestCase {
         super.tearDown()
     }
     
+    // public class func saveData(data: Dictionary<String, String>, inService service: String, forUserAccount userAccount: String) -> NSError?
     func testSaveData_Once() {
-        let error = Locksmith.saveData(["key": "value"], forUserAccount: myUserAccount, inService: myService)
+        let error = Locksmith.saveData(data: ["key": "value"], forUserAccount: "myUserAccount", inService: "myService")
+//        var error = Locksmith.saveData(["key": "value"], inService: <#String#>, forUserAccount: <#String#>)
+//        var error = Locksmith.saveData(, inService: "myService", forUserAccount: "myUserAccount")
         XCTAssert(error == nil, "❌: saving data")
     }
     
     func testSaveData_Multiple() {
         var errors: [NSError?] = []
         for i in 0...10 {
-            errors.append(Locksmith.saveData(["key": "value \(i)"], forUserAccount: "myAccount\(i)", inService: "myService"))
+            errors.append(Locksmith.saveData(["key": "value \(i)"], inService: "myService", forUserAccount: "myAccount\(i)"))
         }
         XCTAssert(errors.filter({ $0 != nil }).isEmpty, "❌: saving multiple items")
     }
     
     func testSaveData_Duplicate() {
         // Should be successful
-        
-        let error1 = Locksmith.saveData(sampleData, forUserAccount: "user", inService: myService)
+        let error1 = Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "user")
         
         // Should fail
-        let error2 = Locksmith.saveData(sampleData, forUserAccount: "user", inService: "myService")
+        let error2 = Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "user")
         
         XCTAssert(error1 == nil && error2 != nil, "❌: saving duplicate data")
     }
     
-    // Test using default values for the service
-    func testWorkflow_Defaults() {
-        let error1 = Locksmith.saveData(sampleData, forUserAccount: "me")
-        let error2 = Locksmith.saveData(sampleData, forUserAccount: "me2")
-        
-        XCTAssert(error1 == nil && error2 == nil, "❌: saving with default service")
-        
-        let (dict1, err1) = Locksmith.loadDataForUserAccount("me")
-        let (dict2, err2) = Locksmith.loadDataForUserAccount("me2")
-        
-        XCTAssert(dict1 != nil && dict2 != nil && err1 == nil && err2 == nil, "❌: loading with default service")
-    }
-    
     // Setup the keychain for requests that use pre-existing values on the keychain (update, read, delete)
     func setupLoads() {
-        Locksmith.saveData(["key": "value"], forUserAccount: "user1", inService: "myService")
-        Locksmith.saveData(["anotherkey": "anothervalue"], forUserAccount: "user2", inService: "myService")
-        Locksmith.saveData(["word": "definition"], forUserAccount: "user3", inService: "myService")
+        Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "user1")
+        Locksmith.saveData(["anotherkey": "anothervalue"], inService: "myService", forUserAccount: "user2")
+        Locksmith.saveData(["word": "definition"], inService: "myService", forUserAccount: "user3")
     }
     
     // public class func loadDataInService(service: String, forUserAccount userAccount: String) -> (NSDictionary?, NSError?)
     func testLoadData_Once() {
         setupLoads()
         
-        let (dictionary, error) = Locksmith.loadDataForUserAccount("user1", inService: "myService")
+        let (dictionary, error) = Locksmith.loadDataInService("myService", forUserAccount: "user1")
         XCTAssert(dictionary!.valueForKey("key")! as NSString == "value" && error == nil, "❌: loading one item")
     }
     
     func testLoadData_Multiple() {
         setupLoads()
         
-        let (dictionary, error) = Locksmith.loadDataForUserAccount("user1", inService: "myService")
-        let (dictionary2, error2) = Locksmith.loadDataForUserAccount("user2", inService: "myService")
-        let (dictionary3, error3) = Locksmith.loadDataForUserAccount("user3", inService: "myService")
+        let (dictionary, error) = Locksmith.loadDataInService("myService", forUserAccount: "user1")
+        let (dictionary2, error2) = Locksmith.loadDataInService("myService", forUserAccount: "user2")
+        let (dictionary3, error3) = Locksmith.loadDataInService("myService", forUserAccount: "user3")
         
         XCTAssert(dictionary!.valueForKey("key")! as NSString == "value" && error == nil, "❌: loading multiple items")
         XCTAssert(dictionary2!.valueForKey("anotherkey")! as NSString == "anothervalue" && error == nil, "❌: loading multiple items")
@@ -94,12 +79,12 @@ class LocksmithTests: XCTestCase {
     func testUpdateData() {
         setupLoads()
         
-        let error = Locksmith.updateData(["key": "newvalue"], forUserAccount: "user1", inService: "myService")
-        let (dictionary, err) = Locksmith.loadDataForUserAccount("user1", inService: "myService")
+        let error = Locksmith.updateData(["key": "newvalue"], inService: "myService", forUserAccount: "user1")
+        let (dictionary, err) = Locksmith.loadDataInService("myService", forUserAccount: "user1")
         XCTAssert(dictionary!.valueForKey("key")! as NSString == "newvalue" && error == nil, "❌: updating item")
         
         // Updating an item that doesn't exist should create that item (i.e. performs a regular create request)
-        let error2 = Locksmith.updateData(["key": "anothervalue"], forUserAccount: "user1", inService: "myService")
+        let error2 = Locksmith.updateData(["key": "anothervalue"], inService: "myService", forUserAccount: "user1")
         XCTAssert(error2 == nil, "❌: updating item that doesn't exist")
     }
     
@@ -107,10 +92,10 @@ class LocksmithTests: XCTestCase {
     func testDeleteData() {
         setupLoads()
         
-        let error = Locksmith.deleteDataForUserAccount("user1", inService: "myService")
+        let error = Locksmith.deleteDataInService("myService", forUserAccount: "user1")
         XCTAssert(error == nil, "❌: deleting existing item")
         
-        let error2 = Locksmith.deleteDataForUserAccount("user1", inService: "myService")
+        let error2 = Locksmith.deleteDataInService("myService", forUserAccount: "user1")
         XCTAssert(error2 != nil, "❌: deleting non existent item")
     }
     

Locksmith.podspec

@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Locksmith"
-  s.version          = "1.2.0"
+  s.version          = "1.1.1"
   s.summary          = "Locksmith is a sane way to work with the iOS Keychain in Swift."
   s.description      = <<-DESC
                        Locksmith is a sane way to work with the iOS Keychain in Swift.

Locksmith/Locksmith-Info.plist

@@ -13,12 +13,14 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
 </dict>
 </plist>

Locksmith/Locksmith.h

@@ -0,0 +1,19 @@
+//
+//  Locksmith.h
+//  Locksmith
+//
+//  Created by Michael Hahn on 12/22/14.
+//  Copyright (c) 2014 Mathew Palmer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for Locksmith.
+FOUNDATION_EXPORT double LocksmithVersionNumber;
+
+//! Project version string for Locksmith.
+FOUNDATION_EXPORT const unsigned char LocksmithVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <Locksmith/PublicHeader.h>
+
+

LocksmithTests/LocksmithTests.swift

@@ -1,108 +0,0 @@
-//
-//  LocksmithTests.swift
-//  LocksmithTests
-//
-//  Created by Michael Hahn on 12/22/14.
-//  Copyright (c) 2014 Mathew Palmer. All rights reserved.
-//
-
-import UIKit
-import XCTest
-import Locksmith
-
-class LocksmithTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-        Locksmith.clearKeychain()
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-
-    // public class func saveData(data: Dictionary<String, String>, inService service: String, forUserAccount userAccount: String) -> NSError?
-    func testSaveData_Once() {
-        var error = Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "myUserAccount")
-        XCTAssert(error == nil, "❌: saving data")
-    }
-    
-    func testSaveData_Multiple() {
-        var errors: [NSError?] = []
-        for i in 0...10 {
-            errors.append(Locksmith.saveData(["key": "value \(i)"], inService: "myService", forUserAccount: "myAccount\(i)"))
-        }
-        XCTAssert(errors.filter({ $0 != nil }).isEmpty, "❌: saving multiple items")
-    }
-    
-    func testSaveData_Duplicate() {
-        // Should be successful
-        let error1 = Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "user")
-        
-        // Should fail
-        let error2 = Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "user")
-        
-        XCTAssert(error1 == nil && error2 != nil, "❌: saving duplicate data")
-    }
-
-    // Setup the keychain for requests that use pre-existing values on the keychain (update, read, delete)
-    func setupLoads() {
-        Locksmith.saveData(["key": "value"], inService: "myService", forUserAccount: "user1")
-        Locksmith.saveData(["anotherkey": "anothervalue"], inService: "myService", forUserAccount: "user2")
-        Locksmith.saveData(["word": "definition"], inService: "myService", forUserAccount: "user3")
-    }
-    
-    // public class func loadDataInService(service: String, forUserAccount userAccount: String) -> (NSDictionary?, NSError?)
-    func testLoadData_Once() {
-        setupLoads()
-        
-        let (dictionary, error) = Locksmith.loadDataInService("myService", forUserAccount: "user1")
-        XCTAssert(dictionary!.valueForKey("key")! as NSString == "value" && error == nil, "❌: loading one item")
-    }
-    
-    func testLoadData_Multiple() {
-        setupLoads()
-        
-        let (dictionary, error) = Locksmith.loadDataInService("myService", forUserAccount: "user1")
-        let (dictionary2, error2) = Locksmith.loadDataInService("myService", forUserAccount: "user2")
-        let (dictionary3, error3) = Locksmith.loadDataInService("myService", forUserAccount: "user3")
-        
-        XCTAssert(dictionary!.valueForKey("key")! as NSString == "value" && error == nil, "❌: loading multiple items")
-        XCTAssert(dictionary2!.valueForKey("anotherkey")! as NSString == "anothervalue" && error == nil, "❌: loading multiple items")
-        XCTAssert(dictionary3!.valueForKey("word")! as NSString == "definition" && error == nil, "❌: loading multiple items")
-    }
-    
-    // public class func updateData(data: Dictionary<String, String>, inService service: String, forUserAccount userAccount: String) -> NSError?
-    func testUpdateData() {
-        setupLoads()
-        
-        let error = Locksmith.updateData(["key": "newvalue"], inService: "myService", forUserAccount: "user1")
-        let (dictionary, err) = Locksmith.loadDataInService("myService", forUserAccount: "user1")
-        XCTAssert(dictionary!.valueForKey("key")! as NSString == "newvalue" && error == nil, "❌: updating item")
-        
-        // Updating an item that doesn't exist should create that item (i.e. performs a regular create request)
-        let error2 = Locksmith.updateData(["key": "anothervalue"], inService: "myService", forUserAccount: "user1")
-        XCTAssert(error2 == nil, "❌: updating item that doesn't exist")
-    }
-    
-    // public class func deleteDataInService(service: String, forUserAccount userAccount: String) -> NSError?
-    func testDeleteData() {
-        setupLoads()
-        
-        let error = Locksmith.deleteDataInService("myService", forUserAccount: "user1")
-        XCTAssert(error == nil, "❌: deleting existing item")
-        
-        let error2 = Locksmith.deleteDataInService("myService", forUserAccount: "user1")
-        XCTAssert(error2 != nil, "❌: deleting non existent item")
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measureBlock() {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}

README.md

@@ -2,7 +2,7 @@
 
 A sane way to work with the iOS Keychain in Swift.
 
-[![CI Status](http://img.shields.io/travis/matthewpalmer/Locksmith.svg?style=flat)](https://travis-ci.org/matthewpalmer/Locksmith)
+<!--[![CI Status](http://img.shields.io/travis/matthewpalmer/Locksmith.svg?style=flat)](https://travis-ci.org/matthewpalmer/Locksmith)-->
 [![Version](https://img.shields.io/cocoapods/v/Locksmith.svg?style=flat)](http://cocoadocs.org/docsets/Locksmith)
 [![License](https://img.shields.io/cocoapods/l/Locksmith.svg?style=flat)](http://cocoadocs.org/docsets/Locksmith)
 [![Platform](https://img.shields.io/cocoapods/p/Locksmith.svg?style=flat)](http://cocoadocs.org/docsets/Locksmith)
@@ -14,7 +14,7 @@ A sane way to work with the iOS Keychain in Swift.
 Locksmith is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
-pod "Locksmith"
+    pod "Locksmith"
 
 ### Manual
 
@@ -122,4 +122,4 @@ var synchronizable: Bool          // Defaults to false
 
 ## License
 
-Locksmith is available under the MIT license. See the LICENSE file for more info.
+Locksmith is available under the MIT license. See the LICENSE file for more info.