Merge pull request #178 from NIFCloud-mbaas/develop

リリース 3.0.0 (DEV->MASTER)
NIFCLOUD-mbaas · Sep 4, 2018 · 4531a5c · 4531a5c
2 parents 6f82609 + c5fe00c
commit 4531a5c
Show file tree

Hide file tree

Showing 161 changed files with 98 additions and 9,078 deletions.
diff --git a/NCMB.podspec b/NCMB.podspec
@@ -1,21 +1,21 @@
 Pod::Spec.new do |s|
   s.name         = "NCMB"
-  s.version      = "2.4.3"
-  s.summary      = "NCMB is SDK for NIF Cloud mobile backend."
+  s.version      = "3.0.0"
+  s.summary      = "NCMB is SDK for NIFCLOUD mobile backend."
   s.description  = <<-DESC
-                   NCMB is SDK for NIF Cloud mobile backend.
+                   NCMB is SDK for NIFCLOUD mobile backend.
                    NIF Cloud mobile backend function
                    * Data store
                    * Push Notification
                    * User Management
                    * SNS integration
                    * File store
                    DESC
-  s.homepage     = "http://mb.cloud.nifty.com"
+  s.homepage     = "https://mbaas.nifcloud.com"
   s.license      = "Apache License, Version 2.0"
   s.author       = "FUJITSU CLOUD TECHNOLOGIES LIMITED"
   s.platform     = :ios, "5.1"
-  s.source       = { :git => 'https://github.com/NIFCloud-mbaas/ncmb_ios.git', :tag => 'v2.4.3' }
+  s.source       = { :git => 'https://github.com/NIFCloud-mbaas/ncmb_ios.git', :tag => 'v3.0.0' }
   s.source_files  = "NCMB/**/*.{h,m,c}"
   s.frameworks = "Foundation", "UIKit", "MobileCoreServices", "AudioToolbox", "SystemConfiguration"
   s.requires_arc = true

diff --git a/NCMB.xcodeproj/project.pbxproj b/NCMB.xcodeproj/project.pbxproj
@@ -601,7 +601,7 @@
 				MODULEMAP_FILE = "$(SRCROOT)/NCMB.modulemap";
 				MODULEMAP_PRIVATE_FILE = "";
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.nifty.cloud.mb.NCMB;
+				PRODUCT_BUNDLE_IDENTIFIER = com.nifcloud.mbaas.NCMB;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -619,7 +619,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "$(SRCROOT)/NCMB.modulemap";
 				MODULEMAP_PRIVATE_FILE = "";
-				PRODUCT_BUNDLE_IDENTIFIER = com.nifty.cloud.mb.NCMB;
+				PRODUCT_BUNDLE_IDENTIFIER = com.nifcloud.mbaas.NCMB;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};

diff --git a/NCMB/NCMB.m b/NCMB/NCMB.m
@@ -40,7 +40,7 @@ + (void)setApplicationKey:(NSString *)appKey clientKey:(NSString *)cliKey{
     applicationKey = appKey;
     clientKey = cliKey;
     NCMBReachability *reachability = [NCMBReachability sharedInstance];
-    //[reachability reachabilityWithHostName:@"mb.api.cloud.nifty.com"];
+    //[reachability reachabilityWithHostName:@"mbaas.api.nifcloud.com"];
     [reachability startNotifier];
 
 }

