Merge branch 'release/0.1.0'

alexcristea · alexcristea · commit cc098ee8bc51 · 2016-10-23T12:41:09.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -45,8 +45,8 @@ DerivedData
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-#
-# Pods/
+
+Pods/
  
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
  
@@ -104,4 +104,8 @@ fastlane/build
 ## Covers Carthage
 
 Carthage/Checkouts
-Carthage/Build
+Carthage/Build
+
+## Covers Swift Package
+
+.build
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ env:
   global:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
-  - PROJECT=framework/ValidationComponents.xcodeproj
+  - PROJECT=ValidationComponents.xcodeproj
   - IOS_FRAMEWORK_SCHEME="ValidationComponents iOS"
   - OSX_FRAMEWORK_SCHEME="ValidationComponents macOS"
   - TVOS_FRAMEWORK_SCHEME="ValidationComponents tvOS"
@@ -14,23 +14,28 @@ env:
   - TVOS_SDK=appletvsimulator10.0
   - WATCHOS_SDK=watchsimulator3.0
   matrix:
-    - DESTINATION="OS=10.0,name=iPhone 6S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     CONFIGURATION="Debug" RUN_TESTS="NO"
-    - DESTINATION="arch=x86_64"                     SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$MACOS_SDK"   CONFIGURATION="Debug" RUN_TESTS="NO"
-    - DESTINATION="OS=10.0,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    CONFIGURATION="Debug" RUN_TESTS="YES"
-    - DESTINATION="OS=3.0,name=Apple Watch - 42mm"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO"
+    - DESTINATION="OS=10.0,name=iPhone 6S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="arch=x86_64"                     SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$MACOS_SDK"   CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="OS=10.0,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="OS=3.0,name=Apple Watch - 42mm"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO"
 
 before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
-  - gem install xcpretty 
+  - gem install xcpretty --pre --no-rdoc --no-ri --no-document --quiet
+  - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
 
 script:
   - set -o pipefail
+  - carthage update
   - if [ $RUN_TESTS == "YES" ]; then
       xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration "$CONFIGURATION" ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
     else
       xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration "$CONFIGURATION" ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
+  - if [ $POD_LINT == "YES" ]; then
+      pod lib lint --quick;
+    fi
 
 after_success:
   - if [ $RUN_TESTS == "YES" ]; then
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "alexcristea/validation-kit" "develop"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "alexcristea/validation-kit" "6569766d422fa7dc664222915c8b96adb08e61fb"
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,9 @@
+import PackageDescription
+
+let package = Package(
+    name: "ValidationComponents",
+    dependencies: [
+        .Package(url: "https://github.com/nsagora/validation-kit.git", majorVersion: 0)
+    ],
+    exclude: ["Tests"]
+)
diff --git a/Packages/ValidationKit-0.2.0 b/Packages/ValidationKit-0.2.0
@@ -0,0 +1 @@
+Subproject commit 2f84cf511800da21d30b3b9c74b655c7ebf4aa24
diff --git a/README.md b/README.md
@@ -1,15 +1,57 @@
-# Validation Components [![travis-status]][travis-overview] [![codecov-status]][codecov-overview] [![carthage-compatible]][carthage-overview] [![license]][license-overview]
+[Validation Kit][validation-kit] · __Validation Components__
+
+[validation-kit]: https://github.com/nsagora/validation-kit
+[validation-components]: https://github.com/nsagora/validation-components 
+
+-------
+
+# Validation Components 
+[![travis-status]][travis-overview] [![codecov-status]][codecov-overview] [![carthage-compatible]][carthage-overview] [![license]][license-overview] [![twitter]][twitter-overview]
+
+[twitter]: https://img.shields.io/badge/twitter-%40nsgaora-blue.svg?style=flat
+[twitter-overview]: https://twitter.com/nsagora
 
