rhodes 2.2.6 → 2.3.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +20 -0
- data/README.md +46 -0
- data/Rakefile +85 -80
- data/bin/rhodes +2 -2
- data/bin/rhogen +1 -1
- data/doc/application.txt +277 -0
- data/doc/bb-css.txt +209 -0
- data/doc/build.txt +785 -0
- data/doc/configuration.txt +236 -0
- data/doc/connect-to-web-services.txt +282 -0
- data/doc/contributing.txt +64 -0
- data/doc/css-framework.txt +144 -0
- data/doc/device-caps.txt +1152 -0
- data/doc/extensions.txt +528 -0
- data/doc/files.txt +4 -0
- data/doc/generator.txt +141 -0
- data/doc/install.txt +35 -0
- data/doc/introduction.txt +88 -0
- data/doc/rhom.txt +826 -0
- data/doc/standard-css.txt +392 -0
- data/doc/synchronization.txt +542 -0
- data/doc/test-log-debug.txt +148 -0
- data/doc/tutorial.txt +136 -0
- data/doc/ui.txt +766 -0
- data/installer/EnvVarUpdate.nsh +328 -0
- data/installer/README.html +81 -0
- data/installer/RHOSYNC-LICENSE.txt +675 -0
- data/installer/icon.ico +0 -0
- data/installer/instant-rhodes.nsi +427 -0
- data/lib/build/jake.rb +15 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
- data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
- data/lib/extensions/digest-sha1/ext/build.bat +1 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
- data/lib/extensions/esri/ext/build +17 -0
- data/lib/extensions/esri/ext/build.bat +29 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
- data/lib/extensions/esri/ext.yml +3 -0
- data/lib/extensions/net-http/monitor.rb +265 -0
- data/lib/extensions/net-http/net/ftp.rb +981 -0
- data/lib/extensions/net-http/thread.rb +367 -0
- data/lib/extensions/rhocgi/cgi.rb +16 -0
- data/lib/extensions/rhospec/rhospec.rb +118 -0
- data/lib/framework/base64.rb +91 -0
- data/lib/framework/builtinME.rb +13 -10
- data/lib/framework/ostruct.rb +145 -0
- data/lib/framework/res/back_btn.wm.png +0 -0
- data/lib/framework/res/blue_pushpin.wm.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
- data/lib/framework/res/callout.wm.png +0 -0
- data/lib/framework/res/callout_link.wm.png +0 -0
- data/lib/framework/res/forward_btn.wm.png +0 -0
- data/lib/framework/res/home_btn.wm.png +0 -0
- data/lib/framework/res/options_btn.wm.png +0 -0
- data/lib/framework/res/refresh_btn.wm.png +0 -0
- data/lib/framework/rho/render.rb +5 -2
- data/lib/framework/rho/rho.rb +320 -50
- data/lib/framework/rho/rhoapplication.rb +48 -10
- data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
- data/lib/framework/rho/rhosupport.rb +15 -1
- data/lib/framework/rho/rhotabbar.rb +29 -0
- data/lib/framework/rho/rhotoolbar.rb +17 -0
- data/lib/framework/rho/rhoutils.rb +22 -6
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rholang/rhomsg_de.rb +4 -3
- data/lib/framework/rholang/rhomsg_en.rb +1 -0
- data/lib/framework/rholang/rhomsg_es.rb +1 -0
- data/lib/framework/rholang/rhomsg_it.rb +1 -0
- data/lib/framework/rhom/rhom.rb +31 -10
- data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
- data/lib/framework/rhom/rhom_object_factory.rb +465 -249
- data/lib/framework/rhom/rhom_source.rb +22 -7
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +83 -20
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
- data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
- data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
- data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
- data/platform/android/Rhodes/jni/src/event.cpp +9 -15
- data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
- data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
- data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
- data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
- data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
- data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
- data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
- data/platform/android/Rhodes/res/drawable/callout.png +0 -0
- data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
- data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
- data/platform/android/Rhodes/res/layout/signature.xml +24 -17
- data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
- data/platform/android/Rhodes/res/values/strings.xml +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
- data/platform/android/build/RhodesSRC_build.files +32 -23
- data/platform/android/build/android.rake +28 -11
- data/platform/android/build/androidcommon.rb +2 -0
- data/platform/android/build/librhocommon_build.files +9 -5
- data/platform/android/build/librhodes_build.files +1 -0
- data/platform/android/build/libruby_build.files +1 -0
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
- data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
- data/platform/bb/RubyVM/RubyVM.jdp +3 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
- data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
- data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
- data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
- data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
- data/platform/bb/build/RubyVM_build.files +3 -0
- data/platform/bb/build/bb.rake +140 -62
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/rhodes.jdp +3 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
- data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
- data/platform/iphone/Classes/DateTime.h +4 -0
- data/platform/iphone/Classes/DateTime.m +1 -1
- data/platform/iphone/Classes/DateTimePicker.m +8 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
- data/platform/iphone/Classes/Event/Event.m +2 -2
- data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
- data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
- data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
- data/platform/iphone/Classes/NativeBar.h +34 -0
- data/platform/iphone/Classes/NativeBar.m +131 -26
- data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
- data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
- data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
- data/platform/iphone/Classes/RhoAlert.m +3 -3
- data/platform/iphone/Classes/RhoMainView.h +3 -0
- data/platform/iphone/Classes/Rhodes.h +6 -2
- data/platform/iphone/Classes/Rhodes.m +47 -79
- data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
- data/platform/iphone/Classes/SimpleMainView.h +18 -1
- data/platform/iphone/Classes/SimpleMainView.m +180 -35
- data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
- data/platform/iphone/Classes/TabbedMainView.h +25 -3
- data/platform/iphone/Classes/TabbedMainView.m +340 -14
- data/platform/iphone/ESRI/BluePushpin.png +0 -0
- data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
- data/platform/iphone/ESRI/esri.png +0 -0
- data/platform/iphone/ESRI/esri@2x.png +0 -0
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
- data/platform/iphone/rbuild/iphone.rake +100 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
- data/platform/shared/SyncClient/SyncClient.cpp +29 -3
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/IRhoClassFactory.h +3 -0
- data/platform/shared/common/IRhoCrypt.h +16 -0
- data/platform/shared/common/IRhoThreadImpl.h +1 -0
- data/platform/shared/common/RhoAppAdapter.h +2 -0
- data/platform/shared/common/RhoConf.cpp +97 -46
- data/platform/shared/common/RhoConf.h +14 -13
- data/platform/shared/common/RhoFile.cpp +10 -0
- data/platform/shared/common/RhoFile.h +1 -0
- data/platform/shared/common/RhoMath.cpp +43 -0
- data/platform/shared/common/RhoMath.h +27 -0
- data/platform/shared/common/RhoNativeViewManager.h +27 -1
- data/platform/shared/common/RhoPort.h +11 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoThread.cpp +1 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +381 -139
- data/platform/shared/common/RhodesApp.h +24 -10
- data/platform/shared/common/RhodesAppBase.cpp +72 -1
- data/platform/shared/common/RhodesAppBase.h +5 -1
- data/platform/shared/common/SplashScreen.h +4 -4
- data/platform/shared/common/ThreadQueue.cpp +44 -17
- data/platform/shared/common/ThreadQueue.h +4 -0
- data/platform/shared/common/app_build_configs.c +0 -1
- data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
- data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
- data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
- data/platform/shared/common/map/ESRIMapEngine.h +255 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
- data/platform/shared/common/map/GoogleMapEngine.h +52 -0
- data/platform/shared/common/map/MapEngine.cpp +304 -0
- data/platform/shared/common/map/MapEngine.h +214 -0
- data/platform/shared/db/DBAdapter.cpp +147 -18
- data/platform/shared/db/DBAdapter.h +38 -12
- data/platform/shared/db/DBAttrManager.cpp +4 -3
- data/platform/shared/db/DBAttrManager.h +7 -7
- data/platform/shared/db/res/db/syncdb.triggers +0 -5
- data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
- data/platform/shared/json/JSONIterator.cpp +11 -1
- data/platform/shared/json/JSONIterator.h +1 -0
- data/platform/shared/logging/RhoLogConf.cpp +29 -12
- data/platform/shared/net/CURLNetRequest.cpp +80 -25
- data/platform/shared/net/CURLNetRequest.h +6 -2
- data/platform/shared/net/HttpServer.cpp +12 -6
- data/platform/shared/net/HttpServer.h +2 -1
- data/platform/shared/net/INetRequest.h +1 -0
- data/platform/shared/ruby/ext/alert/alert.i +5 -0
- data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
- data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
- data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
- data/platform/shared/ruby/ext/system/system.i +4 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
- data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
- data/platform/shared/rubyext/System.cpp +9 -0
- data/platform/shared/rubyext/WebView.h +1 -0
- data/platform/shared/sqlite/crypto.c +907 -0
- data/platform/shared/sqlite/sqlite3.c +6 -0
- data/platform/shared/sync/SyncEngine.cpp +49 -19
- data/platform/shared/sync/SyncEngine.h +0 -1
- data/platform/shared/sync/SyncNotify.cpp +14 -5
- data/platform/shared/sync/SyncNotify.h +2 -2
- data/platform/shared/sync/SyncSource.cpp +79 -33
- data/platform/shared/sync/SyncSource.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +26 -11
- data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
- data/platform/wm/build/wm.rake +6 -0
- data/platform/wm/rhodes/Alert.cpp +4 -3
- data/platform/wm/rhodes/Alert.h +1 -1
- data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
- data/platform/wm/rhodes/DateTimePicker.h +9 -1
- data/platform/wm/rhodes/MainWindow.cpp +121 -61
- data/platform/wm/rhodes/MainWindow.h +29 -4
- data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
- data/platform/wm/rhodes/MapView/Graphics.h +136 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
- data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
- data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
- data/platform/wm/rhodes/Rhodes.cpp +94 -102
- data/platform/wm/rhodes/Rhodes.rc +27 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
- data/platform/wm/rhodes/camera/Camera.cpp +36 -15
- data/platform/wm/rhodes/camera/Camera.h +0 -4
- data/platform/wm/rhodes/resource.h +10 -2
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
- data/platform/wm/rhodes/rhodes.vcproj +38 -2
- data/platform/wm/rhodes/stdafx.h +2 -1
- data/platform/wm/rubylib/rubylib.vcproj +12 -0
- data/rakefile.rb +85 -80
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/templates/application/app/application.rb +2 -2
- data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
- data/res/generators/templates/application/public/css/android.css +1 -0
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/rhoconfig.txt +66 -14
- data/rhodes.gemspec +3 -3
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
- data/spec/framework_spec/build.yml +1 -1
- data/spec/phone_spec/Rakefile +1 -0
- data/spec/phone_spec/app/Account/account.rb +2 -0
- data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
- data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
- data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
- data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
- data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
- data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
- data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
- data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
- data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
- data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
- data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
- data/spec/phone_spec/app/spec_runner.rb +15 -7
- data/spec/phone_spec/build.yml +2 -2
- metadata +154 -25
- data/README.textile +0 -45
- data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
- data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
- data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
- data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
- data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -0,0 +1,367 @@
|
|
1
|
+
#
|
2
|
+
# thread.rb - thread support classes
|
3
|
+
# by Yukihiro Matsumoto <matz@netlab.co.jp>
|
4
|
+
#
|
5
|
+
# Copyright (C) 2001 Yukihiro Matsumoto
|
6
|
+
# Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
7
|
+
# Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
8
|
+
#
|
9
|
+
|
10
|
+
unless defined? Thread
|
11
|
+
raise "Thread not available for this ruby interpreter"
|
12
|
+
end
|
13
|
+
|
14
|
+
unless defined? ThreadError
|
15
|
+
class ThreadError < StandardError
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
if $DEBUG
|
20
|
+
Thread.abort_on_exception = true
|
21
|
+
end
|
22
|
+
|
23
|
+
#
|
24
|
+
# ConditionVariable objects augment class Mutex. Using condition variables,
|
25
|
+
# it is possible to suspend while in the middle of a critical section until a
|
26
|
+
# resource becomes available.
|
27
|
+
#
|
28
|
+
# Example:
|
29
|
+
#
|
30
|
+
# require 'thread'
|
31
|
+
#
|
32
|
+
# mutex = Mutex.new
|
33
|
+
# resource = ConditionVariable.new
|
34
|
+
#
|
35
|
+
# a = Thread.new {
|
36
|
+
# mutex.synchronize {
|
37
|
+
# # Thread 'a' now needs the resource
|
38
|
+
# resource.wait(mutex)
|
39
|
+
# # 'a' can now have the resource
|
40
|
+
# }
|
41
|
+
# }
|
42
|
+
#
|
43
|
+
# b = Thread.new {
|
44
|
+
# mutex.synchronize {
|
45
|
+
# # Thread 'b' has finished using the resource
|
46
|
+
# resource.signal
|
47
|
+
# }
|
48
|
+
# }
|
49
|
+
#
|
50
|
+
class ConditionVariable
|
51
|
+
#
|
52
|
+
# Creates a new ConditionVariable
|
53
|
+
#
|
54
|
+
def initialize
|
55
|
+
@waiters = []
|
56
|
+
@waiters_mutex = Mutex.new
|
57
|
+
end
|
58
|
+
|
59
|
+
#
|
60
|
+
# Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
|
61
|
+
#
|
62
|
+
def wait(mutex)
|
63
|
+
begin
|
64
|
+
# TODO: mutex should not be used
|
65
|
+
@waiters_mutex.synchronize do
|
66
|
+
@waiters.push(Thread.current)
|
67
|
+
end
|
68
|
+
mutex.sleep
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
#
|
73
|
+
# Wakes up the first thread in line waiting for this lock.
|
74
|
+
#
|
75
|
+
def signal
|
76
|
+
begin
|
77
|
+
t = @waiters_mutex.synchronize { @waiters.shift }
|
78
|
+
t.run if t
|
79
|
+
rescue ThreadError
|
80
|
+
retry
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
#
|
85
|
+
# Wakes up all threads waiting for this lock.
|
86
|
+
#
|
87
|
+
def broadcast
|
88
|
+
# TODO: imcomplete
|
89
|
+
waiters0 = nil
|
90
|
+
@waiters_mutex.synchronize do
|
91
|
+
waiters0 = @waiters.dup
|
92
|
+
@waiters.clear
|
93
|
+
end
|
94
|
+
for t in waiters0
|
95
|
+
begin
|
96
|
+
t.run
|
97
|
+
rescue ThreadError
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
#
|
104
|
+
# This class provides a way to synchronize communication between threads.
|
105
|
+
#
|
106
|
+
# Example:
|
107
|
+
#
|
108
|
+
# require 'thread'
|
109
|
+
#
|
110
|
+
# queue = Queue.new
|
111
|
+
#
|
112
|
+
# producer = Thread.new do
|
113
|
+
# 5.times do |i|
|
114
|
+
# sleep rand(i) # simulate expense
|
115
|
+
# queue << i
|
116
|
+
# puts "#{i} produced"
|
117
|
+
# end
|
118
|
+
# end
|
119
|
+
#
|
120
|
+
# consumer = Thread.new do
|
121
|
+
# 5.times do |i|
|
122
|
+
# value = queue.pop
|
123
|
+
# sleep rand(i/2) # simulate expense
|
124
|
+
# puts "consumed #{value}"
|
125
|
+
# end
|
126
|
+
# end
|
127
|
+
#
|
128
|
+
# consumer.join
|
129
|
+
#
|
130
|
+
class Queue
|
131
|
+
#
|
132
|
+
# Creates a new queue.
|
133
|
+
#
|
134
|
+
def initialize
|
135
|
+
@que = []
|
136
|
+
@waiting = []
|
137
|
+
@que.taint # enable tainted comunication
|
138
|
+
@waiting.taint
|
139
|
+
self.taint
|
140
|
+
@mutex = Mutex.new
|
141
|
+
end
|
142
|
+
|
143
|
+
#
|
144
|
+
# Pushes +obj+ to the queue.
|
145
|
+
#
|
146
|
+
def push(obj)
|
147
|
+
t = nil
|
148
|
+
@mutex.synchronize{
|
149
|
+
@que.push obj
|
150
|
+
begin
|
151
|
+
t = @waiting.shift
|
152
|
+
t.wakeup if t
|
153
|
+
rescue ThreadError
|
154
|
+
retry
|
155
|
+
end
|
156
|
+
}
|
157
|
+
begin
|
158
|
+
t.run if t
|
159
|
+
rescue ThreadError
|
160
|
+
end
|
161
|
+
end
|
162
|
+
|
163
|
+
#
|
164
|
+
# Alias of push
|
165
|
+
#
|
166
|
+
alias << push
|
167
|
+
|
168
|
+
#
|
169
|
+
# Alias of push
|
170
|
+
#
|
171
|
+
alias enq push
|
172
|
+
|
173
|
+
#
|
174
|
+
# Retrieves data from the queue. If the queue is empty, the calling thread is
|
175
|
+
# suspended until data is pushed onto the queue. If +non_block+ is true, the
|
176
|
+
# thread isn't suspended, and an exception is raised.
|
177
|
+
#
|
178
|
+
def pop(non_block=false)
|
179
|
+
while true
|
180
|
+
@mutex.synchronize{
|
181
|
+
if @que.empty?
|
182
|
+
raise ThreadError, "queue empty" if non_block
|
183
|
+
@waiting.push Thread.current
|
184
|
+
@mutex.sleep
|
185
|
+
else
|
186
|
+
return @que.shift
|
187
|
+
end
|
188
|
+
}
|
189
|
+
end
|
190
|
+
end
|
191
|
+
|
192
|
+
#
|
193
|
+
# Alias of pop
|
194
|
+
#
|
195
|
+
alias shift pop
|
196
|
+
|
197
|
+
#
|
198
|
+
# Alias of pop
|
199
|
+
#
|
200
|
+
alias deq pop
|
201
|
+
|
202
|
+
#
|
203
|
+
# Returns +true+ if the queue is empty.
|
204
|
+
#
|
205
|
+
def empty?
|
206
|
+
@que.empty?
|
207
|
+
end
|
208
|
+
|
209
|
+
#
|
210
|
+
# Removes all objects from the queue.
|
211
|
+
#
|
212
|
+
def clear
|
213
|
+
@que.clear
|
214
|
+
end
|
215
|
+
|
216
|
+
#
|
217
|
+
# Returns the length of the queue.
|
218
|
+
#
|
219
|
+
def length
|
220
|
+
@que.length
|
221
|
+
end
|
222
|
+
|
223
|
+
#
|
224
|
+
# Alias of length.
|
225
|
+
#
|
226
|
+
alias size length
|
227
|
+
|
228
|
+
#
|
229
|
+
# Returns the number of threads waiting on the queue.
|
230
|
+
#
|
231
|
+
def num_waiting
|
232
|
+
@waiting.size
|
233
|
+
end
|
234
|
+
end
|
235
|
+
|
236
|
+
#
|
237
|
+
# This class represents queues of specified size capacity. The push operation
|
238
|
+
# may be blocked if the capacity is full.
|
239
|
+
#
|
240
|
+
# See Queue for an example of how a SizedQueue works.
|
241
|
+
#
|
242
|
+
class SizedQueue < Queue
|
243
|
+
#
|
244
|
+
# Creates a fixed-length queue with a maximum size of +max+.
|
245
|
+
#
|
246
|
+
def initialize(max)
|
247
|
+
raise ArgumentError, "queue size must be positive" unless max > 0
|
248
|
+
@max = max
|
249
|
+
@queue_wait = []
|
250
|
+
@queue_wait.taint # enable tainted comunication
|
251
|
+
super()
|
252
|
+
end
|
253
|
+
|
254
|
+
#
|
255
|
+
# Returns the maximum size of the queue.
|
256
|
+
#
|
257
|
+
def max
|
258
|
+
@max
|
259
|
+
end
|
260
|
+
|
261
|
+
#
|
262
|
+
# Sets the maximum size of the queue.
|
263
|
+
#
|
264
|
+
def max=(max)
|
265
|
+
diff = nil
|
266
|
+
@mutex.synchronize {
|
267
|
+
if max <= @max
|
268
|
+
@max = max
|
269
|
+
else
|
270
|
+
diff = max - @max
|
271
|
+
@max = max
|
272
|
+
end
|
273
|
+
}
|
274
|
+
if diff
|
275
|
+
diff.times do
|
276
|
+
begin
|
277
|
+
t = @queue_wait.shift
|
278
|
+
t.run if t
|
279
|
+
rescue ThreadError
|
280
|
+
retry
|
281
|
+
end
|
282
|
+
end
|
283
|
+
end
|
284
|
+
max
|
285
|
+
end
|
286
|
+
|
287
|
+
#
|
288
|
+
# Pushes +obj+ to the queue. If there is no space left in the queue, waits
|
289
|
+
# until space becomes available.
|
290
|
+
#
|
291
|
+
def push(obj)
|
292
|
+
t = nil
|
293
|
+
@mutex.synchronize{
|
294
|
+
while true
|
295
|
+
break if @que.length < @max
|
296
|
+
@queue_wait.push Thread.current
|
297
|
+
@mutex.sleep
|
298
|
+
end
|
299
|
+
|
300
|
+
@que.push obj
|
301
|
+
begin
|
302
|
+
t = @waiting.shift
|
303
|
+
t.wakeup if t
|
304
|
+
rescue ThreadError
|
305
|
+
retry
|
306
|
+
end
|
307
|
+
}
|
308
|
+
|
309
|
+
begin
|
310
|
+
t.run if t
|
311
|
+
rescue ThreadError
|
312
|
+
end
|
313
|
+
end
|
314
|
+
|
315
|
+
#
|
316
|
+
# Alias of push
|
317
|
+
#
|
318
|
+
alias << push
|
319
|
+
|
320
|
+
#
|
321
|
+
# Alias of push
|
322
|
+
#
|
323
|
+
alias enq push
|
324
|
+
|
325
|
+
#
|
326
|
+
# Retrieves data from the queue and runs a waiting thread, if any.
|
327
|
+
#
|
328
|
+
def pop(*args)
|
329
|
+
retval = super
|
330
|
+
t = nil
|
331
|
+
@mutex.synchronize {
|
332
|
+
if @que.length < @max
|
333
|
+
begin
|
334
|
+
t = @queue_wait.shift
|
335
|
+
t.wakeup if t
|
336
|
+
rescue ThreadError
|
337
|
+
retry
|
338
|
+
end
|
339
|
+
end
|
340
|
+
}
|
341
|
+
begin
|
342
|
+
t.run if t
|
343
|
+
rescue ThreadError
|
344
|
+
end
|
345
|
+
retval
|
346
|
+
end
|
347
|
+
|
348
|
+
#
|
349
|
+
# Alias of pop
|
350
|
+
#
|
351
|
+
alias shift pop
|
352
|
+
|
353
|
+
#
|
354
|
+
# Alias of pop
|
355
|
+
#
|
356
|
+
alias deq pop
|
357
|
+
|
358
|
+
#
|
359
|
+
# Returns the number of threads waiting on the queue.
|
360
|
+
#
|
361
|
+
def num_waiting
|
362
|
+
@waiting.size + @queue_wait.size
|
363
|
+
end
|
364
|
+
end
|
365
|
+
|
366
|
+
# Documentation comments:
|
367
|
+
# - How do you make RDoc inherit documentation from superclass?
|
@@ -0,0 +1,16 @@
|
|
1
|
+
class CGI
|
2
|
+
TABLE_FOR_ESCAPE_HTML__ = {
|
3
|
+
'&' => '&',
|
4
|
+
'"' => '"',
|
5
|
+
'<' => '<',
|
6
|
+
'>' => '>',
|
7
|
+
}
|
8
|
+
|
9
|
+
# Escape special characters in HTML, namely &\"<>
|
10
|
+
# CGI::escapeHTML('Usage: foo "bar" <baz>')
|
11
|
+
# # => "Usage: foo "bar" <baz>"
|
12
|
+
def CGI::escapeHTML(string)
|
13
|
+
string.gsub(/[&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
|
14
|
+
end
|
15
|
+
|
16
|
+
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'version'
|
2
|
+
|
1
3
|
class MSpecScript
|
2
4
|
# Returns the config object. Maintained at the class
|
3
5
|
# level to easily enable simple config files. See the
|
@@ -316,6 +318,101 @@ class NegativeOperatorMatcher
|
|
316
318
|
end
|
317
319
|
end
|
318
320
|
|
321
|
+
class BeTrueMatcher
|
322
|
+
def matches?(actual)
|
323
|
+
@actual = actual
|
324
|
+
@actual == true
|
325
|
+
end
|
326
|
+
|
327
|
+
def failure_message
|
328
|
+
["Expected #{@actual.inspect}", "to be true"]
|
329
|
+
end
|
330
|
+
|
331
|
+
def negative_failure_message
|
332
|
+
["Expected #{@actual.inspect}", "not to be true"]
|
333
|
+
end
|
334
|
+
end
|
335
|
+
|
336
|
+
class BeFalseMatcher
|
337
|
+
def matches?(actual)
|
338
|
+
@actual = actual
|
339
|
+
@actual == false
|
340
|
+
end
|
341
|
+
|
342
|
+
def failure_message
|
343
|
+
["Expected #{@actual.inspect}", "to be false"]
|
344
|
+
end
|
345
|
+
|
346
|
+
def negative_failure_message
|
347
|
+
["Expected #{@actual.inspect}", "not to be false"]
|
348
|
+
end
|
349
|
+
end
|
350
|
+
|
351
|
+
class RaiseErrorMatcher
|
352
|
+
def initialize(exception, message, &block)
|
353
|
+
@exception = exception
|
354
|
+
@message = message
|
355
|
+
@block = block
|
356
|
+
end
|
357
|
+
|
358
|
+
def matches?(proc)
|
359
|
+
proc.call
|
360
|
+
return false
|
361
|
+
rescue Exception => err
|
362
|
+
@actual = err
|
363
|
+
return false unless @exception === @actual
|
364
|
+
if @message then
|
365
|
+
case @message
|
366
|
+
when String then
|
367
|
+
return false if @message != @actual.message
|
368
|
+
when Regexp then
|
369
|
+
return false if @message !~ @actual.message
|
370
|
+
end
|
371
|
+
end
|
372
|
+
|
373
|
+
@block[@actual] if @block
|
374
|
+
|
375
|
+
return true
|
376
|
+
end
|
377
|
+
|
378
|
+
def failure_message
|
379
|
+
message = ["Expected #{@exception}#{%[ (#{@message})] if @message}"]
|
380
|
+
|
381
|
+
if @actual then
|
382
|
+
message << "but got #{@actual.class}#{%[ (#{@actual.message})] if @actual.message}"
|
383
|
+
else
|
384
|
+
message << "but no exception was raised"
|
385
|
+
end
|
386
|
+
|
387
|
+
message
|
388
|
+
end
|
389
|
+
|
390
|
+
def negative_failure_message
|
391
|
+
["Expected to not get #{@exception}#{%[ (#{@message})] if @message}", ""]
|
392
|
+
end
|
393
|
+
end
|
394
|
+
|
395
|
+
class EqualMatcher
|
396
|
+
def initialize(expected)
|
397
|
+
@expected = expected
|
398
|
+
end
|
399
|
+
|
400
|
+
def matches?(actual)
|
401
|
+
@actual = actual
|
402
|
+
@actual.equal?(@expected)
|
403
|
+
end
|
404
|
+
|
405
|
+
def failure_message
|
406
|
+
["Expected #{@actual.pretty_inspect}",
|
407
|
+
"to be identical to #{@expected.pretty_inspect}"]
|
408
|
+
end
|
409
|
+
|
410
|
+
def negative_failure_message
|
411
|
+
["Expected #{@actual.pretty_inspect}",
|
412
|
+
"not to be identical to #{@expected.pretty_inspect}"]
|
413
|
+
end
|
414
|
+
end
|
415
|
+
|
319
416
|
class Object
|
320
417
|
def should(matcher=nil)
|
321
418
|
|
@@ -345,4 +442,25 @@ class Object
|
|
345
442
|
BeNilMatcher.new
|
346
443
|
end
|
347
444
|
|
445
|
+
def be_true
|
446
|
+
BeTrueMatcher.new
|
447
|
+
end
|
448
|
+
|
449
|
+
def be_false
|
450
|
+
BeFalseMatcher.new
|
451
|
+
end
|
452
|
+
|
453
|
+
def equal(expected)
|
454
|
+
EqualMatcher.new(expected)
|
455
|
+
end
|
456
|
+
|
457
|
+
def raise_error(exception=Exception, message=nil, &block)
|
458
|
+
RaiseErrorMatcher.new(exception, message, &block)
|
459
|
+
end
|
460
|
+
|
461
|
+
def ruby_version_is(*args)
|
462
|
+
yield
|
463
|
+
end
|
464
|
+
|
348
465
|
end
|
466
|
+
|
@@ -0,0 +1,91 @@
|
|
1
|
+
#
|
2
|
+
# = base64.rb: methods for base64-encoding and -decoding stings
|
3
|
+
#
|
4
|
+
|
5
|
+
# The Base64 module provides for the encoding (#encode64, #strict_encode64,
|
6
|
+
# #urlsafe_encode64) and decoding (#decode64, #strict_decode64,
|
7
|
+
# #urlsafe_decode64) of binary data using a Base64 representation.
|
8
|
+
#
|
9
|
+
# == Example
|
10
|
+
#
|
11
|
+
# A simple encoding and decoding.
|
12
|
+
#
|
13
|
+
# require "base64"
|
14
|
+
#
|
15
|
+
# enc = Base64.encode64('Send reinforcements')
|
16
|
+
# # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n"
|
17
|
+
# plain = Base64.decode64(enc)
|
18
|
+
# # -> "Send reinforcements"
|
19
|
+
#
|
20
|
+
# The purpose of using base64 to encode data is that it translates any
|
21
|
+
# binary data into purely printable characters.
|
22
|
+
|
23
|
+
module Base64
|
24
|
+
module_function
|
25
|
+
|
26
|
+
# Returns the Base64-encoded version of +bin+.
|
27
|
+
# This method complies with RFC 2045.
|
28
|
+
# Line feeds are added to every 60 encoded charactors.
|
29
|
+
#
|
30
|
+
# require 'base64'
|
31
|
+
# Base64.encode64("Now is the time for all good coders\nto learn Ruby")
|
32
|
+
#
|
33
|
+
# <i>Generates:</i>
|
34
|
+
#
|
35
|
+
# Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
|
36
|
+
# UnVieQ==
|
37
|
+
def encode64(bin)
|
38
|
+
[bin].pack("m")
|
39
|
+
end
|
40
|
+
|
41
|
+
# Returns the Base64-decoded version of +str+.
|
42
|
+
# This method complies with RFC 2045.
|
43
|
+
# Characters outside the base alphabet are ignored.
|
44
|
+
#
|
45
|
+
# require 'base64'
|
46
|
+
# str = 'VGhpcyBpcyBsaW5lIG9uZQpUaGlzIG' +
|
47
|
+
# 'lzIGxpbmUgdHdvClRoaXMgaXMgbGlu' +
|
48
|
+
# 'ZSB0aHJlZQpBbmQgc28gb24uLi4K'
|
49
|
+
# puts Base64.decode64(str)
|
50
|
+
#
|
51
|
+
# <i>Generates:</i>
|
52
|
+
#
|
53
|
+
# This is line one
|
54
|
+
# This is line two
|
55
|
+
# This is line three
|
56
|
+
# And so on...
|
57
|
+
def decode64(str)
|
58
|
+
str.unpack("m").first
|
59
|
+
end
|
60
|
+
|
61
|
+
# Returns the Base64-encoded version of +bin+.
|
62
|
+
# This method complies with RFC 4648.
|
63
|
+
# No line feeds are added.
|
64
|
+
def strict_encode64(bin)
|
65
|
+
[bin].pack("m0")
|
66
|
+
end
|
67
|
+
|
68
|
+
# Returns the Base64-decoded version of +str+.
|
69
|
+
# This method complies with RFC 4648.
|
70
|
+
# ArgumentError is raised if +str+ is incorrectly padded or contains
|
71
|
+
# non-alphabet characters. Note that CR or LF are also rejected.
|
72
|
+
def strict_decode64(str)
|
73
|
+
str.unpack("m0").first
|
74
|
+
end
|
75
|
+
|
76
|
+
# Returns the Base64-encoded version of +bin+.
|
77
|
+
# This method complies with ``Base 64 Encoding with URL and Filename Safe
|
78
|
+
# Alphabet'' in RFC 4648.
|
79
|
+
# The alphabet uses '-' instead of '+' and '_' instead of '/'.
|
80
|
+
def urlsafe_encode64(bin)
|
81
|
+
strict_encode64(bin).tr("+/", "-_")
|
82
|
+
end
|
83
|
+
|
84
|
+
# Returns the Base64-decoded version of +str+.
|
85
|
+
# This method complies with ``Base 64 Encoding with URL and Filename Safe
|
86
|
+
# Alphabet'' in RFC 4648.
|
87
|
+
# The alphabet uses '-' instead of '+' and '_' instead of '/'.
|
88
|
+
def urlsafe_decode64(str)
|
89
|
+
strict_decode64(str.tr("-_", "+/"))
|
90
|
+
end
|
91
|
+
end
|
data/lib/framework/builtinME.rb
CHANGED
@@ -93,7 +93,7 @@ module Enumerable
|
|
93
93
|
|
94
94
|
def sort_by &block
|
95
95
|
array_of_tuples = []
|
96
|
-
each {|x|
|
96
|
+
each {|x| array_of_tuples.push([x, yield(x)])}
|
97
97
|
array_of_tuples = array_of_tuples.sort {|x, y| x[1] <=> y[1]}
|
98
98
|
return array_of_tuples.collect {|x| x[0]}
|
99
99
|
end
|
@@ -778,15 +778,18 @@ class String
|
|
778
778
|
alias to_str to_s
|
779
779
|
alias size length
|
780
780
|
|
781
|
-
def slice!(
|
782
|
-
res =
|
783
|
-
|
784
|
-
|
785
|
-
|
786
|
-
|
787
|
-
|
788
|
-
|
789
|
-
|
781
|
+
def slice!(*args)
|
782
|
+
res = ""
|
783
|
+
if args.size() == 1
|
784
|
+
res = slice(args[0])
|
785
|
+
self[args[0]]= "" if res
|
786
|
+
elsif args.size() == 2
|
787
|
+
res = slice(args[0], args[1])
|
788
|
+
self[args[0], args[1]]= "" if res
|
789
|
+
else
|
790
|
+
raise ArgumentError, 'String.slice! - wrong number of arguments 3 for (1 or 2)'
|
791
|
+
end
|
792
|
+
|
790
793
|
res
|
791
794
|
end
|
792
795
|
|