rhodes 2.2.6 → 2.3.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (486) hide show
  1. data/CHANGELOG +20 -0
  2. data/README.md +46 -0
  3. data/Rakefile +85 -80
  4. data/bin/rhodes +2 -2
  5. data/bin/rhogen +1 -1
  6. data/doc/application.txt +277 -0
  7. data/doc/bb-css.txt +209 -0
  8. data/doc/build.txt +785 -0
  9. data/doc/configuration.txt +236 -0
  10. data/doc/connect-to-web-services.txt +282 -0
  11. data/doc/contributing.txt +64 -0
  12. data/doc/css-framework.txt +144 -0
  13. data/doc/device-caps.txt +1152 -0
  14. data/doc/extensions.txt +528 -0
  15. data/doc/files.txt +4 -0
  16. data/doc/generator.txt +141 -0
  17. data/doc/install.txt +35 -0
  18. data/doc/introduction.txt +88 -0
  19. data/doc/rhom.txt +826 -0
  20. data/doc/standard-css.txt +392 -0
  21. data/doc/synchronization.txt +542 -0
  22. data/doc/test-log-debug.txt +148 -0
  23. data/doc/tutorial.txt +136 -0
  24. data/doc/ui.txt +766 -0
  25. data/installer/EnvVarUpdate.nsh +328 -0
  26. data/installer/README.html +81 -0
  27. data/installer/RHOSYNC-LICENSE.txt +675 -0
  28. data/installer/icon.ico +0 -0
  29. data/installer/instant-rhodes.nsi +427 -0
  30. data/lib/build/jake.rb +15 -1
  31. data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
  32. data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
  33. data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
  34. data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
  35. data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
  36. data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
  37. data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
  38. data/lib/extensions/digest-sha1/ext/build.bat +1 -0
  39. data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
  40. data/lib/extensions/esri/ext/build +17 -0
  41. data/lib/extensions/esri/ext/build.bat +29 -0
  42. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
  43. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
  44. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
  45. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
  46. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
  47. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
  48. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
  49. data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
  50. data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
  51. data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
  52. data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
  53. data/lib/extensions/esri/ext.yml +3 -0
  54. data/lib/extensions/net-http/monitor.rb +265 -0
  55. data/lib/extensions/net-http/net/ftp.rb +981 -0
  56. data/lib/extensions/net-http/thread.rb +367 -0
  57. data/lib/extensions/rhocgi/cgi.rb +16 -0
  58. data/lib/extensions/rhospec/rhospec.rb +118 -0
  59. data/lib/framework/base64.rb +91 -0
  60. data/lib/framework/builtinME.rb +13 -10
  61. data/lib/framework/ostruct.rb +145 -0
  62. data/lib/framework/res/back_btn.wm.png +0 -0
  63. data/lib/framework/res/blue_pushpin.wm.png +0 -0
  64. data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
  65. data/lib/framework/res/callout.wm.png +0 -0
  66. data/lib/framework/res/callout_link.wm.png +0 -0
  67. data/lib/framework/res/forward_btn.wm.png +0 -0
  68. data/lib/framework/res/home_btn.wm.png +0 -0
  69. data/lib/framework/res/options_btn.wm.png +0 -0
  70. data/lib/framework/res/refresh_btn.wm.png +0 -0
  71. data/lib/framework/rho/render.rb +5 -2
  72. data/lib/framework/rho/rho.rb +320 -50
  73. data/lib/framework/rho/rhoapplication.rb +48 -10
  74. data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
  75. data/lib/framework/rho/rhosupport.rb +15 -1
  76. data/lib/framework/rho/rhotabbar.rb +29 -0
  77. data/lib/framework/rho/rhotoolbar.rb +17 -0
  78. data/lib/framework/rho/rhoutils.rb +22 -6
  79. data/lib/framework/rhodes.rb +1 -1
  80. data/lib/framework/rholang/rhomsg_de.rb +4 -3
  81. data/lib/framework/rholang/rhomsg_en.rb +1 -0
  82. data/lib/framework/rholang/rhomsg_es.rb +1 -0
  83. data/lib/framework/rholang/rhomsg_it.rb +1 -0
  84. data/lib/framework/rhom/rhom.rb +31 -10
  85. data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
  86. data/lib/framework/rhom/rhom_object_factory.rb +465 -249
  87. data/lib/framework/rhom/rhom_source.rb +22 -7
  88. data/lib/framework/version.rb +1 -1
  89. data/lib/rhodes.rb +1 -1
  90. data/platform/android/Rhodes/AndroidManifest.xml +83 -20
  91. data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
  92. data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
  93. data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
  94. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
  95. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
  96. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
  97. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
  98. data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
  99. data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
  100. data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
  101. data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
  102. data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
  103. data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
  104. data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
  105. data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
  106. data/platform/android/Rhodes/jni/src/event.cpp +9 -15
  107. data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
  108. data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
  109. data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
  110. data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
  111. data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
  112. data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
  113. data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
  114. data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
  115. data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
  116. data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
  117. data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
  118. data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
  119. data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
  120. data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
  121. data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
  122. data/platform/android/Rhodes/res/drawable/callout.png +0 -0
  123. data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
  124. data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
  125. data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
  126. data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
  127. data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
  128. data/platform/android/Rhodes/res/layout/signature.xml +24 -17
  129. data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
  130. data/platform/android/Rhodes/res/values/strings.xml +1 -1
  131. data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
  132. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
  133. data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
  134. data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
  135. data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
  136. data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
  137. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
  138. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
  139. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
  140. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
  141. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
  142. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
  143. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
  144. data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
  145. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
  146. data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
  147. data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
  148. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
  149. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
  150. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
  151. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
  152. data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
  153. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
  154. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
  155. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
  156. data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
  157. data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
  158. data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
  159. data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
  160. data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
  161. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
  162. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
  163. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
  164. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
  165. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
  166. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
  167. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
  168. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
  169. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
  170. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
  171. data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
  172. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
  173. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
  174. data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
  175. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
  176. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
  177. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
  178. data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
  179. data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
  180. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
  181. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
  182. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
  183. data/platform/android/build/RhodesSRC_build.files +32 -23
  184. data/platform/android/build/android.rake +28 -11
  185. data/platform/android/build/androidcommon.rb +2 -0
  186. data/platform/android/build/librhocommon_build.files +9 -5
  187. data/platform/android/build/librhodes_build.files +1 -0
  188. data/platform/android/build/libruby_build.files +1 -0
  189. data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
  190. data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
  191. data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
  192. data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
  193. data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
  194. data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
  195. data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
  196. data/platform/bb/RubyVM/RubyVM.jdp +3 -0
  197. data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
  198. data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
  199. data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
  200. data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
  201. data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
  202. data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
  203. data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
  204. data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
  205. data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
  206. data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
  207. data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
  208. data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
  209. data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
  210. data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
  211. data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
  212. data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
  213. data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
  214. data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
  215. data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
  216. data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
  217. data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
  218. data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
  219. data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
  220. data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
  221. data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
  222. data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
  223. data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
  224. data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
  225. data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
  226. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
  227. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
  228. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
  229. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
  230. data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
  231. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
  232. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
  233. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
  234. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
  235. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
  236. data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
  237. data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
  238. data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
  239. data/platform/bb/build/RubyVM_build.files +3 -0
  240. data/platform/bb/build/bb.rake +140 -62
  241. data/platform/bb/build/hsqldb_build.files +0 -2
  242. data/platform/bb/build/rhodes_build.files +5 -0
  243. data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
  244. data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
  245. data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
  246. data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
  247. data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
  248. data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
  249. data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
  250. data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
  251. data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
  252. data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
  253. data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
  254. data/platform/bb/rhodes/resources/mappin.png +0 -0
  255. data/platform/bb/rhodes/rhodes.jdp +3 -0
  256. data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
  257. data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
  258. data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
  259. data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
  260. data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
  261. data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
  262. data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
  263. data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
  264. data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
  265. data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
  266. data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
  267. data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
  268. data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
  269. data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
  270. data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
  271. data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
  272. data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
  273. data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
  274. data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
  275. data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
  276. data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
  277. data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
  278. data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
  279. data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
  280. data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
  281. data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
  282. data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
  283. data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
  284. data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
  285. data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
  286. data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
  287. data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
  288. data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
  289. data/platform/iphone/Classes/DateTime.h +4 -0
  290. data/platform/iphone/Classes/DateTime.m +1 -1
  291. data/platform/iphone/Classes/DateTimePicker.m +8 -1
  292. data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
  293. data/platform/iphone/Classes/Event/Event.m +2 -2
  294. data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
  295. data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
  296. data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
  297. data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
  298. data/platform/iphone/Classes/NativeBar.h +34 -0
  299. data/platform/iphone/Classes/NativeBar.m +131 -26
  300. data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
  301. data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
  302. data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
  303. data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
  304. data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
  305. data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
  306. data/platform/iphone/Classes/RhoAlert.m +3 -3
  307. data/platform/iphone/Classes/RhoMainView.h +3 -0
  308. data/platform/iphone/Classes/Rhodes.h +6 -2
  309. data/platform/iphone/Classes/Rhodes.m +47 -79
  310. data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
  311. data/platform/iphone/Classes/SimpleMainView.h +18 -1
  312. data/platform/iphone/Classes/SimpleMainView.m +180 -35
  313. data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
  314. data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
  315. data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
  316. data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
  317. data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
  318. data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
  319. data/platform/iphone/Classes/TabbedMainView.h +25 -3
  320. data/platform/iphone/Classes/TabbedMainView.m +340 -14
  321. data/platform/iphone/ESRI/BluePushpin.png +0 -0
  322. data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
  323. data/platform/iphone/ESRI/esri.png +0 -0
  324. data/platform/iphone/ESRI/esri@2x.png +0 -0
  325. data/platform/iphone/Info.plist +1 -1
  326. data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
  327. data/platform/iphone/rbuild/iphone.rake +100 -4
  328. data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
  329. data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
  330. data/platform/shared/SyncClient/SyncClient.cpp +29 -3
  331. data/platform/shared/SyncClient/SyncClient.h +2 -1
  332. data/platform/shared/common/IRhoClassFactory.h +3 -0
  333. data/platform/shared/common/IRhoCrypt.h +16 -0
  334. data/platform/shared/common/IRhoThreadImpl.h +1 -0
  335. data/platform/shared/common/RhoAppAdapter.h +2 -0
  336. data/platform/shared/common/RhoConf.cpp +97 -46
  337. data/platform/shared/common/RhoConf.h +14 -13
  338. data/platform/shared/common/RhoFile.cpp +10 -0
  339. data/platform/shared/common/RhoFile.h +1 -0
  340. data/platform/shared/common/RhoMath.cpp +43 -0
  341. data/platform/shared/common/RhoMath.h +27 -0
  342. data/platform/shared/common/RhoNativeViewManager.h +27 -1
  343. data/platform/shared/common/RhoPort.h +11 -0
  344. data/platform/shared/common/RhoStd.h +5 -0
  345. data/platform/shared/common/RhoThread.cpp +1 -1
  346. data/platform/shared/common/RhoThread.h +1 -1
  347. data/platform/shared/common/RhodesApp.cpp +381 -139
  348. data/platform/shared/common/RhodesApp.h +24 -10
  349. data/platform/shared/common/RhodesAppBase.cpp +72 -1
  350. data/platform/shared/common/RhodesAppBase.h +5 -1
  351. data/platform/shared/common/SplashScreen.h +4 -4
  352. data/platform/shared/common/ThreadQueue.cpp +44 -17
  353. data/platform/shared/common/ThreadQueue.h +4 -0
  354. data/platform/shared/common/app_build_configs.c +0 -1
  355. data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
  356. data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
  357. data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
  358. data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
  359. data/platform/shared/common/map/ESRIMapEngine.h +255 -0
  360. data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
  361. data/platform/shared/common/map/GoogleMapEngine.h +52 -0
  362. data/platform/shared/common/map/MapEngine.cpp +304 -0
  363. data/platform/shared/common/map/MapEngine.h +214 -0
  364. data/platform/shared/db/DBAdapter.cpp +147 -18
  365. data/platform/shared/db/DBAdapter.h +38 -12
  366. data/platform/shared/db/DBAttrManager.cpp +4 -3
  367. data/platform/shared/db/DBAttrManager.h +7 -7
  368. data/platform/shared/db/res/db/syncdb.triggers +0 -5
  369. data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
  370. data/platform/shared/json/JSONIterator.cpp +11 -1
  371. data/platform/shared/json/JSONIterator.h +1 -0
  372. data/platform/shared/logging/RhoLogConf.cpp +29 -12
  373. data/platform/shared/net/CURLNetRequest.cpp +80 -25
  374. data/platform/shared/net/CURLNetRequest.h +6 -2
  375. data/platform/shared/net/HttpServer.cpp +12 -6
  376. data/platform/shared/net/HttpServer.h +2 -1
  377. data/platform/shared/net/INetRequest.h +1 -0
  378. data/platform/shared/ruby/ext/alert/alert.i +5 -0
  379. data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
  380. data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
  381. data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
  382. data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
  383. data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
  384. data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
  385. data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
  386. data/platform/shared/ruby/ext/rho/extensions.c +0 -1
  387. data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
  388. data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
  389. data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
  390. data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
  391. data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
  392. data/platform/shared/ruby/ext/system/system.i +4 -0
  393. data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
  394. data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
  395. data/platform/shared/rubyext/System.cpp +9 -0
  396. data/platform/shared/rubyext/WebView.h +1 -0
  397. data/platform/shared/sqlite/crypto.c +907 -0
  398. data/platform/shared/sqlite/sqlite3.c +6 -0
  399. data/platform/shared/sync/SyncEngine.cpp +49 -19
  400. data/platform/shared/sync/SyncEngine.h +0 -1
  401. data/platform/shared/sync/SyncNotify.cpp +14 -5
  402. data/platform/shared/sync/SyncNotify.h +2 -2
  403. data/platform/shared/sync/SyncSource.cpp +79 -33
  404. data/platform/shared/sync/SyncSource.h +1 -0
  405. data/platform/shared/sync/SyncThread.cpp +26 -11
  406. data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
  407. data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
  408. data/platform/wm/build/wm.rake +6 -0
  409. data/platform/wm/rhodes/Alert.cpp +4 -3
  410. data/platform/wm/rhodes/Alert.h +1 -1
  411. data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
  412. data/platform/wm/rhodes/DateTimePicker.h +9 -1
  413. data/platform/wm/rhodes/MainWindow.cpp +121 -61
  414. data/platform/wm/rhodes/MainWindow.h +29 -4
  415. data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
  416. data/platform/wm/rhodes/MapView/Graphics.h +136 -0
  417. data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
  418. data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
  419. data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
  420. data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
  421. data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
  422. data/platform/wm/rhodes/Rhodes.cpp +94 -102
  423. data/platform/wm/rhodes/Rhodes.rc +27 -0
  424. data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
  425. data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
  426. data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
  427. data/platform/wm/rhodes/camera/Camera.cpp +36 -15
  428. data/platform/wm/rhodes/camera/Camera.h +0 -4
  429. data/platform/wm/rhodes/resource.h +10 -2
  430. data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
  431. data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
  432. data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
  433. data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
  434. data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
  435. data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
  436. data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
  437. data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
  438. data/platform/wm/rhodes/rhodes.vcproj +38 -2
  439. data/platform/wm/rhodes/stdafx.h +2 -1
  440. data/platform/wm/rubylib/rubylib.vcproj +12 -0
  441. data/rakefile.rb +85 -80
  442. data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
  443. data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
  444. data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
  445. data/res/build-tools/xruby-0.3.3.jar +0 -0
  446. data/res/generators/templates/application/app/application.rb +2 -2
  447. data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
  448. data/res/generators/templates/application/public/css/android.css +1 -0
  449. data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
  450. data/res/generators/templates/application/rhoconfig.txt +66 -14
  451. data/rhodes.gemspec +3 -3
  452. data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
  453. data/spec/framework_spec/build.yml +1 -1
  454. data/spec/phone_spec/Rakefile +1 -0
  455. data/spec/phone_spec/app/Account/account.rb +2 -0
  456. data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
  457. data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
  458. data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
  459. data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
  460. data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
  461. data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
  462. data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
  463. data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
  464. data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
  465. data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
  466. data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
  467. data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
  468. data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
  469. data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
  470. data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
  471. data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
  472. data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
  473. data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
  474. data/spec/phone_spec/app/spec_runner.rb +15 -7
  475. data/spec/phone_spec/build.yml +2 -2
  476. metadata +154 -25
  477. data/README.textile +0 -45
  478. data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
  479. data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
  480. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
  481. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
  482. data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
  483. data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
  484. data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
  485. data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
  486. data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -22,14 +22,32 @@ module Rho
