[#2] More swifty naming

Author: marmelroy

ObjectiveKit.xcodeproj/xcuserdata/marmelroy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -77,7 +77,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "39"
             endingLineNumber = "39"
-            landmarkName = "allIvars()"
+            landmarkName = "ivars()"
             landmarkType = "7">
             <Locations>
                <Location

ObjectiveKit/ObjectiveClass.swift

@@ -27,7 +27,7 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
     /// Get all instance variables implemented by the class.
     ///
     /// - Returns: An array of instance variables.
-    public func allIvars() -> [String] {
+    public func ivars() -> [String] {
         var count: CUnsignedInt = 0
         var ivars = [String]()
         let ivarList = class_copyIvarList(internalClass, &count)
@@ -46,7 +46,7 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
     /// Get all selectors implemented by the class.
     ///
     /// - Returns: An array of selectors.
-    public func allSelectors() -> [Selector] {
+    public func selectors() -> [Selector] {
         var count: CUnsignedInt = 0
         var selectors = [Selector]()
         let methodList = class_copyMethodList(internalClass, &count)
@@ -63,7 +63,7 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
     /// Get all protocols implemented by the class.
     ///
     /// - Returns: An array of protocol names.
-    public func allProtocols() -> [String] {
+    public func protocols() -> [String] {
         var count: CUnsignedInt = 0
         var protocols = [String]()
         let protocolList = class_copyProtocolList(internalClass, &count)
@@ -80,7 +80,7 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
     /// Get all properties implemented by the class.
     ///
     /// - Returns: An array of property names.
-    public func allProperties() -> [String] {
+    public func properties() -> [String] {
         var count: CUnsignedInt = 0
         var properties = [String]()
         let propertyList = class_copyPropertyList(internalClass, &count)

ObjectiveKit/RuntimeClass.swift

@@ -43,7 +43,7 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {
 
 
     /// Register class. Required before usage. Happens automatically on allocate.
-    public func registerClass() {
+    public func register() {
         if registered == false {
             registered =  true
             objc_registerClassPair(internalClass)
@@ -54,7 +54,7 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {
     ///
     /// - Returns: Custom class object.
     public func allocate() -> NSObject {
-        self.registerClass()
+        self.register()
         return internalClass.alloc() as! NSObject
     }
 

ObjectiveKit/RuntimeModification.swift

@@ -19,14 +19,14 @@ public protocol ObjectiveKitRuntimeModification {
     /// - Parameters:
     ///   - selector: Selector.
     ///   - originalClass: Object implementing the selector.
-    func addSelectorToClass(_ selector: Selector, fromClass originalClass: AnyClass)
+    func addSelector(_ selector: Selector, from originalClass: AnyClass)
 
     /// Add a custom method to the current class.
     ///
     /// - Parameters:
     ///   - identifier: Selector name.
     ///   - implementation: Implementation as a closure.
-    func addMethodToClass(_ identifier: String, implementation: ImplementationBlock)
+    func addMethod(_ identifier: String, implementation: ImplementationBlock)
 
     /// Exchange selectors implemented in the current class.
     ///
@@ -39,15 +39,15 @@ public protocol ObjectiveKitRuntimeModification {
 
 extension ObjectiveKitRuntimeModification {
 
-    public func addSelectorToClass(_ selector: Selector, fromClass originalClass: AnyClass) {
+    public func addSelector(_ selector: Selector, from originalClass: AnyClass) {
         guard let method = class_getInstanceMethod(originalClass, selector), let implementation = method_getImplementation(method), let typeEncoding = method_getTypeEncoding(method) else {
             return
         }
         let string = String(cString: typeEncoding)
         class_addMethod(internalClass, selector, implementation, string)
     }
 
-    public func addMethodToClass(_ identifier: String, implementation: ImplementationBlock) {
+    public func addMethod(_ identifier: String, implementation: ImplementationBlock) {
         let blockObject = unsafeBitCast(implementation, to: AnyObject.self)
         let implementation = imp_implementationWithBlock(blockObject)
         let selector = NSSelectorFromString(identifier)

ObjectiveKitTests/ObjectiveKitTests.swift

@@ -33,7 +33,7 @@ import MapKit
     func testAddClosure() {
         let methodExpectation = expectation(description: "Method was called")
         let objectiveView = ObjectiveClass<UIView>()
-        objectiveView.addMethodToClass(closureName, implementation: {
+        objectiveView.addMethod(closureName, implementation: {
             methodExpectation.fulfill()
         })
         let view = UIView()
@@ -45,7 +45,7 @@ import MapKit
         let view = UIView()
         XCTAssertFalse(view.responds(to: #selector(testSelector)))
         let objectiveView = ObjectiveClass<UIView>()
-        objectiveView.addSelectorToClass(#selector(testSelector), fromClass: self.classForCoder)
+        objectiveView.addSelector(#selector(testSelector), from: self.classForCoder)
         XCTAssert(view.responds(to: #selector(testSelector)))
     }
 
@@ -59,13 +59,13 @@ import MapKit
 
     func testIntrospection() {
         let objectiveView = ObjectiveClass<MKMapView>()
-        let ivars = objectiveView.allIvars()
+        let ivars = objectiveView.ivars()
         XCTAssert(ivars.contains("_camera"))
-        let selectors = objectiveView.allSelectors()
+        let selectors = objectiveView.selectors()
         XCTAssert(selectors.contains(NSSelectorFromString("layoutSubviews")))
-        let protocols = objectiveView.allProtocols()
+        let protocols = objectiveView.protocols()
         XCTAssert(protocols.contains("MKAnnotationManagerDelegate"))
-        let properties = objectiveView.allProperties()
+        let properties = objectiveView.properties()
         XCTAssert(properties.contains("mapRegion"))
     }