2.0.0 (#39)

* MOD: Refactor JSONHelper * WIP commit of proposed structural changes * Add license info to files missing it * Comment out tests of unimplemented features * Minor naming change * Boolean conversion * Convert from Any * NSDate conversion * NSURL conversion * Update travis configuration * Array conversion * JSON string to instance conversion * Better use of generics * Instance array conversions * Add missing new line characters to end of files * [String: Convertible] deserialization * Move string tests * Update test assertion messages * Move int tests * Move bool tests and complete them Fixed int to bool conversion. * Better string tests * Change NSDate conversion attempt order * String to UIColor and NSColor conversion * Upgrade to latest version of Swift and add declare all JSON data types * A step in the right direction (restructuring & refactoring) * [Int] Support conversion from Double, Float, and NSDecimalNuber * [Tests] Test new String to Bool conversions * [Double] Support conversions to Double type * Conversion operations can now throw errors Additionally: - Bumped version to 2.0.0. - Completed more tests. - Minor code refactoring. - Commented out JSONAPI code temporarily. * Complete even more tests and functionality These commits will be squashed, so I'm going to detail these later on. * Add enum conversion support and tests * Dictionary conversion and deserialization Additional changes: - NSDate to String conversion. - Serializable protocol. * Complete the rest of the tests and functionality Except serialization and JSON API support. * Partially complete new README * Backup commit, will be squashed * [README] Update for 2.0.0
isair · Jun 9, 2016 · 63e0a69 · 63e0a69
1 parent db1c9a2
commit 63e0a69
Show file tree

Hide file tree

Showing 42 changed files with 1,905 additions and 1,077 deletions.
diff --git a/JSONHelper.podspec b/JSONHelper.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'JSONHelper'
-  s.version = '1.7.0'
+  s.version = '2.0.0'
   s.license = { :type => 'zlib', :file => 'LICENSE' }
   s.summary = 'Lightning fast JSON deserialization and value conversion library for iOS & OS X written in Swift.'
 
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '9.0'
   s.source       = { :git => 'https://github.com/isair/JSONHelper.git', :tag => s.version }
-  s.source_files = 'JSONHelper'
+  s.source_files = 'JSONHelper/**/*.swift'
   s.frameworks   = 'Foundation'
   s.requires_arc = true
 end
diff --git a/JSONHelper.xcodeproj/project.pbxproj b/JSONHelper.xcodeproj/project.pbxproj
diff --git a/JSONHelper.xcodeproj/project.xcworkspace/xcshareddata/JSONHelper.xccheckout b/JSONHelper.xcodeproj/project.xcworkspace/xcshareddata/JSONHelper.xccheckout
@@ -11,7 +11,7 @@
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>9540366943750F418CA1A28462EA7F786EC07683</key>
-		<string>https://github.com/isair/JSONHelper.git</string>
+		<string>github.com:isair/JSONHelper.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>JSONHelper.xcodeproj</string>
@@ -21,7 +21,7 @@
 		<string>../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/isair/JSONHelper.git</string>
+	<string>github.com:isair/JSONHelper.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>

diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-Mac.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,21 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D76C52001ACD46B100B49735"
                BuildableName = "JSONHelper.framework"
-               BlueprintName = "JSONHelper_Mac"
+               BlueprintName = "JSONHelper-Mac"
+               ReferencedContainer = "container:JSONHelper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
+               BuildableName = "JSONHelperTests.xctest"
+               BlueprintName = "JSONHelperTests"
                ReferencedContainer = "container:JSONHelper.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,9 +40,29 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
+               BuildableName = "JSONHelperTests.xctest"
+               BlueprintName = "JSONHelperTests"
+               ReferencedContainer = "container:JSONHelper.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D76C52001ACD46B100B49735"
+            BuildableName = "JSONHelper.framework"
+            BlueprintName = "JSONHelper-Mac"
+            ReferencedContainer = "container:JSONHelper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -47,7 +81,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D76C52001ACD46B100B49735"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper_Mac"
+            BlueprintName = "JSONHelper-Mac"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -65,7 +99,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D76C52001ACD46B100B49735"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper_Mac"
+            BlueprintName = "JSONHelper-Mac"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
                BuildableName = "JSONHelper.framework"
-               BlueprintName = "JSONHelper"
+               BlueprintName = "JSONHelper-iOS"
                ReferencedContainer = "container:JSONHelper.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -37,10 +37,11 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Release">
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -58,44 +59,47 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper"
+            BlueprintName = "JSONHelper-iOS"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper"
+            BlueprintName = "JSONHelper-iOS"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper"
+            BlueprintName = "JSONHelper-iOS"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-tvOS.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-tvOS.xcscheme
@@ -15,8 +15,22 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
-               BuildableName = "JSONHelper_tvOS.framework"
-               BlueprintName = "JSONHelper_tvOS"
+               BuildableName = "JSONHelper.framework"
+               BlueprintName = "JSONHelper-tvOS"
+               ReferencedContainer = "container:JSONHelper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
+               BuildableName = "JSONHelperTests.xctest"
+               BlueprintName = "JSONHelperTests"
                ReferencedContainer = "container:JSONHelper.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,9 +40,29 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
+               BuildableName = "JSONHelperTests.xctest"
+               BlueprintName = "JSONHelperTests"
+               ReferencedContainer = "container:JSONHelper.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
+            BuildableName = "JSONHelper.framework"
+            BlueprintName = "JSONHelper-tvOS"
+            ReferencedContainer = "container:JSONHelper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -46,8 +80,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
-            BuildableName = "JSONHelper_tvOS.framework"
-            BlueprintName = "JSONHelper_tvOS"
+            BuildableName = "JSONHelper.framework"
+            BlueprintName = "JSONHelper-tvOS"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,8 +98,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
-            BuildableName = "JSONHelper_tvOS.framework"
-            BlueprintName = "JSONHelper_tvOS"
+            BuildableName = "JSONHelper.framework"
+            BlueprintName = "JSONHelper-tvOS"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelperExample.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelperExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">