22
22
  APPNAME = 'app'
23
23
 
24
24
  @@rho_framework = nil
25
+ @@native_bar_initialized = nil
25
26
 
26
27
  def self.get_instance
27
28
  @@rho_framework
28
29
  end
29
-
30
+
31
+ def initialize(app_manifest_filename=nil)
32
+ puts "Calling RHO.initialize"
33
+
34
+ if app_manifest_filename
35
+ load_models_from_file(app_manifest_filename)
36
+ else
37
+ load_models_from_file(Rho::RhoFSConnector::get_app_manifest_filename)
38
+ end
39
+
40
+ # Initialize application and sources
41
+ @@rho_framework = self
42
+ @db_partitions = {}
43
+
44
+ partition = 'user'
45
+ @db_partitions[partition] = Rhom::RhomDbAdapter.new(Rho::RhoFSConnector::get_db_fullpathname(partition), partition)
46
+ end
47
+
48
+ =begin
30
49
  def initialize(app_manifest_filename=nil)
31
50
  puts "Calling RHO.initialize"
32
- #RHO.process_rhoconfig
33
51
 
34
52
  if app_manifest_filename
35
53
  process_model_dirs(app_manifest_filename)
@@ -42,7 +60,7 @@ module Rho
42
60
  @db_partitions = {}
