rhodes 2.0.0.beta2 → 2.0.0.beta3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (306) hide show
  1. data/LICENSE +2 -0
  2. data/Manifest.txt +27 -148
  3. data/Rakefile +49 -3
  4. data/lib/framework/builtinME.rb +6 -0
  5. data/lib/framework/rho/render.rb +13 -8
  6. data/lib/framework/rho/rho.rb +97 -43
  7. data/lib/framework/rho/rhoapplication.rb +8 -3
  8. data/lib/framework/rho/rhocontroller.rb +1 -1
  9. data/lib/framework/rhodes-framework.rb +1 -1
  10. data/lib/framework/rhodes.rb +1 -1
  11. data/lib/framework/rhoframework.rb +7 -22
  12. data/lib/framework/rhofsconnector.rb +1 -1
  13. data/lib/framework/rholang/localization_simplified.rb +2 -2
  14. data/lib/framework/rhom/rhom.rb +1 -0
  15. data/lib/framework/rhom/rhom_db_adapter.rb +2 -2
  16. data/lib/framework/rhom/rhom_model.rb +98 -0
  17. data/lib/framework/rhom/rhom_object_factory.rb +13 -12
  18. data/lib/rhodes.rb +1 -1
  19. data/platform/android/Rhodes/jni/include/{JNIRhodes.h → rhodes/JNIRhodes.h} +3 -54
  20. data/platform/android/Rhodes/jni/include/{RhoClassFactory.h → rhodes/RhoClassFactory.h} +0 -0
  21. data/platform/android/Rhodes/jni/include/{SystemInfoImpl.h → rhodes/SystemInfoImpl.h} +0 -0
  22. data/platform/android/Rhodes/jni/include/{details → rhodes/details}/rhojava.inc +1 -0
  23. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_Logger.h +0 -0
  24. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_RhoConf.h +0 -0
  25. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_RhoLogConf.h +0 -0
  26. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_RhoMenu.h +0 -0
  27. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_Rhodes.h +0 -0
  28. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_SplashScreen.h +0 -0
  29. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_alert_Alert.h +0 -0
  30. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_camera_Camera.h +0 -0
  31. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_datetime_DateTimePicker.h +0 -0
  32. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_geolocation_GeoLocationImpl.h +0 -0
  33. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_socket_RhoSocketImpl.h +0 -0
  34. data/platform/android/Rhodes/jni/include/{jni → rhodes/jni}/com_rhomobile_rhodes_socket_SSLImpl.h +0 -0
  35. data/platform/android/Rhodes/jni/include/{sslimpl.h → rhodes/sslimpl.h} +0 -0
  36. data/platform/android/Rhodes/jni/include/rhodes.h +59 -0
  37. data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +3 -3
  38. data/platform/android/Rhodes/jni/src/alert.cpp +2 -2
  39. data/platform/android/Rhodes/jni/src/callbacks.cpp +4 -3
  40. data/platform/android/Rhodes/jni/src/camera.cpp +2 -2
  41. data/platform/android/Rhodes/jni/src/datetimepicker.cpp +2 -2
  42. data/platform/android/Rhodes/jni/src/geolocation.cpp +2 -2
  43. data/platform/android/Rhodes/jni/src/logconf.cpp +2 -2
  44. data/platform/android/Rhodes/jni/src/logger.cpp +2 -2
  45. data/platform/android/Rhodes/jni/src/mapview.cpp +1 -1
  46. data/platform/android/Rhodes/jni/src/menu.cpp +2 -2
  47. data/platform/android/Rhodes/jni/src/nativebar.cpp +1 -1
  48. data/platform/android/Rhodes/jni/src/navbar.cpp +17 -3
  49. data/platform/android/Rhodes/jni/src/phonebook.cpp +1 -1
  50. data/platform/android/Rhodes/jni/src/rhoconf.cpp +2 -2
  51. data/platform/android/Rhodes/jni/src/rhodes.cpp +3 -3
  52. data/platform/android/Rhodes/jni/src/ringtones.cpp +1 -1
  53. data/platform/android/Rhodes/jni/src/socketimpl.cpp +2 -2
  54. data/platform/android/Rhodes/jni/src/splashscreen.cpp +2 -2
  55. data/platform/android/Rhodes/jni/src/sslimpl.cpp +3 -3
  56. data/platform/android/Rhodes/jni/src/syncengine.cpp +2 -2
  57. data/platform/android/Rhodes/jni/src/webview.cpp +15 -12
  58. data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeLibraries.java +11 -0
  59. data/platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java +52 -0
  60. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +8 -2
  61. data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +26 -28
  62. data/platform/android/build/RhodesSRC_build.files +21 -20
  63. data/platform/android/build/android.rake +69 -24
  64. data/platform/android/build/androidcommon.rb +17 -12
  65. data/platform/bb/build/bb.rake +23 -21
  66. data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +5 -2
  67. data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -1
  68. data/platform/bb/rhodes/src/com/rho/rubyext/System.java +9 -1
  69. data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +31 -2
  70. data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +17 -6
  71. data/platform/bb/rhodes/src/rhomobile/Utilities.java +6 -0
  72. data/platform/iphone/Classes/AppManager/AppManager.m +16 -4
  73. data/platform/iphone/Classes/DateTime.h +5 -6
  74. data/platform/iphone/Classes/DateTimePicker.m +4 -18
  75. data/platform/iphone/Classes/DateTimePickerDelegate.h +7 -9
  76. data/platform/iphone/Classes/DateTimePickerDelegate.m +141 -152
  77. data/platform/iphone/Classes/Rhodes.h +6 -1
  78. data/platform/iphone/Classes/Rhodes.m +17 -43
  79. data/platform/iphone/Classes/SimpleMainView.h +1 -1
  80. data/platform/iphone/Classes/SimpleMainView.m +54 -4
  81. data/platform/iphone/Classes/WebView.m +17 -0
  82. data/platform/iphone/rbuild/iphone.rake +1 -0
  83. data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +0 -45
  84. data/platform/shared/common/PosixThreadImpl.cpp +8 -0
  85. data/platform/shared/common/PosixThreadImpl.h +1 -0
  86. data/platform/shared/common/RhoThread.cpp +1 -0
  87. data/platform/shared/common/RhoThread.h +4 -2
  88. data/platform/shared/curl/include/curl/curl.h +4 -0
  89. data/platform/shared/db/DBAdapter.cpp +47 -60
  90. data/platform/shared/db/DBAdapter.h +6 -2
  91. data/platform/shared/net/AsyncHttp.cpp +27 -11
  92. data/platform/shared/net/AsyncHttp.h +3 -1
  93. data/platform/shared/net/CURLNetRequest.cpp +11 -10
  94. data/platform/shared/net/CURLNetRequest.h +6 -4
  95. data/platform/shared/net/HttpServer.cpp +11 -6
  96. data/platform/shared/ruby/ext/asynchttp/asynchttp.i +2 -2
  97. data/platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c +22 -11
  98. data/platform/shared/ruby/ext/rho/rhoruby.c +2 -2
  99. data/platform/shared/ruby/ext/rho/rhosupport.c +23 -3
  100. data/platform/shared/ruby/ext/webview/webview.i +4 -0
  101. data/platform/shared/ruby/ext/webview/webview_wrap.c +39 -0
  102. data/platform/shared/ruby/re.c +8 -0
  103. data/platform/shared/ruby/string.c +1 -1
  104. data/platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java +1 -0
  105. data/platform/shared/rubyJVM/src/com/rho/RhoClassFactory.java +6 -1
  106. data/platform/shared/rubyJVM/src/com/rho/RhoThread.java +3 -0
  107. data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java +34 -0
  108. data/platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java +40 -53
  109. data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java +32 -15
  110. data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java +31 -17
  111. data/platform/shared/rubyJVM/src/com/rho/net/RhoConnection.java +3 -0
  112. data/platform/shared/rubyJVM/src/com/rho/sync/JSONArrayIterator.java +17 -0
  113. data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java +158 -137
  114. data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java +18 -17
  115. data/platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java +10 -2
  116. data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubyFile_Methods.java +6 -0
  117. data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyFile.java +18 -3
  118. data/platform/shared/rubyJVM/src/j2me/io/File.java +37 -9
  119. data/platform/shared/sqlite/sqlite3.c +14613 -13016
  120. data/platform/shared/sqlite/sqlite3.h +1461 -1499
  121. data/platform/shared/sqlite/sqlite3ext.h +0 -2
  122. data/platform/shared/sync/ClientRegister.cpp +3 -3
  123. data/platform/shared/sync/ClientRegister.h +2 -1
  124. data/platform/shared/sync/SyncEngine.cpp +20 -8
  125. data/platform/shared/sync/SyncSource.cpp +12 -12
  126. data/platform/shared/sync/SyncSource.h +4 -4
  127. data/platform/shared/sync/SyncThread.cpp +8 -1
  128. data/platform/shared/tcmalloc/rhomem.h +3 -0
  129. data/platform/shared/tcmalloc/tcmalloc_.cpp +11 -0
  130. data/platform/wm/rhodes/Alert.cpp +148 -101
  131. data/platform/wm/rhodes/Alert.h +4 -1
  132. data/platform/wm/rhodes/AppManager.cpp +212 -72
  133. data/platform/wm/rhodes/AppManager.h +24 -3
  134. data/platform/wm/rhodes/DateTimePicker.cpp +23 -11
  135. data/platform/wm/rhodes/DateTimePicker.h +16 -5
  136. data/platform/wm/rhodes/MainWindow.cpp +22 -7
  137. data/platform/wm/rhodes/OkCancelModalDialog.h +63 -0
  138. data/platform/wm/rhodes/Rhodes.cpp +29 -17
  139. data/platform/wm/rhodes/phonebook/NativeAddressBook.cpp +128 -4
  140. data/platform/wm/rhodes/phonebook/NativeAddressBook.h +33 -3
  141. data/platform/wm/rhodes/resource.h +1 -1
  142. data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +5 -0
  143. data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +136 -102
  144. data/platform/wm/rhodes/rho/net/NetRequestImpl.h +12 -5
  145. data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +24 -10
  146. data/platform/wm/rhodes/rho/rubyext/WebView.cpp +6 -0
  147. data/platform/wm/rhodes/rhodes.vcproj +4 -0
  148. data/platform/wm/tools/detool/detool.cpp +17 -4
  149. data/rakefile.rb +49 -3
  150. data/res/build-tools/db/syncdb.schema +2 -2
  151. data/res/build-tools/detool.exe +0 -0
  152. data/res/generators/rhogen.rb +10 -10
  153. data/res/generators/templates/application/app/helpers/browser_helper.rb +9 -4
  154. data/res/generators/templates/application/app/index.bb.erb +5 -5
  155. data/res/generators/templates/application/build.yml +1 -0
  156. data/res/generators/templates/application/public/css/android.css +10 -8
  157. data/res/generators/templates/application/public/css/blackberry.css +40 -31
  158. data/res/generators/templates/application/public/css/iphone.css +4 -4
  159. data/res/generators/templates/application/public/css/webkit.css +7 -0
  160. data/res/generators/templates/application/public/css/windows_mobile.css +31 -27
  161. data/res/generators/templates/application/rhoconfig.txt +2 -2
  162. data/res/generators/templates/model/edit.bb.erb +2 -2
  163. data/res/generators/templates/model/index.bb.erb +6 -4
  164. data/res/generators/templates/model/model.rb +2 -1
  165. data/res/generators/templates/model/new.bb.erb +2 -2
  166. data/res/generators/templates/model/show.bb.erb +2 -2
  167. data/rhobuild.yml +37 -0
  168. data/rhodes.gemspec +1 -1
  169. data/spec/framework_spec/app/Account/account.rb +7 -0
  170. data/spec/framework_spec/app/Case/case.rb +6 -0
  171. data/spec/framework_spec/app/Customer/customer.rb +6 -0
  172. data/spec/framework_spec/app/Product/product.rb +9 -0
  173. data/spec/framework_spec/app/spec/rhom_object_spec.rb +1 -1
  174. data/spec/framework_spec/app/spec/syncengine_spec.rb +2 -1
  175. metadata +45 -151
  176. data/lib/build/manifest/createAppManifest.rb +0 -18
  177. data/lib/build/tasks/android.rake +0 -317
  178. data/lib/build/tasks/blackberry.rake +0 -355
  179. data/lib/build/tasks/common.rake +0 -62
  180. data/lib/build/tasks/iphone.rake +0 -108
  181. data/lib/build/tasks/linux.rake +0 -81
  182. data/lib/build/tasks/rhodes-build.rb +0 -11
  183. data/lib/build/tasks/rspec.rake +0 -20
  184. data/lib/build/tasks/symbian.rake +0 -202
  185. data/lib/build/tasks/wm.rake +0 -166
  186. data/lib/framework/ServeME.rb +0 -7
  187. data/platform/bb/build/MANIFEST.MF +0 -12
  188. data/platform/iphone/Classes/DateTimePicker.h +0 -17
  189. data/res/generators/templates/application/public/icons/Read me first - license.txt +0 -14
  190. data/res/generators/templates/application/public/icons/about.png +0 -0
  191. data/res/generators/templates/application/public/icons/airplane.png +0 -0
  192. data/res/generators/templates/application/public/icons/baby.png +0 -0
  193. data/res/generators/templates/application/public/icons/badge.png +0 -0
  194. data/res/generators/templates/application/public/icons/bandaid.png +0 -0
  195. data/res/generators/templates/application/public/icons/bar-chart.png +0 -0
  196. data/res/generators/templates/application/public/icons/battery.png +0 -0
  197. data/res/generators/templates/application/public/icons/beaker.png +0 -0
  198. data/res/generators/templates/application/public/icons/beaker2.png +0 -0
  199. data/res/generators/templates/application/public/icons/beermug.png +0 -0
  200. data/res/generators/templates/application/public/icons/bird.png +0 -0
  201. data/res/generators/templates/application/public/icons/book.png +0 -0
  202. data/res/generators/templates/application/public/icons/bookmark.png +0 -0
  203. data/res/generators/templates/application/public/icons/brightness.png +0 -0
  204. data/res/generators/templates/application/public/icons/bug.png +0 -0
  205. data/res/generators/templates/application/public/icons/cabinet.png +0 -0
  206. data/res/generators/templates/application/public/icons/calendar.png +0 -0
  207. data/res/generators/templates/application/public/icons/camera.png +0 -0
  208. data/res/generators/templates/application/public/icons/changeName.rb +0 -22
  209. data/res/generators/templates/application/public/icons/chat2.png +0 -0
  210. data/res/generators/templates/application/public/icons/chicken.png +0 -0
  211. data/res/generators/templates/application/public/icons/clock.png +0 -0
  212. data/res/generators/templates/application/public/icons/cloud.png +0 -0
  213. data/res/generators/templates/application/public/icons/coffee.png +0 -0
  214. data/res/generators/templates/application/public/icons/compass.png +0 -0
  215. data/res/generators/templates/application/public/icons/contrast.png +0 -0
  216. data/res/generators/templates/application/public/icons/dashboard.png +0 -0
  217. data/res/generators/templates/application/public/icons/display.png +0 -0
  218. data/res/generators/templates/application/public/icons/dogpaw.png +0 -0
  219. data/res/generators/templates/application/public/icons/download.png +0 -0
  220. data/res/generators/templates/application/public/icons/dumbbell.png +0 -0
  221. data/res/generators/templates/application/public/icons/ekg.png +0 -0
  222. data/res/generators/templates/application/public/icons/envelope.png +0 -0
  223. data/res/generators/templates/application/public/icons/equalizer.png +0 -0
  224. data/res/generators/templates/application/public/icons/eye.png +0 -0
  225. data/res/generators/templates/application/public/icons/film-roll.png +0 -0
  226. data/res/generators/templates/application/public/icons/flag.png +0 -0
  227. data/res/generators/templates/application/public/icons/fork-and-knife.png +0 -0
  228. data/res/generators/templates/application/public/icons/fuel.png +0 -0
  229. data/res/generators/templates/application/public/icons/gameplan.png +0 -0
  230. data/res/generators/templates/application/public/icons/gear.png +0 -0
  231. data/res/generators/templates/application/public/icons/gear2.png +0 -0
  232. data/res/generators/templates/application/public/icons/gift.png +0 -0
  233. data/res/generators/templates/application/public/icons/heart.png +0 -0
  234. data/res/generators/templates/application/public/icons/house.png +0 -0
  235. data/res/generators/templates/application/public/icons/inbox.png +0 -0
  236. data/res/generators/templates/application/public/icons/index-cards.png +0 -0
  237. data/res/generators/templates/application/public/icons/iphone.png +0 -0
  238. data/res/generators/templates/application/public/icons/ipod.png +0 -0
  239. data/res/generators/templates/application/public/icons/key.png +0 -0
  240. data/res/generators/templates/application/public/icons/lifebuoy.png +0 -0
  241. data/res/generators/templates/application/public/icons/lightbulb.png +0 -0
  242. data/res/generators/templates/application/public/icons/line-chart.png +0 -0
  243. data/res/generators/templates/application/public/icons/location.png +0 -0
  244. data/res/generators/templates/application/public/icons/lock.png +0 -0
  245. data/res/generators/templates/application/public/icons/loopback.png +0 -0
  246. data/res/generators/templates/application/public/icons/magnifying-glass.png +0 -0
  247. data/res/generators/templates/application/public/icons/map-marker.png +0 -0
  248. data/res/generators/templates/application/public/icons/map.png +0 -0
  249. data/res/generators/templates/application/public/icons/medical-bag.png +0 -0
  250. data/res/generators/templates/application/public/icons/medical.png +0 -0
  251. data/res/generators/templates/application/public/icons/microphone.png +0 -0
  252. data/res/generators/templates/application/public/icons/movie1.png +0 -0
  253. data/res/generators/templates/application/public/icons/movie2.png +0 -0
  254. data/res/generators/templates/application/public/icons/network.png +0 -0
  255. data/res/generators/templates/application/public/icons/note.png +0 -0
  256. data/res/generators/templates/application/public/icons/outlet.png +0 -0
  257. data/res/generators/templates/application/public/icons/palette.png +0 -0
  258. data/res/generators/templates/application/public/icons/paperclip.png +0 -0
  259. data/res/generators/templates/application/public/icons/phone.png +0 -0
  260. data/res/generators/templates/application/public/icons/photos.png +0 -0
  261. data/res/generators/templates/application/public/icons/piano.png +0 -0
  262. data/res/generators/templates/application/public/icons/picture-frame.png +0 -0
  263. data/res/generators/templates/application/public/icons/pill.png +0 -0
  264. data/res/generators/templates/application/public/icons/pin.png +0 -0
  265. data/res/generators/templates/application/public/icons/pinetree.png +0 -0
  266. data/res/generators/templates/application/public/icons/planet.png +0 -0
  267. data/res/generators/templates/application/public/icons/puzzle.png +0 -0
  268. data/res/generators/templates/application/public/icons/radar.png +0 -0
  269. data/res/generators/templates/application/public/icons/redo.png +0 -0
  270. data/res/generators/templates/application/public/icons/refresh.png +0 -0
  271. data/res/generators/templates/application/public/icons/runner.png +0 -0
  272. data/res/generators/templates/application/public/icons/shoebox.png +0 -0
  273. data/res/generators/templates/application/public/icons/shopping-bag.png +0 -0
  274. data/res/generators/templates/application/public/icons/shopping-cart.png +0 -0
  275. data/res/generators/templates/application/public/icons/shuffle.png +0 -0
  276. data/res/generators/templates/application/public/icons/signpost.png +0 -0
  277. data/res/generators/templates/application/public/icons/skull-n-crossbones.png +0 -0
  278. data/res/generators/templates/application/public/icons/skull.png +0 -0
  279. data/res/generators/templates/application/public/icons/sliders.png +0 -0
  280. data/res/generators/templates/application/public/icons/spraycan.png +0 -0
  281. data/res/generators/templates/application/public/icons/squiggle.png +0 -0
  282. data/res/generators/templates/application/public/icons/star.png +0 -0
  283. data/res/generators/templates/application/public/icons/stopwatch.png +0 -0
  284. data/res/generators/templates/application/public/icons/suitcase.png +0 -0
  285. data/res/generators/templates/application/public/icons/tag.png +0 -0
  286. data/res/generators/templates/application/public/icons/tags.png +0 -0
  287. data/res/generators/templates/application/public/icons/target.png +0 -0
  288. data/res/generators/templates/application/public/icons/testtube.png +0 -0
  289. data/res/generators/templates/application/public/icons/thermometer.png +0 -0
  290. data/res/generators/templates/application/public/icons/toolbox.png +0 -0
  291. data/res/generators/templates/application/public/icons/trophy.png +0 -0
  292. data/res/generators/templates/application/public/icons/tshirt.png +0 -0
  293. data/res/generators/templates/application/public/icons/tv.png +0 -0
  294. data/res/generators/templates/application/public/icons/umbrella.png +0 -0
  295. data/res/generators/templates/application/public/icons/walk.png +0 -0
  296. data/res/generators/templates/application/public/icons/weather.png +0 -0
  297. data/res/generators/templates/application/public/icons/widescreen.png +0 -0
  298. data/res/generators/templates/application/public/icons/wineglass.png +0 -0
  299. data/res/generators/templates/application/public/icons/zap.png +0 -0
  300. data/res/generators/templates/application/public/js/jquery-1.2.6.min.js +0 -32
  301. data/res/generators/templates/model/config.rb +0 -3
  302. data/res/generators/templates/spec/app/spec/webview_spec.rb +0 -5
  303. data/spec/framework_spec/app/Account/config.rb +0 -59
  304. data/spec/framework_spec/app/Case/config.rb +0 -3
  305. data/spec/framework_spec/app/Customer/config.rb +0 -3
  306. data/spec/framework_spec/app/Product/config.rb +0 -17
