rhodes 2.0.0.beta4 → 2.0.0.beta6

data/Manifest.txt

@@ -224,6 +224,7 @@ lib/framework/rhom.rb
 lib/framework/singleton.rb
 lib/framework/time.rb
 lib/framework/version.rb
+lib/rhodes/generator.rb
 lib/rhodes.rb
 lib/test/apps/rhoconfig.txt
 lib/test/framework_test.rb

data/lib/rhodes/generator.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../res/generators/rhogen'

data/platform/android/Rhodes/jni/src/webview.cpp

@@ -62,19 +62,16 @@ RHO_GLOBAL int rho_webview_active_tab()
 
 RHO_GLOBAL const char* rho_webview_execute_js(const char* js, int index)
 {
-    static std::string result;
-
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
     if (!cls) return NULL;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "executeJs", "(Ljava/lang/String;I)Ljava/lang/String;");
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "executeJs", "(Ljava/lang/String;I)V");
     if (!mid) return NULL;
 
-    jstring objJs = rho_cast<jstring>(js);
-    jstring str = (jstring)env->CallStaticObjectMethod(cls, mid, objJs, index);
+    jstring objJs = rho_cast<jstring>(env, js);
+    env->CallStaticObjectMethod(cls, mid, objJs, index);
     env->DeleteLocalRef(objJs);
-    result = rho_cast<std::string>(str);
-    return (char*)result.c_str();
+    return "";
 }
 
 RHO_GLOBAL void rho_webview_full_screen_mode(int enable)

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java

@@ -62,6 +62,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.ViewGroup.LayoutParams;
+import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -363,6 +364,16 @@ public class Rhodes extends Activity {
 				}
 				super.onProgressChanged(view, newProgress);
 			}
+			
+			@Override
+			public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
+				return false;
+			}
+			
+			@Override
+			public boolean onJsConfirm(WebView view, String url, String message, JsResult result) {
+				return false;
+			}
 		});
 
 		return w;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java

@@ -20,6 +20,7 @@
  */
 package com.rhomobile.rhodes;
 