43
61
  init_sources()
44
62
  end
45
-
63
+ =end
46
64
  attr_reader :db_partitions
47
65
 
48
66
  def self.get_src_db(src_name=nil)
@@ -76,6 +94,27 @@ module Rho
76
94
  end
77
95
  end
78
96
 
97
+ def init_nativebar
98
+ return if @@native_bar_initialized
99
+
100
+ begin
101
+ get_app(APPNAME).init_nativebar
102
+ rescue Exception => e
103
+ trace_msg = e.backtrace.join("\n");
104
+ puts "Application's native bar initialization failed: #{e.inspect}; Trace: #{trace_msg}"
105
+ end
106
+ @@native_bar_initialized = true
107
+ end
108
+
109
+ def on_config_conflicts(conflicts)
110
+ begin
111
+ get_app(APPNAME).on_reinstall_config_update(conflicts)
112
+ rescue Exception => e
113
+ trace_msg = e.backtrace.join("\n")
114
+ puts 'Application on_reinstall_config_update failed: ' + e.inspect + ";Trace: #{trace_msg}"
115
+ end
116
+ end
117
+
79
118
  def activate_app
80
119
  begin
81
120
  get_app(APPNAME).on_activate_app
@@ -90,10 +129,29 @@ module Rho
90
129
  get_app(APPNAME).on_deactivate_app
