Skip to content
This repository has been archived by the owner on Mar 29, 2018. It is now read-only.

Format Number #86

Closed
wants to merge 3 commits into from
Closed

Format Number #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6570114
Add ExSwiftFormatter and format to Double
PGLongo Mar 10, 2015
affe948
Add format to Float
PGLongo Mar 10, 2015
a6bda0d
Add format to Int
PGLongo Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 21 additions & 56 deletions ExSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
12168FCA1A22852300ED4105 /* NSDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12168FC91A22852300ED4105 /* NSDate.swift */; };
12168FCD1A2285A900ED4105 /* ExSwiftNSDateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12168FCC1A2285A900ED4105 /* ExSwiftNSDateTests.swift */; };
127C7F061A23154A0038B454 /* NSDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12168FC91A22852300ED4105 /* NSDate.swift */; };
12C41B251AA0C28800601341 /* ExSwiftFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C41B241AA0C28800601341 /* ExSwiftFormatter.swift */; };
12C41B261AA0C4DF00601341 /* ExSwiftFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C41B241AA0C28800601341 /* ExSwiftFormatter.swift */; };
12C619FA1AAB891B004AD4D3 /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C619F91AAB891B004AD4D3 /* NSNumberFormatter.swift */; };
12C619FB1AAB891B004AD4D3 /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C619F91AAB891B004AD4D3 /* NSNumberFormatter.swift */; };
12C619FD1AAB8981004AD4D3 /* ExSwiftNSNumberFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C619FC1AAB8981004AD4D3 /* ExSwiftNSNumberFormatterTests.swift */; };
1E11AF8A1943222D006BCE48 /* ExSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E11AF891943222D006BCE48 /* ExSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
1E11AFA719432236006BCE48 /* ExSwiftDictionaryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E11AFA119432236006BCE48 /* ExSwiftDictionaryTests.swift */; };
1E11AFA819432236006BCE48 /* ExSwiftFloatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E11AFA219432236006BCE48 /* ExSwiftFloatTests.swift */; };
Expand Down Expand Up @@ -41,21 +46,20 @@
3C0AB978195C7FAF0009BDA0 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0AB977195C7FAF0009BDA0 /* Sequence.swift */; };
3C0AB979195C7FB20009BDA0 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0AB977195C7FAF0009BDA0 /* Sequence.swift */; };
3C0AB97D195C7FBC0009BDA0 /* ExSwiftSequenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0AB97C195C7FBC0009BDA0 /* ExSwiftSequenceTests.swift */; };
CC633BA61A37142900341557 /* ExSwiftCharacterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC633BA51A37142900341557 /* ExSwiftCharacterTests.swift */; };
CC633BA71A37144E00341557 /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC8C1D701A365CA6003D386E /* Character.swift */; };
CC8C1D711A365CA6003D386E /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC8C1D701A365CA6003D386E /* Character.swift */; };
3C0AB97E195C7FC20009BDA0 /* ExSwiftSequenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0AB97C195C7FBC0009BDA0 /* ExSwiftSequenceTests.swift */; };
6CB1F15F1A8AB867002EA767 /* Bool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1F15E1A8AB867002EA767 /* Bool.swift */; };
6CB1F1611A8AB8D3002EA767 /* ExSwiftBoolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1F1601A8AB8D3002EA767 /* ExSwiftBoolTests.swift */; };
6CB1F1621A8AB979002EA767 /* ExSwiftBoolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1F1601A8AB8D3002EA767 /* ExSwiftBoolTests.swift */; };
6CB1F1631A8ABA1A002EA767 /* Bool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1F15E1A8AB867002EA767 /* Bool.swift */; };
6CB1F1641A8ABA1A002EA767 /* Bool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1F15E1A8AB867002EA767 /* Bool.swift */; };
6CB1F1661A8ABA1C002EA767 /* Bool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB1F15E1A8AB867002EA767 /* Bool.swift */; };
CC633BA61A37142900341557 /* ExSwiftCharacterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC633BA51A37142900341557 /* ExSwiftCharacterTests.swift */; };
CC633BA71A37144E00341557 /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC8C1D701A365CA6003D386E /* Character.swift */; };
CC8C1D711A365CA6003D386E /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC8C1D701A365CA6003D386E /* Character.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
12168FC91A22852300ED4105 /* NSDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDate.swift; sourceTree = "<group>"; };
12168FCC1A2285A900ED4105 /* ExSwiftNSDateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftNSDateTests.swift; sourceTree = "<group>"; };
12C41B241AA0C28800601341 /* ExSwiftFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftFormatter.swift; sourceTree = "<group>"; };
12C619F91AAB891B004AD4D3 /* NSNumberFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSNumberFormatter.swift; sourceTree = "<group>"; };
12C619FC1AAB8981004AD4D3 /* ExSwiftNSNumberFormatterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftNSNumberFormatterTests.swift; sourceTree = "<group>"; };
1E11AF841943222D006BCE48 /* ExSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ExSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1E11AF881943222D006BCE48 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1E11AF891943222D006BCE48 /* ExSwift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExSwift.h; sourceTree = "<group>"; };
Expand All @@ -81,10 +85,10 @@
1ED536831943863100BDA94E /* ExSwift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwift.swift; sourceTree = "<group>"; };
3C0AB977195C7FAF0009BDA0 /* Sequence.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sequence.swift; sourceTree = "<group>"; };
3C0AB97C195C7FBC0009BDA0 /* ExSwiftSequenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftSequenceTests.swift; sourceTree = "<group>"; };
CC633BA51A37142900341557 /* ExSwiftCharacterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftCharacterTests.swift; sourceTree = "<group>"; };
CC8C1D701A365CA6003D386E /* Character.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Character.swift; sourceTree = "<group>"; };
6CB1F15E1A8AB867002EA767 /* Bool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bool.swift; sourceTree = "<group>"; };
6CB1F1601A8AB8D3002EA767 /* ExSwiftBoolTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftBoolTests.swift; sourceTree = "<group>"; };
CC633BA51A37142900341557 /* ExSwiftCharacterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExSwiftCharacterTests.swift; sourceTree = "<group>"; };
CC8C1D701A365CA6003D386E /* Character.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Character.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -139,6 +143,8 @@
1EC241FB1946E91B0047109A /* NSArray.swift */,
12168FC91A22852300ED4105 /* NSDate.swift */,
6CB1F15E1A8AB867002EA767 /* Bool.swift */,
12C41B241AA0C28800601341 /* ExSwiftFormatter.swift */,
12C619F91AAB891B004AD4D3 /* NSNumberFormatter.swift */,
1E11AF891943222D006BCE48 /* ExSwift.h */,
1E11AF871943222D006BCE48 /* Supporting Files */,
);
Expand Down Expand Up @@ -169,6 +175,7 @@
1EC241FD1946E92E0047109A /* ExSwiftNSArrayTests.swift */,
12168FCC1A2285A900ED4105 /* ExSwiftNSDateTests.swift */,
6CB1F1601A8AB8D3002EA767 /* ExSwiftBoolTests.swift */,
12C619FC1AAB8981004AD4D3 /* ExSwiftNSNumberFormatterTests.swift */,
1E11AF941943222D006BCE48 /* Supporting Files */,
);
path = ExSwiftTests;
Expand Down Expand Up @@ -302,6 +309,8 @@
1E48E61E1973ED07006FEEC8 /* Double.swift in Sources */,
12168FCA1A22852300ED4105 /* NSDate.swift in Sources */,
1E11AFBA1943225B006BCE48 /* Range.swift in Sources */,
12C619FA1AAB891B004AD4D3 /* NSNumberFormatter.swift in Sources */,
12C41B251AA0C28800601341 /* ExSwiftFormatter.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -316,18 +325,21 @@
2EB34F09195473AC00A8D2AF /* Int.swift in Sources */,
2EB34F06195473AC00A8D2AF /* Array.swift in Sources */,
1EC241FE1946E92E0047109A /* ExSwiftNSArrayTests.swift in Sources */,
12C41B261AA0C4DF00601341 /* ExSwiftFormatter.swift in Sources */,
2EB34F07195473AC00A8D2AF /* Dictionary.swift in Sources */,
3C0AB979195C7FB20009BDA0 /* Sequence.swift in Sources */,
1E48E6231973ED22006FEEC8 /* ExSwiftDoubleTests.swift in Sources */,
1E11AFA819432236006BCE48 /* ExSwiftFloatTests.swift in Sources */,
1E11AFA719432236006BCE48 /* ExSwiftDictionaryTests.swift in Sources */,
12C619FD1AAB8981004AD4D3 /* ExSwiftNSNumberFormatterTests.swift in Sources */,
1E48E61F1973ED07006FEEC8 /* Double.swift in Sources */,
3C0AB97D195C7FBC0009BDA0 /* ExSwiftSequenceTests.swift in Sources */,
2EB34F0C195473AC00A8D2AF /* NSArray.swift in Sources */,
CC633BA71A37144E00341557 /* Character.swift in Sources */,
2EB34F05195473AC00A8D2AF /* ExSwift.swift in Sources */,
6CB1F1631A8ABA1A002EA767 /* Bool.swift in Sources */,
2EB34F08195473AC00A8D2AF /* Float.swift in Sources */,
12C619FB1AAB891B004AD4D3 /* NSNumberFormatter.swift in Sources */,
12168FCD1A2285A900ED4105 /* ExSwiftNSDateTests.swift in Sources */,
1E11AFAB19432236006BCE48 /* ExSwiftStringTests.swift in Sources */,
1E11AFA919432236006BCE48 /* ExSwiftIntTests.swift in Sources */,
Expand All @@ -338,53 +350,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
2E8CE8E6194ECF29008B9919 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2EC02FD1194ED10500619CB5 /* NSArray.swift in Sources */,
2EC02FCD194ED10500619CB5 /* Float.swift in Sources */,
3C0AB97A195C7FB30009BDA0 /* Sequence.swift in Sources */,
2EC02FCA194ED10500619CB5 /* ExSwift.swift in Sources */,
6CB1F1641A8ABA1A002EA767 /* Bool.swift in Sources */,
2EC02FCE194ED10500619CB5 /* Int.swift in Sources */,
2EC02FCF194ED10500619CB5 /* Range.swift in Sources */,
2EC02FD0194ED10500619CB5 /* String.swift in Sources */,
2EC02FCB194ED10500619CB5 /* Array.swift in Sources */,
1E48E6201973ED07006FEEC8 /* Double.swift in Sources */,
2EC02FCC194ED10500619CB5 /* Dictionary.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
2EC02FB9194ED0D500619CB5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6CB1F1621A8AB979002EA767 /* ExSwiftBoolTests.swift in Sources */,
1ED8FC30194EF9E1004F829A /* ExSwiftDictionaryTests.swift in Sources */,
2EB34F111954744D00A8D2AF /* Int.swift in Sources */,
2EB34F0E1954744D00A8D2AF /* Array.swift in Sources */,
1ED8FC31194EF9E1004F829A /* ExSwiftFloatTests.swift in Sources */,
1ED8FC32194EF9E1004F829A /* ExSwiftIntTests.swift in Sources */,
2EB34F0F1954744D00A8D2AF /* Dictionary.swift in Sources */,
3C0AB97B195C7FB30009BDA0 /* Sequence.swift in Sources */,
1E48E6241973ED22006FEEC8 /* ExSwiftDoubleTests.swift in Sources */,
1ED8FC33194EF9E1004F829A /* ExSwiftRangeTests.swift in Sources */,
1ED8FC34194EF9E1004F829A /* ExSwiftStringTests.swift in Sources */,
1E48E6211973ED07006FEEC8 /* Double.swift in Sources */,
3C0AB97E195C7FC20009BDA0 /* ExSwiftSequenceTests.swift in Sources */,
2EB34F141954744D00A8D2AF /* NSArray.swift in Sources */,
2EB34F0D1954744D00A8D2AF /* ExSwift.swift in Sources */,
6CB1F1661A8ABA1C002EA767 /* Bool.swift in Sources */,
2EB34F101954744D00A8D2AF /* Float.swift in Sources */,
1ED8FC35194EF9E1004F829A /* ExSwiftTests.swift in Sources */,
1ED8FC36194EF9E1004F829A /* ExSwiftNSArrayTests.swift in Sources */,
2EB34F131954744D00A8D2AF /* String.swift in Sources */,
2EC02FC9194ED0F000619CB5 /* ExSwiftArrayTests.swift in Sources */,
2EB34F121954744D00A8D2AF /* Range.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
Expand Down
4 changes: 4 additions & 0 deletions ExSwift/Double.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,9 @@ public extension Double {
let rand = Double(arc4random() % (UInt32(RAND_MAX) + 1))
return ((rand / Double(RAND_MAX)) * diff) + min;
}

func format() -> String{
return ExSwiftFormatter.numberFormatter.stringFromNumber(self)!
}

}
28 changes: 28 additions & 0 deletions ExSwift/ExSwiftFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// ExSwiftFormatter.swift
// ExSwift
//
// Created by Piergiuseppe Longo on 27/02/15.
// Copyright (c) 2015 pNre. All rights reserved.
//

import UIKit

public class ExSwiftFormatter: NSObject {

class var numberFormatter: NSNumberFormatter {
struct Static {
static let instance : NSNumberFormatter = {
let formatter = NSNumberFormatter()
formatter.formatterBehavior = .BehaviorDefault
formatter.numberStyle = .DecimalStyle
return formatter
}()

}
return Static.instance
}

}


3 changes: 3 additions & 0 deletions ExSwift/Float.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,8 @@ public extension Float {
return ((rand / Float(RAND_MAX)) * diff) + min;
}

func format() -> String{
return ExSwiftFormatter.numberFormatter.stringFromNumber(self)!
}
}

4 changes: 4 additions & 0 deletions ExSwift/Int.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ public extension Int {
return Int(arc4random_uniform(UInt32((max - min) + 1))) + min
}

func format() -> String{
return ExSwiftFormatter.numberFormatter.stringFromNumber(self)!
}

}

/**
Expand Down
16 changes: 16 additions & 0 deletions ExSwift/NSNumberFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// NSNumberFormatter.swift
// ExSwift
//
// Created by Piergiuseppe Longo on 07/03/15.
// Copyright (c) 2015 pNre. All rights reserved.
//

import UIKit

public extension NSNumberFormatter{
func setPrecision(precision: Int){
self.minimumFractionDigits = precision
self.maximumFractionDigits = precision
}
}
23 changes: 23 additions & 0 deletions ExSwiftTests/ExSwiftDoubleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,27 @@ class ExSwiftDoubleTests: XCTestCase {
XCTAssertEqualWithAccuracy(10.0.roundToNearest(3), 9.0, 0.01)
XCTAssertEqualWithAccuracy(-2.0.roundToNearest(3), -3.0, 0.01)
}

func testFormat(){
var price:Double = 12356789.424
var formatter = ExSwiftFormatter.numberFormatter

formatter.decimalSeparator = "."
formatter.numberStyle = .DecimalStyle
formatter.setPrecision(3)

XCTAssertEqual("12,356,789.424", price.format())

formatter = ExSwiftFormatter.numberFormatter
formatter.setPrecision(4)
XCTAssertEqual("12,356,789.4240", price.format())

formatter = ExSwiftFormatter.numberFormatter
formatter.decimalSeparator = "."
formatter.numberStyle = .CurrencyStyle

XCTAssertEqual("$12,356,789.4240", price.format())

}

}
22 changes: 22 additions & 0 deletions ExSwiftTests/ExSwiftFloatTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,27 @@ class ExSwiftFloatTests: XCTestCase {

func testRandom() {
}

func testFormat(){
var price:Float = 789.424
var formatter = ExSwiftFormatter.numberFormatter

formatter.decimalSeparator = "."
formatter.numberStyle = .DecimalStyle
formatter.setPrecision(3)

XCTAssertEqual("789.424", price.format())

formatter = ExSwiftFormatter.numberFormatter
formatter.setPrecision(4)
XCTAssertEqual("789.4240", price.format())

formatter = ExSwiftFormatter.numberFormatter
formatter.decimalSeparator = "."
formatter.numberStyle = .CurrencyStyle

XCTAssertEqual("$789.4240", price.format())

}

}
22 changes: 22 additions & 0 deletions ExSwiftTests/ExSwiftIntTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,27 @@ class ExSwiftIntTests: XCTestCase {
XCTAssertEqual(20, 20.second)
XCTAssertEqual(-1, -1.second)
}

func testFormat(){
var price:Int = 456789
var formatter = ExSwiftFormatter.numberFormatter

formatter.decimalSeparator = "."
formatter.numberStyle = .DecimalStyle
formatter.setPrecision(3)

XCTAssertEqual("456,789.000", price.format())

formatter = ExSwiftFormatter.numberFormatter
formatter.setPrecision(4)
XCTAssertEqual("456,789.0000", price.format())

formatter = ExSwiftFormatter.numberFormatter
formatter.decimalSeparator = "."
formatter.numberStyle = .CurrencyStyle

XCTAssertEqual("$456,789.0000", price.format())

}
}

39 changes: 39 additions & 0 deletions ExSwiftTests/ExSwiftNSNumberFormatterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
//
// ExSwiftNSNumberFormatterTests.swift
// ExSwift
//
// Created by Piergiuseppe Longo on 07/03/15.
// Copyright (c) 2015 pNre. All rights reserved.
//

import UIKit
import XCTest

class ExSwiftNSNumberFormatterTests: XCTestCase {

var numberFormatter = NSNumberFormatter()

override func setUp() {
super.setUp()
numberFormatter = NSNumberFormatter()
}

override func tearDown() {
super.tearDown()
}

func testSetPrecision() {
let number = 42.42
self.numberFormatter.setPrecision(3);

XCTAssertEqual("42.420", self.numberFormatter.stringFromNumber(number)!)
self.numberFormatter.setPrecision(1);
XCTAssertEqual("42.4", self.numberFormatter.stringFromNumber(number)!)

self.numberFormatter.setPrecision(-1);
XCTAssertEqual("42", self.numberFormatter.stringFromNumber(number)!)
self.numberFormatter.setPrecision(0);
XCTAssertEqual("42", self.numberFormatter.stringFromNumber(number)!)
}

}