rhodes 1.4.1 → 1.4.2

data/platform/shared/common/RhodesApp.cpp

@@ -341,72 +341,78 @@ void CRhodesApp::initHttpServer()
 
 const char* CRhodesApp::getFreeListeningPort()
 {
-#ifdef OS_MACOSX
-    return "8080";
-#else
-    if ( m_strListeningPorts.length() > 0 )
-        return m_strListeningPorts.c_str();
-
-    int noerrors = 1;
-    LOG(INFO) + "Trying to get free listening port.";
-    
-    //get free port
-    int sockfd = -1;
-    struct sockaddr_in serv_addr = {0};
-    //struct hostent *server = {0};
-    //int result = -1;
-
-    if ( noerrors )
-    {
-        sockfd = socket(AF_INET, SOCK_STREAM, 0);
-        if ( sockfd < 0 )
-        {
-            LOG(WARNING) + ("Unable to open socket");
-            noerrors = 0;
-        }
-        
-        if ( noerrors )
-        {
-            //server = gethostbyname( "localhost" );
-
-            memset((void *) &serv_addr, 0, sizeof(serv_addr));
-            serv_addr.sin_family = AF_INET;
-            serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-            serv_addr.sin_port = htons(0);
-
-            if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) )
+	if ( m_strListeningPorts.length() > 0 )
+		return m_strListeningPorts.c_str();
+	
+	int noerrors = 1;
+	LOG(INFO) + "Trying to get free listening port.";
+	
+	//get free port
+	int sockfd = -1;
+	struct sockaddr_in serv_addr = {0};
+	//struct hostent *server = {0};
+	//int result = -1;
+	
+	if ( noerrors )
+	{
+		sockfd = socket(AF_INET, SOCK_STREAM, 0);
+		if ( sockfd < 0 )
+		{
+			LOG(WARNING) + ("Unable to open socket");
+			noerrors = 0;
+		}
+		
+		if ( noerrors )
+		{
+			//server = gethostbyname( "localhost" );
+			
+			memset((void *) &serv_addr, 0, sizeof(serv_addr));
+			serv_addr.sin_family = AF_INET;
+			serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+			serv_addr.sin_port = htons(8080);
+
+			if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) )
             {
-                LOG(WARNING) + "Unable to bind";
-                noerrors = 0;
+    			serv_addr.sin_port = htons(0);
+			    if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) )
+			    {
+				    LOG(WARNING) + "Unable to bind";
+				    noerrors = 0;
+			    }
             }
-            else
-            {
-                char buf[10] = {0};
-                /*socklen_t*/int length = sizeof( serv_addr );
-
-                getsockname( sockfd, (struct sockaddr *)&serv_addr, &length );
-                
-                sprintf(buf,"%d",ntohs(serv_addr.sin_port));
-                
-                m_strListeningPorts = buf;
-            }
-            //Clean up
+
+			if ( noerrors )
+			{
+				char buf[10] = {0};
+#ifdef OS_MACOSX
+				socklen_t
+#else				
+				int
+#endif				
+				length = sizeof( serv_addr );
+				
+				getsockname( sockfd, (struct sockaddr *)&serv_addr, &length );
+				
+				sprintf(buf,"%d",ntohs(serv_addr.sin_port));
+				
+				m_strListeningPorts = buf;
+			}
+			//Clean up
 #if defined(OS_ANDROID)
-            close(sockfd);
+			close(sockfd);
 #else
-            closesocket(sockfd);
-#endif
-        }
-
-    }
-
-    if ( !noerrors )
-        m_strListeningPorts = "8080";
-
-    LOG(INFO) + "Free listening port: " + m_strListeningPorts;
-
-    return m_strListeningPorts.c_str();
+			closesocket(sockfd);
 #endif
+		}
+		
+	}
+	
+	if ( !noerrors )
+		m_strListeningPorts = "8080";
+	
+	LOG(INFO) + "Free listening port: " + m_strListeningPorts;
+	
+	return m_strListeningPorts.c_str();
 }
 
 void CRhodesApp::initAppUrls() 