91
130
  rescue Exception => e
92
131
  trace_msg = e.backtrace.join("\n")
93
- puts 'Application activate failed: ' + e.inspect + ";Trace: #{trace_msg}"
132
+ puts 'Application deactivate failed: ' + e.inspect + ";Trace: #{trace_msg}"
94
133
  end
95
134
  end
96
135
 
136
+ def ui_created
137
+ begin
138
+ get_app(APPNAME).on_ui_created
139
+ rescue Exception => e
140
+ trace_msg = e.backtrace.join("\n")
141
+ puts '"UI created" callback failed: ' + e.inspect + ";Trace: #{trace_msg}"
142
+ end
143
+ end
144
+
145
+ def ui_destroyed
146
+ begin
147
+ get_app(APPNAME).on_ui_destroyed
148
+ @@native_bar_initialized = false
149
+ rescue Exception => e
150
+ trace_msg = e.backtrace.join("\n");
151
+ puts '"UI destroyed" callback failed: ' + e.inspect + ";Trace: #{trace_msg}"
152
+ end
153
+ end
154
+
97
155
  # make sure we close the database file
98
156
  #def self.finalize
99
157
  #Rhom::RhomDbAdapter::close
@@ -122,6 +180,19 @@ module Rho
122
180
  end
123
181
  APPLICATIONS[appname]
124
182
  end
183
+
184
+ def load_models_from_file(app_manifest_filename=nil)
185
+ File.open(app_manifest_filename).each do |line|
186
+ str = line.chomp
187
+ if str != nil and str.length > 0
188
+ #puts "model file: #{str}"
189
+ model_name = File.basename(File.dirname(str))
190
+
191
+ Rho::RhoConfig::add_source(model_name, {:loaded => false, :file_path => str})
192
+ end
193
+
194
+ end
195
+ end
125
196
 
126
197
  # Return the directories where we need to load configuration files
127
198
  def process_model_dirs(app_manifest_filename=nil)