data/LICENSE CHANGED
@@ -1,3 +1,5 @@
1
+ (The MIT License)
2
+
1
3
  Copyright (c) 2008-2010 Rhomobile, Inc.
2
4
 
3
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
data/Manifest.txt CHANGED
@@ -12,17 +12,7 @@ lib/build/compileERB/bb.rb
12
12
  lib/build/compileERB/default.rb
13
13
  lib/build/compileRB/compileRB.rb
14
14
  lib/build/jake.rb
15
- lib/build/manifest/createAppManifest.rb
16
15
  lib/build/rhodes-build.rb
17
- lib/build/tasks/android.rake
18
- lib/build/tasks/blackberry.rake
19
- lib/build/tasks/common.rake
20
- lib/build/tasks/iphone.rake
21
- lib/build/tasks/linux.rake
22
- lib/build/tasks/rhodes-build.rb
23
- lib/build/tasks/rspec.rake
24
- lib/build/tasks/symbian.rake
25
- lib/build/tasks/wm.rake
26
16
  lib/extensions/crypt/crypt/blowfish-tables.rb
27
17
  lib/extensions/crypt/crypt/blowfish.rb
28
18
  lib/extensions/crypt/crypt/cbc.rb
@@ -226,11 +216,11 @@ lib/framework/rholang/rhoerror_en.rb
226
216
  lib/framework/rholang/rhomsg_en.rb