+import android.net.Uri;
 import android.webkit.CookieManager;
 
 public class WebView {
@@ -85,7 +86,8 @@ public class WebView {
 		private String cookie;
 		
 		public SetCookieTask(String u, String c) {
-			url = u;
+			Uri uri = Uri.parse(u);
+			url = uri.getScheme() + "://" + uri.getHost() + "/" + uri.getPath();
 			cookie = c;
 		}
 		
@@ -135,15 +137,13 @@ public class WebView {
 		return 0;
 	}
 	
-	public static String executeJs(String js, int index) {
+	public static void executeJs(String js, int index) {
 		try {
 			Rhodes.performOnUiThread(new NavigateTask("javascript:" + js, index), false);
 		}
 		catch (Exception e) {
 			reportFail("executeJs", e);
 		}
-		
-		return "";
 	}
 	
 	public static void setCookie(String url, String cookie) {

data/platform/android/build/android.rake

@@ -709,7 +709,7 @@ namespace "build" do
         f.puts "public class NativeLibraries {"
         f.puts "  public static void load() {"
         f.puts "    // Load native .so libraries"
-        Dir.glob($extensionsdir + "/lib*.so").each do |lib|
+        Dir.glob($extensionsdir + "/lib*.so").reverse.each do |lib|
           libname = File.basename(lib).gsub(/^lib/, '').gsub(/\.so$/, '')
           f.puts "    System.loadLibrary(\"#{libname}\");"
         end

data/platform/android/build/androidcommon.rb

@@ -163,7 +163,7 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << "-Wl,-z,defs"
   args << "-shared"
   args << "-fPIC"
-  args << "-Wl,-soname,#{outname}"
+  args << "-Wl,-soname,#{File.basename(outname)}"
   args << "-o"
   args << outname
   args += objects
@@ -172,9 +172,12 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << "-Wl,-rpath-link=#{$ndksysroot}/usr/lib"
   args << "#{$ndksysroot}/usr/lib/libstdc++.so"
   args << "#{$ndksysroot}/usr/lib/libsupc++.so" unless USE_STLPORT
-  args << "#{$ndktools}/lib/gcc/arm-eabi/#{$ndkgccver}/libgcc.a"
+  libgccdir = File.join($ndktools, "lib/gcc/arm-eabi", $ndkgccver)
+  libgccdir = File.join(libgccdir, "interwork") if $ndkgccver == "4.2.1"
+  args << "#{libgccdir}/libgcc.a" if $ndkgccver != "4.2.1"
   args << "#{$ndksysroot}/usr/lib/libc.so"
   args << "#{$ndksysroot}/usr/lib/libm.so"
+  args << "#{libgccdir}/libgcc.a" if $ndkgccver == "4.2.1"
   cc_run($gccbin, args)
 end
 

data/platform/iphone/Classes/Rhodes.m

@@ -137,11 +137,15 @@ static Rhodes *instance = NULL;
 }
 
 - (void)setCookie:(NSString*)cookie forUrl:(NSString*)url {
-    [cookies setObject:cookie forKey:url];
+    NSURL *parsed = [NSURL URLWithString:url];
+    NSString *basicUrl = [NSString stringWithFormat:@"%@://%@/%@", parsed.scheme, parsed.host, parsed.path];
+    [cookies setObject:cookie forKey:basicUrl];
 }
 
 - (NSString*)cookie:(NSString*)url {
-    NSString *c = [cookies objectForKey:url];
+    NSURL *parsed = [NSURL URLWithString:url];
+    NSString *basicUrl = [NSString stringWithFormat:@"%@://%@/%@", parsed.scheme, parsed.host, parsed.path];
+    NSString *c = [cookies objectForKey:basicUrl];
     return c;
 }
 

data/platform/shared/json/JSONIterator.cpp

@@ -1,6 +1,7 @@
 #include "JSONIterator.h"
 
 #include "json/json.h"
+#include "ruby/ext/rho/rhoruby.h"
 
 #if defined(OS_WINCE) || defined (OS_WINDOWS)
 #define rho_atoi64 _atoi64
@@ -242,5 +243,70 @@ CJSONEntry CJSONEntry::getEntry(const char* name)const
     return CJSONEntry(obj);
 }
 
+/*static*/ String CJSONEntry::quoteValue(const String& strValue)
+{
+    int pos = 0, start_offset = 0;
+    unsigned char c;
+    String strRes = "\"";
+    const char* str = strValue.c_str();
+    do 
+    {
+        c = str[pos];
+        switch(c) {
+        case '\0':
+            break;
+        case '\b':
+        case '\n':
+        case '\r':
+        case '\t':
+        case '"':
+        case '\\':
+        case '/':
+            if(pos - start_offset > 0)
+                strRes.append(str + start_offset, pos - start_offset);
+
+            if(c == '\b') strRes.append( "\\b", 2 );
+            else if(c == '\n') strRes.append( "\\n", 2);
+            else if(c == '\r') strRes.append( "\\r", 2);
+            else if(c == '\t') strRes.append( "\\t", 2);
+            else if(c == '"') strRes.append( "\\\"", 2);
+            else if(c == '\\') strRes.append( "\\\\", 2);
+            else if(c == '/') strRes.append( "\\/", 2);
+
+            start_offset = ++pos;
+            break;
+        default:
+            if(c < ' ') 
+            {
+                if(pos - start_offset > 0)
+                    strRes.append( str + start_offset, pos - start_offset);
+
+                char buf[128];
+                int nSize = snprintf(buf, 128, "\\u00%c%c", json_hex_chars[c >> 4], json_hex_chars[c & 0xf]);
+                strRes.append(buf, nSize);
+
+                start_offset = ++pos;
+            }else 
+                pos++;
+        }
+    } while(c);
+
+    if ( strRes.length() == 1 )
+        return "\"" + strValue + "\"";
+
+    if ( pos - start_offset > 0 )
+        strRes.append( str + start_offset, pos - start_offset);
+
+    strRes.append("\"");
+    return strRes;
+}
+
 }
 }
+
+extern "C" VALUE rho_json_quote_value(VALUE v,VALUE str)
+{
+    rho::String strRes = rho::json::CJSONEntry::quoteValue(getStringFromValue(str));
+
+    return rho_ruby_create_string(strRes.c_str());
+}

