ruboto-core 0.3.3 → 0.4.0

data/assets/src/RubotoActivity.java

@@ -2,144 +2,104 @@ package THE_PACKAGE;
 
 import java.io.IOException;
 
-import org.jruby.Ruby;
-import org.jruby.embed.ScriptingContainer;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.javasupport.util.RuntimeHelpers;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.ruboto.Script;
 
 import android.app.ProgressDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private ScriptingContainer __ruby__;
-  private String scriptName;
-  private String rubyClassName;
-  private Object rubyInstance;
-  private int splash = 0;
-  private String remoteVariable = "";
-  public Object[] args;
-  private ProgressDialog loadingDialog; 
+    private String scriptName;
+    private String remoteVariable = null;
+    private Object[] args;
+    private Bundle configBundle;
 
 THE_CONSTANTS
-  private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
 
-  private ScriptingContainer getRuby() {
-    if (__ruby__ == null) {
-        __ruby__ = Script.getRuby();
+    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
 
-        if (__ruby__ == null) {
-          Script.setUpJRuby(this);
-          __ruby__ = Script.getRuby();
-        }
+    public void setCallbackProc(int id, Object obj) {
+        callbackProcs[id] = obj;
     }
-
-    return __ruby__;
-  }
-
-  public void setCallbackProc(int id, IRubyObject obj) {
-    callbackProcs[id] = obj;
-  }
 	
-  public THE_RUBOTO_CLASS setRemoteVariable(String var) {
-    remoteVariable = ((var == null) ? "" : (var + "."));
-    return this;
-  }
+    public THE_RUBOTO_CLASS setRemoteVariable(String var) {
+        remoteVariable = var;
+        return this;
+    }
 
-  public void setSplash(int a_res){
-    splash = a_res;
-  }
+    public String getRemoteVariableCall(String call) {
+        return (remoteVariable == null ? "" : (remoteVariable + ".")) + call;
+    }
 
-  public void setScriptName(String name){
-    scriptName = name;
-  }
+    public void setScriptName(String name) {
+        scriptName = name;
+    }
 
-  /****************************************************************************************
-   * 
-   *  Activity Lifecycle: onCreate
-   */
+    /****************************************************************************************
+     *
+     *  Activity Lifecycle: onCreate
+     */
 	
-  @Override
-  public void onCreate(android.os.Bundle arg0) {
-    args = new Object[1];
-    args[0] = arg0;
-
-    android.os.Bundle configBundle = getIntent().getBundleExtra("RubotoActivity Config");
-
-    if (configBundle != null && configBundle.containsKey("Theme")) {
-      setTheme(configBundle.getInt("Theme"));
-    }
+    @Override
+    public void onCreate(Bundle bundle) {
+        args = new Object[1];
+        args[0] = bundle;
+
+        configBundle = getIntent().getBundleExtra("RubotoActivity Config");
+
+        if (configBundle != null) {
+            if (configBundle.containsKey("Theme")) {
+                setTheme(configBundle.getInt("Theme"));
+            }
+            if (configBundle.containsKey("Script")) {
+                if (this.getClass().getName() == RubotoActivity.class.getName()) {
+                    setScriptName(configBundle.getString("Script"));
+                } else {
+                    throw new IllegalArgumentException("Only local Intents may set script name.");
+                }
+            }
+        }
 
-    super.onCreate(arg0);
+        super.onCreate(bundle);
     
-    if (Script.getRuby() != null) {
-      backgroundCreate();
-    	finishCreate();
-    } else {
-      if (splash == 0) {
-        loadingDialog = ProgressDialog.show(this, null, "Loading...", true, false);
-      } else {
-        requestWindowFeature(android.view.Window.FEATURE_NO_TITLE);
-        setContentView(splash);
-      }
-      loadingThread.start();
+        if (Script.isInitialized()) {
+            prepareJRuby();
+    	    loadScript();
+        }
     }
-  }
-
-  private final Handler loadingHandler = new Handler();
-  
-  private final Thread loadingThread = new Thread() {
-      public void run(){
-        backgroundCreate();
-        loadingHandler.post(loadingComplete);
-      }
-  };
-  
-  private final Runnable loadingComplete = new Runnable(){
-    public void run(){
-      if (loadingDialog != null) loadingDialog.dismiss();
-      finishCreate();
-      onStart();
-      onResume();
+
+    // This causes JRuby to initialize and takes while
+    protected void prepareJRuby() {
+        Script.put("$activity", this);
+        Script.put("$bundle", args[0]);
     }
-  };
-
-  private void backgroundCreate() {
-      getRuby().put("$activity", this);
-      getRuby().put("$bundle", args[0]);
-  }
-
-  private void finishCreate() {
-    android.os.Bundle configBundle = getIntent().getBundleExtra("RubotoActivity Config");
-
-    if (configBundle != null) {
-      setRemoteVariable(configBundle.getString("Remote Variable"));
-      if (configBundle.getBoolean("Define Remote Variable")) {
-        Script.defineGlobalVariable(configBundle.getString("Remote Variable"), this);
-        setRemoteVariable(configBundle.getString("Remote Variable"));
-      }
-      if (configBundle.getString("Initialize Script") != null) {
-        Script.execute(configBundle.getString("Initialize Script"));
-      }
-      Script.execute(remoteVariable + "on_create($bundle)");
-    } else {
-      try {
-          new Script(scriptName).execute();
-          /* TODO(uwe): Add a way to add callbacks from a class or just forward all calls to the instance
-          rubyClassName = this.getClass().getSimpleName();
-          if (getRuby().get(rubyClassName) != null) {
-  		    rubyInstance = Script.exec(rubyClassName + ".new");
-  		    getRuby().callMethod(rubyInstance, "on_create", configBundle);
-          }
-          */
-      } catch(IOException e){
-        e.printStackTrace();
-        ProgressDialog.show(this, "Script failed", "Something bad happened", true, true);
-      }
+
+    protected void loadScript() {
+        try {
+            if (scriptName != null) {
+                new Script(scriptName).execute();
+            } else if (configBundle != null && configBundle.getString("Remote Variable") != null) {
+                setRemoteVariable(configBundle.getString("Remote Variable"));
+                if (configBundle.getBoolean("Define Remote Variable")) {
+                    Script.put(remoteVariable, this);
+                }
+                if (configBundle.getString("Initialize Script") != null) {
+                    Script.execute(configBundle.getString("Initialize Script"));
+                }
+                Script.execute(getRemoteVariableCall("on_create($bundle)"));
+            } else {
+                throw new RuntimeException("Neither script name nor remote variable was set.");
+            }
+        } catch(IOException e){
+            e.printStackTrace();
+            ProgressDialog.show(this, "Script failed", "Something bad happened", true, true);
+        }
     }
-  }
 
   /****************************************************************************************
    * 
@@ -147,5 +107,5 @@ THE_CONSTANTS
    */
 
 THE_METHODS
-}	
 
+}

data/assets/src/RubotoBroadcastReceiver.java

@@ -2,69 +2,50 @@ package THE_PACKAGE;
 
 import java.io.IOException;
 
-import org.jruby.embed.ScriptingContainer;
-import org.jruby.runtime.builtin.IRubyObject;
-
 public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private ScriptingContainer __ruby__;
-  private String scriptName;
-  private String remoteVariable = "";
-  public Object[] args;
+    private String scriptName;
+    private String remoteVariable = "";
 
 THE_CONSTANTS
-  private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
-
-  private ScriptingContainer getRuby() {
-    if (__ruby__ == null) {
-        __ruby__ = Script.getRuby();
-    }
-
-    return __ruby__;
-  }
-
-  public void setCallbackProc(int id, IRubyObject obj) {
-    callbackProcs[id] = obj;
-  }
-	
-  public THE_RUBOTO_CLASS setRemoteVariable(String var) {
-    remoteVariable = ((var == null) ? "" : (var + "."));
-    return this;
-  }
 
-  public void setScriptName(String name){
-    scriptName = name;
-  }
+    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
 
-  /****************************************************************************************
-   * 
-   *  Activity Lifecycle: onCreate
-   */
+    public void setCallbackProc(int id, Object obj) {
+        callbackProcs[id] = obj;
+    }
 	
-  @Override
-  public void onReceive(android.content.Context arg0, android.content.Intent arg1) {
-    args = new Object[2];
-    args[0] = arg0;
-    args[1] = arg1;
+    public THE_RUBOTO_CLASS setRemoteVariable(String var) {
+        remoteVariable = ((var == null) ? "" : (var + "."));
+        return this;
+    }
 
-    getRuby();
+    public void setScriptName(String name){
+        scriptName = name;
+    }
 
-    Script.defineGlobalVariable("$broadcast_receiver", this);
-    Script.defineGlobalVariable("$broadcast_context", arg0);
-    Script.defineGlobalVariable("$broadcast_intent", arg1);
+    public THE_RUBOTO_CLASS(String scriptName) {
+        setScriptName(scriptName);
+        if (Script.isInitialized()) {
+            loadScript();
+        }
+    }
 
-    try {
-      new Script(scriptName).execute();
-    } catch(IOException e) {
-      e.printStackTrace();
+    protected void loadScript() {
+        Script.put("$broadcast_receiver", this);
+        try {
+            new Script(scriptName).execute();
+        } catch(IOException e) {
+            throw new RuntimeException("IOException loading broadcast receiver script", e);
+        }
     }
-  }
 
-  /****************************************************************************************
-   * 
-   *  Generated Methods
-   */
+    /****************************************************************************************
+     * 
+     *  Generated Methods
+     */
 
 THE_METHODS
+
 }	
 
 

data/assets/src/RubotoService.java

@@ -1,36 +1,19 @@
 package THE_PACKAGE;
 
-import org.jruby.Ruby;
-import org.jruby.javasupport.util.RuntimeHelpers;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.embed.ScriptingContainer;
-import org.jruby.exceptions.RaiseException;
 import org.ruboto.Script;
 import java.io.IOException;
 import android.app.ProgressDialog;
 
 public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private ScriptingContainer __ruby__;
   private String scriptName;
   private String remoteVariable = "";
   public Object[] args;
 
 THE_CONSTANTS
-  private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
 
-  private ScriptingContainer getRuby() {
-    if (__ruby__ == null) __ruby__ = Script.getRuby();
+  private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
 
-    if (__ruby__ == null) {
-      Script.setUpJRuby(this);
-      __ruby__ = Script.getRuby();
-    }
-
-    return __ruby__;
-  }
-
-  public void setCallbackProc(int id, IRubyObject obj) {
+  public void setCallbackProc(int id, Object obj) {
     callbackProcs[id] = obj;
   }
 	
@@ -54,14 +37,15 @@ THE_CONSTANTS
 
     super.onCreate();
 
-    getRuby();
-
-    Script.defineGlobalVariable("$service", this);
-
-    try {
-      new Script(scriptName).execute();
-    } catch(IOException e) {
-      e.printStackTrace();
+    if (Script.setUpJRuby(this)) {
+        Script.defineGlobalVariable("$service", this);
+        try {
+            new Script(scriptName).execute();
+        } catch(IOException e) {
+            e.printStackTrace();
+        }
+    } else {
+      // FIXME(uwe):  What to do if the Ruboto Core plarform cannot be found?
     }
   }
 
@@ -71,6 +55,7 @@ THE_CONSTANTS
    */
 
 THE_METHODS
-}	
+
+}