227
217
  lib/framework/rhom/rhom.rb
228
218
  lib/framework/rhom/rhom_db_adapter.rb
219
+ lib/framework/rhom/rhom_model.rb
229
220
  lib/framework/rhom/rhom_object.rb
230
221
  lib/framework/rhom/rhom_object_factory.rb
231
222
  lib/framework/rhom/rhom_source.rb
232
223
  lib/framework/rhom.rb
233
- lib/framework/ServeME.rb
234
224
  lib/framework/singleton.rb
235
225
  lib/framework/time.rb
236
226
  lib/framework/version.rb
@@ -257,23 +247,24 @@ platform/android/build/RhodesGEN_build.files
257
247
  platform/android/build/RhodesSRC_build.files
258
248
  platform/android/Rhodes/AndroidManifest.xml
259
249
  platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java
260
- platform/android/Rhodes/jni/include/details/rhojava.inc
261
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_alert_Alert.h
262
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_camera_Camera.h
263
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_datetime_DateTimePicker.h
264
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_geolocation_GeoLocationImpl.h
265
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_Logger.h
266
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoConf.h
267
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_Rhodes.h
268
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoLogConf.h
269
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoMenu.h
270
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_socket_RhoSocketImpl.h
271
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_socket_SSLImpl.h
272
- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_SplashScreen.h
273
- platform/android/Rhodes/jni/include/JNIRhodes.h
274
- platform/android/Rhodes/jni/include/RhoClassFactory.h
275
- platform/android/Rhodes/jni/include/sslimpl.h
276
- platform/android/Rhodes/jni/include/SystemInfoImpl.h
250
+ platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc
251
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_alert_Alert.h
252
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_camera_Camera.h
253
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_datetime_DateTimePicker.h
254
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_geolocation_GeoLocationImpl.h
255
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_Logger.h
256
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhoConf.h
257
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_Rhodes.h
258
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhoLogConf.h
259
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhoMenu.h
260
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_socket_RhoSocketImpl.h
261
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_socket_SSLImpl.h
262
+ platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h
263
+ platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h
264
+ platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h
265
+ platform/android/Rhodes/jni/include/rhodes/sslimpl.h
266
+ platform/android/Rhodes/jni/include/rhodes/SystemInfoImpl.h
267
+ platform/android/Rhodes/jni/include/rhodes.h
277
268
  platform/android/Rhodes/jni/src/alert.cpp
