Skip to content

Commit f52f3e5

Browse files
author
Baris Sencan
committed
Merge branch 'master' of github.com:isair/JSONHelper
2 parents b6d4c65 + 40d1d9a commit f52f3e5

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
22
osx_image: xcode61
33
script:
4-
- xctool -project JSONHelper.xcodeproj -scheme JSONHelperiOS build
5-
- xctool -project JSONHelper.xcodeproj -scheme JSONHelperMac build
4+
- xctool -project JSONHelper.xcodeproj -scheme JSONHelper-iOS build
5+
- xctool -project JSONHelper.xcodeproj -scheme JSONHelper-Mac build

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4141
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4242
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
buildConfiguration = "Release">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">

JSONHelper/JSONHelper.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ infix operator <-- { associativity right precedence 150 }
4242
// For optionals.
4343
public func <-- <T>(inout property: T?, value: AnyObject?) -> T? {
4444
var newValue: T?
45+
""
4546
if let unwrappedValue: AnyObject = value {
4647
// We unwrapped the given value successfully, try to convert.
4748
if let convertedValue = unwrappedValue as? T {

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Gratipay](https://img.shields.io/gratipay/bsencan91.svg)](https://gratipay.com/bsencan91/)
77
[![Gitter](https://badges.gitter.im/JOIN CHAT.svg)](https://gitter.im/isair/JSONHelper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
88

9-
Lightning fast JSON deserialization for iOS &amp; OS X written in Swift. Expanded upon the ideas found in [this blog post](http://robots.thoughtbot.com/efficient-json-in-swift-with-functional-concepts-and-generics).
9+
Lightning fast JSON deserialization for iOS &amp; OS X written in Swift.
1010

1111
##Table of Contents
1212

@@ -85,7 +85,7 @@ internal struct Movie: Deserializable {
8585

8686
init(data: [String: AnyObject]) {
8787
name <-- data["name"]
88-
releaseDate <-- (value: data["release_date"], format: "yyyy-MM-dd") // Refer to the next section for more info.
88+
releaseDate <-- (data["release_date"], "yyyy-MM-dd") // Refer to the next section for more info.
8989
}
9090
}
9191
```
@@ -144,8 +144,8 @@ NSDate deserialization however, requires a format to be provided most of the tim
144144
let meetingDate: NSDate?
145145
let partyDates: [NSDate]?
146146

147-
meetingDate <-- (value: "2014-09-18", format: "yyyy-MM-dd")
148-
partyDates <-- (value: ["2014-09-19", "2014-09-20"], format: "yyyy-MM-dd")
147+
meetingDate <-- ("2014-09-18", "yyyy-MM-dd")
148+
partyDates <-- (["2014-09-19", "2014-09-20"], "yyyy-MM-dd")
149149

150150
let myDayOff: NSDate?
151151
myDayOff <-- 1414172803 // You can also use unix timestamps.

0 commit comments

Comments
 (0)