rhodes 2.3.0 → 2.3.1.beta.1

data/platform/shared/net/INetRequest.h

@@ -3,8 +3,13 @@
 #include "common/RhoStd.h"
 #include "common/InputStream.h"
 #include "common/AutoPointer.h"
+#include "common/RhoMutexLock.h"
 
 namespace rho {
+namespace common {
+class CRhoFile;
+}
+
 namespace net {
 
 struct INetResponse
@@ -13,11 +18,9 @@ struct INetResponse
     virtual const char* getCharData() = 0;
     virtual unsigned int getDataSize() = 0;
     virtual int getRespCode() = 0;
-    virtual boolean isOK() = 0;
-    virtual boolean isResponseRecieved() = 0;
-    virtual boolean isUnathorized() = 0;
-    virtual boolean isSuccess() = 0;
     virtual String getCookies() = 0;
+
+    virtual void setCharData(const char* szData) = 0;
 };
 
 struct IRhoSession
@@ -39,34 +42,104 @@ struct CMultipartItem
     String m_strDataPrefix;
 };
 
-struct INetRequest
+struct INetRequestImpl
 {
-    virtual ~INetRequest(void){;}
+    virtual ~INetRequestImpl(void){;}
 
-    virtual INetResponse* pullData(const String& strUrl, IRhoSession* oSession ) = 0;
-    virtual INetResponse* pushData(const String& strUrl, const String& strBody, IRhoSession* oSession)=0;
+    virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )=0;
+    virtual INetResponse* pullFile(const String& strUrl, common::CRhoFile& oFile, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
     virtual INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
-    virtual INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
 
-    virtual INetResponse* pullFile(const String& strUrl, const String& strFileName, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
-    virtual INetResponse* pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession)=0;
+    virtual void cancel() = 0;
 
-    virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )=0;
+    virtual boolean getSslVerifyPeer() = 0;
+    virtual void setSslVerifyPeer(boolean mode) = 0;
 
-    virtual boolean sslVerifyPeer() = 0;
-    virtual void sslVerifyPeer(boolean mode) = 0;
-    
-    virtual String resolveUrl(const String& strUrl)=0;
+    virtual INetResponse* createEmptyNetResponse() = 0;
+};
 
-    virtual void cancel() = 0;
-    virtual boolean isCancelled() = 0;
+typedef rho::common::CAutoPtr<rho::net::INetResponse> NetResponsePtr;
+
+class CNetResponseWrapper
+{
+    NetResponsePtr m_netResp;
+public:
+    CNetResponseWrapper( INetResponse* resp = 0) : m_netResp(resp)  {}
+
+    const char* getCharData(){ return m_netResp->getCharData(); }
+    unsigned int getDataSize(){ return m_netResp->getDataSize(); }
+    int getRespCode(){ return m_netResp->getRespCode(); }
+    String getCookies(){ return m_netResp->getCookies(); }
+
+	boolean isOK()
+	{
+		return getRespCode() == 200 || getRespCode() == 206;
+	}
+
+    boolean isUnathorized()
+    {
+        return getRespCode() == 401;
+    }
+
+    boolean isRedirect()
+    {
+       return getRespCode() == 301 || getRespCode() ==302;
+    }
+
+    boolean isSuccess()
+    {
+        return getRespCode() > 0 && getRespCode() < 400;
+    }
+
+    boolean isResponseRecieved(){ return getRespCode() != -1; }
 };
 