278
269
  platform/android/Rhodes/jni/src/callbacks.cpp
279
270
  platform/android/Rhodes/jni/src/camera.cpp
@@ -339,6 +330,8 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
339
330
  platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
340
331
  platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
341
332
  platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
333
+ platform/android/Rhodes/src/com/rhomobile/rhodes/NativeLibraries.java
334
+ platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
342
335
  platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
343
336
  platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
344
337
  platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
@@ -367,7 +360,6 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
367
360
  platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
368
361
  platform/bb/build/bb.rake
369
362
  platform/bb/build/hsqldb_build.files
370
- platform/bb/build/MANIFEST.MF
371
363
  platform/bb/build/RhoBundleAlx.erb
372
364
  platform/bb/build/rhodes_build.files
373
365
  platform/bb/build/rhodesApp.csl
@@ -600,7 +592,6 @@ platform/iphone/Classes/Camera/PickImageDelegate.h
600
592
  platform/iphone/Classes/Camera/PickImageDelegate.m
601
593
  platform/iphone/Classes/DateTime.h
602
594
  platform/iphone/Classes/DateTime.m
603
- platform/iphone/Classes/DateTimePicker.h
604
595
  platform/iphone/Classes/DateTimePicker.m
605
596
  platform/iphone/Classes/DateTimePickerDelegate.h