@@ -140,7 +211,7 @@ module Rho
140
211
  if modelClass
141
212
  puts "model class found"
142
213
  if modelClass.respond_to?( :get_model_params )
143
- Rho::RhoConfig::add_source(modelName,modelClass.get_model_params())
214
+ Rho::RhoConfig::add_loaded_source(modelName,modelClass.get_model_params())
144
215
  modelClass.reset_model_params()
145
216
  else
146
217
  puts "ERROR: Invalid model definition. Add 'include Rhom::PropertyBag' or 'include Rhom::FixedSchema' to model class"
@@ -198,6 +269,16 @@ module Rho
198
269
  db.update_into_table('sources', {"schema_version"=>source['schema_version']},{"name"=>source['name']})
199
270
  end
200
271
  end
272
+
273
+ def reset_db_on_sync_user_changed()
274
+ puts "reset_db_on_sync_user_changed"
275
+ begin
276
+ get_app(APPNAME).on_sync_user_changed
277
+ rescue Exception => e
278
+ trace_msg = e.backtrace.join("\n")
279
+ puts 'Application reset_db_on_sync_user_changed failed: ' + e.inspect + ";Trace: #{trace_msg}"
280
+ end
281
+ end
201
282
 
202
283
  def load_server_sources(data)
203
284
  puts "load_server_sources : #{data}"
@@ -209,35 +290,43 @@ module Rho
209
290
  puts "reload sources for partition: #{str_partition}"
210
291
  db = @db_partitions[ str_partition ]
211
292
 
212
- puts "sources before: #{Rho::RhoConfig::sources()}"
293
+ #puts "sources before: #{Rho::RhoConfig::sources()}"
213
294
 
214
- Rho::RhoConfig::sources().delete_if {|key, value| value['partition']==str_partition }
215
- arSrcs = db.select_from_table('sources','source_id, name, sync_priority, partition, sync_type, schema, schema_version, associations, blob_attribs',
216
- {'partition'=>str_partition} )
217
- arSrcs.each do |src|
218
-
219
- if src && src['schema'] && src['schema'].length() > 0
220
-
221
- #puts "src['schema'] : #{src['schema']}"
222
- hashSchema = Rho::JSON.parse(src['schema'])
223
- #puts "hashSchema : #{hashSchema}"
224
-
225
- src['schema'] = {}
226
- src['schema']['sql'] = ::Rho::RHO.make_createsql_script( src['name'], hashSchema)
227
- src['schema_version'] = hashSchema['version']
295
+ db.start_transaction
296
+ begin
297
+ Rho::RhoConfig::sources().delete_if {|key, value| value['partition']==str_partition }
298
+ arSrcs = db.select_from_table('sources','source_id, name, sync_priority, partition, sync_type, schema, schema_version, associations, blob_attribs',
299
+ {'partition'=>str_partition} )
300
+ arSrcs.each do |src|
228
301
 
229
- db.update_into_table('sources', {"schema"=>src['schema']['sql'], "schema_version"=>src['schema_version']},{"name"=>src['name']})
302
+ if src && src['schema'] && src['schema'].length() > 0
230
303
 
231
- if str_partition != 'user'
232
- @db_partitions['user'].update_into_table('sources', {"schema"=>src['schema']['sql'], "schema_version"=>src['schema_version']},{"name"=>src['name']})
304
+ #puts "src['schema'] : #{src['schema']}"
305
+ hashSchema = Rho::JSON.parse(src['schema'])
306
+ #puts "hashSchema : #{hashSchema}"
307
+
308
+ src['schema'] = {}
309
+ src['schema']['sql'] = ::Rho::RHO.make_createsql_script( src['name'], hashSchema)
310
+ src['schema_version'] = hashSchema['version']
311
+
312
+ db.update_into_table('sources', {"schema"=>src['schema']['sql'], "schema_version"=>src['schema_version']},{"name"=>src['name']})
313
+
314
+ #if str_partition != 'user'
315
+ # @db_partitions['user'].update_into_table('sources', {"schema"=>src['schema']['sql'], "schema_version"=>src['schema_version']},{"name"=>src['name']})
316
+ #end
233
317
  end
234
- end
235
318
 
236
- Rho::RhoConfig::sources()[ src['name'] ] = src
237
-
238
- end
319
+ src[:loaded] = true
320
+ Rho::RhoConfig::sources()[ src['name'] ] = src
321
+
322
+ end
323
+ db.commit
324
+ rescue Exception => e
325
+ db.rollback
326
+ raise
327
+ end
239
328
 
240
- puts "sources after: #{Rho::RhoConfig::sources()}"
329
+ #puts "sources after: #{Rho::RhoConfig::sources()}"
241
330
  return
242
331
  end
243
332
  rescue Exception => e
@@ -248,6 +337,85 @@ module Rho
248
337
  raise ArgumentError, "load_server_sources should be called only from bulk sync with partition parameter!"
249
338
  end
250
339
 
