Merge branch 'release/v0.0.9'

Andrew(유금상) · Andrew(유금상) · commit 1c20e77623c4 · 2018-08-28T10:28:15.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,38 @@
+# os: osx
+osx_image: xcode9.4
+language: swift
+sudo: required
+podfile: Example/RxValidatorExample/Podfile
+cache: cocoapods
+
+notifications:
+    slack: '$SLACK_KEY'
+
+branches:
+  only:
+      - develop
+  except:
+      - screenshot
+env:
+  global:
+    - PROJECT="Example/RxValidatorExample/RxValidatorExample.xcworkspace"
+    - SCHEME="RxValidatorExample"
+  matrix: 
+    - TEST=1 DESTINATION="platform=iOS Simulator,name=iPhone X,OS=11.4"
+    #- TEST=1 DESTINATION="arch=x86_64"
+    #- TEST=1 DESTINATION="OS=11.4,name=Apple TV"
+    #- TEST=0 DESTINATION="OS=4.3,name=Apple Watch - 38mm"
+
+before_install:
+  - set -o pipefail
+  
+script:
+  - xcodebuild clean build test
+      -workspace "$PROJECT"
+      -scheme "$SCHEME"
+      -destination "$DESTINATION" | xcpretty -c
+
+  - pod lib lint --verbose --allow-warnings --fail-fast
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -J 'RxValidatorExample'
diff --git a/Example/RxValidatorExample/Podfile b/Example/RxValidatorExample/Podfile
@@ -19,9 +19,4 @@ target 'RxValidatorExample' do
 
   end
 
-  target 'RxValidatorExampleUITests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
 end