diff --git a/NCMB/NCMBAnalytics.m b/NCMB/NCMBAnalytics.m
@@ -28,7 +28,7 @@ +(void)trackAppOpenedWithLaunchOptions:(NSDictionary *)launchOptions{
 }
 
 + (void)trackAppOpenedWithRemoteNotificationPayload:(NSDictionary *)userInfo{
-    NSString * pushId = [userInfo objectForKey:@"com.nifty.PushId"];
+    NSString * pushId = [userInfo objectForKey:@"com.nifcloud.mbaas.PushId"];
     NCMBInstallation *installation = [NCMBInstallation currentInstallation];
     if (pushId != nil && installation.deviceToken != nil){
         //コネクションを作成

diff --git a/NCMB/NCMBConstants.h b/NCMB/NCMBConstants.h
@@ -22,7 +22,7 @@
 
 #pragma mark - error
 #define ERRORDOMAIN @"NCMBErrorDomain"
-#define SDK_VERSION @"2.4.3"
+#define SDK_VERSION @"3.0.0"
 
 #define DATA_MAIN_PATH [NSHomeDirectory() stringByAppendingPathComponent:@"Library/"]
 #define COMMAND_CACHE_FOLDER_PATH [NSString stringWithFormat:@"%@/Private Documents/NCMB/Command Cache/", DATA_MAIN_PATH]

diff --git a/NCMB/NCMBError.m b/NCMB/NCMBError.m
@@ -17,7 +17,7 @@
 #import "NCMBError.h"
 
 
-NSString const *kNCMBErrorDomain = @"com.nifty.cloud.mb";
+NSString const *kNCMBErrorDomain = @"com.nifcloud.mbaas";
 
 NSInteger const NCMBErrorFacebookLoginCancelled = 401004;
 

diff --git a/NCMB/NCMBFile.m b/NCMB/NCMBFile.m
@@ -24,7 +24,7 @@
 
 #pragma mark - url
 #define URL_FILE @"files"
-#define URL_PATH @"https://mb.api.cloud.nifty.com/2013-09-01/"
+#define URL_PATH @"https://mbaas.api.nifcloud.com/2013-09-01/"
 
 @interface NCMBFile(){
     NCMBURLSession *session;

diff --git a/NCMB/NCMBPush.h b/NCMB/NCMBPush.h
@@ -118,7 +118,7 @@
 
 
 /**
- ユーザの情報を設定。開発者が付与したい情報を設定することができる。ここで設定した値はプッシュ通知のペイロードから「com.nifty.Data」というキーで取得できる
+ ユーザの情報を設定。開発者が付与したい情報を設定することができる。ここで設定した値はプッシュ通知のペイロードから「com.nifcloud.mbaas.Data」というキーで取得できる
  @param userSettingValue ユーザの情報
  */
 - (void)setUserSettingValue:(NSDictionary *)userSettingValue;

diff --git a/NCMB/NCMBPush.m b/NCMB/NCMBPush.m
@@ -143,7 +143,7 @@ + (void)handlePush:(NSDictionary *)userInfo{
 }
 
 + (void) handleRichPush:(NSDictionary *)userInfo {
-    NSString *urlStr = [userInfo objectForKey:@"com.nifty.RichUrl"];
+    NSString *urlStr = [userInfo objectForKey:@"com.nifcloud.mbaas.RichUrl"];
 
     if ([urlStr isKindOfClass:[NSString class]]) {
         if (rv == nil){

diff --git a/NCMB/NCMBReachability/NCMBReachability.m b/NCMB/NCMBReachability/NCMBReachability.m
@@ -23,7 +23,7 @@
 #import <ifaddrs.h>
 #import <net/if.h>
 
-static NSString *const kHostName = @"mb.api.cloud.nifty.com";
+static NSString *const kHostName = @"mbaas.api.nifcloud.com";
 
 /**
  通信状況が変化した際に呼び出されるコールバックメソッド

diff --git a/NCMB/NCMBRequest/NCMBRequest.m b/NCMB/NCMBRequest/NCMBRequest.m
@@ -20,7 +20,7 @@
 #import <CommonCrypto/CommonCrypto.h>
 #import "NCMBDateFormat.h"
 
-static NSString *const kEndPoint            = @"https://mb.api.cloud.nifty.com";
+static NSString *const kEndPoint            = @"https://mbaas.api.nifcloud.com";
 static NSString *const kAPIVersion          = @"2013-09-01";
 static NSString *const appKeyField       = @"X-NCMB-Application-Key";
 static NSString *const timestampField    = @"X-NCMB-Timestamp";
@@ -57,7 +57,7 @@ -(instancetype)initWithURL:(NSURL *)url
                                   method:method
                                timestamp:timestampStr] forHTTPHeaderField:signatureField];
 
-    NSRange range = [url.description rangeOfString:@"script.mb.api.cloud.nifty.com"];
+    NSRange range = [url.description rangeOfString:@"script.mbaas.api.nifcloud.com"];
     if(![headers objectForKey:@"Content-Type"] || range.location != NSNotFound){
         [self setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
     }

diff --git a/NCMB/NCMBScriptService/NCMBScriptService.m b/NCMB/NCMBScriptService/NCMBScriptService.m
@@ -16,7 +16,7 @@
 
 #import "NCMBScriptService.h"
 
-NSString *const NCMBScriptServiceDefaultEndPoint = @"https://script.mb.api.cloud.nifty.com";
+NSString *const NCMBScriptServiceDefaultEndPoint = @"https://script.mbaas.api.nifcloud.com";
 NSString *const NCMBScriptServiceApiVersion = @"2015-09-01";
 NSString *const NCMBScriptServicePath = @"script";
 

diff --git a/NCMB/NCMB_Info.plist b/NCMB/NCMB_Info.plist
@@ -11,15 +11,15 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.nifty.cloud.mb.NCMB</string>
+	<string>com.nifcloud.mbaas.NCMB</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>NCMB</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.3</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/NCMBTests/NCMBTests.xcodeproj/project.pbxproj b/NCMBTests/NCMBTests.xcodeproj/project.pbxproj
@@ -289,7 +289,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.nifty.cloud.mb.NCMBTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.nifcloud.mbaas.NCMBTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 			};
@@ -330,7 +330,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.nifty.cloud.mb.NCMBTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.nifcloud.mbaas.NCMBTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

diff --git a/NCMBTests/NCMBTests/NCMBFileSpec.m b/NCMBTests/NCMBTests/NCMBFileSpec.m
@@ -58,7 +58,7 @@ +(NSString*) getTimeStamp;
         NCMBFile *fileData = [NCMBFile fileWithName:@"test.png" data:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
 
             NSDictionary *responseDic = @{
@@ -91,7 +91,7 @@ +(NSString*) getTimeStamp;
         NCMBFile *fileData = [NCMBFile fileWithName:@"ncmb.txt" data:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
 
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:200 headers:@{@"Content-Type":@"text/plain;charset=UTF-8"}];
@@ -113,7 +113,7 @@ +(NSString*) getTimeStamp;
 
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:200 headers:@{@"Content-Type":@"text/plain;charset=UTF-8"}];
         }];
@@ -133,7 +133,7 @@ +(NSString*) getTimeStamp;
         NSData *responseData = [NSJSONSerialization dataWithJSONObject:responseDic options:NSJSONWritingPrettyPrinted error:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:403 headers:@{@"Content-Type":@"application/json;charset=UTF-8"}];
         }];
@@ -155,7 +155,7 @@ +(NSString*) getTimeStamp;
         NSData *responseData = [NSJSONSerialization dataWithJSONObject:responseDic options:NSJSONWritingPrettyPrinted error:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:201 headers:@{@"Content-Type":@"application/json;charset=UTF-8"}];
         }];
@@ -178,7 +178,7 @@ +(NSString*) getTimeStamp;
         NSData *responseData = [NSJSONSerialization dataWithJSONObject:responseDic options:NSJSONWritingPrettyPrinted error:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:403 headers:@{@"Content-Type":@"application/json;charset=UTF-8"}];
         }];
@@ -201,7 +201,7 @@ +(NSString*) getTimeStamp;
         NSData *responseData = [NSJSONSerialization dataWithJSONObject:responseDic options:NSJSONWritingPrettyPrinted error:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:201 headers:@{@"Content-Type":@"application/json;charset=UTF-8"}];
         }];
@@ -221,7 +221,7 @@ +(NSString*) getTimeStamp;
         NSData *responseData = [NSJSONSerialization dataWithJSONObject:responseDic options:NSJSONWritingPrettyPrinted error:nil];
 
         [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-            return [request.URL.host isEqualToString:@"mb.api.cloud.nifty.com"];
+            return [request.URL.host isEqualToString:@"mbaas.api.nifcloud.com"];
         } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
             return [OHHTTPStubsResponse responseWithData:responseData statusCode:403 headers:@{@"Content-Type":@"application/json;charset=UTF-8"}];
         }];

diff --git a/NCMBTests/NCMBTests/NCMBInstallationSpec.m b/NCMBTests/NCMBTests/NCMBInstallationSpec.m
@@ -54,7 +54,7 @@ -(NSMutableDictionary *)beforeConnection;
                                                        },
                                                @"applicationName" : @"aaaa",
                                                @"objectId" : @"EVMu2ne7bjzZhOW2",
-                                               @"sdkVersion" : @"2.4.3"
+                                               @"sdkVersion" : @"3.0.0"
                                                };
 
     NSDictionary *responseInstallation = @{@"channels" : @[