340
+ def self.load_all_sources
341
+ Rho::RHO.get_instance().load_all_sync_sources()
342
+ end
343
+
344
+ @all_models_loaded = false
345
+ def load_all_sync_sources()
346
+ return if @all_models_loaded
347
+ puts "load_all_sync_sources"
348
+
349
+ begin
350
+ Rho::RhoConfig.sources.values.each do |src|
351
+ next if src[:loaded]
352
+
353
+ load_model(src['name'],false)
354
+ end
355
+
356
+ init_sources()
357
+ rescue Exception => e
358
+ puts "Error load_all_sync_sources: #{e}"
359
+ puts "Trace: #{e.backtrace}"
360
+ end
361
+ end
362
+
363
+ def load_model(modelName, init_db = true)
364
+ return nil if !Rho::RhoConfig.sources.has_key?(modelName) || Rho::RhoConfig.sources[modelName][:loaded]
365
+ Rho::RhoConfig.sources[modelName][:loaded] = true
366
+
367
+ puts "load_model: #{modelName}"
368
+
369
+ Rhom::RhomObjectFactory.init_object(modelName)
370
+ require "#{Rho::RhoConfig.sources[modelName][:file_path]}"
371
+
372
+ puts "model name: #{modelName}"
373
+
374
+ modelClass = nil
375
+ modelClass = Object.const_get(modelName) if Object.const_defined?(modelName)
376
+ if modelClass
377
+ puts "model class found"
378
+ if modelClass.respond_to?( :get_model_params )
379
+ Rho::RhoConfig::add_loaded_source(modelName,modelClass.get_model_params())
380
+ modelClass.reset_model_params()
381
+
382
+ partition = Rho::RhoConfig::sources[modelName]['partition']
383
+ db = ::Rho::RHO.get_db_partitions()[partition]
384
+ if !db
385
+ db = Rhom::RhomDbAdapter.new(Rho::RhoFSConnector::get_db_fullpathname(partition), partition)
386
+ ::Rho::RHO.get_db_partitions()[partition] = db
387
+ end
388
+
389
+ if init_db
390
+ hash_migrate = {}
391
+ db.start_transaction
392
+ begin
393
+ uniq_sources = [Rho::RhoConfig::sources[modelName]]
394
+ init_db_sources(db, uniq_sources, partition, hash_migrate)
395
+
396
+ ::Rho::RHO.init_schema_sources_partition(uniq_sources, hash_migrate, partition, db)
397
+
398
+ ::Rho::RHO.init_sync_source_properties(uniq_sources)
399
+
400
+ SyncEngine.update_blob_attribs(partition, Rho::RhoConfig::sources[modelName]['source_id'].to_i() )
401
+ db.commit
402
+ rescue Exception => e
403
+ trace_msg = e.backtrace.join("\n")
404
+ puts "exception when init_db_sources: #{e}; Trace:" + trace_msg
405
+
406
+ db.rollback
407
+ end
408
+ end
409
+ else
410
+ puts "ERROR: Invalid model definition. Add 'include Rhom::PropertyBag' or 'include Rhom::FixedSchema' to model class"
411
+ end
412
+ else
413
+ puts "ERROR: cannot load model : #{modelClass}"
414
+ end
415
+
416
+ modelClass
417
+ end
418
+
251
419
  def find_src_byname(uniq_sources, src_name)
252
420
  uniq_sources.each do |source|
253
421
  return source if src_name == source['name']
@@ -255,13 +423,15 @@ module Rho
255
423
 
256
424
  nil
257
425
  end
258
-
426
+
259
427
  # setup the sources table and model attributes for all applications
260
428
  def init_sources()
261
429
  return unless defined? Rho::RhoConfig::sources
430
+
431
+ @all_models_loaded = true
262
432
 
263
433
  uniq_sources = Rho::RhoConfig::sources.values
264
- puts 'init_sources: ' + uniq_sources.inspect
434
+ puts 'init_sources: ' #+ uniq_sources.inspect
265
435
 
266
436
  uniq_sources.each do |source|
267
437
  source['str_associations'] = ""
@@ -301,6 +471,8 @@ module Rho
301
471
  db.start_transaction
302
472
  begin
303
473
  init_db_sources(db, uniq_sources, partition,hash_migrate)
474
+ SyncEngine.update_blob_attribs(partition, -1 )
475
+
304
476
  db.commit
305
477
  rescue Exception => e
306
478
  trace_msg = e.backtrace.join("\n")
@@ -313,15 +485,18 @@ module Rho
313
485
  end
314
486
 
315
487
  ::Rho::RHO.init_schema_sources(hash_migrate)
488
+ ::Rho::RHO.init_sync_source_properties(uniq_sources)
489
+ end
316
490
 
317
- Rho::RhoConfig::sources.values.each do|src|
491
+ def self.init_sync_source_properties(uniq_sources)
492
+ uniq_sources.each do|src|
318
493
  ['pass_through'].each do |prop|
319
494
  next unless src.has_key?(prop)
320
495
  SyncEngine.set_source_property(src['source_id'], prop, src[prop] ? src[prop].to_s() : '' )
321
496
  end
322
497
  end
323
498
  end
324
-
499
+
325
500
  def self.processIndexes(index_param, src_name, is_unique)
326
501
 
327
502
  return "" unless index_param
@@ -356,11 +531,29 @@ module Rho
356
531
  def self.init_schema_sources(hash_migrate)
357
532
  uniq_sources = Rho::RhoConfig::sources.values
358
533
  puts 'init_schema_sources'
534
+
535
+ ::Rho::RHO.get_db_partitions().each do |partition, db|
536
+ db.start_transaction
537
+ begin
538
+ init_schema_sources_partition(uniq_sources, hash_migrate, partition, db)
539
+ db.commit
540
+ rescue Exception => e
541
+ trace_msg = e.backtrace.join("\n")
542
+ puts "exception when init_schema_sources: #{e}; Trace:" + trace_msg
543
+
544
+ db.rollback
545
+ end
546
+ end
359
547
 
