rhodes 2.3.0 → 2.3.1.beta.1

data/spec/phone_spec/app/spec/syncengine_spec.rb

@@ -77,6 +77,10 @@ describe "SyncEngine_test" do
   
   after (:each) do
     Rho::RhoConfig.syncserver = SYNC_SERVER_URL
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", "" )        
+    ::Rho::RHO.get_user_db().delete_all_from_table('changed_values')
+    
   end
     
   it "should update syncserver at runtime" do
@@ -349,7 +353,222 @@ describe "SyncEngine_test" do
     item2 = getProduct.find(item.object)    
     item2.should be_nil
   end
+
+  it "should process create-error : delete" do    
+ 
+    item = getProduct.create({:name => 'Test', :brand => "Rho"})
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+    
+    item.update_attributes({:price => "123"})
+
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"" + item.object + "\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"" + item.object + "-error\":{\"message\":\"error create\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['create-error'].should_not be_nil
+    res['server_errors']['create-error'][item.object].should_not be_nil    
+    res['server_errors']['create-error'][item.object]['message'].should == "error create"
+
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 2
+
+    item.update_attributes({:price => "456"})
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 2
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'update')
+    records2.length.should == 1
+    records2[0]['attrib'].should == 'price'        
+    records2[0]['sent'].should == 0
+
+    getProduct.on_sync_create_error( res['server_errors']['create-error'].keys(), :delete)
+    
+    records3 = getTestDB().select_from_table('changed_values','*', 'object' => item.object)
+    records3.length.should == 0
+    records4 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records4.length.should == 0
+    
+    item = getProduct.find(item.object)
+    item.should be_nil
+  end
+  
+  it "should process create-error : recreate" do    
+ 
+    item = getProduct.create({:name => 'Test', :brand => "Rho"})
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+    
+    item.update_attributes({:price => "123"})
+
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"" + item.object + "\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"" + item.object + "-error\":{\"message\":\"error create\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['create-error'].should_not be_nil
+    res['server_errors']['create-error'][item.object].should_not be_nil    
+    res['server_errors']['create-error'][item.object]['message'].should == "error create"
+
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 2
+
+    item.update_attributes({:price => "456"})
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 2
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'update')
+    records2.length.should == 1
+    records2[0]['attrib'].should == 'price'        
+    records2[0]['sent'].should == 0
+
+    getProduct.on_sync_create_error( res['server_errors']['create-error'].keys(), :recreate)
+    
+    records3 = getTestDB().select_from_table('changed_values','*', 'object' => item.object)
+    records3.length.should == 1
+    records3[0]['attrib'].should == 'object'        
+    
+    records4 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'update')
+    records4.length.should == 0
+    
+    item = getProduct.find(item.object)
+    item.should_not be_nil
+    
+  end
+
+  it "should process create-error : recreate deleted item" do    
+ 
+    item = getProduct.create({:name => 'Test', :brand => "Rho"})
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+    
+    item.update_attributes({:price => "123"})
+
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 1
+    records[0]['attrib'].should == 'object'
+    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"" + item.object + "\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"" + item.object + "-error\":{\"message\":\"error create\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['create-error'].should_not be_nil
+    res['server_errors']['create-error'][item.object].should_not be_nil    
+    res['server_errors']['create-error'][item.object]['message'].should == "error create"
+
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 2
+
+    item.destroy
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 2
+    records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'delete')
+    records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
+    records2[0]['attrib'].should_not == 'object'        
+    records2[0]['sent'].should == 0
+
+    getProduct.on_sync_create_error( res['server_errors']['create-error'].keys(), :recreate)
+    
+    records3 = getTestDB().select_from_table('changed_values','*', 'object' => item.object)
+    records3.length.should == 0
+    
+    records4 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'update')
+    records4.length.should == 0
+    
+    item = getProduct.find(item.object)
+    item.should be_nil
+    
+  end
+    
+  it "should process update-error" do    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"update-error\":{\"broken_object_id\":{\"name\":\"wrongname\",\"an_attribute\":\"error update\"},\"broken_object_id-error\":{\"message\":\"error update\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    puts "res : #{res}"
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['update-error'].should_not be_nil
+    res['server_errors']['update-error']['broken_object_id'].should_not be_nil    
+    res['server_errors']['update-error']['broken_object_id']['message'].should == "error update"
+    
+  end
+
+  it "should process delete-error" do    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"delete-error\":{\"broken_object_id\":{\"name\":\"wrongname\",\"an_attribute\":\"error delete\"},\"broken_object_id-error\":{\"message\":\"Error delete record\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    puts "res : #{res}"
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['delete-error'].should_not be_nil
+    res['server_errors']['delete-error']['broken_object_id'].should_not be_nil    
+    res['server_errors']['delete-error']['broken_object_id']['message'].should == "Error delete record"
     