data/platform/shared/json/JSONIterator.h

@@ -31,6 +31,8 @@ public:
     CJSONEntry getEntry(const char* name)const;
 
     struct json_object* getObject()const{ return m_object; }
+
+    static String quoteValue(const String& strValue);
 };
 
 class CJSONArrayIterator

data/platform/shared/json/RJSONTokener.c

@@ -580,4 +580,4 @@ VALUE rho_json_parse(VALUE v,VALUE str)
         free(szError);
 
     return rho_ruby_get_NIL();
-}
+}

data/platform/shared/ruby/ext/rho/rhosupport.c

@@ -545,6 +545,7 @@ static void Init_RhoLog(){
 static VALUE rb_RhoModule;
 static VALUE rb_RhoJSON;
 extern VALUE rho_json_parse(VALUE,VALUE);
+extern VALUE rho_json_quote_value(VALUE,VALUE);
 static void Init_RhoJSON()
 {
 
@@ -554,6 +555,7 @@ static void Init_RhoJSON()
     rb_RhoJSON = rb_define_class_under(rb_RhoModule, "JSON", rb_cObject);
 
     rb_define_singleton_method(rb_RhoJSON, "parse", rho_json_parse, 1);
+    rb_define_singleton_method(rb_RhoJSON, "quote_value", rho_json_quote_value, 1);
 }
 
 const char* rho_ruby_internal_getMessageText(const char* szName)

data/platform/shared/ruby/thread_pthread.c

@@ -17,6 +17,9 @@
 #include <sys/resource.h>
 #endif
 
+void *rho_nativethread_start();
+void rho_nativethread_end(void *arg);
+
 /*static*/ void native_mutex_lock(pthread_mutex_t *lock);
 /*static*/ void native_mutex_unlock(pthread_mutex_t *lock);
 static int native_mutex_trylock(pthread_mutex_t *lock);
@@ -350,8 +353,10 @@ thread_start_func_1(void *th_ptr)
 	rb_thread_t *th = th_ptr;
 	VALUE stack_start;
 
+  void *p = rho_nativethread_start();
 	/* run */
 	thread_start_func_2(th, &stack_start, rb_ia64_bsp());
+  rho_nativethread_end(p);
     }
 #if USE_THREAD_CACHE
     if (1) {

data/platform/shared/rubyJVM/src/com/rho/rjson/RJSONTokener.java

@@ -225,6 +225,23 @@ public class RJSONTokener extends JSONTokener
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 				}
 			}
+		});
+		
+		klass.getSingletonClass().defineMethod("quote_value", new RubyOneArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block )
+			{
+				try {
+					String str = arg.toStr();
+					
+					String strRes = JSONObject.quote(str);
+					
+					return ObjectFactory.createString(strRes);
+				} catch(Exception e) {
+					LOG.ERROR("parse failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
 		});		
+		
 	}    
 }

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

@@ -26,6 +26,11 @@ class JSONEntry
 		return m_object.has(name);
 	}
 	
+	static String quoteValue(String str)
+	{
+		return JSONObject.quote(str);
+	}
+	
 	String getString(String name)throws JSONException
 	{
 	    String szRes = null;

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

@@ -272,7 +272,7 @@ class SyncSource
 
 	    m_arMultipartItems.removeAllElements();
 	    m_arBlobAttrs.removeAllElements();
-	    String strBody = "{\"source_name\":\"" + getName() + "\",\"client_id\":\"" + getSync().getClientID() + "\"";
+	    String strBody = "{\"source_name\":" + JSONEntry.quoteValue(getName()) + ",\"client_id\":" + JSONEntry.quoteValue(getSync().getClientID());
 	    boolean bSend = false;
 	    int i = 0;
 	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
@@ -289,7 +289,7 @@ class SyncSource
 	                if ( strBlobAttrs.length() > 0 )   
 	                    strBlobAttrs += ",";
 
-	                strBlobAttrs += "\"" + m_arBlobAttrs.elementAt(j) + "\"";
+	                strBlobAttrs += JSONEntry.quoteValue((String)m_arBlobAttrs.elementAt(j));
 	            }
 
 	            if ( strBlobAttrs.length() > 0 )