606
597
  platform/iphone/Classes/DateTimePickerDelegate.m
@@ -3279,6 +3270,7 @@ platform/wm/rhodes/MainWindow.cpp
3279
3270
  platform/wm/rhodes/MainWindow.h
3280
3271
  platform/wm/rhodes/menubar.cpp
3281
3272
  platform/wm/rhodes/menubar.h
3273
+ platform/wm/rhodes/OkCancelModalDialog.h
3282
3274
  platform/wm/rhodes/phonebook/NativeAddressBook.cpp
3283
3275
  platform/wm/rhodes/phonebook/NativeAddressBook.h
3284
3276
  platform/wm/rhodes/phonebook/phonebook.cpp
@@ -3379,117 +3371,6 @@ res/generators/templates/application/public/css/blackberry.css
3379
3371
  res/generators/templates/application/public/css/iphone.css
3380
3372
  res/generators/templates/application/public/css/webkit.css
3381
3373
  res/generators/templates/application/public/css/windows_mobile.css
3382
- res/generators/templates/application/public/icons/about.png
3383
- res/generators/templates/application/public/icons/airplane.png
3384
- res/generators/templates/application/public/icons/baby.png
3385
- res/generators/templates/application/public/icons/badge.png
3386
- res/generators/templates/application/public/icons/bandaid.png
3387
- res/generators/templates/application/public/icons/bar-chart.png
3388
- res/generators/templates/application/public/icons/battery.png
3389
- res/generators/templates/application/public/icons/beaker.png
3390
- res/generators/templates/application/public/icons/beaker2.png
3391
- res/generators/templates/application/public/icons/beermug.png
3392
- res/generators/templates/application/public/icons/bird.png
3393
- res/generators/templates/application/public/icons/book.png
3394
- res/generators/templates/application/public/icons/bookmark.png
3395
- res/generators/templates/application/public/icons/brightness.png
3396
- res/generators/templates/application/public/icons/bug.png
3397
- res/generators/templates/application/public/icons/cabinet.png
3398
- res/generators/templates/application/public/icons/calendar.png
3399
- res/generators/templates/application/public/icons/camera.png
3400
- res/generators/templates/application/public/icons/changeName.rb
3401
- res/generators/templates/application/public/icons/chat2.png
3402
- res/generators/templates/application/public/icons/chicken.png
3403
- res/generators/templates/application/public/icons/clock.png
3404
- res/generators/templates/application/public/icons/cloud.png
3405
- res/generators/templates/application/public/icons/coffee.png
3406
- res/generators/templates/application/public/icons/compass.png
3407
- res/generators/templates/application/public/icons/contrast.png
3408
- res/generators/templates/application/public/icons/dashboard.png
3409
- res/generators/templates/application/public/icons/display.png
3410
- res/generators/templates/application/public/icons/dogpaw.png
3411
- res/generators/templates/application/public/icons/download.png
3412
- res/generators/templates/application/public/icons/dumbbell.png
3413
- res/generators/templates/application/public/icons/ekg.png
3414
- res/generators/templates/application/public/icons/envelope.png
3415
- res/generators/templates/application/public/icons/equalizer.png
3416
- res/generators/templates/application/public/icons/eye.png
3417
- res/generators/templates/application/public/icons/film-roll.png
3418
- res/generators/templates/application/public/icons/flag.png
3419
- res/generators/templates/application/public/icons/fork-and-knife.png
3420
- res/generators/templates/application/public/icons/fuel.png
3421
- res/generators/templates/application/public/icons/gameplan.png
3422
- res/generators/templates/application/public/icons/gear.png
3423
- res/generators/templates/application/public/icons/gear2.png
3424
- res/generators/templates/application/public/icons/gift.png
3425
- res/generators/templates/application/public/icons/heart.png
3426
- res/generators/templates/application/public/icons/house.png
3427
- res/generators/templates/application/public/icons/inbox.png
3428
- res/generators/templates/application/public/icons/index-cards.png
3429
- res/generators/templates/application/public/icons/iphone.png
3430
- res/generators/templates/application/public/icons/ipod.png
3431
- res/generators/templates/application/public/icons/key.png
3432
- res/generators/templates/application/public/icons/lifebuoy.png
3433
- res/generators/templates/application/public/icons/lightbulb.png
3434
- res/generators/templates/application/public/icons/line-chart.png
3435
- res/generators/templates/application/public/icons/location.png
3436
- res/generators/templates/application/public/icons/lock.png
3437
- res/generators/templates/application/public/icons/loopback.png
3438
- res/generators/templates/application/public/icons/magnifying-glass.png
3439
- res/generators/templates/application/public/icons/map-marker.png
3440
- res/generators/templates/application/public/icons/map.png
3441
- res/generators/templates/application/public/icons/medical-bag.png
3442
- res/generators/templates/application/public/icons/medical.png
3443
- res/generators/templates/application/public/icons/microphone.png
3444
- res/generators/templates/application/public/icons/movie1.png
3445
- res/generators/templates/application/public/icons/movie2.png
3446
- res/generators/templates/application/public/icons/network.png
3447
- res/generators/templates/application/public/icons/note.png
3448
- res/generators/templates/application/public/icons/outlet.png
3449
- res/generators/templates/application/public/icons/palette.png
3450
- res/generators/templates/application/public/icons/paperclip.png
3451
- res/generators/templates/application/public/icons/phone.png
3452
- res/generators/templates/application/public/icons/photos.png
3453
- res/generators/templates/application/public/icons/piano.png
3454
- res/generators/templates/application/public/icons/picture-frame.png
3455
- res/generators/templates/application/public/icons/pill.png
3456
- res/generators/templates/application/public/icons/pin.png
3457
- res/generators/templates/application/public/icons/pinetree.png
3458
- res/generators/templates/application/public/icons/planet.png
3459
- res/generators/templates/application/public/icons/puzzle.png
3460
- res/generators/templates/application/public/icons/radar.png
3461
- res/generators/templates/application/public/icons/Read me first - license.txt
3462
- res/generators/templates/application/public/icons/redo.png
3463
- res/generators/templates/application/public/icons/refresh.png
3464
- res/generators/templates/application/public/icons/runner.png
3465
- res/generators/templates/application/public/icons/shoebox.png
3466
- res/generators/templates/application/public/icons/shopping-bag.png
3467
- res/generators/templates/application/public/icons/shopping-cart.png
3468
- res/generators/templates/application/public/icons/shuffle.png
3469
- res/generators/templates/application/public/icons/signpost.png
3470
- res/generators/templates/application/public/icons/skull-n-crossbones.png
3471
- res/generators/templates/application/public/icons/skull.png
3472
- res/generators/templates/application/public/icons/sliders.png
3473
- res/generators/templates/application/public/icons/spraycan.png
3474
- res/generators/templates/application/public/icons/squiggle.png
3475
- res/generators/templates/application/public/icons/star.png
3476
- res/generators/templates/application/public/icons/stopwatch.png
3477
- res/generators/templates/application/public/icons/suitcase.png
3478
- res/generators/templates/application/public/icons/tag.png
3479
- res/generators/templates/application/public/icons/tags.png
3480
- res/generators/templates/application/public/icons/target.png
3481
- res/generators/templates/application/public/icons/testtube.png
3482
- res/generators/templates/application/public/icons/thermometer.png
3483
- res/generators/templates/application/public/icons/toolbox.png
3484
- res/generators/templates/application/public/icons/trophy.png
3485
- res/generators/templates/application/public/icons/tshirt.png
3486
- res/generators/templates/application/public/icons/tv.png
3487
- res/generators/templates/application/public/icons/umbrella.png
3488
- res/generators/templates/application/public/icons/walk.png
3489
- res/generators/templates/application/public/icons/weather.png
3490
- res/generators/templates/application/public/icons/widescreen.png
3491
- res/generators/templates/application/public/icons/wineglass.png
3492
- res/generators/templates/application/public/icons/zap.png
3493
3374
  res/generators/templates/application/public/images/android/btn_check_off.png
