Skip to content

Commit

Permalink
Merge pull request #8 from JoaoCaixinha/master
Browse files Browse the repository at this point in the history 
set javascript Number as NSNumber instead of NSString on native Objec…
  • Loading branch information
@realtime-framework
realtime-framework authored Feb 21, 2017
2 parents e2a5e65 + 99fc3fd commit 5fd3711
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 28 deletions.
1 change: 0 additions & 1 deletion RCTRealtimeCloudStorage/RCTRealtimeCloudStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#import <Foundation/Foundation.h>
#import "RealTimeCloudStorage.h"
#import "RCTBridgeModule.h"
#import "RCTBridge.h"
#import "RCTEventDispatcher.h"

@interface RCTRealtimeCloudStorage : NSObject<RCTBridgeModule>
Expand Down
52 changes: 26 additions & 26 deletions RCTRealtimeCloudStorage/RCTRealtimeCloudStorage.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,21 @@ - (StorageEventType)convertEventType:(NSString*)eventType
StorageRef *storageref = [_storageRefs objectForKey:pid];
[storageref getTables:^(TableSnapshot *success) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-getTables", pid]
body:success.val];
body:success.val];
} error:^(NSError *error) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-getTables", pid]
body:@{@"error":error.description}];
body:@{@"error":error.description}];
}];
}

RCT_EXPORT_METHOD(isAuthenticated: (NSString*) aAuthenticationToken ide:(NSString*)pid){
StorageRef *storageref = [_storageRefs objectForKey:pid];
[storageref isAuthenticated:aAuthenticationToken success:^(Boolean success) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-isAuthenticated", pid]
body:@{@"success": [NSNumber numberWithBool:success]}];
body:@{@"success": [NSNumber numberWithBool:success]}];
} error:^(NSError *error) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-isAuthenticated", pid]
body:@{@"error": error.description}];
body:@{@"error": error.description}];
}];
}

Expand Down Expand Up @@ -166,15 +166,15 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
StorageRef *storageref = [_storageRefs objectForKey:pid];
[storageref onReconnected:^(StorageRef *storage) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-onReconnected", pid]
body:@{}];
body:@{}];
}];
}

RCT_EXPORT_METHOD(onReconnecting:(NSString*)pid){
StorageRef *storageref = [_storageRefs objectForKey:pid];
[storageref onReconnecting:^(StorageRef *storage) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-onReconnecting", pid]
body:@{}];
body:@{}];
}];
}

Expand Down Expand Up @@ -225,7 +225,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
NSMutableDictionary *sRefs = [_tableRefs objectForKey:sId];
TableRef *tableRef = [sRefs objectForKey:table];
[tableRef betweenNumber:item beginValue:beginValue endValue:endValue];

}
RCT_EXPORT_METHOD(containsString: (NSString*) item value:(NSString*) value storage:(NSString*)sId table:(NSString*)table){
NSMutableDictionary *sRefs = [_tableRefs objectForKey:sId];
Expand Down Expand Up @@ -386,7 +386,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
}


RCT_EXPORT_METHOD(item: (NSString*) primaryKey storage:(NSString*)sId table:(NSString*)table item:(NSString*)iId){
RCT_EXPORT_METHOD(item: (NSString*) primaryKey storage:(NSString*)sId table:(NSString*)table item:(NSNumber* _Nonnull)iId){
NSMutableDictionary *sRefs = [_tableRefs objectForKey:sId];
TableRef *tableRef = [sRefs objectForKey:table];

Expand All @@ -398,15 +398,15 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
[_itemRefs setObject:item forKey: iId];
}

RCT_EXPORT_METHOD(itemCustom: (NSString*) primaryKey secondaryKey:(NSString*) secondaryKey storage:(NSString*)sId table:(NSString*)table item:(NSString*)iId){
RCT_EXPORT_METHOD(itemCustom: (NSString*) primaryKey secondaryKey:(NSString*) secondaryKey storage:(NSString*)sId table:(NSString*)table item:(NSNumber* _Nonnull)iId){
NSMutableDictionary *sRefs = [_tableRefs objectForKey:sId];
TableRef *tableRef = [sRefs objectForKey:table];

ItemRef* item = [_itemRefs objectForKey:iId];
if (!item) {
item = [tableRef item:primaryKey secondaryKey:secondaryKey];
}

[_itemRefs setObject:item forKey: iId];
}

Expand All @@ -430,7 +430,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
[tableRef getItems:^(ItemSnapshot *item) {
if (item) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-getItems", table]
body:item.val];
body:item.val];
}else
{
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-getItems", table]
Expand All @@ -439,7 +439,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*

} error:^(NSError *error) {
[self.bridge.eventDispatcher sendDeviceEventWithName:[NSString stringWithFormat:@"%@-getItems", table]
body:@{@"error": error.localizedDescription}];
body:@{@"error": error.localizedDescription}];
}];

}
Expand Down Expand Up @@ -554,7 +554,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*