+  end
+
+  it "should process source-error" do    
+    err_resp = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"source-error\":{\"query-error\":{\"message\":\"Error during query\"}}}]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    res = ::Rho::RhoSupport::parse_query_parameters getProduct.sync( "/app/Settings/sync_notify")
+    puts "res : #{res}"
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['query-error'].should_not be_nil
+    res['server_errors']['query-error']['message'].should == "Error during query"
+    
+  end
+
+  it "should process search-error" do    
+    err_resp = "[[{\"version\":3},{\"source\":\"" + getProduct_str() + "\"},{\"search-error\":{\"search-error\":{\"message\":\"Error during search\"}}}]]"
+    
+    SyncEngine.set_source_property(getProduct().get_source_id.to_i(), "rho_server_response", err_resp )    
+    _search_id = Time.now.to_i.to_s
+    search_res = getProduct.search(
+      :from => 'search',
+      :search_params => { :filterData => "Test", :search_id => _search_id },
+      :offset => 0,
+      :max_results => 1000,
+      :progress_step => 10,
+      :callback => '/app/Contact/search_callback',
+      :callback_param => "")
+    res = ::Rho::RhoSupport::parse_query_parameters(search_res)      
+    puts "res : #{res}"
+    
+    res['server_errors'].should_not be_nil
+    res['server_errors']['search-error'].should_not be_nil
+    res['server_errors']['search-error']['message'].should == "Error during search"
+    
+  end
+
   it "should logout" do
     SyncEngine.logout()
   

data/spec/phone_spec/build.yml

@@ -15,6 +15,7 @@ iphone:
   extensions: ["barcode"]
   
 android:
+  apikey: "0tLch9tZSX1G7PQRWwmqvINECUGtJ8ReArpPJxw"
   mapping: enabled
   capabilities:
     - network_state

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 62196441
+  prerelease: true
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  - beta
+  - 1
+  version: 2.3.1.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +139,7 @@ files:
 - doc/generator.txt
 - doc/install.txt
 - doc/introduction.txt
+- doc/linea.txt
 - doc/rhom.txt
 - doc/standard-css.txt
 - doc/synchronization.txt
@@ -755,6 +758,7 @@ files:
 - lib/framework/res/blue_pushpin_small.wm.png
 - lib/framework/res/callout.wm.png
 - lib/framework/res/callout_link.wm.png
+- lib/framework/res/esri.wm.png
 - lib/framework/res/forward_btn.wm.png
 - lib/framework/res/home_btn.wm.png
 - lib/framework/res/options_btn.wm.png
@@ -810,6 +814,7 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
+- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
 - platform/android/build/libcurl_build.files
@@ -883,6 +888,7 @@ files:
 - platform/android/Rhodes/res/drawable/callout.png
 - platform/android/Rhodes/res/drawable/callout_link.png
 - platform/android/Rhodes/res/drawable/camera.png
+- platform/android/Rhodes/res/drawable/esri.png
 - platform/android/Rhodes/res/drawable/exit.png
 - platform/android/Rhodes/res/drawable/home.png
 - platform/android/Rhodes/res/drawable/icon.png
@@ -1174,6 +1180,7 @@ files:
 - platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java
 - platform/bb/rhodes/platform/common/com/rho/RhodesApplicationPlatform.java
 - platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java
+- platform/bb/rhodes/resources/esri.png
 - platform/bb/rhodes/resources/icon.png
 - platform/bb/rhodes/resources/mappin.png
 - platform/bb/rhodes/rhodes.csl
@@ -1267,6 +1274,7 @@ files:
 - platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java
 - platform/bb/RubyVM/src/com/rho/RhoClassFactory.java
 - platform/bb/RubyVM/src/com/rho/RhoConf.java
+- platform/bb/RubyVM/src/com/rho/RhoCrypto.java
 - platform/bb/RubyVM/src/com/rho/RhodesApp.java
 - platform/bb/RubyVM/src/com/rho/RhoEmptyLogger.java
 - platform/bb/RubyVM/src/com/rho/RhoEmptyProfiler.java
@@ -2143,6 +2151,7 @@ files:
 - platform/shared/net/CURLNetRequest.h
 - platform/shared/net/HttpServer.cpp
 - platform/shared/net/HttpServer.h
+- platform/shared/net/INetRequest.cpp
 - platform/shared/net/INetRequest.h
 - platform/shared/net/iphone/sslimpl.cpp
 - platform/shared/net/iphone/sslimpl.h
@@ -4021,8 +4030,6 @@ files:
 - platform/wm/rhodes/rho/common/RhoClassFactory.h
 - platform/wm/rhodes/rho/common/RhoThreadImpl.cpp
 - platform/wm/rhodes/rho/common/RhoThreadImpl.h
-- platform/wm/rhodes/rho/net/NetRequest.cpp
-- platform/wm/rhodes/rho/net/NetRequest.h
 - platform/wm/rhodes/rho/net/NetRequestImpl.cpp
 - platform/wm/rhodes/rho/net/NetRequestImpl.h
 - platform/wm/rhodes/rho/rubyext/calendar.cpp
@@ -5957,7 +5964,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rhodes
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: The Rhodes framework is the easiest way to develop NATIVE apps with full device capabilities (GPS, PIM, camera, etc.) for any smartphone.

data/platform/wm/rhodes/rho/net/NetRequest.cpp

@@ -1,89 +0,0 @@
-#include "stdafx.h"
-
-#include "NetRequest.h"
-#include "common/AutoPointer.h"
-#include "common/RhoFile.h"
-#include "common/RhoFilePath.h"
-#include "NetRequestImpl.h"
-#include "common/RhodesApp.h"
-
-namespace rho {
-namespace net {
-IMPLEMENT_LOGCLASS(CNetRequest,"Net");
-
-INetResponse* CNetRequest::pullData(const String& strUrl, IRhoSession* oSession )
-{
-    return doRequest("GET",strUrl,String(),oSession,null);
-}
-
-INetResponse* CNetRequest::pushData(const String& strUrl, const String& strBody, IRhoSession* oSession)
-{
-    return doRequest("POST",strUrl,strBody,oSession,null);
-}
-
-INetResponse* CNetRequest::pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession)
-{
-	INetResponse* pResp = doRequest("POST", strUrl, strBody, oSession, null );
-	if ( pResp->isOK() )
-        ((CNetResponseImpl*)pResp)->getRawData() = pResp->getCookies();
-		
-	return pResp;
-}
-
-INetResponse* CNetRequest::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
-{
-    m_bCancel = false;
-    CNetRequestImpl oImpl(this, method,strUrl,oSession,pHeaders, m_sslVerifyPeer);
-    return oImpl.sendString(strBody);
-}
-
-
-String CNetRequest::resolveUrl(const String& strUrl)
-{
-    return RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
-}
-
-void CNetRequest::cancel()
-{
-    m_bCancel = true;
-    if ( m_pCurNetRequestImpl != null )
-        m_pCurNetRequestImpl->cancel();
-}
-
-INetResponse* CNetRequest::pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
-{
-    m_bCancel = false;
-    CNetRequestImpl oImpl(this, "POST",strUrl,oSession,pHeaders,m_sslVerifyPeer);
-    CNetResponseImpl* pResp = oImpl.sendMultipartData(arItems);
-    return pResp;
-}
-
-INetResponse* CNetRequest::pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
-{
-    m_bCancel = false;
-    VectorPtr<CMultipartItem*> arItems;
-    arItems.addElement(&oItem);
-
-    INetResponse* pResp = pushMultipartData(strUrl, arItems, oSession, pHeaders);
-
-    arItems[0] = 0; //do not delete item
-    return pResp;
-}
-
-INetResponse* CNetRequest::pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
-{
-    m_bCancel = false;
-    common::CRhoFile oFile;
-    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenForAppend) ) 
-    {
-        LOG(ERROR) + "pullFile: cannot create file :" + strFilePath;
-        return new CNetResponseImpl();
-    }
-
-    CNetRequestImpl oImpl(this, "GET",strUrl,oSession,pHeaders,m_sslVerifyPeer);
-    CNetResponseImpl* pResp = oImpl.downloadFile(oFile);
-    return pResp;
-}
-
-}
-}

data/platform/wm/rhodes/rho/net/NetRequest.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include "net/INetRequest.h"
-#include "logging/RhoLog.h"
-
-namespace rho {
-namespace net {
-
-class CNetRequestImpl;
-class CNetRequest : public INetRequest
-{
-    DEFINE_LOGCLASS;
-    boolean m_bCancel;
-    boolean m_sslVerifyPeer;
-public:
-    CNetRequestImpl* m_pCurNetRequestImpl;
-
-    CNetRequest(void) : m_pCurNetRequestImpl(null), m_bCancel(false), m_sslVerifyPeer(true) {}
-    virtual ~CNetRequest(void){}
-
-    virtual INetResponse* pullData(const String& strUrl, IRhoSession* oSession );
-    virtual INetResponse* pushData(const String& strUrl, const String& strBody, IRhoSession* oSession);
-    virtual INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
-    virtual INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
-
-    virtual INetResponse* pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
-    virtual INetResponse* pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession);
-
-    virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
-
-    virtual boolean sslVerifyPeer() {return m_sslVerifyPeer;}
-    virtual void sslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
-
-    virtual String resolveUrl(const String& strUrl);
-
-    virtual void cancel();
-    virtual boolean isCancelled(){return m_bCancel;}
-
-protected:
-};
-
-}
-}
-
-extern "C" int rho_net_has_network();