@@ -446,6 +452,11 @@ const String& CRhodesApp::getStartUrl()
     return m_strStartUrl;
 }
 
+const char* rho_rhodesapp_gethomeurl()
+{
+    return RHODESAPP().getHomeUrl().c_str();
+}
+
 const String& CRhodesApp::getOptionsUrl()
 {
     m_strOptionsUrl = canonicalizeRhoUrl( RHOCONF().getString("options_path") );
@@ -746,6 +757,11 @@ const char* rho_rhodesapp_getstarturl()
     return RHODESAPP().getStartUrl().c_str();
 }
 
+const char* rho_rhodesapp_gethomeurl()
+{
+	return RHODESAPP().getHomeUrl().c_str();
+}
+	
 const char* rho_rhodesapp_getoptionsurl()
 {
     return RHODESAPP().getOptionsUrl().c_str();

data/platform/shared/common/RhodesApp.h

@@ -66,6 +66,7 @@ public:
     const String& getOptionsUrl();
     const String& getCurrentUrl(int index = 0);
     const String& getFirstStartUrl();
+    const String& getHomeUrl(){ return m_strHomeUrl; }
 
     const String& getLoadingPagePath(){return m_strLoadingPagePath; }
     const String& getBlobsDirPath(){return m_strBlobsDirPath; }

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

@@ -13,7 +13,7 @@ extern void mapview_create(int nparams, char** params, int nannotations, char**
 	$1 = $3 = 0;
 	if (input_arr) {
 		VALUE main_keys_arr = rb_funcall($input, rb_intern("keys"), 0, NULL);
-		int mk,main_keys_len = RARRAY_LEN(main_keys_arr);		
+		int mk,main_keys_len = RARRAY_LEN(main_keys_arr);
 		for(mk=0; mk<main_keys_len; mk++) {
 			VALUE main_key = rb_ary_entry(main_keys_arr, mk);
 			VALUE main_data = rb_hash_aref($input,main_key);
@@ -33,52 +33,34 @@ extern void mapview_create(int nparams, char** params, int nannotations, char**
 						case T_STRING:
 							tmp = StringValuePtr(data);
 							break;
-						case T_TRUE:
-						case T_FALSE:
-						case T_SYMBOL:
-							val = rb_funcall(data, rb_intern("to_s"), 0, NULL);
-							tmp = StringValuePtr(val);
-							break;
 						case T_ARRAY:
 							{
 								int alen = RARRAY_LEN(data);
-							  	char **arr = (char **)malloc((alen+1)*sizeof(char*));
-							  	for(i=0;i<alen;i++) {
+								char **arr = (char **)malloc((alen+1)*sizeof(char*));
+								for(i=0;i<alen;i++) {
 									VALUE item = rb_ary_entry(data,i);
-									switch(TYPE(item)) {
-										case T_STRING:
-											tmp = StringValuePtr(item);
-											break;
-										case T_FLOAT:	
-										case T_RATIONAL:	
-										case T_SYMBOL:
-											val = rb_funcall(item, rb_intern("to_s"), 0, NULL);
-											tmp = StringValuePtr(val);
-											break;
-										default:
-											tmp = "";
-											break;
-									}
+									if (TYPE(item) != T_STRING)
+										item = rb_funcall(item, rb_intern("to_s"), 0, NULL);
+									tmp = StringValuePtr(item);
 									arr[i] = tmp;
-							  	}
+								}
 								arr[alen] = NULL;
 								tmp = (char*)arr;
 							}
 							break;
 						default:
-							tmp = NULL;
-							break;
+							val = rb_funcall(data, rb_intern("to_s"), 0, NULL);
+							tmp = StringValuePtr(val);
 					}
 					settings[arr_len++] = key_str;
 					settings[arr_len++] = tmp;
-				}	
+				}
 				
 				$1 = arr_len;
-				$2 = settings;			
-							
+				$2 = settings;
 			} else if (!strcmp(main_key_str,"annotations")) {
 				int arr_len = 0;
-			 	len = RARRAY_LEN(main_data);
+				len = RARRAY_LEN(main_data);
 				ret_val = (char **)malloc(6*len*sizeof(char*));
 				for(i=0; i<len; i++) {
 					char *lat, *lon, *addr, *title, *subtitle, *url;
@@ -93,20 +75,9 @@ extern void mapview_create(int nparams, char** params, int nannotations, char**
 						VALUE key = rb_ary_entry(keys_arr, j);
 						VALUE data = rb_hash_aref(hash,key);
 						char *key_str = StringValuePtr(key);
-						switch(TYPE(data)) {
-							case T_STRING:
-								tmp = StringValuePtr(data);
-								break;
-							case T_FLOAT:	
-							case T_RATIONAL:	
-							case T_SYMBOL:
-								val = rb_funcall(data, rb_intern("to_s"), 0, NULL);
-								tmp = StringValuePtr(val);
-								break;
-							default:
-								tmp = "";
-								break;
-						}
+						if (TYPE(data) != T_STRING)
+							data = rb_funcall(data, rb_intern("to_s"), 0, NULL);
+						tmp = StringValuePtr(data);
 						if (!strcmp(key_str,"latitude")) {
 							lat = tmp;
 						} else if (!strcmp(key_str, "longitude")) {
@@ -126,12 +97,11 @@ extern void mapview_create(int nparams, char** params, int nannotations, char**
 					ret_val[arr_len++] = addr;
 					ret_val[arr_len++] = title;
 					ret_val[arr_len++] = subtitle;
-					ret_val[arr_len++] = url;			
+					ret_val[arr_len++] = url;
 				} /* for(i=0; i<len; i++) */
 				
 				$3 = arr_len;
-				$4 = ret_val;			
-								
+				$4 = ret_val;
 			} /* if (!strcmp(key_str,"annotations")) */
 		} /* for(mk=0; mk<main_keys_len; mk++) */
 	} /* if (input_arr) */
@@ -144,4 +114,4 @@ extern void mapview_create(int nparams, char** params, int nannotations, char**
  free((void *) $4);
 }
 
-extern void create(int nparams, char** params, int nannotations, char** annotation);
+extern void create(int nparams, char** params, int nannotations, char** annotation);

data/platform/shared/ruby/ext/mapview/mapview_wrap.c

@@ -998,10 +998,10 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. */
 static VALUE swig_ruby_trackings;
-
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete = 0;
+
+/* Global variable that stores a reference to the ruby
+   hash table delete function. */
+static ID swig_ruby_hash_delete = 0;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
@@ -1011,9 +1011,9 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   swig_ruby_trackings = rb_hash_new();
   rb_gc_register_address(&swig_ruby_trackings);
   
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
+  /* Now store a reference to the hash table delete function
+     so that we only have to look it up once.*/
+  swig_ruby_hash_delete = rb_intern("delete");
 }
 
 /* Get a Ruby number to reference a pointer */
@@ -1631,7 +1631,7 @@ _wrap_create(int argc, VALUE *argv, VALUE self) {
     arg1 = arg3 = 0;
     if (input_arr) {
       VALUE main_keys_arr = rb_funcall(argv[0], rb_intern("keys"), 0, NULL);
-      int mk,main_keys_len = RARRAY_LEN(main_keys_arr);		
+      int mk,main_keys_len = RARRAY_LEN(main_keys_arr);
       for(mk=0; mk<main_keys_len; mk++) {
         VALUE main_key = rb_ary_entry(main_keys_arr, mk);
         VALUE main_data = rb_hash_aref(argv[0],main_key);
@@ -1651,32 +1651,15 @@ _wrap_create(int argc, VALUE *argv, VALUE self) {
             case T_STRING:
               tmp = StringValuePtr(data);
               break;
-            case T_TRUE:
-            case T_FALSE:
-            case T_SYMBOL:
-              val = rb_funcall(data, rb_intern("to_s"), 0, NULL);
-              tmp = StringValuePtr(val);
-              break;
             case T_ARRAY:
               {
                 int alen = RARRAY_LEN(data);
                 char **arr = (char **)malloc((alen+1)*sizeof(char*));
                 for(i=0;i<alen;i++) {
                   VALUE item = rb_ary_entry(data,i);
-                  switch(TYPE(item)) {
-                  case T_STRING:
-                    tmp = StringValuePtr(item);
-                    break;
-                    case T_FLOAT:	
-                    case T_RATIONAL:	
-                  case T_SYMBOL:
-                    val = rb_funcall(item, rb_intern("to_s"), 0, NULL);
-                    tmp = StringValuePtr(val);
-                    break;
-                  default:
-                    tmp = "";
-                    break;
-                  }
+                  if (TYPE(item) != T_STRING)
+                  item = rb_funcall(item, rb_intern("to_s"), 0, NULL);
+                  tmp = StringValuePtr(item);
                   arr[i] = tmp;
                 }
                 arr[alen] = NULL;
@@ -1684,16 +1667,15 @@ _wrap_create(int argc, VALUE *argv, VALUE self) {
               }
               break;
             default:
-              tmp = NULL;
-              break;
+              val = rb_funcall(data, rb_intern("to_s"), 0, NULL);
+              tmp = StringValuePtr(val);
             }
             settings[arr_len++] = key_str;
             settings[arr_len++] = tmp;
-          }	
+          }
           
           arg1 = arr_len;
-          arg2 = settings;			
-          
+          arg2 = settings;
         } else if (!strcmp(main_key_str,"annotations")) {
           int arr_len = 0;
           len = RARRAY_LEN(main_data);
@@ -1711,20 +1693,9 @@ _wrap_create(int argc, VALUE *argv, VALUE self) {
               VALUE key = rb_ary_entry(keys_arr, j);
               VALUE data = rb_hash_aref(hash,key);
               char *key_str = StringValuePtr(key);
-              switch(TYPE(data)) {
-              case T_STRING:
-                tmp = StringValuePtr(data);
-                break;
-                case T_FLOAT:	
-                case T_RATIONAL:	
-              case T_SYMBOL:
-                val = rb_funcall(data, rb_intern("to_s"), 0, NULL);
-                tmp = StringValuePtr(val);
-                break;
-              default:
-                tmp = "";
-                break;
-              }
+              if (TYPE(data) != T_STRING)
+              data = rb_funcall(data, rb_intern("to_s"), 0, NULL);
+              tmp = StringValuePtr(data);
               if (!strcmp(key_str,"latitude")) {
                 lat = tmp;
               } else if (!strcmp(key_str, "longitude")) {
@@ -1744,12 +1715,11 @@ _wrap_create(int argc, VALUE *argv, VALUE self) {
             ret_val[arr_len++] = addr;
             ret_val[arr_len++] = title;
             ret_val[arr_len++] = subtitle;
-            ret_val[arr_len++] = url;			
+            ret_val[arr_len++] = url;
           } /* for(i=0; i<len; i++) */
           
           arg3 = arr_len;
-          arg4 = ret_val;			
-          
+          arg4 = ret_val;
         } /* if (!strcmp(key_str,"annotations")) */
       } /* for(mk=0; mk<main_keys_len; mk++) */
     } /* if (input_arr) */

data/platform/shared/ruby/ext/system/system_properties.c

@@ -30,6 +30,8 @@ char* get_property(char* property) {
 			return "WINDOWS";
 #elif defined(__SYMBIAN32__)
 			return "SYMBIAN";
+#elif defined(OS_ANDROID)
+            return "ANDROID";
 #else
 			return "UNKNOWN";
 #endif			

data/res/generators/templates/application/Rakefile

@@ -1,3 +1,4 @@
+require 'yaml'
 
 unless File.exists? "build.yml"
   puts "Cannot find build.yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -2527,7 +2527,6 @@ files:
 - lib/test/syncdb.sqlite
 - LICENSE
 - LICENSING_OPTIONS
-- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
 - platform/android/build/libcurl_build.files
@@ -5727,7 +5726,6 @@ files:
 - res/generators/templates/spec/app/spec_runner.rb
 - res/generators/templates/spec/app/SpecRunner/controller.rb
 - res/generators/templates/spec/app/SpecRunner/index.erb
-- rhobuild.yml
 - rhobuild.yml.example
 - rhodes.gemspec
 - spec/framework_spec/app/Account/config.rb