diff --git a/Example/RxValidatorExample/RxValidatorExample.xcodeproj/project.pbxproj b/Example/RxValidatorExample/RxValidatorExample.xcodeproj/project.pbxproj
diff --git a/Example/RxValidatorExample/RxValidatorExampleTests/AlwaysFailingTests.swift b/Example/RxValidatorExample/RxValidatorExampleTests/AlwaysFailingTests.swift
@@ -0,0 +1,17 @@
+//
+//  AlwaysFailingTests.swift
+//  RxValidatorExampleTests
+//
+//  Created by 유금상 on 2018. 6. 28..
+//  Copyright © 2018년 유금상. All rights reserved.
+//
+
+import XCTest
+
+class AlwaysFailingTests: XCTestCase {
+    
+    func testExample() {
+//        XCTFail()
+    }
+}
+ 
diff --git a/Example/RxValidatorExample/RxValidatorExampleTests/DateValidateTests.swift b/Example/RxValidatorExample/RxValidatorExampleTests/DateValidateTests.swift
@@ -20,7 +20,7 @@ class DateValidateTests: XCTestCase {
     func testDateValidation() {
         
         let targetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
-        let afterTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
+        let afterTargetDate = "2018-05-29T12:01+09:00".date(format: .iso8601Auto)!.absoluteDate
         let beforeTargetDate = "2018-05-29T11:59+09:00".date(format: .iso8601Auto)!.absoluteDate
         let sameTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
         
@@ -49,6 +49,53 @@ class DateValidateTests: XCTestCase {
         expect(resultDate).toEventually(equal(targetDate))
     }
     
+    func testDateValidationShouldBeforeThenWithSameTargetDate() {
+        // given
+        let targetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
+        let sameTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
+        var resultDate: Date?
+        var resultError: RxValidatorResult = .valid
+        let underTest = DateValidationTarget(targetDate)
+        
+        // when
+        underTest
+            .validate(.shouldBeforeThen(date: sameTargetDate))
+            .asObservable()
+            .subscribe(onNext: { (date) in
+                resultDate = date
+            }, onError: { (error) in
+                resultError = RxValidatorResult.determine(error: error)
+            }).disposed(by: disposeBag)
+        
+        // then
+        // it should not before date
+        expect(resultError).toEventually(equal(RxValidatorResult.notBeforeDate))
+        expect(resultDate).toEventually(beNil())
+    }
+    
+    func testDateValidationShouldAfterThenWithSameTargetDate() {
+        // given
+        let targetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
+        let sameTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
+        var resultDate: Date?
+        var resultError: RxValidatorResult = .valid
+        let underTest = DateValidationTarget(targetDate)
+        
+        // when
+        underTest
+            .validate(.shouldAfterThen(date: sameTargetDate))
+            .asObservable()
+            .subscribe(onNext: { (date) in
+                resultDate = date
+            }, onError: { (error) in
+                resultError = RxValidatorResult.determine(error: error)
+            }).disposed(by: disposeBag)
+        
+        // then
+        // it should not after date
+        expect(resultError).toEventually(equal(RxValidatorResult.notAfterDate))
+        expect(resultDate).toEventually(beNil())
+    }
     
     func testDateValidationWithAllday() {
         let targetDate = "2018-05-29T12:00:00+09:00".date(format: .iso8601Auto)!.absoluteDate
diff --git a/Example/RxValidatorExample/RxValidatorExampleTests/IntValidateTests.swift b/Example/RxValidatorExample/RxValidatorExampleTests/IntValidateTests.swift
@@ -16,12 +16,12 @@ class IntValidateTests: XCTestCase {
     func testEvenNumber() {
         
         let resultNotValid = Validate.to(1)
-            .validate(NumberIsShouldBeEven())
+            .validate(NumberShouldBeEven())
             .check()
         expect(resultNotValid).to(equal(RxValidatorResult.notEvenNumber))
         
         let resultValid = Validate.to(2)
-            .validate(NumberIsShouldBeEven())
+            .validate(NumberShouldBeEven())
             .check()
         expect(resultValid).to(equal(RxValidatorResult.valid))
     }
diff --git a/Example/RxValidatorExample/RxValidatorExampleTests/ObservableExtensionTests.swift b/Example/RxValidatorExample/RxValidatorExampleTests/ObservableExtensionTests.swift
@@ -42,7 +42,7 @@ class ObservableExtensionTests: XCTestCase {
         
         observable
             .asObservable()
-            .validate(StringIsShouldNotEmpty())
+            .validate(StringShouldNotBeEmpty())
             .asObservable()
             .subscribe(onNext: { (text) in
                 XCTFail()
@@ -65,7 +65,7 @@ class ObservableExtensionTests: XCTestCase {
         
         observable
             .asObservable()
-            .validate(NumberIsShouldBeEven())
+            .validate(NumberShouldBeEven())
             .asObservable()
             .subscribe(onNext: { number in
                 result = number
diff --git a/Example/RxValidatorExample/RxValidatorExampleTests/StringValidateTests.swift b/Example/RxValidatorExample/RxValidatorExampleTests/StringValidateTests.swift
@@ -113,4 +113,13 @@ class StringValidateTests: XCTestCase {
     }
     
     
+    func testStringArray() {
+        let targetValue = ["1", "2", "3"]
+        
+        let result: RxValidatorResult = targetValue
+            .compactMap { return Validate.to($0).validate(StringShouldNotBeEmpty()).check() }
+            .reduce(RxValidatorResult.valid) { $0 != .valid ? $0 : $1 }
+        
+        expect(result).toEventually(equal(.valid))
+    }
 }
diff --git a/Example/RxValidatorExample/RxValidatorExampleUITests/Info.plist b/Example/RxValidatorExample/RxValidatorExampleUITests/Info.plist
diff --git a/Example/RxValidatorExample/RxValidatorExampleUITests/RxValidatorExampleUITests.swift b/Example/RxValidatorExample/RxValidatorExampleUITests/RxValidatorExampleUITests.swift
diff --git a/README.md b/README.md
@@ -1,11 +1,15 @@
 
-[![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg)](https://swift.org/blog/swift-4-1-released/)
+[![License](https://img.shields.io/cocoapods/l/RxValidator.svg?style=flat)](http://cocoapods.org/pods/RxValidator)
 [![Platform](https://img.shields.io/cocoapods/p/RxValidator.svg?style=flat)](http://cocoapods.org/pods/RxValidator)
+[![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg)](https://swift.org/blog/swift-4-1-released/)
 [![Version](https://img.shields.io/cocoapods/v/RxValidator.svg?style=flat)](http://cocoapods.org/pods/RxValidator)
-[![License](https://img.shields.io/cocoapods/l/RxValidator.svg?style=flat)](http://cocoapods.org/pods/RxValidator)
+[![Build Status](https://travis-ci.org/vbmania/RxValidator.svg?branch=develop)](https://travis-ci.org/vbmania/RxValidator)
+[![codecov.io](https://codecov.io/gh/vbmania/RxValidator/branch/develop/graphs/badge.svg)](https://codecov.io/gh/vbmania/RxValidator/branch/develop)
 
 # RxValidator
-Easy to Use, Read, Extensible, Flexible Validation Checker
+Easy to Use, Read, Extensible, Flexible Validation Checker.
+
+It can use without Rx.
 
 ## Requirements
 
@@ -26,13 +30,14 @@ pod 'RxValidator'
 You just use like this:
 ```swift
 
+//without Rx
 Validate.to(TargetValue)
     .validate(condition)
         ...
     .validate(condition)
     .asObservable() or .check()
     
-
+//with Rx
 observable
     .validate(condition)
         ...
@@ -96,12 +101,12 @@ Validate.to(Date())
 ### Int
 ```swift {.line-numbers}
 Validate.to(2)
-    .validate(NumberIsShouldBeEven())
+    .validate(NumberShouldBeEven())
     .check()
     //.valid
     
 Validate.to(1)
-    .validate(NumberIsShouldBeEven())
+    .validate(NumberShouldBeEven())
     .check()
     //.notEvenNumber
 ```
@@ -153,7 +158,7 @@ Validate.to("vbmania@me.com")
 ### Int
 ```swift {.line-numbers}
 Validate.to(2)
-    .validate(NumberIsShouldBeEven())
+    .validate(NumberShouldBeEven())
     .asObservable()
     .subscribe(onNext: { value in
         print(value)
@@ -162,7 +167,7 @@ Validate.to(2)
     .disposed(by: disposeBag)
     
 Validate.to(1)
-    .validate(NumberIsShouldBeEven())
+    .validate(NumberShouldBeEven())
     .asObservable()
     .subscribe(onNext: { value in
         print(value)
@@ -315,7 +320,7 @@ StringIsNotOverflowThen(maxLength: Int)
 StringShouldBeMatch("regex string")
 
 //Int
-NumberIsShouldBeEven()
+NumberShouldBeEven()
 
 //Date
 DateValidatorType.shouldEqualTo(Date)
@@ -324,6 +329,7 @@ DateValidatorType.shouldBeforeOrSameThen(Date)
 DateValidatorType.shouldAfterThen(Date)
 DateValidatorType.shouldAfterOrSameThen(Date)
 DateValidatorType.shouldBeCloseDates(date: Date, termOfDays: Int)
+
 ```
 
 ## Make custom ValidationRule like this:
@@ -349,3 +355,8 @@ class MyCustomIntValidationRule: IntValidatorType {
 
 
 ```
+
+## I want to be...
+* More Built-in Validation Rules. (Help me. Welcome to PR.)
+* Support More Type (Array, Float, Double, etc)
+* More Flexible Code via Generics.
diff --git a/RxValidator.podspec b/RxValidator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = 'RxValidator'
-  spec.version          = '0.0.8'
+  spec.version          = '0.0.9'
   spec.summary          = 'Simple, Extensable, Flexable Validation Checker'
   spec.homepage         = 'https://github.com/vbmania/RxValidator'
   spec.license          = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/Sources/rules/Date/DateValidatorType.swift b/Sources/rules/Date/DateValidatorType.swift
@@ -30,22 +30,22 @@ public enum DateValidatorType {
             }
         case let .shouldBeforeThen(comparison):
             let result = calendar.compare(value, to: comparison, toGranularity: granularity)
-            if result == .orderedDescending {
+            if result != .orderedAscending {
                 throw RxValidatorResult.notBeforeDate
             }
         case let .shouldBeforeOrSameThen(comparison):
             let result = calendar.compare(value, to: comparison, toGranularity: granularity)
-            if result == .orderedAscending {
+            if result == .orderedDescending {
                 throw RxValidatorResult.notBeforeDate
             }
         case let .shouldAfterThen(comparison):
             let result = calendar.compare(value, to: comparison, toGranularity: granularity)
-            if result == .orderedAscending {
+            if result != .orderedDescending {
                 throw RxValidatorResult.notAfterDate
             }
         case let .shouldAfterOrSameThen(comparison):
             let result = calendar.compare(value, to: comparison, toGranularity: granularity)
-            if !(result != .orderedAscending) {
+            if result == .orderedAscending {
                 throw RxValidatorResult.notAfterDate
             }
         case let .shouldBeCloseDates(comparison, termOfDays):            
diff --git a/Sources/rules/Int/NumberShouldBeEven.swift b/Sources/rules/Int/NumberShouldBeEven.swift
@@ -1,13 +1,13 @@
 //
-//  NumberIsShouldBeEven.swift
+//  NumberShouldBeEven.swift
 //  RxValidator
 //
 //  Created by 유금상 on 2018. 6. 20..
 //
 
 import Foundation
 
-public final class NumberIsShouldBeEven: IntValidatorType {
+public final class NumberShouldBeEven: IntValidatorType {
     
     public init() {}
     
diff --git a/codecov.yml b/codecov.yml
@@ -0,0 +1,2 @@
+codecov:
+  branch: develop

Original file line number	Diff line number	Diff line change
`@@ -113,4 +113,13 @@ class StringValidateTests: XCTestCase {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`
	`116`	`+ func testStringArray() {`
	`117`	`+ let targetValue = ["1", "2", "3"]`
	`118`	`+`
	`119`	`+ let result: RxValidatorResult = targetValue`
	`120`	`+ .compactMap { return Validate.to($0).validate(StringShouldNotBeEmpty()).check() }`
	`121`	`+ .reduce(RxValidatorResult.valid) { $0 != .valid ? $0 : $1 }`
	`122`	`+`
	`123`	`+ expect(result).toEventually(equal(.valid))`
	`124`	`+ }`
`116`	`125`	`}`