3494
3375
  res/generators/templates/application/public/images/android/btn_check_on.png
3495
3376
  res/generators/templates/application/public/images/android/btn_radio_off.png
@@ -3522,14 +3403,12 @@ res/generators/templates/application/public/images/toolButton.png
3522
3403
  res/generators/templates/application/public/images/toolButton_new.png
3523
3404
  res/generators/templates/application/public/images/whiteButton.png
3524
3405
  res/generators/templates/application/public/js/application.js
3525
- res/generators/templates/application/public/js/jquery-1.2.6.min.js
3526
3406
  res/generators/templates/application/public/js/rho.js
3527
3407
  res/generators/templates/application/public/js/rhogeolocation-wm.js
3528
3408
  res/generators/templates/application/public/js/rhogeolocation.js
3529
3409
  res/generators/templates/application/Rakefile
3530
3410
  res/generators/templates/application/rhoconfig.txt
3531
3411
  res/generators/templates/bundle/db/syncdb.sqlite
3532
- res/generators/templates/model/config.rb
3533
3412
  res/generators/templates/model/controller.rb
3534
3413
  res/generators/templates/model/edit.bb.erb
3535
3414
  res/generators/templates/model/edit.erb
@@ -3655,16 +3534,16 @@ res/generators/templates/spec/app/mspec/utils/script.rb
3655
3534
  res/generators/templates/spec/app/mspec/utils/version.rb