-#define NetResponse(name,call)\
-    rho::common::CAutoPtr<rho::net::INetResponse> p##name = call;\
-    rho::net::INetResponse& name = *p##name;
-#define NetRequest(call)\
-    rho::common::CAutoPtr<rho::net::INetResponse> p__NetReq = call;p__NetReq;
+class CNetRequestHolder
+{
+    common::CMutex m_mxReq;
+    INetRequestImpl*   m_pReq;
+    boolean        m_bCancel;
+    boolean        m_sslVerifyPeer;
+
+public:
+
+    CNetRequestHolder() : m_pReq(0), m_bCancel(false), m_sslVerifyPeer(true){}
+
+    void setRequest(INetRequestImpl* pReq);
+    void cancel();
+    boolean isCancelled();
+    static String resolveUrl(const String& strUrl);
+
+    boolean getSslVerifyPeer() {return m_sslVerifyPeer;}
+    void setSslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
+};
+
+class CNetRequestWrapper
+{
+    common::CAutoPtr<INetRequestImpl>  m_pReqImpl;
+    CNetRequestHolder*                 m_pHolder;
+public:
+    CNetRequestWrapper(INetRequestImpl* pImpl, CNetRequestHolder* pHolder);
+    ~CNetRequestWrapper();
+
+    INetResponse* pullData(const String& strUrl, IRhoSession* oSession );
+    INetResponse* pushData(const String& strUrl, const String& strBody, IRhoSession* oSession);
+    INetResponse* pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession);
+    INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
+    INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    INetResponse* pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+
+    String resolveUrl(const String& strUrl);
+
+};
 
 }
 }
+
+typedef rho::net::CNetResponseWrapper NetResponse;
+typedef rho::net::CNetRequestHolder NetRequest;
+
+rho::net::CNetRequestWrapper getNetRequest(rho::net::CNetRequestHolder* pHolder = 0);
+
+

data/platform/shared/net/ssl.cpp