//=========================================================

RCT_EXPORT_METHOD(itemRefdel:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefdel:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item del:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
Expand All @@ -563,7 +563,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
}];
}

RCT_EXPORT_METHOD(itemRefget:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefget:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item get:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
Expand All @@ -572,7 +572,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
}];
}

RCT_EXPORT_METHOD(itemRefset: (NSDictionary*)attributes item:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefset: (NSDictionary*)attributes item:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item set: attributes success:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
Expand All @@ -581,23 +581,23 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
}];
}

RCT_EXPORT_METHOD(itemRefincr:(NSString *)property withValue:(NSInteger)value item:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefincr:(NSString *)property withValue:(NSInteger)value item:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item incr:property withValue:value success:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
} error:^(NSError *error) {
errorC(@[error.localizedDescription]);
}];
}
RCT_EXPORT_METHOD(itemRefincrCustom:(NSString *)property item:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefincrCustom:(NSString *)property item:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item incr:property success:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
} error:^(NSError *error) {
errorC(@[error.localizedDescription]);
}];
}
RCT_EXPORT_METHOD(itemRefdecr:(NSString *)property withValue:(NSInteger)value item:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefdecr:(NSString *)property withValue:(NSInteger)value item:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item decr:property withValue:value success:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
Expand All @@ -606,7 +606,7 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
}];
}

RCT_EXPORT_METHOD(itemRefdecrCustom:(NSString *)property item:(NSString*)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
RCT_EXPORT_METHOD(itemRefdecrCustom:(NSString *)property item:(NSNumber* _Nonnull)iId success:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)errorC){
ItemRef *item = [_itemRefs objectForKey:iId];
[item decr:property success:^(ItemSnapshot *itemRef) {
success(@[itemRef.val]);
Expand All @@ -616,36 +616,36 @@ - (void)appendTable:(TableRef*)table toStorage:(NSString*)sId withTid:(NSString*
}


RCT_EXPORT_METHOD(itemRefon: (NSString*) eventType item:(NSString*)iId callback:(RCTResponseSenderBlock)callback){
RCT_EXPORT_METHOD(itemRefon: (NSString*) eventType item:(NSNumber* _Nonnull)iId callback:(RCTResponseSenderBlock)callback){
ItemRef *item = [_itemRefs objectForKey:iId];
[item on:[self convertEventType:eventType] callback:^(ItemSnapshot *itemRef) {
callback(@[itemRef.val]);
}];
}


RCT_EXPORT_METHOD(itemRefoff: (NSString*) eventType item:(NSString*)iId){
RCT_EXPORT_METHOD(itemRefoff: (NSString*) eventType item:(NSNumber* _Nonnull)iId){
ItemRef *item = [_itemRefs objectForKey:iId];
[item off:[self convertEventType:eventType]];
}



RCT_EXPORT_METHOD(itemRefonce: (NSString*) eventType item:(NSString*)iId callback:(RCTResponseSenderBlock)callback)
RCT_EXPORT_METHOD(itemRefonce: (NSString*) eventType item:(NSNumber* _Nonnull)iId callback:(RCTResponseSenderBlock)callback)
{
ItemRef *item = [_itemRefs objectForKey:iId];
[item once:[self convertEventType:eventType] callback:^(ItemSnapshot *itemRef) {
callback(@[itemRef.val]);
}];
}

RCT_EXPORT_METHOD(itemRefenablePushNotifications:(NSString*)iId){
ItemRef *item = [_itemRefs objectForKey:iId];
RCT_EXPORT_METHOD(itemRefenablePushNotifications:(NSNumber* _Nonnull)iId){
ItemRef *item = [_itemRefs objectForKey:iId];
[item enablePushNotifications];
}

RCT_EXPORT_METHOD(itemRefdisablePushNotifications:(NSString*)iId){
ItemRef *item = [_itemRefs objectForKey:iId];
RCT_EXPORT_METHOD(itemRefdisablePushNotifications:(NSNumber* _Nonnull)iId){
ItemRef *item = [_itemRefs objectForKey:iId];
[item enablePushNotifications];
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-realtimestorage-ios",
"version": "1.0.9",
"version": "1.0.10",
"description": "The Realtime Framework Cloud Storage client for React-Native",
"main": "RCTRealtimeCloudStorageIOS.js",
"scripts": {
Expand Down

0 comments on commit 5fd3711

Please sign in to comment.