3656
3535
  res/generators/templates/spec/app/mspec/version.rb
3657
3536
  res/generators/templates/spec/app/mspec.rb
3658
- res/generators/templates/spec/app/spec/webview_spec.rb
3659
3537
  res/generators/templates/spec/app/spec_runner.rb
3660
3538
  res/generators/templates/spec/app/SpecRunner/controller.rb
3661
3539
  res/generators/templates/spec/app/SpecRunner/index.erb
3540
+ rhobuild.yml
3662
3541
  rhobuild.yml.example
3663
3542
  rhodes.gemspec
3664
- spec/framework_spec/app/Account/config.rb
3543
+ spec/framework_spec/app/Account/account.rb
3665
3544
  spec/framework_spec/app/application.rb
3666
- spec/framework_spec/app/Case/config.rb
3667
- spec/framework_spec/app/Customer/config.rb
3545
+ spec/framework_spec/app/Case/case.rb
3546
+ spec/framework_spec/app/Customer/customer.rb
3668
3547
  spec/framework_spec/app/fileutils.rb
3669
3548
  spec/framework_spec/app/index.erb
3670
3549
  spec/framework_spec/app/layout.erb
@@ -3782,8 +3661,8 @@ spec/framework_spec/app/mspec/utils/script.rb
3782
3661
  spec/framework_spec/app/mspec/utils/version.rb
3783
3662
  spec/framework_spec/app/mspec/version.rb
3784
3663
  spec/framework_spec/app/mspec.rb
3785
- spec/framework_spec/app/Product/config.rb
3786
3664
  spec/framework_spec/app/Product/controller.rb
3665
+ spec/framework_spec/app/Product/product.rb
3787
3666
  spec/framework_spec/app/Settings/controller.rb
3788
3667
  spec/framework_spec/app/Settings/index.erb
3789
3668
  spec/framework_spec/app/spec/bsearch_spec.rb
data/Rakefile CHANGED
@@ -84,7 +84,12 @@ namespace "config" do
84
84
  extpaths << File.join($app_path, "extensions")
85
85
  extpaths << "lib/extensions"
86
86
  $app_config["extpaths"] = extpaths
87
-
87
+
88
+ if $app_config["build"] and $app_config["build"] == "release"
89
+ $debug = false
90
+ else
91
+ $debug = true
92
+ end
88
93
  end
89
94
 
90
95
  out = `javac -version 2>&1`
@@ -211,6 +216,17 @@ def common_bundle_start(startdir, dest)
211
216
  end
212
217
  end
213
218
 
219
+ if extpath.nil?
220
+ begin
221
+ $rhodes_extensions = nil
222
+ require extname
223
+ extpath = $rhodes_extensions[0] unless $rhodes_extensions.nil?
224
+ rescue Exception => e
225
+
226
+ end
227
+
228
+ end
229
+
214
230
  unless extpath.nil?
215
231
  add_extension(extpath, dest)
216
232
 
@@ -286,6 +302,16 @@ def common_bundle_start(startdir, dest)
286
302
  cp_r app + '/public', File.join($srcdir,'apps')
287
303
  cp app + '/rhoconfig.txt', File.join($srcdir,'apps')
288
304
 