@@ -3,7 +3,7 @@
 
 extern "C" {
 
-#define GETSSL rho::common::rho_impl_createClassFactory()->createSSLEngine()
+#define GETSSL rho_get_RhoClassFactory()->createSSLEngine()
 
 void *rho_ssl_create_storage()
 {

data/platform/shared/ruby/ext/calendar/calendar.i

@@ -6,7 +6,7 @@ extern VALUE event_fetch(VALUE params);
 #define fetch event_fetch
 extern VALUE event_fetch_by_id(const char *id);
 #define fetch_by_id event_fetch_by_id
-extern void event_save(VALUE event);
+extern const char* event_save(VALUE event);
 #define save event_save
 extern void event_delete(const char *id);
 #define delete event_delete
@@ -22,7 +22,7 @@ extern VALUE fetch_by_id(const char *id);
 %typemap(check) VALUE {
     Check_Type($1, T_HASH);
 }
-extern void save(VALUE event);
+extern const char* save(VALUE event);
 
 extern void delete(const char *id);
 

data/platform/shared/ruby/ext/calendar/calendar_wrap.c

@@ -1820,7 +1820,7 @@ extern VALUE event_fetch(VALUE params);
 #define fetch event_fetch
 extern VALUE event_fetch_by_id(const char *id);
 #define fetch_by_id event_fetch_by_id
-extern void event_save(VALUE event);
+extern const char* event_save(VALUE event);
 #define save event_save
 extern void event_delete(const char *id);
 #define delete event_delete
@@ -1879,6 +1879,30 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+{
+  if (carray) {
+    if (size > LONG_MAX) {
+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+      return pchar_descriptor ? 
+	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : Qnil;
+    } else {
+      return rb_str_new(carray, (long)(size));
+    }
+  } else {
+    return Qnil;
+  }
+}
+
+
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtr(const char *cptr)
+{ 
+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+}
+
 SWIGINTERN VALUE
 _wrap_fetch(int argc, VALUE *argv, VALUE self) {
   VALUE arg1 = (VALUE) 0 ;
@@ -1930,6 +1954,8 @@ fail:
 SWIGINTERN VALUE
 _wrap_save(int argc, VALUE *argv, VALUE self) {
   VALUE arg1 = (VALUE) 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -1938,8 +1964,9 @@ _wrap_save(int argc, VALUE *argv, VALUE self) {
   {
     Check_Type(arg1, T_HASH);
   }
-  save(arg1);
-  return Qnil;
+  result = (char *)save(arg1);
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
 fail:
   return Qnil;
 }

data/platform/shared/rubyext/GeoLocation.cpp

@@ -21,12 +21,12 @@ namespace rubyext{
 IMPLEMENT_LOGCLASS(CGeoLocation,"GeoLocation");
 CGeoLocation* CGeoLocation::m_pInstance = 0;
 
-/*static*/ CGeoLocation* CGeoLocation::Create(common::IRhoClassFactory* factory)
+/*static*/ CGeoLocation* CGeoLocation::Create()
 {
     if ( m_pInstance ) 
         return m_pInstance;
 
-    m_pInstance = new CGeoLocation(factory);
+    m_pInstance = new CGeoLocation();
     return m_pInstance;
 }
 
@@ -38,10 +38,9 @@ CGeoLocation* CGeoLocation::m_pInstance = 0;
     m_pInstance = 0;
 }
 
-CGeoLocation::CGeoLocation(common::IRhoClassFactory* pFactory)
+CGeoLocation::CGeoLocation()
 {
     m_nGeoPingTimeoutSec = 0;
-    m_NetRequest = pFactory->createNetRequest();
 }
 
 void CGeoLocation::callGeoCallback(const CGeoNotification& oNotify, boolean bError, boolean bRunInThread)
@@ -68,7 +67,7 @@ void CGeoLocation::callGeoCallback(const CGeoNotification& oNotify, boolean bErr
         RHODESAPP().runCallbackInThread(strFullUrl, strBody);
     else
     {
-        NetRequest( getNet().pushData( strFullUrl, strBody, null ) );
+        getNet().pushData( strFullUrl, strBody, null );
     }
 }
 

data/platform/shared/rubyext/GeoLocation.h

@@ -16,7 +16,7 @@ public:
     DEFINE_LOGCLASS;
 private:
 
-    common::CAutoPtr<net::INetRequest> m_NetRequest;
+    NetRequest m_NetRequest;
 	int m_nGeoPingTimeoutSec;
 
     struct CGeoNotification
@@ -35,11 +35,11 @@ private:
 
     static CGeoLocation* m_pInstance;
 
-    CGeoLocation(common::IRhoClassFactory* pFactory);
+    CGeoLocation();
 
 public:
 
-    static CGeoLocation* Create(common::IRhoClassFactory* factory);
+    static CGeoLocation* Create();
     static void Destroy();
     static CGeoLocation* getInstance(){ return m_pInstance; }
 
@@ -55,7 +55,7 @@ private:
     void setPingTimeoutSec( int nTimeout );
     void callGeoCallback(const CGeoNotification& oNotify, boolean bError, boolean bRunInThread);
 
-    net::INetRequest& getNet(){ return *m_NetRequest; }
+    net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 };
 
 }

data/platform/shared/rubyext/RhoAppAdapter.cpp

@@ -21,7 +21,7 @@ const _CRhoAppAdapter& RhoAppAdapter = _CRhoAppAdapter();
     return rho_ruby_getErrorText(nError);
 }
 
-/*static*/ int  _CRhoAppAdapter::getErrorFromResponse(net::INetResponse& resp)
+/*static*/ int  _CRhoAppAdapter::getErrorFromResponse(NetResponse& resp)
 {
     if ( !resp.isResponseRecieved())
         return ERR_NETWORK;

data/platform/shared/rubyext/System.cpp

@@ -59,6 +59,9 @@ VALUE rho_sys_get_property(char* szPropName)
 	if (strcasecmp("has_touchscreen",szPropName) == 0)
         return rho_ruby_create_boolean(1);
 
+	if (strcasecmp("has_sqlite",szPropName) == 0)
+        return rho_ruby_create_boolean(1);
+
     RAWLOG_ERROR1("Unknown Rho::System property : %s", szPropName);
 
     return rho_ruby_get_NIL();

data/platform/shared/sync/ClientRegister.cpp

@@ -15,12 +15,12 @@ IMPLEMENT_LOGCLASS(CClientRegister,"ClientRegister");
 
 CClientRegister* CClientRegister::m_pInstance = 0;
 	
-/*static*/ CClientRegister* CClientRegister::Create(common::IRhoClassFactory* factory,const char* device_pin) 
+/*static*/ CClientRegister* CClientRegister::Create(const char* device_pin) 
 {
 	if ( m_pInstance ) 
 		return m_pInstance;
 
-	m_pInstance = new CClientRegister(factory, device_pin);
+	m_pInstance = new CClientRegister(device_pin);
 	return m_pInstance;
 }
 
@@ -32,20 +32,17 @@ CClientRegister* CClientRegister::m_pInstance = 0;
     m_pInstance = 0;
 }
 
-CClientRegister::CClientRegister(common::IRhoClassFactory* factory,const char* device_pin) : CRhoThread(factory) 
+CClientRegister::CClientRegister(const char* device_pin) : CRhoThread() 
 {
 	m_strDevicePin = device_pin;
-	m_NetRequest = factory->createNetRequest();
     m_nPollInterval = POLL_INTERVAL_SECONDS;
 
-    delete factory;
-
     startUp();
 }
 
 CClientRegister::~CClientRegister()
 {
-	m_NetRequest->cancel();
+	m_NetRequest.cancel();
 	
     stop(WAIT_BEFOREKILL_SECONDS);
     m_pInstance = null;
@@ -99,7 +96,7 @@ boolean CClientRegister::doRegister(CSyncEngine& oSync)
 	if ( client_id.length() == 0 )
 		return false;
 
-    DBResult( res, CDBAdapter::getUserDB().executeSQL("SELECT token,token_sent from client_info") );
+    IDBResult res = CDBAdapter::getUserDB().executeSQL("SELECT token,token_sent from client_info");
     if ( !res.isEnd() ) {
 		String token = res.getStringByIdx(0); 
 		int token_sent = res.getIntByIdx(1);
@@ -111,7 +108,7 @@ boolean CClientRegister::doRegister(CSyncEngine& oSync)
 		}
     }
 	String strBody = getRegisterBody(client_id);
-    NetResponse(resp, getNet().pushData( oSync.getProtocol().getClientRegisterUrl(), strBody, &oSync ));
+    NetResponse resp = getNet().pushData( oSync.getProtocol().getClientRegisterUrl(), strBody, &oSync );
 	if( resp.isOK() )
     {
 //				try {

data/platform/shared/sync/ClientRegister.h

@@ -21,11 +21,11 @@ class CClientRegister : public common::CRhoThread
     DEFINE_LOGCLASS;
 
 	static CClientRegister* m_pInstance;
-	common::CAutoPtr<net::INetRequest>     m_NetRequest;
-	String                                 m_strDevicePin;
-    unsigned int                           m_nPollInterval;
+	NetRequest              m_NetRequest;
+	String                  m_strDevicePin;
+    unsigned int            m_nPollInterval;
 public:
-    static CClientRegister* Create(common::IRhoClassFactory* factory,const char* device_pin);
+    static CClientRegister* Create(const char* device_pin);
     static void Destroy();
 	static CClientRegister* getInstance() { return m_pInstance; }
 	
@@ -36,12 +36,14 @@ public:
     String getRegisterBody(const String& strClientID);
 
     void startUp();
+
+    void setSslVerifyPeer(boolean b){m_NetRequest.setSslVerifyPeer(b);}
 private:
-	CClientRegister(common::IRhoClassFactory* factory,const char* device_pin);
+	CClientRegister(const char* device_pin);
     ~CClientRegister();
 
     boolean doRegister(CSyncEngine& oSync);
-    net::INetRequest& getNet(){ return *m_NetRequest; }
+    net::CNetRequestWrapper getNet(){ return getNetRequest(&m_NetRequest); }
 
 };