diff --git a/examples/ReactExample/index.ios.js b/examples/ReactExample/index.ios.js index 7b45e870..4e608975 100644 --- a/examples/ReactExample/index.ios.js +++ b/examples/ReactExample/index.ios.js @@ -21,14 +21,14 @@ var { var TodoItemSchema = { name: 'Todo', properties: [ - {name: 'text', type: Realm.Type.String}, + {name: 'text', type: Realm.Types.String}, ] }; var TodoListSchmea = { name: 'TodoList', properties: [ - {name: 'name', type: Realm.Type.String}, - {name: 'items', type: Realm.Type.Array, objectType: 'Todo'} + {name: 'name', type: Realm.Types.String}, + {name: 'items', type: Realm.Types.Array, objectType: 'Todo'} ] }; diff --git a/src/RealmJS.mm b/src/RealmJS.mm index 3be39fe3..808f988b 100644 --- a/src/RealmJS.mm +++ b/src/RealmJS.mm @@ -26,7 +26,7 @@ JSValueRef RJSTypeGet(JSContextRef ctx, JSObjectRef object, JSStringRef property JSClassRef RJSRealmTypeClass() { JSClassDefinition realmTypesDefinition = kJSClassDefinitionEmpty; - realmTypesDefinition.className = "RealmType"; + realmTypesDefinition.className = "RealmTypes"; JSStaticValue types[] = { { "Bool", RJSTypeGet, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, { "Int", RJSTypeGet, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, @@ -51,7 +51,7 @@ JSClassRef RJSRealmTypeClass() { JSObjectRef globalRealmObject = RJSRegisterGlobalClass(ctx, globalObject, RJSRealmConstructorClass(), "Realm", &exception); JSObjectRef typesObject = JSObjectMake(ctx, RJSRealmTypeClass(), NULL); - JSStringRef typeString = JSStringCreateWithUTF8CString("Type"); + JSStringRef typeString = JSStringCreateWithUTF8CString("Types"); JSObjectSetProperty(ctx, globalRealmObject, typeString, typesObject, kJSPropertyAttributeNone, &exception); JSStringRelease(typeString); diff --git a/tests/ObjectTests.js b/tests/ObjectTests.js index 2cc99ad6..cb3c1dbd 100644 --- a/tests/ObjectTests.js +++ b/tests/ObjectTests.js @@ -29,10 +29,10 @@ var ObjectTests = { for (var i = 0; i < BasicTypesObjectSchema.properties.length; i++) { var prop = BasicTypesObjectSchema.properties[i]; - if (prop.type == Realm.Type.Float) { + if (prop.type == Realm.Types.Float) { TestCase.assertEqualWithTolerance(object[prop.name], basicTypesValues[i], 0.000001); } - else if (prop.type == Realm.Type.Date) { + else if (prop.type == Realm.Types.Date) { TestCase.assertEqual(object[prop.name].getTime(), basicTypesValues[i].getTime()); } else { diff --git a/tests/TestObjects.js b/tests/TestObjects.js index 7633bbb0..1e2fdde5 100644 --- a/tests/TestObjects.js +++ b/tests/TestObjects.js @@ -21,7 +21,7 @@ var TestObjectSchema = { name: 'TestObject', properties: [ - {name: 'doubleCol', type: Realm.Type.Double}, + {name: 'doubleCol', type: Realm.Types.Double}, ] }; @@ -29,8 +29,8 @@ function PersonObject() {} PersonObject.prototype.schema = { name: 'PersonObject', properties: [ - {name: 'name', type: Realm.Type.String}, - {name: 'age', type: Realm.Type.Double}, + {name: 'name', type: Realm.Types.String}, + {name: 'age', type: Realm.Types.Double}, ] }; PersonObject.prototype.description = function() { @@ -40,13 +40,13 @@ PersonObject.prototype.description = function() { var BasicTypesObjectSchema = { name: 'BasicTypesObject', properties: [ - {name: 'boolCol', type: Realm.Type.Bool}, - {name: 'intCol', type: Realm.Type.Int}, - {name: 'floatCol', type: Realm.Type.Float}, - {name: 'doubleCol', type: Realm.Type.Double}, - {name: 'stringCol', type: Realm.Type.String}, - {name: 'dateCol', type: Realm.Type.Date}, - {name: 'dataCol', type: Realm.Type.Data}, + {name: 'boolCol', type: Realm.Types.Bool}, + {name: 'intCol', type: Realm.Types.Int}, + {name: 'floatCol', type: Realm.Types.Float}, + {name: 'doubleCol', type: Realm.Types.Double}, + {name: 'stringCol', type: Realm.Types.String}, + {name: 'dateCol', type: Realm.Types.Date}, + {name: 'dataCol', type: Realm.Types.Data}, ] }; @@ -54,8 +54,8 @@ var LinkTypesObjectSchema = { name: 'LinkTypesObject', properties: [ {name: 'objectCol', type: 'TestObject'}, - {name: 'objectCol1', type: Realm.Type.Object, objectType: 'TestObject'}, - {name: 'arrayCol', type: Realm.Type.Array, objectType: 'TestObject'}, + {name: 'objectCol1', type: Realm.Types.Object, objectType: 'TestObject'}, + {name: 'arrayCol', type: Realm.Types.Array, objectType: 'TestObject'}, ] }; @@ -63,8 +63,8 @@ var IntPrimaryObjectSchema = { name: 'IntPrimaryObject', primaryKey: 'primaryCol', properties: [ - {name: 'primaryCol', type: Realm.Type.Int}, - {name: 'valueCol', type: Realm.Type.String}, + {name: 'primaryCol', type: Realm.Types.Int}, + {name: 'valueCol', type: Realm.Types.String}, ] }; @@ -72,32 +72,32 @@ var AllTypesObjectSchema = { name: 'AllTypesObject', primaryKey: 'primaryCol', properties: [ - {name: 'primaryCol',type: Realm.Type.String}, - {name: 'boolCol', type: Realm.Type.Bool}, - {name: 'intCol', type: Realm.Type.Int}, - {name: 'floatCol', type: Realm.Type.Float}, - {name: 'doubleCol', type: Realm.Type.Double}, - {name: 'stringCol', type: Realm.Type.String}, - {name: 'dateCol', type: Realm.Type.Date}, - {name: 'dataCol', type: Realm.Type.Data}, + {name: 'primaryCol',type: Realm.Types.String}, + {name: 'boolCol', type: Realm.Types.Bool}, + {name: 'intCol', type: Realm.Types.Int}, + {name: 'floatCol', type: Realm.Types.Float}, + {name: 'doubleCol', type: Realm.Types.Double}, + {name: 'stringCol', type: Realm.Types.String}, + {name: 'dateCol', type: Realm.Types.Date}, + {name: 'dataCol', type: Realm.Types.Data}, {name: 'objectCol', type: 'TestObject'}, - {name: 'arrayCol', type: Realm.Type.Array, objectType: 'TestObject'}, + {name: 'arrayCol', type: Realm.Types.Array, objectType: 'TestObject'}, ] }; var DefaultValuesObjectSchema = { name: 'DefaultValuesObject', properties: [ - {name: 'boolCol', type: Realm.Type.Bool, default: true}, - {name: 'intCol', type: Realm.Type.Int, default: -1}, - {name: 'floatCol', type: Realm.Type.Float, default: -1.1}, - {name: 'doubleCol', type: Realm.Type.Double, default: -1.11}, - {name: 'stringCol', type: Realm.Type.String, default: 'defaultString'}, - {name: 'dateCol', type: Realm.Type.Date, default: new Date(1.111)}, - {name: 'dataCol', type: Realm.Type.Data, default: 'defaultData'}, + {name: 'boolCol', type: Realm.Types.Bool, default: true}, + {name: 'intCol', type: Realm.Types.Int, default: -1}, + {name: 'floatCol', type: Realm.Types.Float, default: -1.1}, + {name: 'doubleCol', type: Realm.Types.Double, default: -1.11}, + {name: 'stringCol', type: Realm.Types.String, default: 'defaultString'}, + {name: 'dateCol', type: Realm.Types.Date, default: new Date(1.111)}, + {name: 'dataCol', type: Realm.Types.Data, default: 'defaultData'}, {name: 'objectCol', type: 'TestObject', default: [1]}, {name: 'nullObjectCol', type: 'TestObject', default: null}, - {name: 'arrayCol', type: Realm.Type.Array, objectType: 'TestObject', default: [[2]]}, + {name: 'arrayCol', type: Realm.Types.Array, objectType: 'TestObject', default: [[2]]}, ] };