Feb 10, 2016 · Feb 10, 2016 · Mar 30, 2016 · Mar 31, 2016 · Mar 31, 2016 · Apr 1, 2016
diff --git a/.gitignore b/.gitignore
 # Xcode
 .DS_Store
 SwiftyJSON.xcodeproj
 */build/*
 *.pbxuser
 !default.pbxuser
diff --git a/.travis.yml b/.travis.yml
 # Travis CI build file for Kitura sample app.
 # Kitura runs on OS X and Linux (Ubuntu).
 # See the following URLs for further details on Travis CI
 # https://docs.travis-ci.com/user/customizing-the-build/
 # https://docs.travis-ci.com/user/docker/
    - os: linux
      dist: trusty
      sudo: required
      env:SWIFT_VERSION=3.0.2
      env:SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a
    - os: osx
      osx_image: xcode8.3
      sudo: required
      env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a

 before_install:
  - git clone https://github.com/IBM-Swift/Package-Builder.git
  - test -n "$SWIFT_VERSION" && echo "$SWIFT_VERSION" > .swift-version || echo "SWIFT_VERSION not set, using $(cat .swift-version)"

 script:
  - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
  - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
diff --git a/Source/SwiftyJSON.swift b/Source/SwiftyJSON.swift
                    print("==> error=\(String(describing: _error)). type=\(type(of: newValue))")
            }
 #else
            if  type(of: newValue) == Bool.self {
            ifSwift.type(of: newValue) == Bool.self {
                _type = .bool
                self.rawBool = newValue as! Bool
            }
diff --git a/Tests/SwiftyJSONTests/NumberTests.swift b/Tests/SwiftyJSONTests/NumberTests.swift
        json.float = 23231.65
        XCTAssertTrue(json.float! == 23231.65)
        XCTAssertTrue(json.floatValue == 23231.65)
        XCTAssertEqualWithAccuracy(Double(json.numberValue), 23231.65, accuracy: 0.001)
        XCTAssertEqualWithAccuracy(json.numberValue.doubleValue, 23231.65, accuracy: 0.001)

        json.floatValue = -98766.23
        XCTAssertEqual(json.float!, -98766.23)
        XCTAssertEqual(json.floatValue, -98766.23)
        XCTAssertEqualWithAccuracy(Double(json.numberValue), -98766.23, accuracy: 0.05)
        XCTAssertEqualWithAccuracy(json.numberValue.doubleValue, -98766.23, accuracy: 0.05)
    }

    func testInt() {
diff --git a/Tests/SwiftyJSONTests/RawRepresentableTests.swift b/Tests/SwiftyJSONTests/RawRepresentableTests.swift

 class RawRepresentableTests: XCTestCase {

 // GENERATED: allTests required for Swift 3.0
 // GENERATED: allTests required for Swift 3.0
    static var allTests : [(String, (RawRepresentableTests) -> () throws -> Void)] {
        return [
            ("testNumber", testNumber),
            ("testNil", testNil),
        ]
    }
 // END OF GENERATED CODE
 // END OF GENERATED CODE

    func testNumber() {
        var json:JSON = JSON(rawValue: 948394394.347384 as NSNumber)!

        #if !os(Linux)
            // NSNumber to Int, Double and Float conversion doesn't work on Linux
            XCTAssertEqual(object as? Int, 948394394)
            XCTAssertEqual((object as! NSNumber).intValue, 948394394)
            XCTAssertEqual(object as? Double, 948394394.347384)
 XCTAssertTrue(object as!Float == 948394394.347384)
 XCTAssertEqual((object as!NSNumber).floatValue, 948394394.347384)
        #endif
        XCTAssertEqual(object as? NSNumber, 948394394.347384)
    }
        XCTAssertEqual(objectTrue as? Bool, true)

        #if !os(Linux)
        // Bool to NSNumber conversion doesn't work on Linux
        XCTAssertEqual(objectTrue as? NSNumber, NSNumber(value: true))
 // Bool to NSNumber conversion doesn't work on Linux
 XCTAssertEqual(objectTrue as? NSNumber, NSNumber(value: true))
        #endif

        let objectFalse = jsonFalse.rawValue
        XCTAssertEqual(objectFalse as? Bool, false)


        #if !os(Linux)
        // Bool to NSNumber conversion doesn't work on Linux
        XCTAssertEqual(objectFalse as? NSNumber, NSNumber(value: false))
 // Bool to NSNumber conversion doesn't work on Linux
 XCTAssertEqual(objectFalse as? NSNumber, NSNumber(value: false))
        #endif
    }

    }

    #if !os(Linux)
 // the following tests are not relevant to Linux
 // you cannot convert array/dictionary of value types to NSArray/NSDictionary
    // the following tests are not relevant to Linux
    // you cannot convert array/dictionary of value types to NSArray/NSDictionary
    func testArray() {
        let array = [1,2,"3",4102,"5632", "abocde", "!@# $%^&*()"] as NSArray
        if let json:JSON = JSON(rawValue: array) {
        if let json:JSON = JSON(rawValue: dictionary) {
            XCTAssertEqual(json, JSON(dictionary))
        }


        let object = JSON(rawValue: dictionary)!.rawValue
        XCTAssertTrue(dictionary == object as! NSDictionary)
    }
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,6 @@
		# Xcode
		.DS_Store
		SwiftyJSON.xcodeproj
		/build/
		*.pbxuser
		!default.pbxuser
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,3 @@
		# Travis CI build file for Kitura sample app.
		# Kitura runs on OS X and Linux (Ubuntu).
		# See the following URLs for further details on Travis CI
		# https://docs.travis-ci.com/user/customizing-the-build/
		# https://docs.travis-ci.com/user/docker/
Expand All		@@ -24,14 +22,14 @@ matrix:
		- os: linux
		dist: trusty
		sudo: required
		env:SWIFT_VERSION=3.0.2
		env:SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a
		- os: osx
		osx_image: xcode8.3
		sudo: required
		env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-11-a

		before_install:
		- git clone https://github.com/IBM-Swift/Package-Builder.git
		- test -n "$SWIFT_VERSION" && echo "$SWIFT_VERSION" > .swift-version \|\| echo "SWIFT_VERSION not set, using $(cat .swift-version)"

		script:
		- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
		- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
Original file line number	Diff line number	Diff line change
Expand Up		@@ -192,7 +192,7 @@ public struct JSON {
		print("==> error=\(String(describing: _error)). type=\(type(of: newValue))")
		}
		#else
		if type(of: newValue) == Bool.self {
		ifSwift.type(of: newValue) == Bool.self {
		_type = .bool
		self.rawBool = newValue as! Bool
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,12 +148,12 @@ class NumberTests: XCTestCase {
		json.float = 23231.65
		XCTAssertTrue(json.float! == 23231.65)
		XCTAssertTrue(json.floatValue == 23231.65)
		XCTAssertEqualWithAccuracy(Double(json.numberValue), 23231.65, accuracy: 0.001)
		XCTAssertEqualWithAccuracy(json.numberValue.doubleValue, 23231.65, accuracy: 0.001)

		json.floatValue = -98766.23
		XCTAssertEqual(json.float!, -98766.23)
		XCTAssertEqual(json.floatValue, -98766.23)
		XCTAssertEqualWithAccuracy(Double(json.numberValue), -98766.23, accuracy: 0.05)
		XCTAssertEqualWithAccuracy(json.numberValue.doubleValue, -98766.23, accuracy: 0.05)
		}

		func testInt() {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,7 @@ import Foundation

		class RawRepresentableTests: XCTestCase {

		// GENERATED: allTests required for Swift 3.0
		// GENERATED: allTests required for Swift 3.0
		static var allTests : [(String, (RawRepresentableTests) -> () throws -> Void)] {
		return [
		("testNumber", testNumber),
Expand All		@@ -36,7 +36,7 @@ class RawRepresentableTests: XCTestCase {
		("testNil", testNil),
		]
		}
		// END OF GENERATED CODE
		// END OF GENERATED CODE

		func testNumber() {
		var json:JSON = JSON(rawValue: 948394394.347384 as NSNumber)!
Expand All		@@ -51,9 +51,9 @@ class RawRepresentableTests: XCTestCase {

		#if !os(Linux)
		// NSNumber to Int, Double and Float conversion doesn't work on Linux
		XCTAssertEqual(object as? Int, 948394394)
		XCTAssertEqual((object as! NSNumber).intValue, 948394394)
		XCTAssertEqual(object as? Double, 948394394.347384)
		XCTAssertTrue(object as!Float == 948394394.347384)
		XCTAssertEqual((object as!NSNumber).floatValue, 948394394.347384)
		#endif
		XCTAssertEqual(object as? NSNumber, 948394394.347384)
		}
Expand All		@@ -72,16 +72,16 @@ class RawRepresentableTests: XCTestCase {
		XCTAssertEqual(objectTrue as? Bool, true)

		#if !os(Linux)
		// Bool to NSNumber conversion doesn't work on Linux
		XCTAssertEqual(objectTrue as? NSNumber, NSNumber(value: true))
		// Bool to NSNumber conversion doesn't work on Linux
		XCTAssertEqual(objectTrue as? NSNumber, NSNumber(value: true))
		#endif

		let objectFalse = jsonFalse.rawValue
		XCTAssertEqual(objectFalse as? Bool, false)


		#if !os(Linux)
		// Bool to NSNumber conversion doesn't work on Linux
		XCTAssertEqual(objectFalse as? NSNumber, NSNumber(value: false))
		// Bool to NSNumber conversion doesn't work on Linux
		XCTAssertEqual(objectFalse as? NSNumber, NSNumber(value: false))
		#endif
		}

Expand DownExpand Up		@@ -111,8 +111,8 @@ class RawRepresentableTests: XCTestCase {
		}

		#if !os(Linux)
		// the following tests are not relevant to Linux
		// you cannot convert array/dictionary of value types to NSArray/NSDictionary
		// the following tests are not relevant to Linux
		// you cannot convert array/dictionary of value types to NSArray/NSDictionary
		func testArray() {
		let array = [1,2,"3",4102,"5632", "abocde", "!@# $%^&*()"] as NSArray
		if let json:JSON = JSON(rawValue: array) {
Expand All		@@ -128,7 +128,7 @@ class RawRepresentableTests: XCTestCase {
		if let json:JSON = JSON(rawValue: dictionary) {
		XCTAssertEqual(json, JSON(dictionary))
		}


		let object = JSON(rawValue: dictionary)!.rawValue
		XCTAssertTrue(dictionary == object as! NSDictionary)
		}
Expand Down