Merge branch 'release/1.5.0'

Author: danthorpe

.jazzy.yaml

@@ -1,7 +1,7 @@
 author_name: Daniel Thorpe
 author_url: http://danthorpe.me
 module_name: Money
-module_version: 1.4.0
+module_version: 1.5.0
 github_url: https://github.com/danthorpe/Money
 readme: README.md
 podspec: Money.podspec

Cartfile

@@ -1,3 +1 @@
 github "danthorpe/ValueCoding"
-github "antitypical/Result" >= 1.0
-github "SwiftyJSON/SwiftyJSON"

Cartfile.private

@@ -1,4 +1 @@
-github "venmo/DVR" "v0.2.0"
-github "antitypical/Result" "1.0.1"
-github "SwiftyJSON/SwiftyJSON" "2.3.3"
-github "danthorpe/ValueCoding" "1.1.1"
+github "danthorpe/ValueCoding" "1.2.0"

Cartfile.resolved

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "Money"
-  s.version           = "1.4.2"
+  s.version           = "1.5.0"
   s.summary           = "Swift types for working with Money."
   s.description       = <<-DESC
   
@@ -34,7 +34,6 @@ Pod::Spec.new do |s|
   s.tvos.exclude_files = [ 'Money/iOS' ]  
 
   s.dependency 'ValueCoding'
-  s.dependency 'Result'
-  s.dependency 'SwiftyJSON'    
+
 end
 

Money.podspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Money.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Money.xcodeproj/xcshareddata/xcschemes/Money-OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Money.xcodeproj/xcshareddata/xcschemes/Money-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Money.xcodeproj/xcshareddata/xcschemes/Money-tvOS.xcscheme

@@ -25,8 +25,6 @@
 // SOFTWARE.
 
 import Foundation
-import Result
-import SwiftyJSON
 
 
 // MARK: - Bitcoin Currency
@@ -90,143 +88,3 @@ public typealias XBT = _Money<Currency.XBT>
 public typealias BTC = _Money<Currency.BTC>
 
 
-// MARK - cex.io FX
-
-/**
- CEX.io Supported fiat currencies
- 
- CEX only supports USD, EUR and RUB.
- 
- - see: https://cex.io
-*/
-public protocol CEXSupportedFiatCurrencyType: ISOCurrencyType {
-
-    /**
-     CEX.io charge a percentage based commission with FX transactions.
-     - returns: a BankersDecimal representing the % commission.
-    */
-    static var cex_commissionPercentage: BankersDecimal { get }
-}
-
-extension Currency.USD: CEXSupportedFiatCurrencyType {
-
-    /// - returns: the commission charged for USD transactions, a BankersDecimal
-    public static let cex_commissionPercentage: BankersDecimal = 0.2
-}
-
-extension Currency.EUR: CEXSupportedFiatCurrencyType {
-
-    /// - returns: the commission charged for EUR transactions, a BankersDecimal
-    public static let cex_commissionPercentage: BankersDecimal = 0.2
-}
-
-extension Currency.RUB: CEXSupportedFiatCurrencyType {
-
-    /// - returns: the commission charged for RUB transactions, a BankersDecimal
-    public static let cex_commissionPercentage: BankersDecimal = 0
-}
-
-struct _CEXBuy<Base: MoneyType where Base.Currency: CEXSupportedFiatCurrencyType>: CryptoCurrencyMarketTransactionType {
-    typealias BaseMoney = Base
-    typealias CounterMoney = BTC
-    typealias FiatCurrency = Base.Currency
-    static var transactionKind: CurrencyMarketTransactionKind { return .Buy }
-}
-
-struct _CEXSell<Counter: MoneyType where Counter.Currency: CEXSupportedFiatCurrencyType>: CryptoCurrencyMarketTransactionType {
-    typealias BaseMoney = BTC
-    typealias CounterMoney = Counter
-    typealias FiatCurrency = Counter.Currency
-    static var transactionKind: CurrencyMarketTransactionKind { return .Sell }
-}
-
-class _CEX<T: CryptoCurrencyMarketTransactionType where T.FiatCurrency: CEXSupportedFiatCurrencyType>: FXRemoteProvider<T.BaseMoney, T.CounterMoney>, FXRemoteProviderType {
-
-    static func name() -> String {
-        return "CEX.IO \(BaseMoney.Currency.code)\(CounterMoney.Currency.code)"
-    }
-
-    static func request() -> NSURLRequest {
-        let url = NSURL(string: "https://cex.io/api/convert/\(BTC.Currency.code)/\(T.FiatCurrency.code)")
-        let request = NSMutableURLRequest(URL: url!)
-        request.HTTPMethod = "POST"
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        let data = try! JSON(["amnt": Double(1.0)]).rawData()
-        request.HTTPBody = data
-        return request
-    }
-
-    static func quoteFromNetworkResult(result: Result<(NSData?, NSURLResponse?), NSError>) -> Result<FXQuote, FXError> {
-        return result.analysis(
-
-            ifSuccess: { data, response in
-
-                guard let data = data else {
-                    return Result(error: .NoData)
-                }
-
-                let json = JSON(data: data)
-
-                if json.isEmpty {
-                    return Result(error: .InvalidData(data))
-                }
-
-                guard let rateLiteral = json["amnt"].double else {
-                    return Result(error: .RateNotFound(name()))
-                }
-
-                let rate: BankersDecimal
-
-                switch T.transactionKind {
-                case .Buy:
-                    rate = BankersDecimal(floatLiteral: rateLiteral).reciprocal
-                case .Sell:
-                    rate = BankersDecimal(floatLiteral: rateLiteral)
-                }
-
-                return Result(value: FXQuote(rate: rate, percentage: T.FiatCurrency.cex_commissionPercentage))
-            },
-
-            ifFailure: { error in
-                return Result(error: .NetworkError(error))
-            }
-        )
-    }
-}
-
-/**
-  Represents the purchase of bitcoin using CEX.io.
-  
-  Usage is entirely type based - there is nothing to initialize. It is
-  generic over USD, EUR or RUB, no other currency types. For example.
-  
-  ```swift
-  CEXBuy<USD>.quote(1_000) { transaction in 
-    // etc.
-  }
-  ```
-  
-  The above sample represents buying US$1,000 worth of BTC using CEX.io.
-*/
-public final class CEXBuy<Base: MoneyType where Base.Currency: CEXSupportedFiatCurrencyType>: _CEX<_CEXBuy<Base>> { }
-
- /**
-  Represents the sale of bitcoin using CEX.io.
-
-  Usage is entirely type based - there is nothing to initialize. It is
-  generic over USD, EUR or RUB, no other currency types. For example.
-
-  ```swift
-  CEXBuy<EUR>.quote(10) { transaction in
-  // etc.
-  }
-  ```
-
-  The above sample represents selling 10 bitcoins for euros using CEX.io.
-  */
-public final class CEXSell<Counter: MoneyType where Counter.Currency: CEXSupportedFiatCurrencyType>: _CEX<_CEXSell<Counter>> { }
-
-
-
-
-