Merge remote-tracking branch 'origin/development' into cdz/separate-p…

…rotocols

.ci/buildkite/pipeline.template.yml

@@ -1,9 +1,4 @@
 steps:
-  -
-    name: ":bundler: Update Bundler"
-    command: .ci/scripts/update-bundler
-    agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"	
   -
     name: ":fastlane: Test Mac OS X"
     command: .ci/scripts/test-osx

.fastlane/Fastfile

@@ -8,7 +8,7 @@ platform :ios do
   lane :test do
 	xctest scheme: 'YapDatabaseExtensions-iOS', 
       sdk: 'iphonesimulator',
-      destination: 'platform=iOS Simulator,name=iPhone 6,OS=9.1',
+      destination: 'platform=iOS Simulator,name=iPhone 6,OS=9.2',
       destination_timeout: 120,
       derivedDataPath: '.ci/xcodebuild-data'
   end

Gemfile.lock

@@ -4,30 +4,22 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.0)
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    aws-sdk (1.66.0)
-      aws-sdk-v1 (= 1.66.0)
-    aws-sdk-v1 (1.66.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
     babosa (1.0.2)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    cert (0.3.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)
-    cliver (0.3.2)
     cocoapods (0.39.0)
       activesupport (>= 4.0.2)
       claide (~> 0.9.1)
@@ -48,7 +40,7 @@ GEM
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-downloader (0.9.3)
-    cocoapods-keys (1.5.2)
+    cocoapods-keys (1.6.0)
       dotenv
       osx_keychain
     cocoapods-plugins (0.4.2)
@@ -63,85 +55,106 @@ GEM
     colored (1.2)
     commander (4.3.5)
       highline (~> 1.7.2)
-    credentials_manager (0.9.0)
+    credentials_manager (0.13.0)
       colored
       highline (>= 1.7.1)
       security
-    deliver (1.3.0)
-      credentials_manager (>= 0.8.2)
-      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.11.2, <= 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)
     escape (0.0.4)
     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.32.1)
+    fastlane (1.49.0)
       addressable (~> 2.3.8)
-      cert (>= 0.3.2, < 1.0.0)
-      credentials_manager (>= 0.8.2, < 1.0.0)
-      deliver (>= 1.2.0, < 2.0.0)
-      fastlane_core (>= 0.18.2, < 1.0.0)
-      frameit (>= 2.2.1, < 3.0.0)
-      gym (>= 0.8.4, < 1.0.0)
-      krausefx-shenzhen (>= 0.14.5)
-      nokogiri (~> 1.6)
-      pbxplorer (~> 1.0.0)
-      pem (>= 0.8.0, < 1.0.0)
-      pilot (>= 0.2.1, < 1.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 (>= 0.6.2, < 1.0.0)
-      rest-client (~> 1.8.0)
-      sigh (>= 0.10.8, < 1.0.0)
-      slack-notifier (~> 1.0)
-      snapshot (>= 0.10.0, < 1.0.0)
-      spaceship (>= 0.11.2, < 1.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.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.1.11)
-    fastlane_core (0.19.0)
+      xcpretty (>= 0.2.1)
+    fastlane_core (0.32.0)
       babosa
-      capybara (~> 2.4.3)
       colored
       commander (>= 4.3.5)
-      credentials_manager (>= 0.8.2, < 1.0.0)
+      credentials_manager (>= 0.11.0, < 1.0.0)
       excon (~> 0.45.0)
       highline (>= 1.7.2)
       json
       multi_json
-      phantomjs (~> 1.9.8)
       plist (~> 3.1)
-      poltergeist (~> 1.5.1)
       rubyzip (~> 1.1.6)
+      sentry-raven (~> 0.15)
       terminal-table (~> 1.4.5)
-    frameit (2.2.1)
+    frameit (2.4.1)
       deliver (> 0.3)
       fastimage (~> 1.6.3)
       fastlane_core (>= 0.16.0, < 1.0.0)
       mini_magick (~> 4.0.2)
     fuzzy_match (2.0.4)
-    gym (0.8.5)
-      fastlane_core (>= 0.19.0, < 1.0.0)
+    google-api-client (0.8.6)
+      activesupport (>= 3.2)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      googleauth (~> 0.3)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
+    googleauth (0.5.0)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      signet (~> 0.7)
+    gym (1.2.0)
+      fastlane_core (>= 0.25.0, < 1.0.0)
       plist
       rubyzip (>= 1.1.7)
       terminal-table
-      xcpretty
+      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)
-    krausefx-shenzhen (0.14.5)
-      aws-sdk (~> 1.0)
+    jwt (1.5.2)
+    krausefx-shenzhen (0.14.7)
       commander (~> 4.3)
       dotenv (>= 0.7)
       faraday (~> 0.9)