-Components Catalog for extending the Validation Kit framework.
 
 [license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
 [license-overview]: http://choosealicense.com/licenses/apache-2.0/
 
-[travis-status]: https://travis-ci.org/alexcristea/validation-components.svg?branch=develop
-[travis-overview]: https://travis-ci.org/alexcristea/validation-components
+[travis-status]: https://travis-ci.org/nsagora/validation-components.svg?branch=develop
+[travis-overview]: https://travis-ci.org/nsagora/validation-components
 
-[codecov-status]: https://codecov.io/gh/alexcristea/validation-components/branch/develop/graph/badge.svg
-[codecov-overview]: https://codecov.io/gh/alexcristea/validation-components 
+[codecov-status]: https://codecov.io/gh/nsagora/validation-components/branch/develop/graph/badge.svg
+[codecov-overview]: https://codecov.io/gh/nsagora/validation-components 
 
 [carthage-compatible]: https://img.shields.io/badge/carthage-compatible-4BC51D.svg?style=flat
-[carthage-overview]: https://github.com/Carthage/Carthage
+[carthage-overview]: https://github.com/Carthage/Carthage
+
+## Introduction
+
+`Validation Components` extends the [`Validation Kit`][validation-kit] framework by offering a collection of common validation predicates that most of the projects can benefit of.
+
+## Installation
+
+### Carthage
+
+To use the latest stable version, add this to your [`Cartfile`][carthage-cartfile]:
+
+``` 
+github "nsagora/validation-components" 
+```
+
+To use a certain version, add this to your [`Cartfile`][carthage-cartfile]:
+
+``` 
+github "nsagora/validation-components" >= 0.1.0 
+```
+
+To use the latest version in development, add this to your [`Cartfile`][carthage-cartfile]:
+
+``` 
+github "nsagora/validation-components" "develop" 
+```
+
+The full documentation on how to install and use [Carthage][carthage] is available on their official github [page][carthage].
+
+[carthage]: https://github.com/Carthage/Carthage
+[carthage-cartfile]: https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile
+
diff --git a/Sources/EmailValidationPredicate.swift b/Sources/EmailValidationPredicate.swift
@@ -0,0 +1,32 @@
+//
+//  EmailValidationPredicate.swift
+//  Validator
+//
+//  Created by Alex Cristea on 07/08/16.
+//  Copyright © 2016 iOS NSAgora. All rights reserved.
+//
+
+import Foundation
+import ValidationKit
+
+public struct EmailValidationPredicate: ValidationPredicate {
+
+    private let rule: RegexValidationPredicate
+    private let regex = "(?:[\\p{L}0-9!#$%\\&'*+/=?\\^_`{|}~-]+(?:\\.[\\p{L}0-9!#$%\\&'*+/=?\\^_`{|}" +
+        "~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\" +
+        "x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[\\p{L}0-9](?:[a-" +
+        "z0-9-]*[\\p{L}0-9])?\\.)+[\\p{L}0-9](?:[\\p{L}0-9-]*[\\p{L}0-9])?|\\[(?:(?:25[0-5" +
+        "]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-" +
+        "9][0-9]?|[\\p{L}0-9-]*[\\p{L}0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21" +
+        "-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"
+
+    public init() {
+        rule = RegexValidationPredicate(expression: regex)
+    }
+
+    public func evaluate(with input: String?) -> Bool {
+
+        guard let _ = input else { return false }
+        return rule.evaluate(with: input)
+    }
+}
diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/Sources/URLValidationRule.swift b/Sources/URLValidationRule.swift
@@ -0,0 +1,18 @@
+//
+//  URLValidationRule.swift
+//  ValidationComponents
+//
+//  Created by Alex Cristea on 26/08/16.
+//  Copyright © 2016 iOS NSAgora. All rights reserved.
+//
+
+import Foundation
+import ValidationKit
+
+public struct URLValidationPredicate:  ValidationPredicate{
+
+    public func evaluate(with input: String?) -> Bool {
+        guard let input = input else { return false }
+        return URL(string: input) != nil
+    }
+}
diff --git a/Sources/ValidationComponents.h b/Sources/ValidationComponents.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 iOS NSAgora. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for ValidationComponents iOS.
 FOUNDATION_EXPORT double ValidationComponents_iOSVersionNumber;
diff --git a/Sources/ValueMatchingValidationPredicate.swift b/Sources/ValueMatchingValidationPredicate.swift
@@ -0,0 +1,21 @@
+//
+//  ValueMatchingValidationPredicate.swift
+//  ValidationComponents
+//
+//  Created by Alex Cristea on 23/08/16.
+//  Copyright © 2016 iOS NSAgora. All rights reserved.
+//
+
+import Foundation
+import ValidationKit
+
+public struct ValueMatchingValidationPredicate<T:Equatable>: ValidationPredicate {
+
+    public typealias InputType = (T?, T?)
+
+    public func evaluate(with input: InputType?) -> Bool {
+
+        guard let input = input else { return false }
+        return input.0 == input.1
+    }
+}
diff --git a/Tests/EmailValidationRuleTests.swift b/Tests/EmailValidationRuleTests.swift
@@ -0,0 +1,48 @@
+//
+//  EmailValidationPredicateTests.swift
+//  Validator
+//
+//  Created by Alex Cristea on 07/08/16.
+//  Copyright © 2016 iOS NSAgora. All rights reserved.
+//
+
+import XCTest
+@testable import ValidationComponents
+
+class EmailValidationPredicateTests: XCTestCase {
+
+    var rule: EmailValidationPredicate!
+
+    override func setUp() {
+        super.setUp()
+        rule = EmailValidationPredicate()
+    }
+    
+    override func tearDown() {
+        rule = nil
+        super.tearDown()
+    }
+
+    func testThatItFailsForNil() {
+        let result = rule.evaluate(with: nil)
+        XCTAssertFalse(result)
+    }
+
+    func testThatItFailsForInvalidEmail() {
+        let email = "test@"
+        let result = rule.evaluate(with: email)
+        XCTAssertFalse(result)
+    }
+
+    func testThatItPassesForValidEmail() {
+        let email = "test@example.com"
+        let result = rule.evaluate(with: email)
+        XCTAssertTrue(result)
+    }
+
+    func testThatItPassesForUTF8() {
+        let email = "tést@example.com"
+        let result = rule.evaluate(with: email)
+        XCTAssertTrue(result)
+    }
+}
diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
diff --git a/Tests/URLValidationPredicateTests.swift b/Tests/URLValidationPredicateTests.swift
@@ -0,0 +1,43 @@
+//
+//  URLValidationPredicateTests.swift
+//  ValidationComponents
+//
+//  Created by Alex Cristea on 26/08/16.
+//  Copyright © 2016 iOS NSAgora. All rights reserved.
+//
+
+import XCTest
+@testable import ValidationComponents
+
+class URLValidationPredicateTests: XCTestCase {
+
+
+    var predicate: URLValidationPredicate!
+
+    override func setUp() {
+        super.setUp()
+        predicate = URLValidationPredicate()
+    }
+    
+    override func tearDown() {
+        predicate = nil
+        super.tearDown()
+    }
+
+    func testThatItEvaluateNilInputToFalse() {
+
+        let result = predicate.evaluate(with: nil)
+        XCTAssertFalse(result)
+    }
+
+    func testThatItEvaluatesValuidURLToTrue() {
+        let result = predicate.evaluate(with: "http://www.url.com")
+        XCTAssertTrue(result)
+    }
+
+    func testThatItEvaluatesInvaluidURLToFalse() {
+        let result = predicate.evaluate(with: "http:\\www.url.com")
+        XCTAssertFalse(result)
+    }
+
+}
diff --git a/Tests/ValueMathcingValidationPredicate.swift b/Tests/ValueMathcingValidationPredicate.swift
@@ -0,0 +1,46 @@
+//
+//  ValueMathcingValidationPredicate.swift
+//  ValidationComponents
+//
+//  Created by Alex Cristea on 23/08/16.
+//  Copyright © 2016 iOS NSAgora. All rights reserved.
+//
+
+import XCTest
+@testable import ValidationComponents
+
+
+class ValueMatchingValidationPredicateTests: XCTestCase {
+
+    var predicate: ValueMatchingValidationPredicate<String>!
+
+    override func setUp() {
+        super.setUp()
+        predicate = ValueMatchingValidationPredicate()
+    }
+    
+    override func tearDown() {
+        predicate = nil
+        super.tearDown()
+    }
+
+    func testThatItFailsForNil() {
+        let result = predicate.evaluate(with: nil)
+        XCTAssertFalse(result)
+    }
+
+    func testThatItPassesForNilIputs() {
+        let result = predicate.evaluate(with: (nil, nil))
+        XCTAssertTrue(result)
+    }
+
+    func testThatItPassesForMatchingInputs() {
+        let result = predicate.evaluate(with: ("match", "match"))
+        XCTAssertTrue(result)
+    }
+
+    func testThatItFailsForUnmatchingInputs() {
+        let result = predicate.evaluate(with: ("match", "unmatch"))
+        XCTAssertFalse(result)
+    }
+}
diff --git a/ValidationComponents.podspec b/ValidationComponents.podspec
diff --git a/ValidationComponents.xcodeproj/project.pbxproj b/ValidationComponents.xcodeproj/project.pbxproj
diff --git a/ValidationComponents.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ValidationComponents.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents iOS.xcscheme b/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents iOS.xcscheme
diff --git a/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents macOS.xcscheme b/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents macOS.xcscheme
diff --git a/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents tvOS.xcscheme b/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents tvOS.xcscheme
diff --git a/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents watchOS.xcscheme b/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents watchOS.xcscheme

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+github "alexcristea/validation-kit" "develop"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+github "alexcristea/validation-kit" "6569766d422fa7dc664222915c8b96adb08e61fb"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 2f84cf511800da21d30b3b9c74b655c7ebf4aa24`