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,473 @@
|
|
1
|
+
#require File.dirname(File.join(__rhoGetCurrentDir(), __FILE__)) + '/../../spec_helper'
|
2
|
+
require File.dirname(File.join(__rhoGetCurrentDir(), __FILE__)) + '/fixtures/classes.rb'
|
3
|
+
#require File.dirname(File.join(__rhoGetCurrentDir(), __FILE__)) + '/shared/slice.rb'
|
4
|
+
=begin
|
5
|
+
describe "String#slice" do
|
6
|
+
it_behaves_like :string_slice, :slice
|
7
|
+
end
|
8
|
+
|
9
|
+
describe "String#slice with index, length" do
|
10
|
+
it_behaves_like :string_slice_index_length, :slice
|
11
|
+
end
|
12
|
+
|
13
|
+
describe "String#slice with Range" do
|
14
|
+
it_behaves_like :string_slice_range, :slice
|
15
|
+
end
|
16
|
+
|
17
|
+
describe "String#slice with Regexp" do
|
18
|
+
it_behaves_like :string_slice_regexp, :slice
|
19
|
+
end
|
20
|
+
|
21
|
+
describe "String#slice with Regexp, index" do
|
22
|
+
it_behaves_like :string_slice_regexp_index, :slice
|
23
|
+
end
|
24
|
+
|
25
|
+
describe "String#slice with String" do
|
26
|
+
it_behaves_like :string_slice_string, :slice
|
27
|
+
end
|
28
|
+
=end
|
29
|
+
|
30
|
+
describe "String#slice! with index" do
|
31
|
+
it "deletes and return the char at the given position" do
|
32
|
+
a = "hello"
|
33
|
+
a.slice!(1).should == ?e
|
34
|
+
a.should == "hllo"
|
35
|
+
#a.slice!(-1).should == ?o
|
36
|
+
#a.should == "hll"
|
37
|
+
end
|
38
|
+
|
39
|
+
it "returns nil if idx is outside of self" do
|
40
|
+
a = "hello"
|
41
|
+
a.slice!(20).should == nil
|
42
|
+
a.should == "hello"
|
43
|
+
a.slice!(-20).should == nil
|
44
|
+
a.should == "hello"
|
45
|
+
end
|
46
|
+
|
47
|
+
# ruby_version_is ""..."1.9" do
|
48
|
+
# it "raises a TypeError if self is frozen" do
|
49
|
+
# lambda { "hello".freeze.slice!(1) }.should raise_error(TypeError)
|
50
|
+
# end
|
51
|
+
# end
|
52
|
+
|
53
|
+
# ruby_version_is "1.9" do
|
54
|
+
# it "raises a RuntimeError if self is frozen" do
|
55
|
+
# lambda { "hello".freeze.slice!(1) }.should raise_error(RuntimeError)
|
56
|
+
# lambda { "hello".freeze.slice!(10) }.should raise_error(RuntimeError)
|
57
|
+
# lambda { "".freeze.slice!(0) }.should raise_error(RuntimeError)
|
58
|
+
# end
|
59
|
+
# end
|
60
|
+
|
61
|
+
# ruby_version_is ""..."1.9" do
|
62
|
+
# it "doesn't raise a TypeError if self is frozen and idx is outside of self" do
|
63
|
+
# "hello".freeze.slice!(10).should be_nil
|
64
|
+
# "".freeze.slice!(0).should be_nil
|
65
|
+
# end
|
66
|
+
# end
|
67
|
+
|
68
|
+
# it "calls to_int on index" do
|
69
|
+
# "hello".slice!(0.5).should == ?h
|
70
|
+
|
71
|
+
# obj = mock('1')
|
72
|
+
# # MRI calls this twice so we can't use should_receive here.
|
73
|
+
# def obj.to_int() 1 end
|
74
|
+
# "hello".slice!(obj).should == ?e
|
75
|
+
|
76
|
+
# obj = mock('1')
|
77
|
+
# def obj.respond_to?(name) name == :to_int ? true : super; end
|
78
|
+
# def obj.method_missing(name, *) name == :to_int ? 1 : super; end
|
79
|
+
# "hello".slice!(obj).should == ?e
|
80
|
+
# end
|
81
|
+
end
|
82
|
+
|
83
|
+
describe "String#slice! with index, length" do
|
84
|
+
it "deletes and returns the substring at idx and the given length" do
|
85
|
+
a = "hello"
|
86
|
+
a.slice!(1, 2).should == "el"
|
87
|
+
a.should == "hlo"
|
88
|
+
|
89
|
+
a.slice!(1, 0).should == ""
|
90
|
+
a.should == "hlo"
|
91
|
+
|
92
|
+
a.slice!(-2, 4).should == "lo"
|
93
|
+
a.should == "h"
|
94
|
+
end
|
95
|
+
|
96
|
+
# it "always taints resulting strings when self is tainted" do
|
97
|
+
# str = "hello world"
|
98
|
+
# str.taint
|
99
|
+
|
100
|
+
# str.slice!(0, 0).tainted?.should == true
|
101
|
+
# str.slice!(2, 1).tainted?.should == true
|
102
|
+
# end
|
103
|
+
|
104
|
+
it "returns nil if the given position is out of self" do
|
105
|
+
a = "hello"
|
106
|
+
a.slice(10, 3).should == nil
|
107
|
+
a.should == "hello"
|
108
|
+
|
109
|
+
a.slice(-10, 20).should == nil
|
110
|
+
a.should == "hello"
|
111
|
+
end
|
112
|
+
|
113
|
+
it "returns nil if the length is negative" do
|
114
|
+
a = "hello"
|
115
|
+
a.slice(4, -3).should == nil
|
116
|
+
a.should == "hello"
|
117
|
+
end
|
118
|
+
|
119
|
+
# ruby_version_is "1.9" do
|
120
|
+
# it "raises a RuntimeError if self is frozen" do
|
121
|
+
# lambda { "hello".freeze.slice!(1, 2) }.should raise_error(RuntimeError)
|
122
|
+
# lambda { "hello".freeze.slice!(10, 3) }.should raise_error(RuntimeError)
|
123
|
+
# lambda { "hello".freeze.slice!(-10, 3)}.should raise_error(RuntimeError)
|
124
|
+
# lambda { "hello".freeze.slice!(4, -3) }.should raise_error(RuntimeError)
|
125
|
+
# lambda { "hello".freeze.slice!(10, 3) }.should raise_error(RuntimeError)
|
126
|
+
# lambda { "hello".freeze.slice!(-10, 3)}.should raise_error(RuntimeError)
|
127
|
+
# lambda { "hello".freeze.slice!(4, -3) }.should raise_error(RuntimeError)
|
128
|
+
# end
|
129
|
+
# end
|
130
|
+
|
131
|
+
# it "calls to_int on idx and length" do
|
132
|
+
# "hello".slice!(0.5, 2.5).should == "he"
|
133
|
+
|
134
|
+
# obj = mock('2')
|
135
|
+
# def obj.to_int() 2 end
|
136
|
+
# "hello".slice!(obj, obj).should == "ll"
|
137
|
+
|
138
|
+
# obj = mock('2')
|
139
|
+
# def obj.respond_to?(name) name == :to_int; end
|
140
|
+
# def obj.method_missing(name, *) name == :to_int ? 2 : super; end
|
141
|
+
# "hello".slice!(obj, obj).should == "ll"
|
142
|
+
# end
|
143
|
+
|
144
|
+
it "returns subclass instances" do
|
145
|
+
s = StringSpecs::MyString.new("hello")
|
146
|
+
s.slice!(0, 0).class.should == StringSpecs::MyString
|
147
|
+
s.slice!(0, 4).class.should == StringSpecs::MyString
|
148
|
+
end
|
149
|
+
end
|
150
|
+
|
151
|
+
describe "String#slice! Range" do
|
152
|
+
it "deletes and return the substring given by the offsets of the range" do
|
153
|
+
a = "hello"
|
154
|
+
a.slice!(1..3).should == "ell"
|
155
|
+
a.should == "ho"
|
156
|
+
a.slice!(0..0).should == "h"
|
157
|
+
a.should == "o"
|
158
|
+
a.slice!(0...0).should == ""
|
159
|
+
a.should == "o"
|
160
|
+
|
161
|
+
# Edge Case?
|
162
|
+
"hello".slice!(-3..-9).should == ""
|
163
|
+
end
|
164
|
+
|
165
|
+
it "returns nil if the given range is out of self" do
|
166
|
+
#a = "hello"
|
167
|
+
#a.slice!(-6..-9).should == nil
|
168
|
+
#a.should == "hello"
|
169
|
+
|
170
|
+
b = "hello"
|
171
|
+
b.slice!(10..20).should == nil
|
172
|
+
b.should == "hello"
|
173
|
+
end
|
174
|
+
|
175
|
+
# it "always taints resulting strings when self is tainted" do
|
176
|
+
# str = "hello world"
|
177
|
+
# str.taint
|
178
|
+
|
179
|
+
# str.slice!(0..0).tainted?.should == true
|
180
|
+
# str.slice!(2..3).tainted?.should == true
|
181
|
+
# end
|
182
|
+
|
183
|
+
it "returns subclass instances" do
|
184
|
+
s = StringSpecs::MyString.new("hello")
|
185
|
+
s.slice!(0...0).class.should == StringSpecs::MyString
|
186
|
+
s.slice!(0..4).class.should == StringSpecs::MyString
|
187
|
+
end
|
188
|
+
=begin
|
189
|
+
it "calls to_int on range arguments" do
|
190
|
+
from = mock('from')
|
191
|
+
to = mock('to')
|
192
|
+
|
193
|
+
# So we can construct a range out of them...
|
194
|
+
def from.<=>(o) 0 end
|
195
|
+
def to.<=>(o) 0 end
|
196
|
+
|
197
|
+
def from.to_int() 1 end
|
198
|
+
def to.to_int() -2 end
|
199
|
+
|
200
|
+
"hello there".slice!(from..to).should == "ello ther"
|
201
|
+
|
202
|
+
from = mock('from')
|
203
|
+
to = mock('to')
|
204
|
+
|
205
|
+
def from.<=>(o) 0 end
|
206
|
+
def to.<=>(o) 0 end
|
207
|
+
|
208
|
+
def from.respond_to?(name) name == :to_int; end
|
209
|
+
def from.method_missing(name) name == :to_int ? 1 : super; end
|
210
|
+
def to.respond_to?(name) name == :to_int; end
|
211
|
+
def to.method_missing(name) name == :to_int ? -2 : super; end
|
212
|
+
|
213
|
+
"hello there".slice!(from..to).should == "ello ther"
|
214
|
+
end
|
215
|
+
=end
|
216
|
+
it "works with Range subclasses" do
|
217
|
+
a = "GOOD"
|
218
|
+
range_incl = StringSpecs::MyRange.new(1, 2)
|
219
|
+
|
220
|
+
a.slice!(range_incl).should == "OO"
|
221
|
+
end
|
222
|
+
|
223
|
+
ruby_version_is ""..."1.9" do
|
224
|
+
# it "raises a TypeError if self is frozen" do
|
225
|
+
# lambda { "hello".freeze.slice!(1..3) }.should raise_error(TypeError)
|
226
|
+
# end
|
227
|
+
|
228
|
+
# ruby_bug "#1551", "1.9.2" do
|
229
|
+
# it "doesn't raise a TypeError if self is frozen but the given range is out of self" do
|
230
|
+
# "hello".freeze.slice!(10..20).should == nil
|
231
|
+
# end
|
232
|
+
# end
|
233
|
+
end
|
234
|
+
|
235
|
+
# ruby_version_is "1.9" do
|
236
|
+
# it "raises a RuntimeError if self is frozen" do
|
237
|
+
# lambda { "hello".freeze.slice!(1..3) }.should raise_error(RuntimeError)
|
238
|
+
# lambda { "hello".freeze.slice!(10..20)}.should raise_error(RuntimeError)
|
239
|
+
# end
|
240
|
+
# end
|
241
|
+
end
|
242
|
+
|
243
|
+
describe "String#slice! with Regexp" do
|
244
|
+
it "deletes and returns the first match from self" do
|
245
|
+
s = "this is a string"
|
246
|
+
s.slice!(/s.*t/).should == 's is a st'
|
247
|
+
s.should == 'thiring'
|
248
|
+
|
249
|
+
c = "hello hello"
|
250
|
+
c.slice!(/llo/).should == "llo"
|
251
|
+
c.should == "he hello"
|
252
|
+
end
|
253
|
+
|
254
|
+
it "returns nil if there was no match" do
|
255
|
+
s = "this is a string"
|
256
|
+
s.slice!(/zzz/).should == nil
|
257
|
+
s.should == "this is a string"
|
258
|
+
end
|
259
|
+
|
260
|
+
# it "always taints resulting strings when self or regexp is tainted" do
|
261
|
+
# strs = ["hello world"]
|
262
|
+
# strs += strs.map { |s| s.dup.taint }
|
263
|
+
|
264
|
+
# strs.each do |str|
|
265
|
+
# str = str.dup
|
266
|
+
# str.slice!(//).tainted?.should == str.tainted?
|
267
|
+
# str.slice!(/hello/).tainted?.should == str.tainted?
|
268
|
+
|
269
|
+
# tainted_re = /./
|
270
|
+
# tainted_re.taint
|
271
|
+
|
272
|
+
# str.slice!(tainted_re).tainted?.should == true
|
273
|
+
# end
|
274
|
+
# end
|
275
|
+
|
276
|
+
# it "doesn't taint self when regexp is tainted" do
|
277
|
+
# s = "hello"
|
278
|
+
# s.slice!(/./.taint)
|
279
|
+
# s.tainted?.should == false
|
280
|
+
# end
|
281
|
+
|
282
|
+
it "returns subclass instances" do
|
283
|
+
s = StringSpecs::MyString.new("hello")
|
284
|
+
s.slice!(//).class.should == StringSpecs::MyString
|
285
|
+
s.slice!(/../).class.should == StringSpecs::MyString
|
286
|
+
end
|
287
|
+
|
288
|
+
# This currently fails, but passes in a pure Rubinius environment (without mspec)
|
289
|
+
# probably because mspec uses match internally for its operation
|
290
|
+
it "sets $~ to MatchData when there is a match and nil when there's none" do
|
291
|
+
'hello'.slice!(/./)
|
292
|
+
$~[0].should == 'h'
|
293
|
+
|
294
|
+
'hello'.slice!(/not/)
|
295
|
+
$~.should == nil
|
296
|
+
end
|
297
|
+
|
298
|
+
# ruby_version_is ""..."1.9" do
|
299
|
+
# it "raises a TypeError if self is frozen" do
|
300
|
+
# lambda { "this is a string".freeze.slice!(/s.*t/) }.should raise_error(TypeError)
|
301
|
+
# end
|
302
|
+
# end
|
303
|
+
|
304
|
+
# ruby_version_is "1.9" do
|
305
|
+
# it "raises a RuntimeError if self is frozen" do
|
306
|
+
# lambda { "this is a string".freeze.slice!(/s.*t/) }.should raise_error(RuntimeError)
|
307
|
+
# lambda { "this is a string".freeze.slice!(/zzz/) }.should raise_error(RuntimeError)
|
308
|
+
# lambda { "this is a string".freeze.slice!(/zzz/) }.should raise_error(RuntimeError)
|
309
|
+
# end
|
310
|
+
# end
|
311
|
+
end
|
312
|
+
=begin
|
313
|
+
#Not supported on Blackberry
|
314
|
+
describe "String#slice! with Regexp, index" do
|
315
|
+
it "deletes and returns the capture for idx from self" do
|
316
|
+
str = "hello there"
|
317
|
+
str.slice!(/[aeiou](.)\1/, 0).should == "ell"
|
318
|
+
str.should == "ho there"
|
319
|
+
str.slice!(/(t)h/, 1).should == "t"
|
320
|
+
str.should == "ho here"
|
321
|
+
end
|
322
|
+
|
323
|
+
# it "always taints resulting strings when self or regexp is tainted" do
|
324
|
+
# strs = ["hello world"]
|
325
|
+
# strs += strs.map { |s| s.dup.taint }
|
326
|
+
|
327
|
+
# strs.each do |str|
|
328
|
+
# str = str.dup
|
329
|
+
# str.slice!(//, 0).tainted?.should == str.tainted?
|
330
|
+
# str.slice!(/hello/, 0).tainted?.should == str.tainted?
|
331
|
+
|
332
|
+
# tainted_re = /(.)(.)(.)/
|
333
|
+
# tainted_re.taint
|
334
|
+
|
335
|
+
# str.slice!(tainted_re, 1).tainted?.should == true
|
336
|
+
# end
|
337
|
+
# end
|
338
|
+
|
339
|
+
# it "doesn't taint self when regexp is tainted" do
|
340
|
+
# s = "hello"
|
341
|
+
# s.slice!(/(.)(.)/.taint, 1)
|
342
|
+
# s.tainted?.should == false
|
343
|
+
# end
|
344
|
+
|
345
|
+
it "returns nil if there was no match" do
|
346
|
+
s = "this is a string"
|
347
|
+
s.slice!(/x(zzz)/, 1).should == nil
|
348
|
+
s.should == "this is a string"
|
349
|
+
end
|
350
|
+
|
351
|
+
it "returns nil if there is no capture for idx" do
|
352
|
+
"hello there".slice!(/[aeiou](.)\1/, 2).should == nil
|
353
|
+
# You can't refer to 0 using negative indices
|
354
|
+
"hello there".slice!(/[aeiou](.)\1/, -2).should == nil
|
355
|
+
end
|
356
|
+
|
357
|
+
# it "calls to_int on idx" do
|
358
|
+
# obj = mock('2')
|
359
|
+
# def obj.to_int() 2 end
|
360
|
+
|
361
|
+
# "har".slice!(/(.)(.)(.)/, 1.5).should == "h"
|
362
|
+
# "har".slice!(/(.)(.)(.)/, obj).should == "a"
|
363
|
+
|
364
|
+
# obj = mock('2')
|
365
|
+
# def obj.respond_to?(name) name == :to_int; end
|
366
|
+
# def obj.method_missing(name) name == :to_int ? 2: super; end
|
367
|
+
# "har".slice!(/(.)(.)(.)/, obj).should == "a"
|
368
|
+
# end
|
369
|
+
|
370
|
+
it "returns subclass instances" do
|
371
|
+
s = StringSpecs::MyString.new("hello")
|
372
|
+
s.slice!(/(.)(.)/, 0).class.should == StringSpecs::MyString
|
373
|
+
s.slice!(/(.)(.)/, 1).class.should == StringSpecs::MyString
|
374
|
+
end
|
375
|
+
|
376
|
+
it "sets $~ to MatchData when there is a match and nil when there's none" do
|
377
|
+
'hello'[/.(.)/, 0]
|
378
|
+
$~[0].should == 'he'
|
379
|
+
|
380
|
+
'hello'[/.(.)/, 1]
|
381
|
+
$~[1].should == 'e'
|
382
|
+
|
383
|
+
'hello'[/not/, 0]
|
384
|
+
$~.should == nil
|
385
|
+
end
|
386
|
+
|
387
|
+
# ruby_version_is ""..."1.9" do
|
388
|
+
# it "raises a TypeError if self is frozen" do
|
389
|
+
# lambda { "this is a string".freeze.slice!(/s.*t/) }.should raise_error(TypeError)
|
390
|
+
# end
|
391
|
+
|
392
|
+
# it "doesn't raise a TypeError if self is frozen but there is no match" do
|
393
|
+
# "this is a string".freeze.slice!(/zzz/, 0).should == nil
|
394
|
+
# end
|
395
|
+
|
396
|
+
# it "doesn't raise a TypeError if self is frozen but there is no capture for idx" do
|
397
|
+
# "this is a string".freeze.slice!(/(.)/, 2).should == nil
|
398
|
+
# end
|
399
|
+
# end
|
400
|
+
|
401
|
+
# ruby_version_is "1.9" do
|
402
|
+
# it "raises a RuntimeError if self is frozen" do
|
403
|
+
# lambda { "this is a string".freeze.slice!(/s.*t/) }.should raise_error(RuntimeError)
|
404
|
+
# lambda { "this is a string".freeze.slice!(/zzz/, 0)}.should raise_error(RuntimeError)
|
405
|
+
# lambda { "this is a string".freeze.slice!(/(.)/, 2)}.should raise_error(RuntimeError)
|
406
|
+
# end
|
407
|
+
# end
|
408
|
+
end
|
409
|
+
=end
|
410
|
+
|
411
|
+
describe "String#slice! with String" do
|
412
|
+
it "removes and returns the first occurrence of other_str from self" do
|
413
|
+
c = "hello hello"
|
414
|
+
c.slice!('llo').should == "llo"
|
415
|
+
c.should == "he hello"
|
416
|
+
end
|
417
|
+
|
418
|
+
# it "taints resulting strings when other is tainted" do
|
419
|
+
# strs = ["", "hello world", "hello"]
|
420
|
+
# strs += strs.map { |s| s.dup.taint }
|
421
|
+
|
422
|
+
# strs.each do |str|
|
423
|
+
# str = str.dup
|
424
|
+
# strs.each do |other|
|
425
|
+
# other = other.dup
|
426
|
+
# r = str.slice!(other)
|
427
|
+
|
428
|
+
# r.tainted?.should == !r.nil? & other.tainted?
|
429
|
+
# end
|
430
|
+
# end
|
431
|
+
# end
|
432
|
+
|
433
|
+
it "doesn't set $~" do
|
434
|
+
$~ = nil
|
435
|
+
|
436
|
+
'hello'.slice!('ll')
|
437
|
+
$~.should == nil
|
438
|
+
end
|
439
|
+
|
440
|
+
it "returns nil if self does not contain other" do
|
441
|
+
a = "hello"
|
442
|
+
a.slice!('zzz').should == nil
|
443
|
+
a.should == "hello"
|
444
|
+
end
|
445
|
+
|
446
|
+
# it "doesn't call to_str on its argument" do
|
447
|
+
# o = mock('x')
|
448
|
+
# o.should_not_receive(:to_str)
|
449
|
+
|
450
|
+
# lambda { "hello".slice!(o) }.should raise_error(TypeError)
|
451
|
+
# end
|
452
|
+
|
453
|
+
it "returns a subclass instance when given a subclass instance" do
|
454
|
+
s = StringSpecs::MyString.new("el")
|
455
|
+
r = "hello".slice!(s)
|
456
|
+
r.should == "el"
|
457
|
+
r.class.should == StringSpecs::MyString
|
458
|
+
end
|
459
|
+
|
460
|
+
# ruby_version_is ""..."1.9" do
|
461
|
+
# it "raises a TypeError if self is frozen" do
|
462
|
+
# lambda { "hello hello".freeze.slice!('llo') }.should raise_error(TypeError)
|
463
|
+
# end
|
464
|
+
# end
|
465
|
+
|
466
|
+
# ruby_version_is "1.9" do
|
467
|
+
# it "raises a RuntimeError if self is frozen" do
|
468
|
+
# lambda { "hello hello".freeze.slice!('llo') }.should raise_error(RuntimeError)
|
469
|
+
# lambda { "this is a string".freeze.slice!('zzz')}.should raise_error(RuntimeError)
|
470
|
+
# lambda { "this is a string".freeze.slice!('zzz')}.should raise_error(RuntimeError)
|
471
|
+
# end
|
472
|
+
# end
|
473
|
+
end
|