Merge pull request appsquickly#7 from rhgills/master

Update to Typhoon 1.6.1 and fix unit test failures

Gemfile

@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+# gem "rails"
+gem 'cocoapods'

Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    claide (0.4.0)
+    cocoapods (0.28.0)
+      activesupport (>= 3.2.15, < 4)
+      claide (~> 0.4.0)
+      cocoapods-core (= 0.28.0)
+      cocoapods-downloader (~> 0.2.0)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      json_pure (~> 1.8)
+      open4 (~> 1.3)
+      xcodeproj (~> 0.14.1)
+    cocoapods-core (0.28.0)
+      activesupport (>= 3.2.15, < 4)
+      fuzzy_match (~> 2.0.4)
+      json (~> 1.8)
+      nap (~> 0.5)
+    cocoapods-downloader (0.2.0)
+    colored (1.2)
+    escape (0.0.4)
+    fuzzy_match (2.0.4)
+    i18n (0.6.9)
+    json (1.8.1)
+    json_pure (1.8.1)
+    multi_json (1.8.2)
+    nap (0.6.0)
+    open4 (1.3.0)
+    rake (10.1.0)
+    xcodeproj (0.14.1)
+      activesupport (~> 3.0)
+      colored (~> 1.2)
+      rake
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods

PocketForecast.xcodeproj/project.pbxproj

@@ -759,7 +759,6 @@
 				6B330B9116997D5300A5083C /* CopyFiles */,
 				6BE9746C15AF01A3004472E2 /* Frameworks */,
 				6BE9746D15AF01A3004472E2 /* Resources */,
-				6BE9746E15AF01A3004472E2 /* ShellScript */,
 				9B0FB4F4BBC44BDF8ADAACA5 /* Copy Pods Resources */,
 			);
 			buildRules = (
@@ -943,20 +942,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		6BE9746E15AF01A3004472E2 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Run the unit tests in this test bundle.\n\"${SRCROOT}/Scripts/CmdLineRunTests\"";
-			showEnvVarsInLog = 0;
-		};
 		9A40B9013EA84D7F9AE5A3F6 /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

PocketForecast.xcworkspace/xcshareddata/PocketForecast.xccheckout

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>E12D9F1C-DA7E-43E4-A1E4-DBE5805664F8</string>
+	<key>IDESourceControlProjectName</key>
+	<string>PocketForecast</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>ABE179CD-722B-44E3-95BD-91ECDE96D5C9</key>
+		<string>https://github.com/jasperblues/Typhoon-example</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>PocketForecast.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>ABE179CD-722B-44E3-95BD-91ECDE96D5C9</key>
+		<string>..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/jasperblues/Typhoon-example</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>ABE179CD-722B-44E3-95BD-91ECDE96D5C9</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>ABE179CD-722B-44E3-95BD-91ECDE96D5C9</string>
+			<key>IDESourceControlWCCName</key>
+			<string>Typhoon-example</string>
+		</dict>
+	</array>
+</dict>
+</plist>

PocketForecastTests/Integration/PFWeatherClientTests.m

@@ -31,7 +31,7 @@ - (void)setUp
 {
     TyphoonXmlComponentFactory* factory = [[TyphoonXmlComponentFactory alloc] initWithConfigFileName:@"CoreComponents.xml"];
     id <TyphoonResource> configurationProperties = [TyphoonBundleResource withName:@"Configuration.properties"];
-    [factory attachMutator:[TyphoonPropertyPlaceholderConfigurer configurerWithResource:configurationProperties]];
+    [factory attachPostProcessor:[TyphoonPropertyPlaceholderConfigurer configurerWithResource:configurationProperties]];
     weatherClient = [factory componentForKey:@"weatherClient"];
 }
 
@@ -43,7 +43,7 @@ - (void)test_should_retrieve_a_weather_report_given_a_valid_city
     [weatherClient loadWeatherReportFor:@"Manila" onSuccess:^(PFWeatherReport* weatherReport)
     {
         retrievedReport = weatherReport;
-    } onError:^(NSUInteger statusCode, NSString* message)
+    } onError:^(NSString* message)
     {
         LogDebug(@"Got this error: %@", message);
     }];
@@ -64,7 +64,7 @@ - (void)test_should_trigger_the_error_handler_if_the_city_name_is_not_valid
 {
     __block NSString* errorMessage;
 
-    [weatherClient loadWeatherReportFor:@"Dooglefog" onSuccess:nil onError:^(NSUInteger statusCode, NSString* message)
+    [weatherClient loadWeatherReportFor:@"Dooglefog" onSuccess:nil onError:^(NSString* message)
     {
         errorMessage = message;
     }];

PocketForecastTests/Integration/PFWeatherReportDaoTests.m

@@ -31,7 +31,7 @@ - (void)setUp
     TyphoonXmlComponentFactory* factory = [[TyphoonXmlComponentFactory alloc] initWithConfigFileName:@"CoreComponents.xml"];
     weatherReportDao = [factory componentForType:@protocol(PFWeatherReportDao)];
 
-    NSString* xmlString = [[TyphoonBundleResource withName:@"SampleForecast.xml"] asString];
+    NSString* xmlString = [[TyphoonBundleResource withName:@"SampleForecast.xml" inBundle:[NSBundle bundleForClass:[self class]]] asString];
     RXMLElement* xmlElement = [RXMLElement elementFromXMLString:xmlString encoding:NSUTF8StringEncoding];
     testReport = [xmlElement asWeatherReport];
 }

PocketForecastTests/Unit/RXMLElement_PFWeatherReportSpec.m

@@ -30,7 +30,7 @@ @implementation RXMLElement_PFWeatherReportTests
 
 - (void)setUp
 {
-    sampleReportString = [[TyphoonBundleResource withName:@"SampleForecast.xml"] asString];
+    sampleReportString = [[TyphoonBundleResource withName:@"SampleForecast.xml" inBundle:[NSBundle bundleForClass:[self class]]] asString];
 }
 
 

Podfile.lock

@@ -9,7 +9,7 @@ PODS:
     - OCHamcrest (~> 3.0)
   - PaperFold (1.2)
   - RaptureXML (1.0.1)
-  - Typhoon (1.6.0)
+  - Typhoon (1.6.1)
 
 DEPENDENCIES:
   - CKUITools
@@ -38,6 +38,6 @@ SPEC CHECKSUMS:
   OCMockito: 317fa0cf75c9b0d73d2be335789c556537be7fd2
   PaperFold: 56c21be56fe6454fa99927b251396471d341c874
   RaptureXML: ef017fda62eb95c60300108366d1f0cd0c28cbd4
-  Typhoon: c264bf494e146cddf0781bb820911a48811f21d3
+  Typhoon: 562bcf3bea287ceff1cbc4c2bd7cca56f2f3691a
 
 COCOAPODS: 0.28.0