548
+ puts 'END init_schema_sources'
549
+
550
+ end
551
+
552
+ def self.init_schema_sources_partition(uniq_sources, hash_migrate, partition, db)
360
553
  uniq_sources.each do |source|
361
- db = get_src_db(source['name'])
362
-
554
+ next unless partition == source['partition']
363
555
  next unless source['schema']
556
+
364
557
  raise ArgumentError, "schema parameter should be Hash!" unless source['schema'].is_a?(Hash)
365
558
 
366
559
  call_migrate = false
@@ -373,11 +566,15 @@ module Rho
373
566
 
374
567
  if call_migrate
375
568
  db.update_into_table('sources', {"schema"=>strCreate},{"name"=>source['name']})
569
+ #::Rho::RHO.get_user_db().update_into_table('sources', {"schema"=>strCreate},{"name"=>source['name']}) if db != ::Rho::RHO.get_user_db()
570
+
376
571
  source['migrate_version'] = hash_migrate[ source['name'] ]
377
572
  source['schema']['sql'] = strCreate
378
573
  else
379
574
  db.execute_batch_sql(strCreate)
380
575
  db.update_into_table('sources', {"schema"=>strCreate, "schema_version"=>source['schema_version']},{"name"=>source['name']})
576
+
577
+ #::Rho::RHO.get_user_db().update_into_table('sources', {"schema"=>strCreate, "schema_version"=>source['schema_version']},{"name"=>source['name']}) if db != ::Rho::RHO.get_user_db()
381
578
  end
382
579
 
383
580
  end
@@ -440,15 +637,17 @@ module Rho
440
637
 
441
638
  end
442
639
 
443
- def get_start_id(db_sources)
640
+ def get_start_id(db_sources, db_partition)
444
641
  start_id = 0
445
642
  db_sources.each do |db_src|
643
+ next unless db_partition == db_src['partition']
644
+
446
645
  src_id = db_src['source_id']
447
646
  start_id = src_id if src_id > start_id
448
647
  end
449
648
 
450
- if start_id < Rho::RhoConfig.max_config_srcid
451
- start_id = Rho::RhoConfig.max_config_srcid()+2
649
+ if start_id < Rho::RhoConfig.max_config_srcid()[db_partition]
650
+ start_id = Rho::RhoConfig.max_config_srcid()[db_partition]+2
452
651
  else
453
652
  start_id += 1
454
653
  end
@@ -469,13 +668,14 @@ module Rho
469
668
  puts "init_db_sources"
470
669
 
471
670
  db_sources = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs, name' )
472
- start_id = get_start_id(db_sources)
671
+ start_id = get_start_id(db_sources, db_partition)
473
672
 
474
673
  uniq_sources.each do |source|
674
+ partition = source['partition']
675
+ next unless partition == db_partition
475
676
  #puts "init_db_sources(#{source['name']}) : #{source}"
476
677
  name = source['name']
477
678
  sync_priority = source['sync_priority']
478
- partition = source['partition']
479
679
  sync_type = source['sync_type']
480
680
  schema_version = source['schema_version']
481
681
  associations = source['str_associations']
@@ -538,7 +738,9 @@ module Rho
538
738
  res = init_response
539
739
  get_app(req['application']).send :serve, req, res
540
740
 
741
+ init_nativebar
541
742
  Rho::RhoController.clean_cached_metadata()
743
+ Rho::RhoConfig.clean_cached_changed
542
744
  return send_response(res)
543
745
  rescue Exception => e
544
746
  return send_error(e)
@@ -550,7 +752,10 @@ module Rho
550
752
  puts "RHO serve: " + (req ? "#{req['request-uri']}" : '')
551
753
  res = init_response
552
754
  get_app(req['application']).send :serve, req, res
755
+
756
+ init_nativebar
553
757
  Rho::RhoController.clean_cached_metadata()
758
+ Rho::RhoConfig.clean_cached_changed
554
759
  return send_response_hash(res)
555
760
  rescue Exception => e
556
761
  return send_error(e,500,true)
@@ -564,7 +769,10 @@ module Rho
564
769
  puts "RHO serve_index: " + (req ? "#{req['request-uri']}" : '')
565
770
  res = init_response
566
771
  res['request-body'] = RhoController::renderfile(index_name, req, res)
772
+
773
+ init_nativebar
567
774
  Rho::RhoController.clean_cached_metadata()
775
+ Rho::RhoConfig.clean_cached_changed
568
776
  return send_response(res)
569
777
  rescue Exception => e
570
778
  return send_error(e)
@@ -578,7 +786,10 @@ module Rho
578
786
  puts "RHO serve_index: " + (req ? "#{req['request-uri']}" : '')
579
787
  res = init_response
580
788
  res['request-body'] = RhoController::renderfile(index_name, req, res)
789
+
790
+ init_nativebar
581
791
  Rho::RhoController.clean_cached_metadata()
792
+ Rho::RhoConfig.clean_cached_changed
582
793
  return send_response_hash(res)
583
794
  rescue Exception => e
584
795
  return send_error(e, 500, true)
@@ -716,7 +927,10 @@ module Rho
716
927
 
717
928
  @@sources = {}
718
929
  #@@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
719
- @@max_config_srcid = 1
930
+ @@max_config_srcid = {}
931
+ @@max_config_srcid['user'] = 1
932
+ @@max_config_srcid['app'] = 20001
933
+ @@max_config_srcid['local'] = 40001
720
934
 
