Merge pull request #281 from hkellaway/release/1.2.3

Release/1.2.3
hkellaway · Mar 29, 2017 · 0c83d73 · 0c83d73
2 parents fa7ab86 + 1a0ceef
commit 0c83d73
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 `Gloss` adheres to [Semantic Versioning](http://semver.org/).
 
-- `1.2.x` Releases - [1.2.0](#120) | [1.2.1](#121) | [1.2.2](#122)
+- `1.2.x` Releases - [1.2.0](#120) | [1.2.1](#121) | [1.2.2](#122) | [1.2.3](#123)
 - `1.1.x` Releases - [1.1.0](#110) | [1.1.1](#111)
 - `1.0.x` Releases - [1.0.0](#100)
 - `0.8.x` Releases - [0.8.0](#080)
@@ -16,11 +16,19 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [1.2.3](https://github.com/hkellaway/Gloss/releases/tag/1.2.3)
+Released on 2017-03-29. All issues associated with this milestone can be found using this [filter](https://github.com/hkellaway/Gloss/issues?utf8=%E2%9C%93&q=milestone%3A1.2.3)
+
+#### Fixed
+- Logging when a value cannot be found despite the value being null [Issue #279](https://github.com/hkellaway/Gloss/issues/279)
+
+---
+
 ## [1.2.2](https://github.com/hkellaway/Gloss/releases/tag/1.2.2)
-Released on 2017-03-27. All issues associated with this milestone can be found using this [filter](https://github.com/hkellaway/Gloss/issues?utf8=%E2%9C%93&q=milestone%3A1.2.2)
+Released on 2017-03-28. All issues associated with this milestone can be found using this [filter](https://github.com/hkellaway/Gloss/issues?utf8=%E2%9C%93&q=milestone%3A1.2.2)
 
 #### Added
-- Logging for when a value is found but cannot be decoded
+- Logging for when a value is found but cannot be decoded [PR #277](https://github.com/hkellaway/Gloss/pull/277)
 
 ---
 

diff --git a/Gloss.podspec b/Gloss.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Gloss"
-  s.version          = "1.2.2"
+  s.version          = "1.2.3"
   s.summary          = "A shiny JSON parsing library in Swift"
   s.description      = "A shiny JSON parsing library in Swift. Features include mapping JSON to objects, mapping objects to JSON, handling of nested objects and custom transformations."
   s.homepage         = "https://github.com/hkellaway/Gloss"

diff --git a/README.md b/README.md
@@ -584,7 +584,7 @@ Check out Gloss in these cool places!
 * [Swift Sandbox](http://swiftsandbox.io/issues/3#b1RJwo2)
 * [iOS Goodies](http://ios-goodies.com/post/127166753231/week-93)
 
-Using Gloss in your app? [Let me know.](mailto:hello@harlankellaway.com?subject=Using Gloss in my project)
+Using Gloss in your app? Let me know: hello@harlankellaway.com
 
 ## License
 

diff --git a/Sources/Decoder.swift b/Sources/Decoder.swift
@@ -48,7 +48,9 @@ public struct Decoder {
             // If Gloss cannot determine the type being decoded, this generic decode function
             // will be used. At times, this will result in a value being present in the JSON
             // but Gloss returning nil - in this case, we log the failure.
-            if let _ = json.valueForKeyPath(keyPath: key, withDelimiter: keyPathDelimiter) {
+            if
+                let value = json.valueForKeyPath(keyPath: key, withDelimiter: keyPathDelimiter),
+                !(value is NSNull) {
                 logger.log(message: "Value found for key \"\(key)\" but decoding failed.")
             }