@@ -398,7 +398,7 @@ class SyncSource
 	            }
 
 	            bFirst = true;
-	            strBody += "\"" + strObject + "\"";
+	            strBody += JSONEntry.quoteValue(strObject);
 	            strCurObject = strObject;
 	        }
 	            
@@ -410,7 +410,7 @@ class SyncSource
 	            if ( bFirst )
 	                strBody += ":{";
 
-	            strBody += "\"" + strAttrib + "\":\"" + value + "\"";
+	            strBody += JSONEntry.quoteValue(strAttrib) + ":" + JSONEntry.quoteValue(value);
 	            bFirst = false;
 	        }
 	    }

data/platform/shared/sync/SyncSource.cpp

@@ -42,7 +42,7 @@ CSyncSource::CSyncSource(CSyncEngine& syncEngine, db::CDBAdapter& db  ) : m_sync
 
     m_nCurPageCount = 0;
     m_nInserted = 0;
-    m_nDeleted = 0;
+    m_nDeleted = 0;                                     
     m_nTotalCount = 0;
     m_bGetAtLeastOnePage = false;
 
@@ -176,7 +176,7 @@ void CSyncSource::doSyncClientChanges()
 
     m_arMultipartItems.removeAllElements();
     m_arBlobAttrs.removeAllElements();
-    String strBody = "{\"source_name\":\"" + getName() + "\",\"client_id\":\"" + getSync().getClientID() + "\"";
+    String strBody = "{\"source_name\":" + CJSONEntry::quoteValue(getName()) + ",\"client_id\":" + CJSONEntry::quoteValue(getSync().getClientID());
     boolean bSend = false;
     int i = 0;
     for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
@@ -193,7 +193,7 @@ void CSyncSource::doSyncClientChanges()
                 if ( strBlobAttrs.length() > 0 )   
                     strBlobAttrs += ",";
 
-                strBlobAttrs += "\"" + m_arBlobAttrs.elementAt(j) + "\"";
+                strBlobAttrs += CJSONEntry::quoteValue(m_arBlobAttrs.elementAt(j));
             }
 
             if ( strBlobAttrs.length() > 0 )
@@ -252,7 +252,7 @@ void CSyncSource::doSyncClientChanges()
     m_arMultipartItems.removeAllElements();
     m_arBlobAttrs.removeAllElements();
 }
-
+/*
 static void escapeDoubleQuotes(String& str)
 {
     const char* szQuote = strchr(str.c_str(), '\"');
@@ -265,7 +265,7 @@ static void escapeDoubleQuotes(String& str)
         else
             szQuote = 0;
     }
-}
+}*/
 
 //{"source_name":"SampleAdapter","client_id":1,"create":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
 //{"source_name":"SampleAdapter","client_id":1,"update":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
@@ -317,7 +317,7 @@ void CSyncSource::makePushBody_Ver3(String& strBody, const String& strUpdateType
             }
 
             bFirst = true;
-            strBody += "\"" + strObject + "\"";
+            strBody += CJSONEntry::quoteValue(strObject);
             strCurObject = strObject;
         }
             
@@ -329,8 +329,7 @@ void CSyncSource::makePushBody_Ver3(String& strBody, const String& strUpdateType
             if ( bFirst )
                 strBody += ":{";
 
-            escapeDoubleQuotes(value);
-            strBody += "\"" + strAttrib + "\":\"" + value + "\"";
+            strBody += CJSONEntry::quoteValue(strAttrib) + ":" + CJSONEntry::quoteValue(value);
             bFirst = false;
         }
     }

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.beta4'
+  s.version = '2.0.0.beta6'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - beta4
-  version: 2.0.0.beta4
+  - beta6
+  version: 2.0.0.beta6
 platform: ruby
 authors: 
 - Rhomobile
@@ -327,6 +327,7 @@ files:
 - lib/framework/singleton.rb
 - lib/framework/time.rb
 - lib/framework/version.rb
+- lib/rhodes/generator.rb
 - lib/rhodes.rb
 - lib/test/apps/rhoconfig.txt
 - lib/test/framework_test.rb