721
935
  class << self
722
936
  def method_missing(name, *args)
@@ -742,10 +956,6 @@ module Rho
742
956
  @@max_config_srcid
743
957
  end
744
958
 
745
- def reset_max_config_srcid
746
- @@max_config_srcid = 1
747
- end
748
-
749
959
  def show_log
750
960
  RhoConf.show_log
751
961
  end
@@ -762,6 +972,37 @@ module Rho
762
972
  @@sources
763
973
  end
764
974
 
975
+ @@cached_changed = nil
976
+ def clean_cached_changed
977
+ @@cached_changed = nil
978
+ end
979
+
980
+ def source_changed?(name, partition='user')
981
+ return Object.const_get(name).changed?() if Object.const_defined?(name)
982
+
983
+ if !@@cached_changed
984
+ @@cached_changed = {}
985
+ db = ::Rho::RHO.get_db_partitions[partition]
986
+ db_ids = db.execute_sql("SELECT source_id,name FROM sources" )
987
+ changes = db.execute_sql("SELECT DISTINCT(source_id) FROM changed_values" )
988
+
989
+ changes.each do |changed_item|
990
+
991
+ changed_name = nil
992
+ db_ids.each do |db_item|
993
+ if db_item['source_id'] == changed_item['source_id']
994
+ changed_name = db_item['name']
995
+ break
996
+ end
997
+ end
998
+
999
+ @@cached_changed[changed_name] = true if changed_name
1000
+ end
1001
+ end
1002
+
1003
+ @@cached_changed.has_key?(name) ? @@cached_changed[name] : false
1004
+ end
1005
+
765
1006
  #def config
766
1007
  # @@config
767
1008
  #end
@@ -770,33 +1011,39 @@ module Rho
770
1011
  # @@config[key] = value if key # allow nil value
771
1012
  #end
772
1013
 
773
- def add_source(modelname, new_source=nil)
1014
+ def add_source(modelname, props)
1015
+ @@sources[modelname] = props
1016
+ @@sources[modelname]['name'] ||= modelname
1017
+ end
1018
+
1019
+ def add_loaded_source(modelname, new_source=nil)
774
1020
  return if !modelname || modelname.length() == 0# || @@sources[modelname]
775
1021
 
776
1022
  puts "#{modelname} : #{new_source}"
777
1023
  @@sources[modelname] = new_source ? new_source.clone() : {}
778
1024
  @@sources[modelname]['name'] ||= modelname
1025
+ @@sources[modelname][:loaded] = true
779
1026
 
780
1027
  if @@sources[modelname]['sync_priority']
781
1028
  @@sources[modelname]['sync_priority'] = @@sources[modelname]['sync_priority'].to_i()
782
1029
  else
783
1030
  @@sources[modelname]['sync_priority'] = 1000
784
1031
  end
1032
+
1033
+ #@@sources[modelname]['sync_type'] = 'none' if !@@sources[modelname]['sync']
1034
+ @@sources[modelname]['sync_type'] ||= 'none'
785
1035
 
786
1036
  if @@sources[modelname]['partition']
787
1037
  @@sources[modelname]['partition'] = @@sources[modelname]['partition'].to_s
788
1038
  else
789
- @@sources[modelname]['partition'] ||= 'user'
1039
+ @@sources[modelname]['partition'] ||= @@sources[modelname]['sync_type'] != 'none' ? 'user' : 'local'
790
1040
  end
791
1041
 
792
- #@@sources[modelname]['sync_type'] = 'none' if !@@sources[modelname]['sync']
793
- @@sources[modelname]['sync_type'] ||= 'none'
794
-
795
1042
  if @@sources[modelname]['source_id']
796
1043
  @@sources[modelname]['source_id'] = @@sources[modelname]['source_id'].to_i()
797
1044
  end
798
1045
 
799
- @@max_config_srcid = @@sources[modelname]['source_id'] if @@sources[modelname]['source_id'] && @@max_config_srcid < @@sources[modelname]['source_id']
1046
+ @@max_config_srcid[@@sources[modelname]['partition']] = @@sources[modelname]['source_id'] if @@sources[modelname]['source_id'] && @@max_config_srcid[@@sources[modelname]['partition']] < @@sources[modelname]['source_id']
800
1047
  end
801
1048
 
802
1049
  @@g_base_temp_id = nil
@@ -888,6 +1135,10 @@ module Rho
888
1135
  end # Rho
889
1136
 
890
1137
  module SyncEngine
1138
+ def self.get_user_name
1139
+ Rho::RhoConfig.rho_sync_user
1140
+ end
1141
+
891
1142
  def self.search(args)
892
1143
  searchParams = ""
893
1144
 
@@ -912,3 +1163,22 @@ end
912
1163
  #at_exit do
913
1164
  #::Rhom::RhomDbAdapter.close
914
1165
  #end
1166
+
1167
+
1168
+ class Module
1169
+ alias base_const_missing const_missing
1170
+ def const_missing(name)
1171
+ puts "const_missing: #{name}"
1172
+
1173
+ res = Rho::RHO.get_instance().load_model(name.to_s)
1174
+ return res if res
1175
+
1176
+ return base_const_missing(name)
1177
+ end
1178
+ end
1179
+
1180
+ module Kernel
1181
+ def require_source(name)
1182
+ Rho::RHO.get_instance().load_model(name.to_s)
1183
+ end
1184
+ end