Merge pull request #8 from Ben-G/benji/release-2.0.0

Prepare 2.0.0 Release

Changelog.md

@@ -0,0 +1,22 @@
+#2.0
+*Released: 03/02/2016*
+
+**Breaking API Changes:**
+
+- Removed `Validated2` and `Validated3` in favor of introduced logical wrapper validators - @Ben-G on suggestion of @tomquist
+- Failable initializer of `Validated` now requires explicit `value` argument due to introduction of throwing initializer - @Ben-G
+
+**API Additions:**
+
+- Added wrapper validators for logical operators - @tomquist
+- Added throwing initializer for `Validated` - @Ben-G upon suggestion of @radex
+
+**Other Changes:**
+
+- Major Refactoring of `Validated` Type - @dehesa
+- Addition of OSX, tvOS and watchOS targets - @dehesae
+
+#1.0
+*Released: 02/24/2016*
+
+ - Initial Release - @Ben-G

README.md

@@ -63,22 +63,23 @@ Note, that it is not required to provide a typealias, but for most cases it is r
 
 **And that's it!**
 
-`LoggedInUser` now has a failable initializer that takes a `User`. If the passed in `User` fulfills the logged-in requirement you will have a `LoggedInUser`, otherwise `nil`.
+`LoggedInUser` now has a failable initializer that takes a `User`. If the passed in `User` fulfills the logged-in requirement you will have a `LoggedInUser`, otherwise `nil`. Additionally `LoggedInUser` provides a throwing initializer, in case you prefer to handle failed validations as errors instead of `nil` values.
 
 The underlying value (the full `User` value) is stored in the `.value` property of `LoggedInUser`.
 
 ##Beyond the Basics
 
-Validated provides two further features that might be non-obvious.
+Validated provides some further features that might be non-obvious.
 
-###Validated2, Validated3
+###Composing Validators with Logical Operators
 
-Using `Validated2` or `Validated3` you can create a new type that has two or three requirements, respectively. All requirements need to be verified successfully in order for the type to initialize:
+Validated offers `Validator` types for logical operations that allow you to require multiple validations in different combinations. E.g. you can use the `And` validator to require that two requirements must be met for your type to intializer:
 
 ```swift
 typealias AllCapsNonEmptyString =
-            Validated2<String, NonEmptyStringValidator, AllCapsLatinStringValidator>
+            Validated<String, And<NonEmptyStringValidator, AllCapsLatinStringValidator>>
 ```
+`Or` and `Not` are provided as additional validators. You can take a look at the specs for additional examples.
 
 ###Generic Validators
 
@@ -138,7 +139,7 @@ And run `pod install`.
 
 ## Carthage
 
-You can install Validated via [Carthage]() by adding the following line to your Cartfile:
+You can install Validated via Carthage by adding the following line to your Cartfile:
 
     github "Ben-G/Validated"
 

Tests/ValidatedTests.swift

@@ -1,11 +1,3 @@
-//
-//  ValidatedTests.swift
-//  ValidatedTests
-//
-//  Created by Benji Encz on 2/24/16.
-//  Copyright © 2016 Benjamin Encz. All rights reserved.
-//
-
 import XCTest
 import Validated
 

Validated.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Validated"
-  s.version          = "1.0.0"
+  s.version          = "2.0.0"
   s.summary          = "A Swift μ-Library for Somewhat Dependent Types"
   s.description      = <<-DESC
                         Validated is a μ-library (~50 Source Lines of Code) that allows you make better use of Swift's type system

Validated/Validated.swift

@@ -1,9 +1,3 @@
-//  Validated.swift
-//  Validated
-//
-//  Created by Benji Encz on 2/24/16.
-//  Copyright © 2016 Benjamin Encz. All rights reserved.
-
 /// This protocol needs to be implemented in order to add a requirement to
 /// a wrapped type.
 /// Implementers receive the wrapped type and need to determine if its values

Validated/configuration/common.xcconfig

@@ -4,14 +4,14 @@ PRODUCT_BUNDLE_IDENTIFIER = de.benjamin-encz.Validated
 INFOPLIST_FILE = $(SRCROOT)/Validated/configuration/info.plist
 
 // Versioning
-CURRENT_PROJECT_VERSION = 1
-DYLIB_CURRENT_VERSION = 1.0.1
+CURRENT_PROJECT_VERSION = 2
+DYLIB_CURRENT_VERSION = 2.0.0
 DYLIB_COMPATIBILITY_VERSION = $(DYLIB_CURRENT_VERSION)
 
 // APPLE LLVM - Language
 GCC_C_LANGUAGE_STANDARD = c11
 CLANG_ENABLE_MODULES = YES
 
 // User-defined
-FRAMEWORK_LICENSE = Copyright © 2016 Ben Encz. MIT License.
+FRAMEWORK_LICENSE = Copyright © 2016 Benjamin Encz. MIT License.
 BUNDLE_SIGNATURE = BENC