305
+
306
+ unless $debug
307
+ rm_rf $srcdir + "/apps/app/test"
308
+ rm_rf $srcdir + "/apps/app/SpecRunner"
309
+ rm_rf $srcdir + "/apps/app/mspec"
310
+ rm_rf $srcdir + "/apps/app/mspec.rb"
311
+ rm_rf $srcdir + "/apps/app/spec_runner.rb"
312
+ end
313
+
314
+
289
315
  copy_assets($assetfolder) if ($assetfolder and File.exists? $assetfolder)
290
316
 
291
317
  chdir File.join($srcdir,'apps')
@@ -307,14 +333,34 @@ end
307
333
 
308
334
  def create_manifest
309
335
  dir = File.join($srcdir, 'apps')
310
- fname = "config.rb"
336
+ #fname = "config.rb"
311
337
  fappManifest = File.new( File.join(dir,'app_manifest.txt'), "w")
338
+ dir = File.join($srcdir, 'apps/app')
312
339
 
313
340
  Find.find(dir) do |path|
341
+
342
+ strDir = File.dirname(path)
343
+ next unless dir == File.dirname(strDir) #one level only
344
+
345
+ if File.basename(path) == "config.rb"
346
+ puts "******ERROR enumerating models***********"
347
+ puts "Model definition has changed and doesn't use config.rb anymore: '#{path}' "
348
+ puts "You should replace config.rb with <model_name>.rb file as described: "
349
+ puts "http://wiki.rhomobile.com/index.php/Rhom#Rhom_Models_2.0"
350
+ puts "*****************************************"
351
+ exit 1
352
+ end
353
+
354
+ fname = File.dirname(path)
355
+ fname = File.basename(fname)
356
+ modelname = fname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
357
+ fname = modelname + ".rb"
358
+
314
359
  if File.basename(path) == fname
315
360
 
316
361
  relPath = path[dir.length+1, File.dirname(path).length-1] #relative path
317
- relPath = relPath[0, relPath.length-3] #remove .rb extension
362
+ relPath = relPath[0, relPath.length-3] #remove .rb extension and app
363
+ relPath = File.join(File.dirname(relPath), modelname )
318
364
  fappManifest.puts( relPath )
319
365
 
320
366
  end
data/lib/framework/builtinME.rb CHANGED
@@ -32,6 +32,12 @@ module Kernel
32
32
  #private
33
33
  def require(file_name)
34
34
  return false if ($".include?(file_name) || $".include?(file_name + ".rb"))
35
+ nExt = file_name.index('.rb')
36
+ if nExt
37
+ file_name1 = file_name[0,nExt]
38
+ #puts "require test: #{file_name1}"
39
+ return false if ($".include?(file_name1))
40
+ end
35
41
 
36
42
  load(file_name);
37
43
  end
data/lib/framework/rho/render.rb CHANGED
@@ -4,11 +4,12 @@ require 'rho/rhocontroller'
4
4
  module Rho
5
5
  class RhoController
6
6
  begin
7
- require 'rhodes_translator'
8
- include RhodesTranslator::Translator
9
- include RhodesTranslator::Binding
10
- include RhodesTranslator::Validation
11
-
7
+ if File.exist? File.join(__rhoGetCurrentDir(), 'lib/rhodes_translator.iseq')
8
+ require 'rhodes_translator'
9
+ include RhodesTranslator::Translator
10
+ include RhodesTranslator::Binding
11
+ include RhodesTranslator::Validation
12
+ end
12
13
  rescue Exception => e
13
14
  end
14
15
 
@@ -39,7 +40,7 @@ module Rho
39
40
  require 'rho/rhoviewhelpers'
40
41
  layout = File.dirname(filename) + "/layout_erb.iseq"
41
42
  @content = eval_compiled_file(filename, getBinding() )
42
- @content = eval_compiled_file(layout, getBinding() ) if File.exist?(layout)
43
+ @content = eval_compiled_file(layout, getBinding() ) if Rho::file_exist?(layout)
43
44
  @content
44
45
  end
45
46
 
@@ -91,7 +92,7 @@ module Rho
91
92
  options[:layout] = false
92
93
  else
93
94
  if options[:file].nil? or !options[:file].is_a?(String)
94
- if File.exist?(@request[:modelpath]+action.to_s+'_erb.iseq')
95
+ if Rho::file_exist?(@request[:modelpath]+action.to_s+'_erb.iseq')
95
96
  @content = eval_compiled_file(@request[:modelpath]+action+'_erb.iseq', getBinding() )
96
97
  else
97
98
  @content = ""
@@ -111,7 +112,7 @@ module Rho
111
112
 
112
113
  if options[:layout] != false
113
114
  layoutfile = RhoApplication::get_app_path(@request['application']) + options[:layout].to_s + "_erb.iseq"
114
- @content = eval_compiled_file(layoutfile, binding ) if File.exist?(layoutfile)
115
+ @content = eval_compiled_file(layoutfile, binding ) if Rho::file_exist?(layoutfile)
115
116
  rho_info 'Layout file: ' + layoutfile + '. Content size: ' + @content.length.to_s
116
117
  end
117
118
 
@@ -192,6 +193,10 @@ module Rho
192
193
  content = ""
193
194
  if options[:collection].nil?
194
195
  locals = localclass.new(options[:locals])
196
+
197
+ self.instance_variables.each do |ivar|
198
+ locals.instance_variable_set(ivar,self.instance_variable_get(ivar))
199
+ end
195
200
  modelpath = @request[:modelpath]
196
201
  modelpath = Rho::RhoFSConnector.get_model_path("app",model) if model
197
202
  content = eval_compiled_file(modelpath+'_' + partial_name.to_s+'_erb.iseq', locals.get_binding )