Switch to a framework project.

- Adds support for building with Carthage

Author: calebd

CMDQueryStringSerialization.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'CMDQueryStringSerialization'
-  s.version      = '0.3.2'
+  s.version      = '0.3.3'
   s.summary      = 'Easy conversion between dictionaries and query strings in Objective-C.'
   s.homepage     = 'https://github.com/calebd/CMDQueryStringSerialization'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
@@ -9,6 +9,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.ios.deployment_target = '5.0'
   s.osx.deployment_target = '10.7'
-  s.source_files = 'Pod/*'
+  s.source_files = 'CMDQueryStringSerialization/*.{h,m}'
   s.dependency 'ISO8601'
 end

CMDQueryStringSerialization.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0630"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,9 +14,23 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3B6EAFA9188F5D78005D2EB4"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
+               BlueprintIdentifier = "3BEA1CD81AFB40E40006A6E8"
+               BuildableName = "CMDQueryStringSerialization.framework"
+               BlueprintName = "CMDQueryStringSerialization"
+               ReferencedContainer = "container:CMDQueryStringSerialization.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3BEA1CE31AFB40E50006A6E8"
+               BuildableName = "CMDQueryStringSerializationTests.xctest"
+               BlueprintName = "CMDQueryStringSerializationTests"
                ReferencedContainer = "container:CMDQueryStringSerialization.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -32,19 +46,19 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3B6EAFA9188F5D78005D2EB4"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
+               BlueprintIdentifier = "3BEA1CE31AFB40E50006A6E8"
+               BuildableName = "CMDQueryStringSerializationTests.xctest"
+               BlueprintName = "CMDQueryStringSerializationTests"
                ReferencedContainer = "container:CMDQueryStringSerialization.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3B6EAFA9188F5D78005D2EB4"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "Tests"
+            BlueprintIdentifier = "3BEA1CD81AFB40E40006A6E8"
+            BuildableName = "CMDQueryStringSerialization.framework"
+            BlueprintName = "CMDQueryStringSerialization"
             ReferencedContainer = "container:CMDQueryStringSerialization.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -61,9 +75,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3B6EAFA9188F5D78005D2EB4"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "Tests"
+            BlueprintIdentifier = "3BEA1CD81AFB40E40006A6E8"
+            BuildableName = "CMDQueryStringSerialization.framework"
+            BlueprintName = "CMDQueryStringSerialization"
             ReferencedContainer = "container:CMDQueryStringSerialization.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -79,9 +93,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3B6EAFA9188F5D78005D2EB4"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "Tests"
+            BlueprintIdentifier = "3BEA1CD81AFB40E40006A6E8"
+            BuildableName = "CMDQueryStringSerialization.framework"
+            BlueprintName = "CMDQueryStringSerialization"
             ReferencedContainer = "container:CMDQueryStringSerialization.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Example/CMDQueryStringSerialization.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme renamed to CMDQueryStringSerialization.xcodeproj/xcshareddata/xcschemes/CMDQueryStringSerialization.xcscheme

@@ -63,12 +63,12 @@ + (void)enumerateKeyValuePairsInString:(NSString *)string block:(void (^) (NSStr
         }
 
         key = [key stringByReplacingOccurrencesOfString:@"[]" withString:@""];
-        key = [key cmd_stringByRemovingEscapes];
+        key = [key CMDQueryStringSerialization_stringByRemovingEscapes];
         key = key ?: @"";
 
         NSArray *values = [value componentsSeparatedByString:@","];
         for (__strong NSString *value in values) {
-            value = [value cmd_stringByRemovingEscapes];
+            value = [value CMDQueryStringSerialization_stringByRemovingEscapes];
             value = value ?: @"";
 
             block(key, value);

Pod/CMDQueryStringReader.h renamed to CMDQueryStringSerialization/CMDQueryStringReader.h

@@ -7,7 +7,7 @@
 //
 
 @import Foundation;
-#import "CMDQueryStringWritingOptions.h"
+#import <CMDQueryStringSerialization/CMDQueryStringWritingOptions.h>
 
 /**
  Easily convert between query strings and dictionaries.

Pod/CMDQueryStringReader.m renamed to CMDQueryStringSerialization/CMDQueryStringReader.m

@@ -14,8 +14,8 @@
 @implementation NSObject (CMDQueryStringValueTransformer)
 
 - (NSString *)CMDQueryStringValueTransformer_queryStringWithKey:(NSString *)key options:(CMDQueryStringWritingOptions)options {
-    NSString *escapedKey = [key cmd_stringByAddingEscapes];
-    NSString *escapedValue = [[self description] cmd_stringByAddingEscapes];
+    NSString *escapedKey = [key CMDQueryStringSerialization_stringByAddingEscapes];
+    NSString *escapedValue = [[self description] CMDQueryStringSerialization_stringByAddingEscapes];
     return [NSString stringWithFormat:@"%@=%@", escapedKey, escapedValue];
 }
 
@@ -24,8 +24,8 @@ - (NSString *)CMDQueryStringValueTransformer_queryStringWithKey:(NSString *)key
 @implementation NSArray (CMDQueryStringValueTransformer)
 
 - (NSString *)CMDQueryStringValueTransformer_queryStringWithKey:(NSString *)key options:(CMDQueryStringWritingOptions)options {
-    NSString *escapedKey = [key cmd_stringByAddingEscapes];
-    NSArray *escapedValues = [self valueForKey:@"cmd_stringByAddingEscapes"];
+    NSString *escapedKey = [key CMDQueryStringSerialization_stringByAddingEscapes];
+    NSArray *escapedValues = [self valueForKey:@"CMDQueryStringSerialization_stringByAddingEscapes"];
     if ((options & CMDQueryStringWritingOptionArrayCommaSeparatedValues) == CMDQueryStringWritingOptionArrayCommaSeparatedValues) {
         return [NSString stringWithFormat:@"%@=%@", escapedKey, [escapedValues componentsJoinedByString:@","]];
     }