rhodes 1.5.5 → 2.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +5 -0
- data/Manifest.txt +214 -32
- data/Rakefile +33 -10
- data/bin/upgrade-rhodes-app +0 -1
- data/lib/build/compileERB/bb.rb +2 -2
- data/lib/build/compileERB/default.rb +7 -5
- data/lib/build/jake.rb +1 -1
- data/lib/extensions/digest-md5/ext.yml +1 -1
- data/lib/extensions/digest-md5/ext/Rakefile +35 -36
- data/lib/extensions/digest-md5/ext/build.bat +1 -0
- data/lib/extensions/digest-md5/ext/digest-md5.vcproj +203 -0
- data/lib/extensions/digest-sha1/ext.yml +1 -1
- data/lib/extensions/digest/ext.yml +1 -1
- data/lib/extensions/digest/ext/Rakefile +35 -39
- data/lib/extensions/digest/ext/build.bat +1 -2
- data/lib/extensions/digest/ext/digest.vcproj +203 -0
- data/lib/framework/rho/render.rb +79 -22
- data/lib/framework/rho/rho.rb +294 -56
- data/lib/framework/rho/rhoapplication.rb +10 -0
- data/lib/framework/rho/rhofsconnector.rb +2 -6
- data/lib/framework/rho/rhoutils.rb +56 -14
- data/lib/framework/rho/rhoviewhelpers.rb +2 -0
- data/lib/framework/rhodes.rb +2 -2
- data/lib/framework/rhom/rhom.rb +42 -15
- data/lib/framework/rhom/rhom_db_adapter.rb +165 -159
- data/lib/framework/rhom/rhom_object.rb +0 -1
- data/lib/framework/rhom/rhom_object_factory.rb +343 -166
- data/lib/framework/rhom/rhom_source.rb +28 -15
- data/lib/framework/version.rb +2 -2
- data/lib/rhodes.rb +2 -2
- data/platform/android/Rhodes/AndroidManifest.xml +2 -2
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +39 -44
- data/platform/android/Rhodes/jni/include/JNIRhodes.h +1 -1
- data/platform/android/Rhodes/jni/include/details/rhojava.inc +23 -20
- data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoMenu.h +61 -0
- data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_Rhodes.h +16 -0
- data/platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_alert_Alert.h +21 -0
- data/platform/android/Rhodes/jni/include/sslimpl.h +1 -1
- data/platform/android/Rhodes/jni/src/alert.cpp +32 -5
- data/platform/android/Rhodes/jni/src/callbacks.cpp +51 -21
- data/platform/android/Rhodes/jni/src/mapview.cpp +3 -8
- data/platform/android/Rhodes/jni/src/menu.cpp +70 -0
- data/platform/android/Rhodes/jni/src/navbar.cpp +16 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +37 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +3 -3
- data/platform/android/Rhodes/jni/src/webview.cpp +21 -7
- data/platform/android/Rhodes/res/drawable/alert_alert.png +0 -0
- data/platform/android/Rhodes/res/drawable/alert_info.png +0 -0
- data/platform/android/Rhodes/res/drawable/alert_question.png +0 -0
- data/platform/android/Rhodes/res/drawable/camera.png +0 -0
- data/platform/android/Rhodes/res/layout/camera.xml +18 -3
- data/platform/android/Rhodes/res/menu/options.xml +0 -10
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +5 -10
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +12 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +105 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +157 -122
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +7 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +16 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +220 -17
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +22 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +44 -25
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +3 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +10 -21
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +15 -12
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java +44 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java +47 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java +13 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java +11 -5
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java +1 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java +61 -0
- data/platform/android/build/RhodesSRC_build.files +3 -0
- data/platform/android/build/android.rake +173 -60
- data/platform/android/build/androidcommon.rb +1 -2
- data/platform/android/build/librhocommon_build.files +5 -0
- data/platform/android/build/librhodes_build.files +2 -0
- data/platform/android/build/libruby_build.files +2 -1
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -3
- data/platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java +1 -1
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +16 -1
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java +5 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +25 -4
- data/platform/bb/Hsqldb/src/com/rho/db/Journal.java +1 -1
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -1
- data/platform/bb/Hsqldb/src/j2me/math/Number.java +6 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java +2 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -0
- data/platform/bb/Hsqldb/src/org/hsqldb/Parser.java +1 -0
- data/platform/bb/Hsqldb/src/org/hsqldb/Result.java +2 -0
- data/platform/bb/Hsqldb/src/org/hsqldb/Select.java +12 -6
- data/platform/bb/Hsqldb/src/org/hsqldb/Session.java +19 -12
- data/platform/bb/Hsqldb/src/org/hsqldb/Table.java +10 -4
- data/platform/bb/Hsqldb/src/org/hsqldb/Token.java +10 -2
- data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java +3 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/lib/java/JavaSystem.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/persist/HsqlProperties.java +2 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAFile.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptReaderText.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptWriterBase.java +1 -1
- data/platform/bb/RubyVM/RubyVM.jdp +9 -10
- data/platform/bb/build/RubyVM_build.files +9 -7
- data/platform/bb/build/bb.rake +13 -3
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -2
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +8 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +154 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/RhoMainScreen.java +8 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +28 -0
- data/platform/bb/rhodes/rhodes.jdp +12 -7
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +331 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +28 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +10 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +4 -0
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +2 -4
- data/platform/bb/rhodes/src/com/rho/{Jsr75File.java → file/Jsr75File.java} +83 -36
- data/platform/bb/{Hsqldb → rhodes}/src/com/rho/file/Jsr75RAFileImpl.java +0 -1
- data/platform/bb/{Hsqldb → rhodes}/src/com/rho/file/PersistRAFileImpl.java +0 -2
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +8 -10
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +1 -1
- data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java +39 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +63 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +100 -0
- data/platform/bb/rhodes/src/rhomobile/LogScreen.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +13 -1
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +138 -492
- data/platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java +11 -2
- data/platform/bb/rhodes/src/rhomobile/Utilities.java +14 -10
- data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java +5 -14
- data/platform/bb/rhodes/src/rhomobile/camera/ImageBrowserScreen.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +2 -2
- data/platform/iphone/Classes/AppManager/AppManager.m +37 -14
- data/platform/iphone/Classes/Camera/PickImageDelegate.h +15 -4
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +53 -50
- data/platform/iphone/Classes/DateTimePicker.h +17 -0
- data/platform/iphone/Classes/DateTimePicker.m +35 -0
- data/platform/iphone/Classes/GeoLocation/LocationController.m +2 -3
- data/platform/iphone/Classes/LogOptionsController.m +3 -2
- data/platform/iphone/Classes/LogViewController.m +4 -2
- data/platform/iphone/Classes/MapView/GoogleGeocoder.m +12 -20
- data/platform/iphone/Classes/MapView/MapAnnotation.h +9 -13
- data/platform/iphone/Classes/MapView/MapAnnotation.m +17 -65
- data/platform/iphone/Classes/MapView/MapViewController.h +1 -7
- data/platform/iphone/Classes/MapView/MapViewController.m +51 -25
- data/platform/iphone/Classes/NativeBar.h +0 -12
- data/platform/iphone/Classes/NativeBar.m +121 -2
- data/platform/iphone/Classes/NavBar.h +16 -0
- data/platform/iphone/Classes/NavBar.m +115 -0
- data/platform/iphone/Classes/RhoAlert.h +19 -0
- data/platform/iphone/Classes/RhoAlert.m +258 -0
- data/platform/iphone/Classes/RhoDelegate.m +1 -0
- data/platform/iphone/Classes/RhoMainView.h +33 -0
- data/platform/iphone/Classes/Rhodes.h +56 -0
- data/platform/iphone/Classes/Rhodes.m +533 -0
- data/platform/iphone/Classes/RingtoneManager.h +17 -0
- data/platform/iphone/Classes/RingtoneManager.m +73 -0
- data/platform/iphone/Classes/SimpleMainView.h +30 -0
- data/platform/iphone/Classes/SimpleMainView.m +380 -0
- data/platform/iphone/Classes/TabbedMainView.h +24 -0
- data/platform/iphone/Classes/TabbedMainView.m +202 -0
- data/platform/iphone/Classes/WebView.m +123 -0
- data/platform/iphone/Classes/rho/net/NetRequestImpl.m +2 -2
- data/platform/iphone/Classes/rho/net/sslimpl.cpp +13 -1
- data/platform/iphone/Classes/rho/net/sslimpl.h +1 -1
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +44 -0
- data/platform/iphone/main.m +1 -2
- data/platform/iphone/rbuild/iphone.rake +8 -16
- data/platform/iphone/rhoextlib/dosyscall.c +1 -1
- data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj +6 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +97 -62
- data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj +12 -0
- data/platform/osx/Rhodes Launcher/launch.rb +14 -21
- data/platform/shared/common/AppMenu.cpp +122 -0
- data/platform/shared/common/AppMenu.h +46 -0
- data/platform/shared/common/PosixThreadImpl.cpp +1 -1
- data/platform/shared/common/RhoConf.cpp +27 -2
- data/platform/shared/common/RhoConf.h +5 -0
- data/platform/shared/common/RhoFilePath.h +21 -0
- data/platform/shared/common/RhoStd.h +44 -5
- data/platform/shared/common/RhoTime.h +20 -7
- data/platform/shared/common/RhodesApp.cpp +236 -177
- data/platform/shared/common/RhodesApp.h +36 -13
- data/platform/shared/common/SplashScreen.cpp +2 -2
- data/platform/shared/common/StringConverter.h +10 -11
- data/platform/shared/common/rhoparams.c +0 -6
- data/platform/shared/curl/lib/rhossl.c +3 -2
- data/platform/shared/curl/lib/url.c +0 -5
- data/platform/shared/db/DBAdapter.cpp +304 -81
- data/platform/shared/db/DBAdapter.h +24 -7
- data/platform/shared/db/DBAttrManager.cpp +83 -30
- data/platform/shared/db/DBAttrManager.h +6 -0
- data/platform/shared/db/DBResult.h +15 -4
- data/platform/shared/json/JSONIterator.cpp +100 -3
- data/platform/shared/json/JSONIterator.h +28 -3
- data/platform/shared/net/AsyncHttp.cpp +25 -22
- data/platform/shared/net/AsyncHttp.h +10 -6
- data/platform/shared/net/CURLNetRequest.cpp +115 -36
- data/platform/shared/net/CURLNetRequest.h +6 -0
- data/platform/shared/net/HttpServer.cpp +6 -4
- data/platform/shared/net/HttpServer.h +0 -1
- data/platform/shared/net/INetRequest.h +19 -3
- data/platform/shared/net/URI.cpp +2 -2
- data/platform/shared/net/ssl.cpp +2 -2
- data/platform/shared/net/ssl.h +2 -2
- data/platform/shared/ruby/ext/alert/alert.i +14 -2
- data/platform/shared/ruby/ext/alert/alert_wrap.c +40 -20
- data/platform/shared/ruby/ext/asynchttp/asynchttp.i +8 -8
- data/platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c +112 -16
- data/platform/shared/ruby/ext/geolocation/geolocation.i +16 -12
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +481 -125
- data/platform/shared/ruby/ext/navbar/navbar.i +20 -0
- data/platform/shared/ruby/ext/navbar/navbar_wrap.c +1859 -0
- data/platform/shared/ruby/ext/rho/extensions.c +1 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +32 -2
- data/platform/shared/ruby/ext/rho/rhoruby.h +7 -2
- data/platform/shared/ruby/ext/rhoconf/rhoconf.i +4 -0
- data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +31 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +188 -3226
- data/platform/shared/ruby/ext/syncengine/syncengine.i +14 -25
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +96 -104
- data/platform/shared/ruby/ext/system/system.i +12 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +101 -7
- data/platform/shared/ruby/ext/webview/webview.i +20 -15
- data/platform/shared/ruby/ext/webview/webview_wrap.c +42 -16
- data/platform/shared/ruby/thread_pthread.c +4 -4
- data/platform/shared/ruby/thread_win32.c +4 -4
- data/platform/shared/ruby/wince/io_wce.c +0 -1
- data/platform/shared/rubyJVM/src/com/rho/FilePath.java +18 -2
- data/platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java +1 -0
- data/platform/shared/rubyJVM/src/com/rho/Properties.java +9 -0
- data/platform/shared/rubyJVM/src/com/rho/RhoClassFactory.java +2 -3
- data/platform/shared/rubyJVM/src/com/rho/RhoConf.java +47 -8
- data/platform/shared/rubyJVM/src/com/rho/RhoLogConf.java +1 -0
- data/platform/shared/rubyJVM/src/com/rho/RhoLogFileSink.java +1 -0
- data/platform/shared/rubyJVM/src/com/rho/RhoRuby.java +43 -5
- data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java +98 -3
- data/platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java +460 -175
- data/platform/shared/rubyJVM/src/com/rho/db/DBAttrManager.java +81 -33
- data/platform/shared/rubyJVM/src/com/rho/db/IDBCallback.java +3 -5
- data/platform/shared/rubyJVM/src/com/rho/db/IDBResult.java +2 -0
- data/platform/shared/rubyJVM/src/com/rho/db/IDBStorage.java +2 -0
- data/platform/shared/rubyJVM/src/com/rho/{IFile.java → file/IFile.java} +1 -1
- data/platform/shared/rubyJVM/src/com/rho/{IFileAccess.java → file/IFileAccess.java} +1 -1
- data/platform/shared/rubyJVM/src/com/rho/{IRAFile.java → file/IRAFile.java} +1 -1
- data/platform/{bb/Hsqldb/src/com/rho/db → shared/rubyJVM/src/com/rho/file}/RandomAccessFile.java +1 -2
- data/platform/shared/rubyJVM/src/com/rho/{SimpleFile.java → file/SimpleFile.java} +5 -1
- data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java +23 -18
- data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java +167 -250
- data/platform/shared/rubyJVM/src/com/rho/net/RhoConnection.java +100 -30
- data/platform/shared/rubyJVM/src/com/rho/net/URI.java +0 -1
- data/platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java +30 -33
- data/platform/shared/rubyJVM/src/com/rho/sync/ISyncProtocol.java +20 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/JSONEntry.java +5 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/JSONStructIterator.java +74 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java +486 -257
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java +89 -58
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncProtocol_3.java +79 -0
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java +634 -495
- data/platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java +74 -90
- data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubySymbol_Methods.java +1 -0
- data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyThread.java +6 -0
- data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyRuntime.java +6 -2
- data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubySymbol.java +17 -1
- data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyValue.java +1 -0
- data/platform/shared/rubyJVM/src/org/json/me/JSONObject.java +3 -0
- data/platform/shared/rubyext/GeoLocation.cpp +23 -0
- data/platform/shared/rubyext/GeoLocation.h +2 -0
- data/platform/shared/rubyext/RhoRuby.cpp +31 -0
- data/platform/shared/rubyext/RhoRuby.h +32 -0
- data/platform/shared/rubyext/System.cpp +14 -3
- data/platform/shared/rubyext/WebView.h +21 -0
- data/platform/shared/sync/ClientRegister.cpp +23 -28
- data/platform/shared/sync/ClientRegister.h +6 -2
- data/platform/shared/sync/ISyncProtocol.h +29 -0
- data/platform/shared/sync/SyncEngine.cpp +450 -190
- data/platform/shared/sync/SyncEngine.h +28 -38
- data/platform/shared/sync/SyncNotify.cpp +43 -41
- data/platform/shared/sync/SyncNotify.h +7 -7
- data/platform/shared/sync/SyncProtocol_3.h +86 -0
- data/platform/shared/sync/SyncSource.cpp +535 -371
- data/platform/shared/sync/SyncSource.h +48 -55
- data/platform/shared/sync/SyncThread.cpp +59 -103
- data/platform/shared/sync/SyncThread.h +10 -23
- data/platform/shared/unzip/unzip.cpp +3 -2
- data/platform/shared/unzip/unzip.h +5 -1
- data/platform/shared/wtl80/include/atlapp.h +10 -10
- data/platform/wm/RhoLib/RhoLib.vcproj +32 -0
- data/platform/wm/build/build_inf.js +40 -3
- data/platform/wm/build/wm.rake +95 -9
- data/platform/wm/rhodes/Alert.cpp +4 -0
- data/platform/wm/rhodes/DateTimePicker.cpp +183 -0
- data/platform/wm/rhodes/DateTimePicker.h +100 -0
- data/platform/wm/rhodes/MainWindow.cpp +222 -209
- data/platform/wm/rhodes/MainWindow.h +28 -35
- data/platform/wm/rhodes/Rhodes.cpp +20 -60
- data/platform/wm/rhodes/Rhodes.rc +41 -7
- data/platform/wm/rhodes/Utils.cpp +65 -0
- data/platform/wm/rhodes/Utils.h +9 -0
- data/platform/wm/rhodes/camera/Camera.cpp +2 -2
- data/platform/wm/rhodes/menubar.cpp +2 -33
- data/platform/wm/rhodes/menubar.h +0 -14
- data/platform/wm/rhodes/resource.h +13 -11
- data/platform/wm/rhodes/rho/net/NetRequest.cpp +16 -35
- data/platform/wm/rhodes/rho/net/NetRequest.h +8 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +264 -46
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +14 -4
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +1 -1
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h +1 -1
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +77 -4
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +63 -0
- data/platform/wm/rhodes/rhodes.vcproj +20 -66
- data/platform/wm/rhodes/stdafx.h +22 -0
- data/platform/wm/rubylib/rubylib.vcproj +4 -0
- data/platform/wm/syncengine/syncengine.vcproj +8 -0
- data/platform/wm/tools/detool.sln +66 -0
- data/platform/wm/tools/detool/DEMComInterface.tlb +0 -0
- data/platform/wm/tools/detool/ReadMe.txt +33 -0
- data/platform/wm/tools/detool/detool.cpp +559 -0
- data/platform/wm/tools/detool/detool.h +5 -0
- data/platform/wm/tools/detool/detool.vcproj +233 -0
- data/platform/wm/tools/detool/stdafx.cpp +8 -0
- data/platform/wm/tools/detool/stdafx.h +15 -0
- data/platform/wm/tools/detool/targetver.h +24 -0
- data/platform/wm/tools/rhosetup/ReadMe.txt +41 -0
- data/platform/wm/tools/rhosetup/rhosetup.cpp +52 -0
- data/platform/wm/tools/rhosetup/rhosetup.vcproj +641 -0
- data/platform/wm/tools/rhosetup/stdafx.cpp +8 -0
- data/platform/wm/tools/rhosetup/stdafx.h +59 -0
- data/rakefile.rb +33 -10
- data/res/build-tools/db/syncdb.schema +25 -23
- data/res/build-tools/db/syncdb.triggers +1 -1
- data/res/build-tools/detool.exe +0 -0
- data/res/build-tools/rhosetup.dll +0 -0
- data/res/generators/rhogen.rb +27 -22
- data/res/generators/templates/application/app/Settings/controller.rb +3 -1
- data/res/generators/templates/application/app/Settings/home.bb.erb +17 -0
- data/res/generators/templates/application/app/Settings/home.erb +21 -12
- data/res/generators/templates/application/app/Settings/index.bb.erb +32 -0
- data/res/generators/templates/application/app/Settings/index.erb +44 -15
- data/res/generators/templates/application/app/Settings/login.bb.erb +35 -0
- data/res/generators/templates/application/app/Settings/login.erb +29 -30
- data/res/generators/templates/application/app/Settings/reset.bb.erb +15 -0
- data/res/generators/templates/application/app/Settings/reset.erb +16 -13
- data/res/generators/templates/application/app/Settings/wait.bb.erb +3 -0
- data/res/generators/templates/application/app/Settings/wait.erb +4 -4
- data/res/generators/templates/application/app/application.rb +8 -0
- data/res/generators/templates/application/app/helpers/browser_helper.rb +13 -0
- data/res/generators/templates/application/app/index.bb.erb +26 -0
- data/res/generators/templates/application/app/index.erb +21 -12
- data/res/generators/templates/application/app/layout.erb +9 -11
- data/res/generators/templates/application/public/css/android.css +285 -0
- data/res/generators/templates/application/public/css/blackberry.css +85 -78
- data/res/generators/templates/application/public/css/iphone.css +286 -296
- data/res/generators/templates/application/public/css/webkit.css +34 -0
- data/res/generators/templates/application/public/css/windows_mobile.css +208 -0
- data/res/generators/templates/application/public/icons/Read me first - license.txt +14 -0
- data/res/generators/templates/application/public/icons/about.png +0 -0
- data/res/generators/templates/application/public/icons/airplane.png +0 -0
- data/res/generators/templates/application/public/icons/baby.png +0 -0
- data/res/generators/templates/application/public/icons/badge.png +0 -0
- data/res/generators/templates/application/public/icons/bandaid.png +0 -0
- data/res/generators/templates/application/public/icons/bar-chart.png +0 -0
- data/res/generators/templates/application/public/icons/battery.png +0 -0
- data/res/generators/templates/application/public/icons/beaker.png +0 -0
- data/res/generators/templates/application/public/icons/beaker2.png +0 -0
- data/res/generators/templates/application/public/icons/beermug.png +0 -0
- data/res/generators/templates/application/public/icons/bird.png +0 -0
- data/res/generators/templates/application/public/icons/book.png +0 -0
- data/res/generators/templates/application/public/icons/bookmark.png +0 -0
- data/res/generators/templates/application/public/icons/brightness.png +0 -0
- data/res/generators/templates/application/public/icons/bug.png +0 -0
- data/res/generators/templates/application/public/icons/cabinet.png +0 -0
- data/res/generators/templates/application/public/icons/calendar.png +0 -0
- data/res/generators/templates/application/public/icons/camera.png +0 -0
- data/res/generators/templates/application/public/icons/changeName.rb +22 -0
- data/res/generators/templates/application/public/icons/chat2.png +0 -0
- data/res/generators/templates/application/public/icons/chicken.png +0 -0
- data/res/generators/templates/application/public/icons/clock.png +0 -0
- data/res/generators/templates/application/public/icons/cloud.png +0 -0
- data/res/generators/templates/application/public/icons/coffee.png +0 -0
- data/res/generators/templates/application/public/icons/compass.png +0 -0
- data/res/generators/templates/application/public/icons/contrast.png +0 -0
- data/res/generators/templates/application/public/icons/dashboard.png +0 -0
- data/res/generators/templates/application/public/icons/display.png +0 -0
- data/res/generators/templates/application/public/icons/dogpaw.png +0 -0
- data/res/generators/templates/application/public/icons/download.png +0 -0
- data/res/generators/templates/application/public/icons/dumbbell.png +0 -0
- data/res/generators/templates/application/public/icons/ekg.png +0 -0
- data/res/generators/templates/application/public/icons/envelope.png +0 -0
- data/res/generators/templates/application/public/icons/equalizer.png +0 -0
- data/res/generators/templates/application/public/icons/eye.png +0 -0
- data/res/generators/templates/application/public/icons/film-roll.png +0 -0
- data/res/generators/templates/application/public/icons/flag.png +0 -0
- data/res/generators/templates/application/public/icons/fork-and-knife.png +0 -0
- data/res/generators/templates/application/public/icons/fuel.png +0 -0
- data/res/generators/templates/application/public/icons/gameplan.png +0 -0
- data/res/generators/templates/application/public/icons/gear.png +0 -0
- data/res/generators/templates/application/public/icons/gear2.png +0 -0
- data/res/generators/templates/application/public/icons/gift.png +0 -0
- data/res/generators/templates/application/public/icons/heart.png +0 -0
- data/res/generators/templates/application/public/icons/house.png +0 -0
- data/res/generators/templates/application/public/icons/inbox.png +0 -0
- data/res/generators/templates/application/public/icons/index-cards.png +0 -0
- data/res/generators/templates/application/public/icons/iphone.png +0 -0
- data/res/generators/templates/application/public/icons/ipod.png +0 -0
- data/res/generators/templates/application/public/icons/key.png +0 -0
- data/res/generators/templates/application/public/icons/lifebuoy.png +0 -0
- data/res/generators/templates/application/public/icons/lightbulb.png +0 -0
- data/res/generators/templates/application/public/icons/line-chart.png +0 -0
- data/res/generators/templates/application/public/icons/location.png +0 -0
- data/res/generators/templates/application/public/icons/lock.png +0 -0
- data/res/generators/templates/application/public/icons/loopback.png +0 -0
- data/res/generators/templates/application/public/icons/magnifying-glass.png +0 -0
- data/res/generators/templates/application/public/icons/map-marker.png +0 -0
- data/res/generators/templates/application/public/icons/map.png +0 -0
- data/res/generators/templates/application/public/icons/medical-bag.png +0 -0
- data/res/generators/templates/application/public/icons/medical.png +0 -0
- data/res/generators/templates/application/public/icons/microphone.png +0 -0
- data/res/generators/templates/application/public/icons/movie1.png +0 -0
- data/res/generators/templates/application/public/icons/movie2.png +0 -0
- data/res/generators/templates/application/public/icons/network.png +0 -0
- data/res/generators/templates/application/public/icons/note.png +0 -0
- data/res/generators/templates/application/public/icons/outlet.png +0 -0
- data/res/generators/templates/application/public/icons/palette.png +0 -0
- data/res/generators/templates/application/public/icons/paperclip.png +0 -0
- data/res/generators/templates/application/public/icons/phone.png +0 -0
- data/res/generators/templates/application/public/icons/photos.png +0 -0
- data/res/generators/templates/application/public/icons/piano.png +0 -0
- data/res/generators/templates/application/public/icons/picture-frame.png +0 -0
- data/res/generators/templates/application/public/icons/pill.png +0 -0
- data/res/generators/templates/application/public/icons/pin.png +0 -0
- data/res/generators/templates/application/public/icons/pinetree.png +0 -0
- data/res/generators/templates/application/public/icons/planet.png +0 -0
- data/res/generators/templates/application/public/icons/puzzle.png +0 -0
- data/res/generators/templates/application/public/icons/radar.png +0 -0
- data/res/generators/templates/application/public/icons/redo.png +0 -0
- data/res/generators/templates/application/public/icons/refresh.png +0 -0
- data/res/generators/templates/application/public/icons/runner.png +0 -0
- data/res/generators/templates/application/public/icons/shoebox.png +0 -0
- data/res/generators/templates/application/public/icons/shopping-bag.png +0 -0
- data/res/generators/templates/application/public/icons/shopping-cart.png +0 -0
- data/res/generators/templates/application/public/icons/shuffle.png +0 -0
- data/res/generators/templates/application/public/icons/signpost.png +0 -0
- data/res/generators/templates/application/public/icons/skull-n-crossbones.png +0 -0
- data/res/generators/templates/application/public/icons/skull.png +0 -0
- data/res/generators/templates/application/public/icons/sliders.png +0 -0
- data/res/generators/templates/application/public/icons/spraycan.png +0 -0
- data/res/generators/templates/application/public/icons/squiggle.png +0 -0
- data/res/generators/templates/application/public/icons/star.png +0 -0
- data/res/generators/templates/application/public/icons/stopwatch.png +0 -0
- data/res/generators/templates/application/public/icons/suitcase.png +0 -0
- data/res/generators/templates/application/public/icons/tag.png +0 -0
- data/res/generators/templates/application/public/icons/tags.png +0 -0
- data/res/generators/templates/application/public/icons/target.png +0 -0
- data/res/generators/templates/application/public/icons/testtube.png +0 -0
- data/res/generators/templates/application/public/icons/thermometer.png +0 -0
- data/res/generators/templates/application/public/icons/toolbox.png +0 -0
- data/res/generators/templates/application/public/icons/trophy.png +0 -0
- data/res/generators/templates/application/public/icons/tshirt.png +0 -0
- data/res/generators/templates/application/public/icons/tv.png +0 -0
- data/res/generators/templates/application/public/icons/umbrella.png +0 -0
- data/res/generators/templates/application/public/icons/walk.png +0 -0
- data/res/generators/templates/application/public/icons/weather.png +0 -0
- data/res/generators/templates/application/public/icons/widescreen.png +0 -0
- data/res/generators/templates/application/public/icons/wineglass.png +0 -0
- data/res/generators/templates/application/public/icons/zap.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_check_off.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_check_on.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_radio_off.png +0 -0
- data/res/generators/templates/application/public/images/android/btn_radio_on.png +0 -0
- data/res/generators/templates/application/public/images/android/ic_menu_more.png +0 -0
- data/res/generators/templates/application/public/images/iphone/disclosure.png +0 -0
- data/res/generators/templates/application/public/images/iphone/disclosure_detail.png +0 -0
- data/res/generators/templates/application/public/images/iphone/radiobutton.png +0 -0
- data/res/generators/templates/application/public/images/iphone/select.png +0 -0
- data/res/generators/templates/application/public/images/iphone/switch.png +0 -0
- data/res/generators/templates/application/public/images/listArrow.png +0 -0
- data/res/generators/templates/application/public/images/listArrowDown.png +0 -0
- data/res/generators/templates/model/controller.rb +2 -0
- data/res/generators/templates/model/edit.bb.erb +24 -0
- data/res/generators/templates/model/edit.erb +21 -25
- data/res/generators/templates/model/index.bb.erb +21 -0
- data/res/generators/templates/model/index.erb +28 -14
- data/res/generators/templates/model/new.bb.erb +24 -0
- data/res/generators/templates/model/new.erb +20 -20
- data/res/generators/templates/model/show.bb.erb +21 -0
- data/res/generators/templates/model/show.erb +15 -15
- data/rhobuild.yml +37 -0
- data/rhodes.gemspec +1 -1
- data/spec/framework_spec/app/Account/config.rb +57 -1
- data/spec/framework_spec/app/Case/config.rb +1 -1
- data/spec/framework_spec/app/Customer/config.rb +1 -1
- data/spec/framework_spec/app/Product/config.rb +15 -1
- data/spec/framework_spec/app/spec/fixtures/object_values.txt +90 -90
- data/spec/framework_spec/app/spec/pagination/fixtures/object_values.txt +91 -91
- data/spec/framework_spec/app/spec/rho_spec.rb +1 -1
- data/spec/framework_spec/app/spec/rhom_object_spec.rb +47 -28
- data/spec/framework_spec/app/spec/rhom_spec.rb +8 -8
- data/spec/framework_spec/app/spec/spec_helper.rb +13 -5
- data/spec/framework_spec/app/spec_runner.rb +5 -4
- data/spec/framework_spec/public/css/base.css +0 -1
- data/spec/framework_spec/public/css/iphone.css +0 -1
- data/spec/framework_spec/rhoconfig.txt +3 -1
- metadata +220 -37
- data/platform/bb/rhodes/src/rhomobile/WebView.java +0 -90
- data/platform/iphone/Classes/BarItem.h +0 -27
- data/platform/iphone/Classes/BarItem.m +0 -32
- data/platform/iphone/Classes/JSString.h +0 -12
- data/platform/iphone/Classes/JSString.m +0 -7
- data/platform/iphone/Classes/RhoRunnerAppDelegate.h +0 -48
- data/platform/iphone/Classes/RhoRunnerAppDelegate.m +0 -617
- data/platform/iphone/Classes/Server/ServerHost.h +0 -81
- data/platform/iphone/Classes/Server/ServerHost.m +0 -597
- data/platform/iphone/Classes/Server/WebViewUrl.h +0 -13
- data/platform/iphone/Classes/Server/WebViewUrl.m +0 -8
- data/platform/iphone/Classes/TabBarDelegate.h +0 -39
- data/platform/iphone/Classes/TabBarDelegate.m +0 -151
- data/platform/iphone/Classes/Utils/unzip.cpp +0 -4328
- data/platform/iphone/Classes/Utils/unzip.h +0 -234
- data/platform/iphone/Classes/WebViewController.h +0 -59
- data/platform/iphone/Classes/WebViewController.m +0 -472
- data/platform/wm/rhodes/GetURLDialog.cpp +0 -64
- data/platform/wm/rhodes/GetURLDialog.h +0 -39
- data/res/generators/templates/application/public/css/base.css +0 -39
- data/res/generators/templates/application/public/css/rho.css +0 -3
- data/res/generators/templates/application/public/css/xhtml.css +0 -114
- data/spec/framework_spec/app/Question/config.rb +0 -3
- data/spec/generator_spec/source_generator_spec.rb +0 -27
data/lib/framework/rho/rho.rb
CHANGED
@@ -4,16 +4,27 @@ require 'rho/rhoapplication'
|
|
4
4
|
require 'rhom'
|
5
5
|
require 'rhofsconnector'
|
6
6
|
require 'rho/rhoerror'
|
7
|
+
require 'rhom/rhom_source'
|
7
8
|
|
8
9
|
module Rho
|
10
|
+
def self.get_app
|
11
|
+
RHO.get_instance().get_app('app')
|
12
|
+
end
|
13
|
+
|
9
14
|
class RHO
|
10
15
|
APPLICATIONS = {}
|
11
16
|
APPNAME = 'app'
|
12
17
|
|
18
|
+
@@rho_framework = nil
|
19
|
+
|
20
|
+
def self.get_instance
|
21
|
+
@@rho_framework
|
22
|
+
end
|
23
|
+
|
13
24
|
def initialize(app_manifest_filename=nil)
|
14
25
|
puts "Calling RHO.initialize"
|
15
26
|
RHO.process_rhoconfig
|
16
|
-
|
27
|
+
|
17
28
|
if app_manifest_filename
|
18
29
|
process_model_dirs(app_manifest_filename)
|
19
30
|
else
|
@@ -21,10 +32,33 @@ module Rho
|
|
21
32
|
end
|
22
33
|
|
23
34
|
# Initialize application and sources
|
24
|
-
|
25
|
-
|
35
|
+
@@rho_framework = self
|
36
|
+
init_sources()
|
26
37
|
end
|
27
38
|
|
39
|
+
attr_reader :db_partitions
|
40
|
+
|
41
|
+
def self.get_src_db(src_name=nil)
|
42
|
+
if src_name
|
43
|
+
src_partition = Rho::RhoConfig.sources[src_name]['partition']
|
44
|
+
@@rho_framework.db_partitions[src_partition]
|
45
|
+
else
|
46
|
+
@@rho_framework.db_partitions['user']
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def self.get_user_db
|
51
|
+
@@rho_framework.db_partitions['user']
|
52
|
+
end
|
53
|
+
|
54
|
+
def self.get_db_partitions
|
55
|
+
@@rho_framework.db_partitions
|
56
|
+
end
|
57
|
+
|
58
|
+
#def self.get_application_db
|
59
|
+
# @@rho_framework.db_application
|
60
|
+
#end
|
61
|
+
|
28
62
|
def init_app
|
29
63
|
get_app(APPNAME)
|
30
64
|
end
|
@@ -32,11 +66,18 @@ module Rho
|
|
32
66
|
def activate_app
|
33
67
|
get_app(APPNAME).on_activate_app
|
34
68
|
end
|
35
|
-
|
69
|
+
|
36
70
|
# make sure we close the database file
|
37
|
-
def self.finalize
|
38
|
-
Rhom::RhomDbAdapter::close
|
39
|
-
|
71
|
+
#def self.finalize
|
72
|
+
#Rhom::RhomDbAdapter::close
|
73
|
+
#puts 'finalize'
|
74
|
+
#if @@rho_framework
|
75
|
+
# @@rho_framework.db_application.close()
|
76
|
+
# @@rho_framework.db_user.close()
|
77
|
+
|
78
|
+
# @@rho_framework = nil
|
79
|
+
#end
|
80
|
+
#end
|
40
81
|
|
41
82
|
def raise_rhoerror(errCode)
|
42
83
|
raise Rho::RhoError.new(errCode)
|
@@ -88,62 +129,237 @@ module Rho
|
|
88
129
|
puts "Error opening rhoconfig.txt: #{e}, using defaults."
|
89
130
|
end
|
90
131
|
end
|
132
|
+
|
133
|
+
def load_server_sources(data)
|
134
|
+
puts "load_server_sources : #{data}"
|
135
|
+
|
136
|
+
res = Rho::JSON.parse(data)
|
137
|
+
arSrc = res['server_sources']
|
138
|
+
puts "arSrc: #{arSrc}"
|
139
|
+
return unless arSrc
|
140
|
+
|
141
|
+
hashSrcs = Rhom::RhomSource::find_all_ashash
|
142
|
+
puts "hashSrcs : #{hashSrcs}"
|
143
|
+
arSrc.each do |src|
|
144
|
+
oldSrc = hashSrcs[src['name']]
|
145
|
+
puts "oldSrc: #{oldSrc}"
|
146
|
+
if oldSrc
|
147
|
+
oldVer = oldSrc.schema_version
|
148
|
+
newVer = src['schema_version']
|
149
|
+
if ( oldVer != newVer )
|
150
|
+
get_app(APPNAME).on_migrate_source(oldSrc.schema_version, src)
|
151
|
+
end
|
152
|
+
end
|
153
|
+
|
154
|
+
Rho::RhoConfig::add_source(src['name'], src)
|
155
|
+
end
|
156
|
+
|
157
|
+
init_sources()
|
158
|
+
end
|
159
|
+
|
160
|
+
def find_src_byname(uniq_sources, src_name)
|
161
|
+
uniq_sources.each do |source|
|
162
|
+
return source if src_name == source['name']
|
163
|
+
end
|
164
|
+
|
165
|
+
nil
|
166
|
+
end
|
91
167
|
|
92
168
|
# setup the sources table and model attributes for all applications
|
93
|
-
def init_sources
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
#uniq_sources = Rho::RhoConfig::sources.values.inject([]) { |result,h|
|
98
|
-
# result << h unless result.include?(h); result
|
99
|
-
#}
|
169
|
+
def init_sources()
|
170
|
+
return unless defined? Rho::RhoConfig::sources
|
171
|
+
|
172
|
+
@db_partitions = {}
|
100
173
|
uniq_sources = Rho::RhoConfig::sources.values
|
101
174
|
puts 'init_sources: ' + uniq_sources.inspect
|
102
175
|
|
103
|
-
|
104
|
-
|
105
|
-
|
176
|
+
uniq_sources.each do |source|
|
177
|
+
partition = source['partition']
|
178
|
+
@db_partitions[partition] = nil
|
179
|
+
|
180
|
+
if source['links']
|
181
|
+
source['links'].each do |src_name, attrib|
|
182
|
+
linkSrc = find_src_byname(uniq_sources, src_name)
|
183
|
+
if !linkSrc
|
184
|
+
rho_error( "links from '#{source['name']}' : source name '#{src_name}' does not exist." )
|
185
|
+
next
|
186
|
+
end
|
187
|
+
|
188
|
+
str_links = linkSrc['str_links']
|
189
|
+
str_links = "" unless str_links
|
190
|
+
str_links += ',' if str_links.length() > 0
|
191
|
+
|
192
|
+
str_links += source['name'] + ',' + attrib
|
193
|
+
linkSrc['str_links'] = str_links
|
194
|
+
end
|
195
|
+
end
|
196
|
+
end
|
197
|
+
|
198
|
+
#user partition should alwayse exist
|
199
|
+
@db_partitions['user'] = nil
|
200
|
+
|
201
|
+
@db_partitions.each_key do |partition|
|
202
|
+
db = Rhom::RhomDbAdapter.new(Rho::RhoFSConnector::get_db_fullpathname(partition), partition)
|
203
|
+
db.start_transaction
|
204
|
+
begin
|
205
|
+
init_db_sources(db, uniq_sources, partition)
|
206
|
+
db.commit
|
207
|
+
rescue Exception => e
|
208
|
+
puts "exception when init_db_sources: #{e}"
|
209
|
+
db.rollback
|
210
|
+
end
|
211
|
+
|
212
|
+
@db_partitions[partition] = db
|
213
|
+
end
|
214
|
+
|
215
|
+
::Rho::RHO.init_schema_sources
|
216
|
+
end
|
217
|
+
|
218
|
+
def self.processIndexes(index_param, src_name, is_unique)
|
219
|
+
|
220
|
+
return "" unless index_param
|
221
|
+
|
222
|
+
strUnique = 'UNIQUE' if is_unique
|
223
|
+
strRes = ""
|
224
|
+
if index_param.is_a?( String )
|
225
|
+
strRes = index_param
|
226
|
+
else
|
227
|
+
nInd = 0
|
228
|
+
index_param.each do |index_cols|
|
229
|
+
strCols = ""
|
230
|
+
index_cols.each do |col|
|
231
|
+
strCols += ',' if strCols.length() > 0
|
232
|
+
strCols += "\"#{col}\""
|
233
|
+
end
|
234
|
+
|
235
|
+
strIndex = "CREATE #{strUnique} INDEX \"rhoIndex_#{nInd}\" on #{src_name} (#{strCols});\r\n"
|
236
|
+
strRes += strIndex
|
237
|
+
nInd += 1
|
238
|
+
end
|
239
|
+
end
|
240
|
+
|
241
|
+
strRes
|
242
|
+
end
|
243
|
+
|
244
|
+
def self.init_schema_sources
|
245
|
+
uniq_sources = Rho::RhoConfig::sources.values
|
246
|
+
puts 'init_schema_sources'
|
106
247
|
|
107
|
-
# generate unique source list in database for sync
|
108
248
|
uniq_sources.each do |source|
|
249
|
+
puts "source : #{source}"
|
250
|
+
db = get_src_db(source['name'])
|
109
251
|
|
110
|
-
|
252
|
+
if source['schema'] && !db.table_exist?(source['name'])
|
253
|
+
|
254
|
+
strCreate = source['schema']['sql']
|
255
|
+
if source['schema']['columns']
|
256
|
+
arCols = source['schema']['columns']
|
257
|
+
arCols = arCols
|
258
|
+
strCols = ""
|
259
|
+
arCols.each do |col|
|
260
|
+
strCols += ',' if strCols.length() > 0
|
261
|
+
strCols += "\"#{col}\" varchar default NULL"
|
262
|
+
end
|
263
|
+
|
264
|
+
strCols += ",object varchar(255) PRIMARY KEY"
|
265
|
+
strCreate = "CREATE TABLE #{source['name']} ( #{strCols} )"
|
266
|
+
end
|
267
|
+
|
268
|
+
strCreate += ";\r\n" if strCreate && strCreate.length() > 0
|
269
|
+
strCreate += processIndexes(source['schema']['indexes'], source['name'], false)
|
270
|
+
strCreate += ";\r\n" if strCreate && strCreate.length() > 0
|
271
|
+
strCreate += processIndexes(source['schema']['unique_indexes'], source['name'], true)
|
272
|
+
|
273
|
+
db.update_into_table('sources', {"schema"=>strCreate, "schema_version"=>source['schema_version']},{"name"=>source['name']})
|
274
|
+
|
275
|
+
db.execute_batch_sql(strCreate)
|
276
|
+
end
|
277
|
+
|
278
|
+
end
|
279
|
+
end
|
280
|
+
|
281
|
+
def process_blob_attribs(source, db)
|
282
|
+
return source['str_blob_attribs'] if source['str_blob_attribs']
|
283
|
+
source['str_blob_attribs'] = ""
|
284
|
+
|
285
|
+
if source['blob_attribs']
|
286
|
+
str = ""
|
287
|
+
source['blob_attribs'].each do |blobAttr|
|
288
|
+
str += ',' if str.length()>0
|
289
|
+
if blobAttr.is_a?(Hash)
|
290
|
+
str += blobAttr['name'].to_s() + ',' + blobAttr['server_overwrite'].to_i()
|
291
|
+
else
|
292
|
+
str += blobAttr.to_s() + ',0'
|
293
|
+
end
|
294
|
+
end
|
295
|
+
|
296
|
+
source['str_blob_attribs'] = str
|
297
|
+
end
|
298
|
+
|
299
|
+
source['str_blob_attribs']
|
300
|
+
end
|
301
|
+
|
302
|
+
def init_db_sources(db, uniq_sources, db_partition)
|
303
|
+
|
304
|
+
result = db.execute_sql("SELECT MAX(source_id) AS maxid FROM sources")
|
305
|
+
#puts 'result: ' + result.inspect
|
306
|
+
start_id = result.length > 0 && result[0]['maxid'] ? result[0]['maxid']+2 : 1
|
307
|
+
start_id = Rho::RhoConfig.max_config_srcid()+2 if start_id < Rho::RhoConfig.max_config_srcid
|
308
|
+
|
309
|
+
uniq_sources.each do |source|
|
310
|
+
puts "init_db_sources : #{source}"
|
111
311
|
name = source['name']
|
112
312
|
priority = source['priority']
|
113
|
-
|
313
|
+
partition = source['partition']
|
314
|
+
sync_type = source['sync_type']
|
315
|
+
schema_version = source['schema_version']
|
316
|
+
links = source['str_links']
|
317
|
+
blob_attribs = process_blob_attribs(source, db)
|
318
|
+
|
319
|
+
attribs = db.select_from_table('sources','priority,source_id,partition, sync_type, schema_version, links, blob_attribs', 'name'=>name)
|
114
320
|
|
115
321
|
if attribs && attribs.size > 0
|
116
322
|
if attribs[0]['priority'].to_i != priority.to_i
|
117
|
-
|
323
|
+
db.update_into_table('sources', {"priority"=>priority},{"name"=>name})
|
324
|
+
end
|
325
|
+
if attribs[0]['sync_type'] != sync_type
|
326
|
+
db.update_into_table('sources', {"sync_type"=>sync_type},{"name"=>name})
|
327
|
+
end
|
328
|
+
if attribs[0]['schema_version'] != schema_version
|
329
|
+
db.update_into_table('sources', {"schema_version"=>schema_version},{"name"=>name})
|
330
|
+
end
|
331
|
+
if attribs[0]['partition'] != partition
|
332
|
+
db.update_into_table('sources', {"partition"=>partition},{"name"=>name})
|
118
333
|
end
|
119
|
-
if attribs[0]['
|
120
|
-
|
334
|
+
if attribs[0]['links'] != links
|
335
|
+
db.update_into_table('sources', {"links"=>links},{"name"=>name})
|
336
|
+
end
|
337
|
+
if attribs[0]['blob_attribs'] != blob_attribs
|
338
|
+
db.update_into_table('sources', {"blob_attribs"=>blob_attribs},{"name"=>name})
|
339
|
+
end
|
340
|
+
|
341
|
+
if !source['source_id']
|
342
|
+
source['source_id'] = attribs[0]['source_id'].to_i
|
343
|
+
Rho::RhoConfig::sources[name]['source_id'] = attribs[0]['source_id'].to_i
|
121
344
|
end
|
122
345
|
|
123
|
-
Rho::RhoConfig::sources[name]['source_id'] = attribs[0]['source_id'].to_i
|
124
346
|
else
|
125
347
|
if !source['source_id']
|
126
|
-
|
348
|
+
source['source_id'] = start_id
|
349
|
+
Rho::RhoConfig::sources[name]['source_id'] = start_id
|
350
|
+
|
127
351
|
start_id += 1
|
128
|
-
else
|
129
|
-
srcid = source['source_id'].to_i
|
130
352
|
end
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
Rho::RhoConfig::sources[name]['source_id'] = srcid
|
137
|
-
|
353
|
+
|
354
|
+
db.insert_into_table('sources',
|
355
|
+
{"source_id"=>source['source_id'],"name"=>name, "priority"=>priority, "sync_type"=>sync_type, "partition"=>partition,
|
356
|
+
"schema_version"=>source['schema_version'], 'links'=>links, 'blob_attribs'=>blob_attribs })
|
357
|
+
|
138
358
|
end
|
359
|
+
|
139
360
|
end
|
140
|
-
end
|
141
361
|
end
|
142
362
|
|
143
|
-
# def source_initialized?(source_id)
|
144
|
-
# Rhom::RhomDbAdapter::select_from_table('sources','*', 'source_id'=>source_id).size > 0 ? true : false
|
145
|
-
# end
|
146
|
-
|
147
363
|
def serve(req)
|
148
364
|
begin
|
149
365
|
puts 'inside RHO.serve...'
|
@@ -322,6 +538,7 @@ module Rho
|
|
322
538
|
|
323
539
|
@@sources = {}
|
324
540
|
@@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
|
541
|
+
@@max_config_srcid = 1
|
325
542
|
|
326
543
|
class << self
|
327
544
|
def method_missing(name, *args)
|
@@ -338,10 +555,18 @@ module Rho
|
|
338
555
|
end
|
339
556
|
end
|
340
557
|
|
558
|
+
def exists?(name)
|
559
|
+
RhoConf.is_property_exists(name)
|
560
|
+
end
|
561
|
+
|
341
562
|
def reload
|
342
563
|
@@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
|
343
564
|
Rho::RHO.process_rhoconfig
|
344
565
|
end
|
566
|
+
|
567
|
+
def max_config_srcid
|
568
|
+
@@max_config_srcid
|
569
|
+
end
|
345
570
|
|
346
571
|
def show_log
|
347
572
|
RhoConf.show_log
|
@@ -364,19 +589,23 @@ module Rho
|
|
364
589
|
end
|
365
590
|
|
366
591
|
def add_source(modelname, new_source=nil)
|
367
|
-
return if !modelname || modelname.length() == 0 || @@sources[modelname]
|
592
|
+
return if !modelname || modelname.length() == 0# || @@sources[modelname]
|
368
593
|
|
369
594
|
@@sources[modelname] = new_source ? new_source : {}
|
370
595
|
@@sources[modelname]['name'] ||= modelname
|
371
596
|
@@sources[modelname]['priority'] ||= 1000
|
597
|
+
@@sources[modelname]['partition'] ||= 'user'
|
598
|
+
@@sources[modelname]['sync_type'] ||= 'incremental'
|
599
|
+
|
600
|
+
if @@sources[modelname]['url'] && @@sources[modelname]['url'].length() == 0
|
601
|
+
@@sources[modelname]['sync'] = false
|
602
|
+
end
|
372
603
|
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
# end
|
379
|
-
# end
|
604
|
+
if @@sources[modelname]['sync'].nil?
|
605
|
+
@@sources[modelname]['sync'] = true
|
606
|
+
end
|
607
|
+
|
608
|
+
@@max_config_srcid = new_source['source_id'] if new_source['source_id'] && @@max_config_srcid < new_source['source_id']
|
380
609
|
end
|
381
610
|
|
382
611
|
@@g_base_temp_id = nil
|
@@ -391,7 +620,13 @@ module Rho
|
|
391
620
|
end # RhoConfig
|
392
621
|
|
393
622
|
module AsyncHttp
|
394
|
-
def self.
|
623
|
+
def self.ssl_verify_peer(args)
|
624
|
+
ret = args[:ssl_verify_peer]
|
625
|
+
ret = true if !ret.is_a? TrueClass and !ret.is_a? FalseClass
|
626
|
+
ret ? 1 : 0
|
627
|
+
end
|
628
|
+
|
629
|
+
def self.process_result(res, callback)
|
395
630
|
return res if callback && callback.length() > 0
|
396
631
|
|
397
632
|
_params = ::Rho::RhoSupport::parse_query_parameters res
|
@@ -401,25 +636,28 @@ module Rho
|
|
401
636
|
|
402
637
|
def self.get(args)
|
403
638
|
process_result(
|
404
|
-
AsyncHttp.do_get(args[:url], args[:headers],
|
405
|
-
|
639
|
+
AsyncHttp.do_get(args[:url], args[:headers],
|
640
|
+
args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
|
406
641
|
end
|
407
642
|
def self.post(args)
|
408
643
|
process_result(
|
409
|
-
AsyncHttp.do_post(args[:url], args[:headers], args[:body],
|
410
|
-
|
644
|
+
AsyncHttp.do_post(args[:url], args[:headers], args[:body],
|
645
|
+
args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
|
411
646
|
end
|
412
647
|
def self.download_file(args)
|
413
648
|
process_result(
|
414
|
-
AsyncHttp.do_downloadfile(args[:url], args[:headers], args[:filename],
|
415
|
-
|
649
|
+
AsyncHttp.do_downloadfile(args[:url], args[:headers], args[:filename],
|
650
|
+
args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
|
416
651
|
end
|
417
652
|
def self.upload_file(args)
|
418
653
|
process_result(
|
419
|
-
AsyncHttp.do_uploadfile(args[:url], args[:headers], args[:filename],
|
420
|
-
|
654
|
+
AsyncHttp.do_uploadfile(args[:url], args[:headers], args[:filename],
|
655
|
+
args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
|
421
656
|
end
|
422
657
|
end
|
423
658
|
|
424
659
|
end # Rho
|
425
660
|
|
661
|
+
#at_exit do
|
662
|
+
#::Rhom::RhomDbAdapter.close
|
663
|
+
#end
|