@@ -153,74 +166,92 @@ GEM
       rubyzip (~> 1.1)
       security (~> 0.1.3)
       terminal-table (~> 1.4.5)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    little-plugger (1.1.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    match (0.2.4)
+      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)
-    mime-types (2.6.2)
     mini_magick (4.0.4)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    molinillo (0.4.0)
+    minitest (5.8.3)
+    molinillo (0.4.1)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nap (1.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
+    net-ssh (3.0.2)
     netrc (0.7.8)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
     osx_keychain (1.0.1)
       RubyInline (~> 3)
-    pbxplorer (1.0.0)
-    pem (0.8.1)
-      fastlane_core (>= 0.19.0, < 1.0.0)
-      spaceship (>= 0.11.2)
-    phantomjs (1.9.8.0)
-    pilot (0.2.3)
+    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.7.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)
-    poltergeist (1.5.1)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      multi_json (~> 1.0)
-      websocket-driver (>= 0.2.0)
-    produce (0.6.5)
-      fastlane_core (>= 0.16.0, < 1.0.0)
-      spaceship (>= 0.6.0)
-    pry (0.10.2)
+    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)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    retriable (1.4.1)
+    rouge (1.10.1)
     rubyzip (1.1.7)
+    scan (0.3.3)
+      fastlane_core (>= 0.26.6, < 1.0.0)
+      slack-notifier (~> 1.3)
+      terminal-table
+      xcpretty (>= 0.2.1)
+      xcpretty-travis-formatter (>= 0.0.3)
     security (0.1.3)
-    sigh (0.10.9)
-      fastlane_core (>= 0.19.0, < 1.0.0)
+    sentry-raven (0.15.3)
+      faraday (>= 0.7.6)
+    sigh (1.2.1)
+      fastlane_core (>= 0.26.4, < 1.0.0)
       plist (~> 3.1)
-      spaceship (>= 0.6.0)
-    slack-notifier (1.3.1)
+      spaceship (>= 0.12.3)
+    signet (0.7.2)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
+    slack-notifier (1.5.1)
     slop (3.6.0)
-    snapshot (0.10.1)
+    snapshot (1.4.3)
       fastimage (~> 1.6.3)
-      fastlane_core (>= 0.16.1, < 1.0.0)
-    spaceship (0.11.5)
+      fastlane_core (>= 0.30.0, < 1.0.0)
+      plist (~> 3.1.0)
+      xcpretty (>= 0.2.1)
+    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)
       plist (~> 3.1)
       pry
+    supply (0.2.2)
+      credentials_manager (>= 0.10.0)
+      fastlane_core (>= 0.19.0)
+      google-api-client (~> 0.8.6)
     terminal-notifier (1.6.3)
     terminal-table (1.4.5)
     thread_safe (0.3.5)
@@ -229,16 +260,17 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    websocket-driver (0.6.2)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    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.1.12)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    xcpretty (0.2.2)
+      rouge (~> 1.8)
+    xcpretty-travis-formatter (0.0.4)
+      xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
@@ -250,4 +282,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

README.md

@@ -77,9 +77,11 @@ Item encoding | Metadata encoding | Pattern
 `ValueCoding` | `NSCoding`        | ValueWithObjectMetadata
 `ValueCoding` | `ValueCoding`     | ValueWithValueMetadata
 
-There are also two styles of API. The *functional* API works on `YapDatabase` types, `YapDatabaseReadTransaction`, `YapDatabaseReadWriteTransaction` and `YapDatabaseConnection`. The *persistable* API works on your `Persistable` types directly, and receives the `YapDatabase` type as arguments.
+## Extension APIs
 
-## Functional API
+YapDatabaseExtensions provides two styles of API. The *functional* API works on `YapDatabase` types, `YapDatabaseReadTransaction`, `YapDatabaseReadWriteTransaction` and `YapDatabaseConnection`. The *persistable* API works on your `Persistable` types directly, and receives the `YapDatabase` type as arguments.
+
+### Functional API
 
 The following “functional” APIs are available directly on the `YapDatabase` types.
 
@@ -141,7 +143,7 @@ connection.read { transaction in
 }
 ```
 
-## `Persistable` API
+### `Persistable` API
 
 The APIs all work on single or sequences of `Persistable` items. To write to the database: