rhodes 2.0.0.rc1 → 2.0.0.rc2

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -304,11 +304,13 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				HEADER_SEARCH_PATHS = ../../shared;
 				INSTALL_PATH = /usr/local/lib;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rhosynclib;
+				SDKROOT = iphonesimulator3.2;
 			};
 			name = Debug;
 		};
@@ -326,7 +328,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rhosynclib;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 			};
 			name = Release;
 		};
@@ -338,9 +340,10 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator3.0;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -352,9 +355,10 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -366,9 +370,10 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Distribution;
@@ -387,7 +392,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rhosynclib;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 			};
 			name = Distribution;
 		};

data/platform/iphone/tcmalloc/tcmalloc.xcodeproj/project.pbxproj

@@ -287,7 +287,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = tcmalloc;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -306,7 +306,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = tcmalloc;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -321,7 +321,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator3.0;
+				SDKROOT = iphonesimulator3.2;
 			};
 			name = Debug;
 		};
@@ -334,7 +334,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 			};
 			name = Release;
 		};
@@ -347,7 +347,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 			};
 			name = Distribution;
 		};
@@ -365,7 +365,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = tcmalloc;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Distribution;

data/platform/shared/common/RhoFile.cpp

@@ -1,13 +1,6 @@
 #include "RhoFile.h"
 #include "common/StringConverter.h"
 
-#if defined(OS_WINCE)
-#include "wince/sys/types.h"
-#include "wince/sys/stat.h"
-#else
-#include <sys/stat.h>
-#endif
-
 namespace rho{
 namespace common{
 

data/platform/shared/common/RhoPort.h

@@ -8,6 +8,13 @@
 #include <windows.h>
 #include <time.h>
 
+#if defined(OS_WINCE)
+#include "ruby/wince/sys/types.h"
+#include "ruby/wince/sys/stat.h"
+#else
+#include <sys/stat.h>
+#endif
+
 #define LOG_NEWLINE "\r\n"
 #define LOG_NEWLINELEN 2
 
@@ -39,6 +46,7 @@ typedef unsigned __int64 uint64;
 #  include <string.h>
 #  include <pthread.h>
 #  include <fcntl.h>
+#  include <common/stat.h>
 
 #undef ASSERT
 #define ASSERT RHO_ASSERT
@@ -73,6 +81,5 @@ char* str_assign(char* data);
 #ifdef __cplusplus
 }
 #endif
-		
-	
+
 #endif //_RHOPORT_H_

data/platform/shared/common/RhodesApp.cpp

@@ -539,7 +539,7 @@ String CRhodesApp::canonicalizeRhoUrl(const String& strUrl)
 boolean CRhodesApp::sendLog() 
 {
     String strDevicePin = rho::sync::CClientRegister::getInstance() ? rho::sync::CClientRegister::getInstance()->getDevicePin() : "";
-	String strClientID = rho::sync::CSyncThread::getSyncEngine().loadClientID();
+	String strClientID = rho::sync::CSyncThread::getSyncEngine().readClientID();
 
     String strLogUrl = RHOCONF().getPath("logserver");
     if ( strLogUrl.length() == 0 )
@@ -559,7 +559,7 @@ boolean CRhodesApp::sendLog()
 
     if ( !resp.isOK() )
     {
-        LOG(ERROR) + "send_log failed : network error";
+        LOG(ERROR) + "send_log failed : network error - " + resp.getRespCode() + "; Body - " + resp.getCharData();
         return false;
     }
 

data/platform/shared/common/stat.h

@@ -0,0 +1,6 @@
+/*
+#if defined(__APPLE__) && !(defined(__DARWIN_ONLY_64_BIT_INO_T) && ___DARWIN_ONLY_64_BIT_INO_T)
+#define __DARWIN_ONLY_64_BIT_INO_T 1
+#endif
+*/
+#include <sys/stat.h>

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

@@ -58,7 +58,7 @@
 #endif
 
 #ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
+#include <common/stat.h>
 #endif
 
 #ifdef HAVE_SYS_TIME_H

data/platform/shared/json/json_util.c

@@ -26,7 +26,7 @@
 #endif /* HAVE_SYS_TYPES_H */
 
 #if HAVE_SYS_STAT_H
-#include <sys/stat.h>
+#include <common/stat.h>
 #endif /* HAVE_SYS_STAT_H */
 
 #if HAVE_FCNTL_H

data/platform/shared/net/CompatWince.cpp

@@ -1,5 +1,6 @@
-#include <windows.h>
-#include <time.h>
+//#include <windows.h>
+//#include <time.h>
+#include "common/RhoPort.h"
 #include "CompatWince.h"
 
 #ifdef _WIN32_WCE
@@ -284,7 +285,7 @@ static FILETIME *Convert_tm_To_FILETIME(struct tm *tm)
 	SystemTimeToFileTime(&System_Time, &File_Time);
 	return(&File_Time);
 }
-
+#if 0
 int
 _wstat(const WCHAR *path, struct stat *buffer)
 {
@@ -364,6 +365,7 @@ int stat(const char *path, struct stat *st)
 
 	return (_wstat(wbuf, (struct stat *) st));
 }
+#endif //0
 
 /*** strftime() from newlib libc/time/strftime.c ***/
 

data/platform/shared/net/CompatWince.h

@@ -20,7 +20,7 @@ void __WinCE_Errno_Thread_Exit(void);
 extern int *(*__WinCE_Errno_Pointer_Function)(void);
 
 #define	errno (*(*__WinCE_Errno_Pointer_Function)())
-
+/*
 struct stat {
 	unsigned long st_size;
 	unsigned long st_ino;
@@ -34,7 +34,7 @@ struct stat {
 	unsigned short st_gid;
 };
 
-int stat(const char *path, struct stat *st);
+int stat(const char *path, struct stat *st);   */
 
 #define _S_IFMT   0170000
 #define _S_IFDIR  0040000

data/platform/shared/net/HttpServer.cpp

@@ -6,7 +6,7 @@
 #include <algorithm>
 
 #if !defined(OS_WINCE)
-#include <sys/stat.h>
+#include <common/stat.h>
 #else
 #include "CompatWince.h"
 
@@ -706,7 +706,11 @@ bool CHttpServer::parse_startline(String const &line, String &method, String &ur
         if (*e != '\0')
             query.assign(s, e);
     }
-    
+
+    const char* frag = strrchr(uri.c_str(), '#');
+    if (frag)
+        uri = uri.substr(0, frag-uri.c_str());
+
     return true;
 }
 
@@ -758,7 +762,7 @@ bool CHttpServer::parse_route(String const &line, Route &route)
     
     if (*s == '/')
         ++s;
-    
+
     String aoi(actionorid_begin, actionorid_end);
     if (isid(aoi)) {
         route.id = aoi;
@@ -769,6 +773,10 @@ bool CHttpServer::parse_route(String const &line, Route &route)
         route.action = aoi;
     }
     
+	//const char* frag = strrchr(route.action.c_str(), '#');
+	//if (frag)
+	//	route.action = route.action.substr(0, frag-route.action.c_str());
+	
     return true;
 }
 

data/platform/shared/ruby/dir.c

@@ -15,7 +15,9 @@
 #include "ruby/encoding.h"
 
 #include <sys/types.h>
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

data/platform/shared/ruby/dln.c

@@ -56,7 +56,9 @@ void *xrealloc();
 #include "missing/file.h"
 #endif
 #include <sys/types.h>
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 
 #ifndef S_ISDIR
 #   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)

data/platform/shared/ruby/eval_intern.h

@@ -97,7 +97,9 @@ NORETURN(void _longjmp(jmp_buf, int));
 #include <sys/param.h>
 #endif
 
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 
 #define SAVE_ROOT_JMPBUF(th, stmt) do \
   if (ruby_setjmp((th)->root_jmpbuf) == 0) { \

data/platform/shared/ruby/file.c

@@ -56,7 +56,9 @@ int flock(int, int);
 #endif
 
 #include <sys/types.h>
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 
 #ifdef HAVE_SYS_MKDEV_H
 #include <sys/mkdev.h>

data/platform/shared/ruby/io.c

@@ -60,7 +60,9 @@
 # define off_t  long
 #endif
 
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 
 /* EMX has sys/param.h, but.. */
 #if defined(HAVE_SYS_PARAM_H) && !(defined(__EMX__) || defined(__HIUX_MPP__))

data/platform/shared/ruby/process.c

@@ -59,7 +59,9 @@ struct timeval rb_time_interval(VALUE);
 #undef HAVE_GETPGRP
 #endif
 
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 
 #ifdef HAVE_SYS_TIMES_H
 #include <sys/times.h>

data/platform/shared/ruby/random.c

@@ -186,7 +186,9 @@ genrand_real(struct MT *mt)
 #endif
 #include <time.h>
 #include <sys/types.h>
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

data/platform/shared/ruby/util.c

@@ -187,7 +187,9 @@ ruby_strtoul(const char *str, char **endptr, int base)
 }
 
 #include <sys/types.h>
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

data/platform/shared/rubyJVM/src/com/rho/RhoConf.java

@@ -269,10 +269,10 @@ public class RhoConf {
 		}
 
 		try{
-			strClientID = com.rho.sync.SyncThread.getSyncEngine().loadClientID();
+			strClientID = com.rho.sync.SyncThread.getSyncEngine().readClientID();
 		}catch(Exception exc)
 		{
-			LOG.ERROR("send_log:loadClientID failed", exc);
+			LOG.ERROR("send_log:readClientID failed", exc);
 		}
 		
 	    String strLogUrl = RhoConf.getInstance().getPath("logserver");
@@ -300,7 +300,8 @@ public class RhoConf {
 		
 		if ( resp == null || !resp.isOK() )
 		{
-			LOG.ERROR("send_log failed : network error");
+	        LOG.ERROR("send_log failed : network error - " + resp.getRespCode() + "; Body - " + resp.getCharData());
+			
 			return false;
 		}
 		

data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java

@@ -434,6 +434,20 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    }
 	}
 
+	public String readClientID()throws Exception
+	{
+	    String clientID = "";
+		
+		synchronized( m_mxLoadClientID )
+		{
+	        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info");
+	        if ( !res.isEnd() )
+	            clientID = res.getStringByIdx(0);
+		}
+		
+		return clientID;
+	}
+	
 	public String loadClientID()throws Exception
 	{
 	    String clientID = "";

data/platform/shared/sync/SyncEngine.cpp

@@ -320,6 +320,19 @@ void CSyncEngine::loadAllSources()
     }
 }
 
+String CSyncEngine::readClientID()
+{
+    String clientID = "";
+    synchronized(m_mxLoadClientID)
+    {
+        DBResult( res, getUserDB().executeSQL("SELECT client_id,reset from client_info limit 1") );
+        if ( !res.isEnd() )
+            clientID = res.getStringByIdx(0);
+    }
+
+    return clientID;
+}
+
 String CSyncEngine::loadClientID()
 {
     String clientID = "";

data/platform/shared/sync/SyncEngine.h

@@ -88,6 +88,7 @@ public:
     VectorPtr<CSyncSource*>& getSources(){ return m_sources; }
     int getStartSource();
     String loadClientID();
+    String readClientID();
     String requestClientIDByNet();
     boolean resetClientIDByNet(const String& strClientID);//throws Exception
     void doBulkSync();//throws Exception

data/platform/shared/unzip/unzip.cpp

@@ -26,7 +26,9 @@
 #define lumkdir(t) (mkdir(t,0755))
 #endif
 #include <sys/types.h>
-#include <sys/stat.h>
+/* RHO BEGIN */
+#include <common/stat.h>
+/* RHO END */
 #include "unzip.h"
 //
 typedef unsigned short WORD;

data/res/generators/templates/application/rhoconfig.txt

@@ -21,3 +21,6 @@ LastVisitedPage = ''
 # Sync server url. Typically this will look like 'http://<hostname>:<port>/application'
 # For example: 'http://localhost:9292/application'
 syncserver = '<%=syncserver%>'
+
+logserver = 'http://rhologs.heroku.com'
+logname='<%=@app_name%>'

data/rhodes.gemspec

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

data/spec/phone_spec/app/Spec/asynchttp_spec.rb

@@ -62,7 +62,9 @@ class AsyncHttpTest
         Test_equal(File.exists?(file_name), true)
 =end        
     end
-
+  
+# TODO: Fix this test!
+=begin
     def httpsget_test
         return unless $is_network_available
             
@@ -81,7 +83,7 @@ class AsyncHttpTest
         end    
         
     end
-
+=end
     def clear
         file_name = File.join(Rho::RhoApplication::get_base_app_path(), 'test.jpg')
         File.delete(file_name) if File.exists?(file_name)

data/spec/phone_spec/app/Spec/controller.rb

@@ -44,8 +44,8 @@ class SpecController < Rho::RhoController
                 testObj.send meth
             rescue Exception => e
                 @exc_count += 1
-                puts "  FAILED: '#{name}:#{meth}' failed: Error: #{e}"
-                puts "  #{e.backtrace[1]}" if e.backtrace && e.backtrace.length > 0
+                puts "FAIL: '#{name}:#{meth}' failed: Error: #{e}\n" + 
+                    "#{e.backtrace[1]}" if e.backtrace && e.backtrace.length > 0
                 #e.backtrace.each do |item|
                 #    puts item
                 #end

data/spec/phone_spec/app/Spec/json_spec.rb

@@ -69,6 +69,34 @@ class JsonTest
         
     end
     
+=begin
+    def webservice2_test
+        return unless $is_network_available
+            
+        res = Rho::AsyncHttp.get( :url => 'http://www.glutenfreechecklist.com/Mob_API/GetCat_MnfsList.aspx?checkListId=17&CategoryID=0&ManfName=&startindex=1&endindex=10' )
+        puts "res : #{res}"  
+        Test_equal(res['status'],'ok')
+        
+        parsed = res['body']
+        Test_equal( parsed.is_a?(Hash), true )
+        Test_equal( parsed["Manufacturer List"].is_a?(Array), true )    
+        
+        manf =  parsed["Manufacturer List"][10]["Manufacturer"]
+        puts "manf : #{manf}"
+        
+        url2 = "http://www.glutenfreechecklist.com/Mob_API/GetCat_MnfsList.aspx?checkListId=17&CategoryID=0&ManfName=" + 
+            Rho::RhoSupport.url_encode(manf) + "&startindex=1&endindex=10"
+        
+        res = Rho::AsyncHttp.get( :url => url2 )
+        puts "res : #{res}"  
+        Test_equal(res['status'],'ok')
+        
+        parsed = res['body']
+        Test_equal( parsed.is_a?(Hash), true )
+        Test_equal( parsed["Manufacturer List"].is_a?(Array), true )    
+        
+    end
+=end    
     def clear
     end
 end    

data/spec/phone_spec/app/Spec/rhofile_spec.rb

@@ -39,10 +39,10 @@ class RhoFileTest
         files = Dir.entries(dir_name)
         #puts "files: #{files}"
 	    dd = files.size - 2 #skip . and ..
-	    if  dd == 14
+	    if  dd == 2
 	        return "limit"
 	    else
-	        # if less than 14, save record of file in model Save, open a new file, write content to file.
+	        # if less than 2, save record of file in model Save, open a new file, write content to file.
             content = "TEST cache"
             content = File.new("#{f}", "w")
             content.write(content)
@@ -57,7 +57,7 @@ class RhoFileTest
         dir_name = Rho::RhoApplication::get_model_path('app', 'cache')
         Dir.mkdir(dir_name) unless Dir.exists?(dir_name)
         
-        (1..14).each do |n|
+        (1..2).each do |n|
             res = create_file_in_cache(dir_name, "cache_test", n.to_s())
             Test_equal( res, "saved" )
         end
@@ -65,13 +65,13 @@ class RhoFileTest
         res = create_file_in_cache(dir_name, "cache_test", "1")
         Test_equal( res, "exist" )
         
-        res = create_file_in_cache(dir_name, "cache_test", "15")
+        res = create_file_in_cache(dir_name, "cache_test", "3")
         Test_equal( res, "limit" )
         
     end
         
     def clear
-        (1..14).each do |n|
+        (1..2).each do |n|
     	    file_name = File.join(Rho::RhoApplication::get_model_path('app', 'cache'), "cache_test"+ n.to_s())
             File.delete(file_name) if File.exists?(file_name)
         end

data/spec/phone_spec/build.yml

@@ -1,6 +1,6 @@
 --- 
 name: phone_spec
-bbver: 4.6
+bbver: 5.1
 sdk: /Users/crystax/work/rhomobile/rhodes
 applog: rholog.txt
 version: 1.0.0
@@ -17,5 +17,8 @@ android:
   capabilities:
     - network_state
     - pim
-   
+
+capabilities:
+  - push
+     
 extensions: ["json", "rhoxml"]

data/spec/phone_spec/rhoconfig.txt

@@ -23,4 +23,8 @@ sync_poll_interval=0
 #syncserver = 'http://192.168.0.185:9292/apps/framework_spec/sources'
 #syncserver = 'http://dev.rhosync.rhohub.com/apps/Store/sources/'
 #syncserver = 'http://rhosyncnew.staging.rhohub.com/apps/store_server'
-syncserver = 'http://rhosyncnew.staging.rhohub.com/application'
+syncserver = 'http://rhosyncnew.staging.rhohub.com/application'
+
+activate_at_startup = 1
+logserver = 'http://rhologs.heroku.com'
+logname=phone_spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 977940590
+  hash: 977940591
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - rc1
-  version: 2.0.0.rc1
+  - rc2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Rhomobile
@@ -925,6 +925,7 @@ files:
 - platform/shared/common/RhoTime.h
 - platform/shared/common/SplashScreen.cpp
 - platform/shared/common/SplashScreen.h
+- platform/shared/common/stat.h
 - platform/shared/common/StringConverter.h
 - platform/shared/common/ThreadQueue.cpp
 - platform/shared/common/ThreadQueue.h