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

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
danthorpe committed Jan 2, 2016
2 parents 83b0e05 + 8f90e6f commit 5d1cc86
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ DerivedData

Carthage/Build
.fastlane/report.xml
.fastlane/xcodebuild-data
.ci/xcodebuild-data
*.coverage.txt
docs
4 changes: 2 additions & 2 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
author_name: Daniel Thorpe
author_url: http://danthorpe.me
module_name: ValueCoding
module_version: 1.1.1
module_version: 1.2.0
github_url: https://github.com/danthorpe/ValueCoding
readme: README.md
podspec: ValueCoding.podspec

swift_version: 2.1
swift_version: 2.1.1
xcodebuild-arguments: -scheme,ValueCoding-iOS

custom_categories:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.2.0
1. [[VCD-9, VCD-10](https://github.com/danthorpe/ValueCoding/pull/10)]: Adds support for a single level of nesting inside SequenceType values. For example it is now possible to encode and decode `[[Foo]]` structures where `Foo` conforms to `ValueCoding`.

# 1.1.1
1. [[VCD-7](https://github.com/danthorpe/ValueCoding/pull/7)]: Updates CI stuff.
2. [[VCD-8](https://github.com/danthorpe/ValueCoding/pull/8)]: Updates documentation and README. Thanks [@mrackwitz](https://github.com/danthorpe/ValueCoding/commit/489809da1ba70abf09bc519b784d77a3c47b9f41).
Expand Down
122 changes: 70 additions & 52 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,58 +13,64 @@ GEM
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
babosa (1.0.2)
cert (1.2.3)
fastlane_core (>= 0.19.0, < 1.0.0)
spaceship (>= 0.6.0)
cert (1.2.7)
fastlane_core (>= 0.26.4, < 1.0.0)
spaceship (>= 0.15.1, < 1.0.0)
claide (0.9.1)
coderay (1.1.0)
colored (1.2)
commander (4.3.5)
highline (~> 1.7.2)
credentials_manager (0.11.0)
credentials_manager (0.13.0)
colored
highline (>= 1.7.1)
security
deliver (1.5.1)
credentials_manager (>= 0.9.0)
fastimage (~> 1.6.3)
fastlane_core (>= 0.19.0, < 1.0.0)
deliver (1.6.6)
credentials_manager (>= 0.12.0, < 1.0.0)
fastimage (~> 1.6)
fastlane_core (>= 0.31.0, < 1.0.0)
plist (~> 3.1.0)
spaceship (>= 0.14.0, <= 1.0.0)
spaceship (>= 0.19.0, <= 1.0.0)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.0.2)
excon (0.45.4)
extlib (0.9.16)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
fastimage (1.6.8)
addressable (~> 2.3, >= 2.3.5)
fastlane (1.41.1)
fastlane (1.49.0)
addressable (~> 2.3.8)
cert (>= 1.2.3, < 2.0.0)
credentials_manager (>= 0.10.0, < 1.0.0)
deliver (>= 1.5.1, < 2.0.0)
fastlane_core (>= 0.26.3, < 1.0.0)
frameit (>= 2.3.0, < 3.0.0)
gym (>= 1.1.5, < 2.0.0)
krausefx-shenzhen (>= 0.14.6)
pem (>= 1.0.1, < 2.0.0)
pilot (>= 1.0.1, < 2.0.0)
cert (>= 1.2.7, < 2.0.0)
credentials_manager (>= 0.13.0, < 1.0.0)
deliver (>= 1.6.5, < 2.0.0)
fastlane_core (>= 0.31.0, < 1.0.0)
frameit (>= 2.4.1, < 3.0.0)
gym (>= 1.1.6, < 2.0.0)
krausefx-shenzhen (>= 0.14.7)
match (>= 0.2.2, < 1.0.0)
pem (>= 1.1.1, < 2.0.0)
pilot (>= 1.2.1, < 2.0.0)
plist (~> 3.1.0)
produce (>= 1.0.0, < 2.0.0)
scan (>= 0.3.0, < 1.0.0)
sigh (>= 1.1.3, < 2.0.0)
produce (>= 1.1.0, < 2.0.0)
scan (>= 0.3.3, < 1.0.0)
sigh (>= 1.2.1, < 2.0.0)
slack-notifier (~> 1.3)
snapshot (>= 1.1.1, < 2.0.0)
spaceship (>= 0.14.2, < 1.0.0)
supply (>= 0.2.1, < 1.0.0)
snapshot (>= 1.4.2, < 2.0.0)
spaceship (>= 0.18.1, < 1.0.0)
supply (>= 0.2.2, < 1.0.0)
terminal-notifier (~> 1.6.2)
terminal-table (~> 1.4.5)
xcode-install (~> 1.0.1)
xcodeproj (>= 0.20, < 1.0.0)
xcpretty (>= 0.2.1)
fastlane_core (0.26.6)
fastlane_core (0.32.0)
babosa
colored
commander (>= 4.3.5)
Expand All @@ -77,7 +83,7 @@ GEM
rubyzip (~> 1.1.6)
sentry-raven (~> 0.15)
terminal-table (~> 1.4.5)
frameit (2.4.0)
frameit (2.4.1)
deliver (> 0.3)
fastimage (~> 1.6.3)
fastlane_core (>= 0.16.0, < 1.0.0)
Expand All @@ -93,24 +99,26 @@ GEM
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
googleauth (0.4.2)
googleauth (0.5.0)
faraday (~> 0.9)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
signet (~> 0.6)
gym (1.1.6)
signet (~> 0.7)
gym (1.2.0)
fastlane_core (>= 0.25.0, < 1.0.0)
plist
rubyzip (>= 1.1.7)
terminal-table
xcpretty (>= 0.2.1)
highline (1.7.8)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
json (1.8.3)
jwt (1.5.2)
krausefx-shenzhen (0.14.6)
krausefx-shenzhen (0.14.7)
commander (~> 4.3)
dotenv (>= 0.7)
faraday (~> 0.9)
Expand All @@ -128,7 +136,14 @@ GEM
logging (2.0.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
memoist (0.13.0)
match (0.2.3)
cert (>= 1.2.7, < 2.0.0)
credentials_manager (>= 0.13.0, < 1.0.0)
fastlane_core (>= 0.31.0, < 1.0.0)
security
sigh (>= 1.2.1, < 2.0.0)
spaceship (>= 0.18.1, < 1.0.0)
memoist (0.14.0)
method_source (0.8.2)
mini_magick (4.0.4)
minitest (5.8.3)
Expand All @@ -137,27 +152,27 @@ GEM
multipart-post (2.0.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (3.0.1)
pem (1.0.1)
fastlane_core (>= 0.21.0, < 1.0.0)
spaceship (>= 0.12.0, < 1.0.0)
pilot (1.0.1)
net-ssh (3.0.2)
pem (1.1.1)
fastlane_core (>= 0.30.0, < 1.0.0)
spaceship (>= 0.18.1, < 1.0.0)
pilot (1.2.1)
credentials_manager (>= 0.3.0)
fastlane_core (>= 0.16.1, < 1.0.0)
spaceship (>= 0.14.0, < 1.0.0)
fastlane_core (>= 0.31.0, < 1.0.0)
spaceship (>= 0.16.0, < 1.0.0)
terminal-table (~> 1.4.5)
plist (3.1.0)
produce (1.0.0)
fastlane_core (>= 0.22.3, < 1.0.0)
spaceship (>= 0.12.0)
produce (1.1.1)
fastlane_core (>= 0.30.0, < 1.0.0)
spaceship (>= 0.16.0)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
retriable (1.4.1)
rouge (1.10.1)
rubyzip (1.1.7)
scan (0.3.2)
scan (0.3.3)
fastlane_core (>= 0.26.6, < 1.0.0)
slack-notifier (~> 1.3)
terminal-table
Expand All @@ -166,27 +181,27 @@ GEM
security (0.1.3)
sentry-raven (0.15.2)
faraday (>= 0.7.6)
sigh (1.1.3)
fastlane_core (>= 0.19.0, < 1.0.0)
sigh (1.2.1)
fastlane_core (>= 0.26.4, < 1.0.0)
plist (~> 3.1)
spaceship (>= 0.12.3)
signet (0.6.1)
signet (0.7.2)
addressable (~> 2.3)
extlib (~> 0.9)
faraday (~> 0.9)
jwt (~> 1.5)
multi_json (~> 1.10)
slack-notifier (1.4.0)
slack-notifier (1.5.1)
slop (3.6.0)
snapshot (1.2.1)
snapshot (1.4.2)
fastimage (~> 1.6.3)
fastlane_core (>= 0.21.0, < 1.0.0)
plist (~> 3.1.0)
xcpretty (>= 0.2.1)
spaceship (0.14.2)
spaceship (0.19.0)
colored
credentials_manager (>= 0.9.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (~> 1.6)
multi_xml (~> 0.5)
Expand All @@ -201,14 +216,17 @@ GEM
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
xcode-install (1.0.1)
claide (~> 0.9.1)
spaceship (>= 0.13.0, < 1.0.0)
xcodeproj (0.28.2)
activesupport (>= 3)
claide (~> 0.9.1)
colored (~> 1.2)
xcpretty (0.2.1)
xcpretty (0.2.2)
rouge (~> 1.8)
xcpretty-travis-formatter (0.0.4)
xcpretty (~> 0.2, >= 0.0.7)
Expand All @@ -222,4 +240,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
1.10.6
1.11.2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ and likewise, decoding from unarchiving can be done:

```swift
if let foo = Foo.decode(NSKeyedUnarchiver.unarchiveObjectWithData(data)) {
// etc, unarchive returns optionals when working with a single item.
// etc, decode returns optionals when working with a single item.
}
```

Expand Down
16 changes: 15 additions & 1 deletion Tests/ValueCodingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import XCTest
class ValueCodingTests: XCTestCase {

var item: Foo!

var items: [Foo]!
var nested: [[Foo]]!

override func setUp() {
super.setUp()
Expand All @@ -38,6 +38,9 @@ class ValueCodingTests: XCTestCase {
Foo(bar: "हैलो वर्ल्ड"),
Foo(bar: "こんにちは世界"),
]
nested = [
items
]
}

func test__single_archiving() {
Expand All @@ -51,6 +54,12 @@ class ValueCodingTests: XCTestCase {
XCTAssertEqual(unarchived, items)
}

func test__nested_archiving() {
let unarchived = Foo.decode(nested.encoded)
XCTAssertEqual(unarchived.count, 1)
XCTAssertEqual(unarchived[0], nested[0])
}

func test__with_single_nil() {
let empty: AnyObject? = .None
XCTAssertNil(Foo.decode(empty))
Expand All @@ -61,6 +70,11 @@ class ValueCodingTests: XCTestCase {
XCTAssertTrue(Foo.decode(empty).isEmpty)
}

func test__with_nested_nil() {
let empty: [[AnyObject]]? = .None
XCTAssertTrue(Foo.decode(empty).isEmpty)
}

func test__get_values_from_sequence_of_archivers() {
XCTAssertEqual(items.encoded.values, items)
}
Expand Down
4 changes: 2 additions & 2 deletions ValueCoding.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ValueCoding"
s.version = "1.1.1"
s.version = "1.2.0"
s.summary = "Swift protocols for encoding/decoding value types."
s.description = <<-DESC
Expand All @@ -19,7 +19,7 @@ Pod::Spec.new do |s|
s.author = { "Daniel Thorpe" => "@danthorpe" }
s.source = { :git => "https://github.com/danthorpe/ValueCoding.git", :tag => s.version.to_s }
s.module_name = 'ValueCoding'
s.documentation_url = 'http://docs.danthorpe.me/valuecoding/1.1.1/index.html'
s.documentation_url = 'http://docs.danthorpe.me/valuecoding/1.2.0/index.html'
s.social_media_url = 'https://twitter.com/danthorpe'
s.requires_arc = true
s.ios.deployment_target = '8.0'
Expand Down
4 changes: 2 additions & 2 deletions ValueCoding.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.$(PRODUCT_NAME)";
PRODUCT_NAME = ValueCoding;
PROJECT_VERSION = 1.1.1;
PROJECT_VERSION = 1.2.0;
};
name = Debug;
};
Expand All @@ -555,7 +555,7 @@
INFOPLIST_FILE = "$(SRCROOT)/ValueCoding/Supporting Files/Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.$(PRODUCT_NAME)";
PRODUCT_NAME = ValueCoding;
PROJECT_VERSION = 1.1.1;
PROJECT_VERSION = 1.2.0;
};
name = Release;
};
Expand Down
Loading

0 comments on commit 5d1cc86

Please sign in to comment.