rhodes 3.2.0.beta.2 → 3.2.0.beta.4

data/platform/shared/curl/lib/setup.h

@@ -50,7 +50,7 @@
 #  endif
 #endif
 
-#if defined(macintosh) && defined(__MRC__)
+#if (defined(macintosh) && defined(__MRC__)) || defined(__APPLE__) || defined(__APPLE_CC__)
 #  include "config-mac.h"
 #endif
 

data/platform/shared/curl/lib/ssluse.h

@@ -28,6 +28,10 @@
  * This header should only be needed to get included by sslgen.c and ssluse.c
  */
 
+#ifdef USE_RHOSSL
+#include "rhossl.h"
+#else
+
 #include "urldata.h"
 CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex);
 CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn,
@@ -69,7 +73,9 @@ ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */
 
 size_t Curl_ossl_version(char *buffer, size_t size);
 int Curl_ossl_check_cxn(struct connectdata *cxn);
+#endif // USE_RHOSSL
 int Curl_ossl_seed(struct SessionHandle *data);
+#ifndef USE_RHOSSL
 
 int Curl_ossl_shutdown(struct connectdata *conn, int sockindex);
 bool Curl_ossl_data_pending(const struct connectdata *conn,
@@ -93,5 +99,6 @@ bool Curl_ossl_data_pending(const struct connectdata *conn,
 #define curlssl_check_cxn Curl_ossl_check_cxn
 #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y)
 
+#endif /* USE_RHOSSL */
 #endif /* USE_SSLEAY */
 #endif /* __SSLUSE_H */

data/platform/shared/qt/RhoSimulator.pro

@@ -3,5 +3,8 @@ SUBDIRS = rubylib rholib sqlite3 syncengine
 unix:!macx {
  # SUBDIRS += curl
 }
+macx {
+ SUBDIRS += curl
+}
 CONFIG += ordered
 SUBDIRS += rhodes

data/platform/shared/qt/curl/curl.pro

@@ -12,12 +12,13 @@ macx {
   DESTDIR = ../../../osx/bin/curl
   OBJECTS_DIR = ../../../osx/bin/curl/tmp
   DEFINES += USE_RHOSSL
+  HEADERS += ../../curl/lib/config-mac.h
 SOURCES += ../../curl/lib/http_ntlm.c\
 ../../curl/lib/qssl.c\
 ../../curl/lib/ssluse.c
 }
 
-unix {
+unix:!macx {
   DESTDIR = ../../../linux/bin/curl
   OBJECTS_DIR = ../../../linux/bin/curl/tmp
   DEFINES += HAVE_CONFIG_H USE_RHOSSL

data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h

@@ -42,7 +42,7 @@
 #else
 #include "net/CURLNetRequest.h"
 #include "common/PosixThreadImpl.h"
-// #include "net/iphone/sslimpl.h"
+#include "SSLImpl.h"
 #define CNETREQUESTIMPL new net::CURLNetRequest()
 #define CRHOTHREADIMPL new CPosixThreadImpl()
 #define CRHOCRYPTIMPL NULL
@@ -67,8 +67,11 @@ public:
 
     net::ISSL* createSSLEngine()
     {
-        //TODO: createSSLEngine
-        return NULL; // new net::SSLImpl();
+#ifdef OS_WINDOWS
+        return NULL;
+#else
+        return new net::SSLImpl();
+#endif
     }
 
     IRhoCrypt* createRhoCrypt()

data/platform/shared/qt/rhodes/impl/SSLImpl.cpp

@@ -0,0 +1,69 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "SSLImpl.h"
+
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "SSL"
+
+namespace rho
+{
+namespace net
+{
+
+void * SSLImpl::createStorage()
+{
+    return NULL;
+}
+
+void SSLImpl::freeStorage(void *ptr)
+{
+    if (ptr)
+        free(ptr);
+}
+    
+CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage)
+{
+    return CURLE_OK;
+}
+
+void SSLImpl::shutdown(void *storage)
+{
+}
+
+ssize_t SSLImpl::send(const void *mem, size_t len, void *storage)
+{
+    return 0;
+}
+
+ssize_t SSLImpl::recv(char *buf, size_t size, int *wouldblock, void *storage)
+{
+    return -1;
+}
+
+} // namespace net
+} // namespace rho

data/platform/shared/qt/rhodes/impl/SSLImpl.h

@@ -0,0 +1,49 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#pragma once
+
+#include "net/ssl.h"
+
+namespace rho
+{
+namespace net
+{
+
+class SSLImpl : public ISSL
+{
+public:
+    void *createStorage();
+    void freeStorage(void *ptr);
+    
+    CURLcode connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage);
+    void shutdown(void *storage);
+    ssize_t send(const void *mem, size_t len, void *storage);
+    ssize_t recv(char *buf, size_t size, int *wouldblock, void *storage);
+};
+
+} // namespace net
+} // namespace rho

data/platform/shared/qt/rhodes/rhodes.pro

@@ -16,8 +16,10 @@ macx {
   UI_DIR = ../../../osx/bin/RhoSimulator/generated_files
   OBJECTS_DIR = ../../../osx/bin/RhoSimulator/tmp
   RCC_DIR =  ../../../osx/bin/RhoSimulator/resources
-  LIBS += -lcurl
-  # LIBS += -L../../../osx/bin/curl -lcurl
+  HEADERS += impl/SSLImpl.h
+  SOURCES += impl/SSLImpl.cpp
+  LIBS += -lcrypto -lssl -lz -lldap
+  LIBS += -L../../../osx/bin/curl -lcurl
   LIBS += -L../../../osx/bin/rubylib -lrubylib
   LIBS += -L../../../osx/bin/rholib -lrholib
   LIBS += -L../../../osx/bin/sqlite3 -lsqlite3

data/platform/symbian/rhodes/rhodes.pro

@@ -12,8 +12,8 @@ db.source = db
 lib.source = lib
 DEPLOYMENTFOLDERS = apps db lib
 
-symbian:TARGET = Yookos
-symbian:TARGET.UID3 = 0xE15AE169
+symbian:TARGET = AgendaSalute
+symbian:TARGET.UID3 = 3780829545
 #0xE17AE169
 #symbian:TARGET.UID3 = 0x20047C9A
 #0xA00100C8
@@ -64,6 +64,7 @@ SOURCES += ../../shared/qt/rhodes/QtWebInspector.cpp \
     ../../shared/qt/rhodes/impl/NativeTabbarImpl.cpp \
     ../../shared/qt/rhodes/impl/MapViewImpl.cpp \
     ../../shared/qt/rhodes/impl/MainWindowImpl.cpp \
+    ../../shared/qt/rhodes/impl/SSLImpl.cpp \
     ../../shared/qt/rhodes/impl/GeoLocationImpl.cpp \
     ../../shared/qt/rhodes/impl/DateTimePickerImpl.cpp \
     ../../shared/qt/rhodes/impl/CameraImpl.cpp \

data/platform/symbian/rholib/rholib.pro

@@ -32,8 +32,11 @@ SOURCES += \
     ../../shared/logging/RhoLogSink.cpp \
     ../../shared/logging/RhoLogConf.cpp \
     ../../shared/logging/RhoLog.cpp \
+    ../../shared/common/map/BaseMapEngine.cpp \
     ../../shared/common/map/MapEngine.cpp \
+    ../../shared/common/map/OSMMapEngine.cpp \
     ../../shared/common/map/GoogleMapEngine.cpp \
+    ../../shared/common/map/GeocodingMapEngine.cpp \
     ../../shared/common/map/ESRIMapEngine.cpp \
     ../../shared/net/URI.cpp \
     ../../shared/net/RawSocket.cpp \
@@ -79,8 +82,11 @@ HEADERS += \
     ../../shared/logging/RhoLogCat.h \
     ../../shared/logging/RhoLog.h \
     ../../shared/logging/RhoATLTrace.h \
+    ../../shared/common/map/BaseMapEngine.h \
     ../../shared/common/map/MapEngine.h \
+    ../../shared/common/map/OSMMapEngine.h \
     ../../shared/common/map/GoogleMapEngine.h \
+    ../../shared/common/map/GeocodingMapEngine.h \
     ../../shared/common/map/ESRIMapEngine.h \
     ../../shared/net/URI.h \
     ../../shared/net/RawSocket.h \

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "3.2.0.beta.2"
+  s.version = "3.2.0.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196455
+  hash: 62196459
   prerelease: true
   segments: 
   - 3
   - 2
   - 0
   - beta
-  - 2
-  version: 3.2.0.beta.2
+  - 4
+  version: 3.2.0.beta.4
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 -07:00
+date: 2011-10-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -2256,6 +2256,7 @@ files:
 - platform/shared/curl/lib/amigaos.c
 - platform/shared/curl/lib/arpa_telnet.h
 - platform/shared/curl/lib/base64.c
+- platform/shared/curl/lib/config-mac.h
 - platform/shared/curl/lib/config-symbian.h
 - platform/shared/curl/lib/config-win32.h
 - platform/shared/curl/lib/config-win32ce.h
@@ -2499,6 +2500,8 @@ files:
 - platform/shared/qt/rhodes/impl/RhoThreadImpl.h
 - platform/shared/qt/rhodes/impl/RingtoneManagerImpl.cpp
 - platform/shared/qt/rhodes/impl/SignatureImpl.cpp
+- platform/shared/qt/rhodes/impl/SSLImpl.cpp
+- platform/shared/qt/rhodes/impl/SSLImpl.h
 - platform/shared/qt/rhodes/impl/SystemImpl.cpp
 - platform/shared/qt/rhodes/impl/WebViewImpl.cpp
 - platform/shared/qt/rhodes/main.cpp