calatrava 0.6.3 → 0.6.4

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/CalatravaApplication.java

@@ -0,0 +1,87 @@
+package com.calatrava.bridge;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+
+public class CalatravaApplication extends Application
+{
+  private static String TAG = CalatravaApplication.class.getSimpleName();
+  private RhinoService rhino;
+
+  public void bootCalatrava(String appName)
+  {
+    rhino = new RhinoService(this);
+    try
+    {
+      PageRegistry.setSharedRegistry(new PageRegistry(appName, this, rhino));
+      PluginRegistry.setSharedRegistry(new PluginRegistry(appName, this, rhino));
+      AjaxRequestManager.setSharedManager(new AjaxRequestManager(this, rhino));
+
+      initBridge();
+    } catch (Exception e)
+    {
+      Log.wtf(TAG, "Unable to boot Calatrava.", e);
+    }
+  }
+
+  public void provideActivityContext(Context activityContext)
+  {
+    PageRegistry.sharedRegistry().updateContext(activityContext);
+    PluginRegistry.sharedRegistry().updateContext(activityContext);
+  }
+
+  public void launchFlow(String flow)
+  {
+    rhino.callJsFunction(flow);
+  }
+
+  private void initBridge()
+  {
+    AssetRepository assets = new AssetRepository(this);
+
+    BufferedReader loadFileReader = null;
+    try
+    {
+      rhino.initRhino(this);
+      // Load all the application JS
+      InputStream inputStream = this.getAssets().open("calatrava/load_file.txt");
+      loadFileReader = new BufferedReader(new InputStreamReader(inputStream), 8192);
+      KernelBridge bridge = new KernelBridge(assets, rhino);
+      String line;
+      while ((line = loadFileReader.readLine()) != null)
+      {
+        bridge.loadLibrary(line);
+      }
+
+    } catch (IOException e) {
+      Log.d(TAG, "LauncherActivity failed to start", e);
+    }
+    finally
+    {
+      if (loadFileReader != null)
+      {
+        try
+        {
+          loadFileReader.close();
+        }
+        catch(IOException e)
+        {
+          Log.e(TAG, "Unable to close load_file.txt", e);
+        }
+      }
+    }
+  }
+
+  public RhinoService getRhino()
+  {
+    return rhino;
+  }
+}

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PageRegistry.java

@@ -1,6 +1,5 @@
 package com.calatrava.bridge;
 
-import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -22,7 +21,7 @@ public class PageRegistry {
   public static String TAG = PageRegistry.class.getSimpleName();
   private static PageRegistry sharedRegistry;
 
-  private Context appContext;
+  private Context activityContext;
   private RhinoService rhino;
   private Map<String, Class<?>> pageFactories = new HashMap<String, Class<?>>();
   private Map<String, RegisteredPage> registeredPages = new HashMap<String, RegisteredPage>();
@@ -37,10 +36,9 @@ public class PageRegistry {
     sharedRegistry = shared;
   }
 
-  public PageRegistry(String appName, Context appContext, Application app, RhinoService rhino)
+  public PageRegistry(String appName, Context appContext, RhinoService rhino)
     throws IOException, URISyntaxException, ClassNotFoundException, NameNotFoundException
   {
-    this.appContext = appContext;
     this.rhino = rhino;
 
     // Find all the logical page classes in the app
@@ -48,6 +46,11 @@ public class PageRegistry {
     addPages(appName, appContext);
   }
 
+  public void updateContext(Context activityContext)
+  {
+    this.activityContext = activityContext;
+  }
+
   private void addPages(String packageName, Context context)
     throws IOException, URISyntaxException, ClassNotFoundException, NameNotFoundException
   {
@@ -74,7 +77,7 @@ public class PageRegistry {
     Log.d(TAG, "changePage('" + target + "')");
     Class activityClass = pageFactories.get(target);
     Log.d(TAG, "Activity to be started: " + activityClass.getSimpleName());
-    appContext.startActivity(new Intent(appContext, activityClass));
+    activityContext.startActivity(new Intent(activityContext, activityClass));
   }
 
   public void triggerEvent(String pageName, String event, String... extraArgs) {
@@ -84,21 +87,21 @@ public class PageRegistry {
   }
 
   public void displayWidget(String name, String options) {
-    appContext.sendBroadcast(new Intent("com.calatrava.widget").putExtra("name", name).putExtra("options", options));
+    activityContext.sendBroadcast(new Intent("com.calatrava.widget").putExtra("name", name).putExtra("options", options));
   }
 
   public void displayDialog(String dialogName) {
-    appContext.sendBroadcast(new Intent("com.calatrava.dialog").putExtra("name", dialogName));
+    activityContext.sendBroadcast(new Intent("com.calatrava.dialog").putExtra("name", dialogName));
   }
 
   public void alert(String message) {
     Log.d(TAG, "Broadcasting alert message: '" + message + "'");
-    appContext.sendBroadcast(new Intent("com.calatrava.alert").putExtra("message", message));
+    activityContext.sendBroadcast(new Intent("com.calatrava.alert").putExtra("message", message));
   }
 
   public void openUrl(String url) {
     Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-    appContext.startActivity(browser);
+    activityContext.startActivity(browser);
   }
 
   public void track(String pageName, String channel, String eventName, Object variables, Object properties) {

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PluginRegistry.java

@@ -19,7 +19,7 @@ public class PluginRegistry {
   public static String TAG = PluginRegistry.class.getSimpleName();
   private static PluginRegistry sharedRegistry;
 
-  private Context appContext;
+  private Context activityContext;
   private RhinoService rhino;
   private Map<String, RegisteredPlugin> registeredPlugins = new HashMap<String, RegisteredPlugin>();
   private Map<String, PluginCommand> installedCmds = new HashMap<String, PluginCommand>();
@@ -37,7 +37,6 @@ public class PluginRegistry {
   public PluginRegistry(String packageName, Context appContext, RhinoService rhino)
     throws IOException, URISyntaxException, ClassNotFoundException, NameNotFoundException
   {
-    this.appContext = appContext;
     this.rhino = rhino;
 
     // Find all the plugins to register in the app
@@ -58,9 +57,7 @@ public class PluginRegistry {
             Log.d(TAG, "Registering Calatrava plugin: " + pluginName);
             try
             {
-              RegisteredPlugin plugin = (RegisteredPlugin)toRegister.newInstance();
-              plugin.setContext(PluginRegistry.this, appContext);
-              registeredPlugins.put(pluginName, plugin);
+              registeredPlugins.put(pluginName, (RegisteredPlugin)toRegister.newInstance());
             }
             catch (Exception e)
             {
@@ -109,4 +106,13 @@ public class PluginRegistry {
   {
     rhino.callJsFunction("calatrava.inbound.invokePluginCallback", new String[] {callbackHandle, data.toString()});
   }
+
+  public void updateContext(Context activityContext)
+  {
+    this.activityContext = activityContext;
+    for (RegisteredPlugin plugin : registeredPlugins.values())
+    {
+      plugin.setContext(PluginRegistry.this, activityContext);
+    }
+  }
 }

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RegisteredActivity.java

@@ -11,16 +11,6 @@ public abstract class RegisteredActivity extends Activity {
 
   private RhinoService rhino;
   private RequestLoader spinner = new RequestLoader(this);
-  private ServiceConnection connection = new ServiceConnection() {
-    public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-      rhino = ((RhinoService.LocalBinder) iBinder).getService();
-      RegisteredActivity.this.onRhinoConnected(rhino);
-    }
-
-    public void onServiceDisconnected(ComponentName componentName) {
-
-    }
-  };
 
   private BroadcastReceiver receiver = new BroadcastReceiver() {
     @Override
@@ -39,8 +29,7 @@ public abstract class RegisteredActivity extends Activity {
   @Override
   protected void onCreate(Bundle availableData) {
     super.onCreate(availableData);
-    Intent serviceIntent = new Intent(this, RhinoService.class);
-    bindService(serviceIntent, connection, Context.BIND_AUTO_CREATE);
+    rhino = ((CalatravaApplication)getApplication()).getRhino();
   }
 
   @Override
@@ -60,7 +49,6 @@ public abstract class RegisteredActivity extends Activity {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    unbindService(connection);
   }
 
   public void triggerEvent(String event, String... extraArgs) {
@@ -71,11 +59,14 @@ public abstract class RegisteredActivity extends Activity {
     rhino.callJsFunction("calatrava.inbound.invokeCallback", args);
   }
 
-  protected abstract void onRhinoConnected(RhinoService rhino);
-
   protected abstract String getPageName();
 
   public abstract String getFieldValue(String field);
 
   public abstract void render(final String json);
+
+  public RhinoService getRhino()
+  {
+    return rhino;
+  }
 }

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RegisteredPlugin.java

@@ -3,7 +3,7 @@ package com.calatrava.bridge;
 import android.content.Context;
 import java.util.Map;
 
-interface RegisteredPlugin
+public interface RegisteredPlugin
 {
   void setContext(PluginRegistry registry, Context ctxt);
   void call(String method, Map<String, Object> args);

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RhinoService.java

@@ -1,8 +1,9 @@
 package com.calatrava.bridge;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.*;
+import android.app.Activity;
+import android.content.AbstractThreadedSyncAdapter;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
@@ -14,46 +15,43 @@ import java.lang.String;
 import java.lang.ThreadGroup;
 import java.util.concurrent.CountDownLatch;
 
-public class RhinoService extends Service {
+public class RhinoService {
   public static String TAG = RhinoService.class.getSimpleName();
 
   private Scriptable mScope;
   private JSEvalThread evaller = new JSEvalThread();
 
-  private final IBinder mBinder = new LocalBinder();
-  
   CountDownLatch countDownLatch = new CountDownLatch(1);
 
-  @Override
-  public IBinder onBind(Intent intent) {
-    return mBinder;
+  public RhinoService(android.content.Context activity) {
+    initRhino(activity);
   }
 
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    Log.d(TAG, "RhinoService created.");
-  }
-
-  public void initRhino() {
+  public void initRhino(android.content.Context homeContext) {
     Context ctxt = enterContext();
     try {
       mScope = ctxt.initStandardObjects();
 
-      Object wrappedRegistry = Context.javaToJS(PageRegistry.sharedRegistry(), mScope);
-      ScriptableObject.putProperty(mScope, "pageRegistry", wrappedRegistry);
-      ScriptableObject.putProperty(mScope, "pluginRegistry", Context.javaToJS(PluginRegistry.sharedRegistry(), mScope));
-      ScriptableObject.putProperty(mScope, "androidRuntime", this);
-
-      Object wrappedAjaxRequestManagerRegistry = Context.javaToJS(AjaxRequestManager.sharedManager(), mScope);
-      ScriptableObject.putProperty(mScope, "ajaxRequestManagerRegistry", wrappedAjaxRequestManagerRegistry);
-
-      evaller.start();
-      try {
+      ScriptableObject.putProperty(mScope,
+                                   "pageRegistry",
+                                   Context.javaToJS(PageRegistry.sharedRegistry(), mScope));
+      ScriptableObject.putProperty(mScope,
+                                   "pluginRegistry",
+                                   Context.javaToJS(PluginRegistry.sharedRegistry(), mScope));
+      ScriptableObject.putProperty(mScope,
+                                   "ajaxRequestManagerRegistry",
+                                   Context.javaToJS(AjaxRequestManager.sharedManager(), mScope));
+      ScriptableObject.putProperty(mScope,
+                                   "androidRuntime",
+                                   this);
+
+      if (!evaller.isAlive())
+        evaller.start();
+      try
+      {
         countDownLatch.await();
       } catch (InterruptedException e) {
-        Log.d(TAG, "Interrupted Exception when waiting for JSEvalThread");
-        e.printStackTrace();
+        Log.d(TAG, "Interrupted Exception when waiting for JSEvalThread", e);
       }
     } finally {
       Context.exit();
@@ -67,12 +65,6 @@ public class RhinoService extends Service {
     return ctxt;
   }
 
-  @Override
-  public void onDestroy() {
-    Log.d(TAG, "RhinoService destroyed.");
-    super.onDestroy();
-  }
-
   public void load(Reader source, String name) {
     evaller.load(source, name);
   }
@@ -101,12 +93,6 @@ public class RhinoService extends Service {
     evaller.callJsFunction(function, args);
   }
 
-  public class LocalBinder extends Binder {
-    public RhinoService getService() {
-      return RhinoService.this;
-    }
-  }
-
   class JSEvalThread extends Thread {
     private Handler handler;
     private Context ctxt;
@@ -183,7 +169,7 @@ public class RhinoService extends Service {
       String js = "calatrava.inbound.failureResponse('{0}', {1}, '{2}');"
           .replace("{0}", requestId)
           .replace("{1}", Integer.toString(statusCode))
-          .replace("{2}", responseBody);
+          .replace("{2}", responseBody.replace("'", "\\'"));
       dispatchJs(js);
     }
 

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/shell/WebViewActivity.java

@@ -5,12 +5,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Color;
+import android.os.Bundle;
 import android.util.Log;
 import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.calatrava.bridge.CalatravaApplication;
 import com.calatrava.bridge.RegisteredActivity;
 import com.calatrava.bridge.RhinoService;
 import com.calatrava.bridge.PageRegistry;
@@ -28,7 +30,6 @@ public abstract class WebViewActivity extends RegisteredActivity {
   private JSContainer jsContainer;
   private WebView webView;
   private boolean pageReady = false;
-  private RhinoService rhino;
 
   private BroadcastReceiver receiver = new BroadcastReceiver() {
     @Override
@@ -41,9 +42,10 @@ public abstract class WebViewActivity extends RegisteredActivity {
   };
 
   @Override
-  protected void onRhinoConnected(RhinoService rhino) {
-    this.rhino = rhino;
-    jsContainer = new JSContainer(rhino, getPageName());
+  protected void onCreate(Bundle data)
+  {
+    super.onCreate(data);
+    jsContainer = new JSContainer(getRhino(), getPageName());
     loadPage();
   }
 
@@ -52,10 +54,8 @@ public abstract class WebViewActivity extends RegisteredActivity {
     super.onResume();
 
     onPageLoadCompleted();
+    pageHasOpened();
 
-    if (rhino != null) {
-      pageHasOpened();
-    }
     registerReceiver(receiver, new IntentFilter("com.calatrava.dialog"));
   }
 
@@ -130,7 +130,6 @@ public abstract class WebViewActivity extends RegisteredActivity {
     webView.getSettings().setDomStorageEnabled(true);
     webView.setScrollBarStyle(webView.SCROLLBARS_OUTSIDE_OVERLAY);
     webView.setScrollbarFadingEnabled(true);
-    webView.setBackgroundColor(0xffffffff);
     webView.addJavascriptInterface(jsContainer, "container");
 
     webView.setWebViewClient(new WebViewClient() {

data/lib/calatrava/templates/ios/Podfile.calatrava

@@ -3,7 +3,7 @@ platform :ios, '5.0'
 xcodeproj '{{ project_name}}.xcodeproj'
 
 {{^dev?}}
-pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => 'ba10050a6f565d7ac10b541ffe6164174db11376'
+pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => '308c74a580e3408785be5fb50ac9254926c2654e'
 {{/dev?}}
 {{#dev?}}
 pod 'calatrava', :local => '../../../calatrava-ios'

data/lib/calatrava/templates/ios/src/AppDelegate.h

@@ -1,6 +1,11 @@
 #import <UIKit/UIKit.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+#import "CalatravaAppDelegate.h"
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate, CalatravaAppDelegate>
+{
+  int outstandingAjaxRequests;
+}
 
 @property (strong, nonatomic) UIWindow *window;
 @property (strong, nonatomic) UINavigationController *rootNavController;

data/lib/calatrava/templates/ios/src/AppDelegate.m

@@ -18,6 +18,8 @@
   self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
   [self.window addSubview:self.rootNavController.view];
   [self.window makeKeyAndVisible];
+  
+  outstandingAjaxRequests = 0;
 
   KernelBridge *kernel = [KernelBridge sharedKernel];
   [kernel startWith:self.rootNavController];
@@ -53,4 +55,22 @@
   // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
+- (void)ajaxRequestStarted:(AJAXConnection *)request
+{
+  ++outstandingAjaxRequests;
+  if (outstandingAjaxRequests == 1)
+  {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+  }
+}
+
+- (void)ajaxRequestCompleted:(AJAXConnection *)request
+{
+  --outstandingAjaxRequests;
+  if (outstandingAjaxRequests == 0)
+  {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+  }
+}
+
 @end

data/lib/calatrava/templates/kernel/app/calatrava.coffee

@@ -75,6 +75,15 @@ calatrava.bridge.pageObject = (pageName) ->
 
   calatrava.bridge.runtime.registerProxyForPage(proxyId, pageName)
 
+  after: (event, handler) ->
+    priorHandler = handlerRegistry[event]
+    if priorHandler?
+      handlerRegistry[event] = (args...) ->
+        priorHandler(args...)
+        handler(args...)
+    else
+      @bind(event, handler)
+
   bind: (event, handler) ->
     handlerRegistry[event] = handler
     calatrava.bridge.runtime.attachProxyEventHandler(proxyId, event)
@@ -153,11 +162,11 @@ calatrava.bridge.requests = (() ->
       failure: failure
 
   successfulResponse: (requestId, response) ->
-    successHandlersById[requestId](response)
+    successHandlersById[requestId](response) if successHandlersById[requestId]
     clearHandlers(requestId)
 
   failureResponse: (requestId, response) ->
-    failureHandlersById[requestId](response)
+    failureHandlersById[requestId](response) if failureHandlersById[requestId]
     clearHandlers(requestId)
 )()
 
@@ -194,9 +203,8 @@ calatrava.bridge.plugins = (() ->
     _.tap calatravaId(), (handle) ->
       callbacks[handle] = callback
 
-  invokeCallback: (handle, data) ->
-    callbacks[handle](data)
-    delete callbacks[handle]
+  invokeCallback: (handle, data) -> callbacks[handle](data)
+  deleteCallback: (handle) -> delete callbacks[handle]
 )()
 
 calatrava.bridge.plugin = (name, impl) ->

data/lib/calatrava/templates/kernel/plugins/alert.coffee

@@ -3,7 +3,10 @@ calatrava.alert = (message) ->
     message: message
 
 calatrava.confirm = (message, onOkExecute) ->
-  okCallbackHandle = calatrava.bridge.plugins.rememberCallback(onOkExecute)
+  okCallbackHandle = calatrava.bridge.plugins.rememberCallback () ->
+    calatrava.bridge.plugins.deleteCallback(okCallbackHandle)
+    onOkExecute()
+
   calatrava.bridge.plugins.call 'alert', 'displayConfirm',
     message: message
     okHandler: okCallbackHandle

data/lib/calatrava/templates/kernel/spec/converter/controller.converter.spec.coffee

@@ -33,5 +33,5 @@ describe 'converter controller', ->
       views.conversionForm.trigger 'convert'
 
     it 'should render the correctly converted amount', ->
-      expect(views.conversionForm.render).toHaveBeenCalledWith
+      expect(views.conversionForm.lastMessage()).toEqual
         out_amount: 96

data/lib/calatrava/templates/kernel/spec/stubView.coffee

@@ -2,15 +2,29 @@ stubView ?= {}
 
 stubView =
   create: (name) ->
+    lastMessage = null
+
     boundEvents: {}
     fieldValues: {}
-    trigger: (event) ->
-      @boundEvents[event]()
+    trigger: (event, args...) ->
+      @boundEvents[event](args...)
+
+    after: (event, handler) ->
+      priorHandler = @boundEvents[event]
+      if priorHandler?
+        @boundEvents[event] = (args...) ->
+          priorHandler(args...)
+          handler(args...)
+      else
+        @bind(event, handler)
 
     bind: (event, handler) ->
       @boundEvents[event] = handler
 
-    render: jasmine.createSpy("#{name} render")
+    render: (viewMessage) ->
+      lastMessage = viewMessage
+
+    lastMessage: () -> lastMessage
 
     fieldContains: (name, value) -> @fieldValues[name] = value
     get: (name, callback) ->

data/lib/calatrava/templates/package.json

@@ -8,7 +8,6 @@
     , "cucumber"      : "latest"
     , "jsdom"         : "latest"
     , "mime"          : "latest"
-    , "ws"            : "0.4.8"
     , "jasmine-node"  : "1.0.26"
     , "should"        : "*"
     , "jasmine-reporters" : "*"

data/lib/calatrava/templates/shell/pages/converter/page.conversionForm.coffee

@@ -32,5 +32,10 @@ calatrava.pageView.conversionForm = ->
     console.log('getting...', field)
     $page.find("#" + field).val()
 
-  show: -> console.log('showing...')
-  hide: -> console.log('hiding...')
+  show: ->
+    console.log('showing...')
+    $page.show()
+
+  hide: ->
+    console.log('hiding...')
+    $page.hide()

data/lib/calatrava/templates/web/app/source/bridge.coffee

@@ -48,25 +48,25 @@ calatrava.bridge.web.ajax = (options) ->
     data: options.body
     contentType: (() ->
       customHeaderTemp = {}
-      for key of options.customHeaders
+      for key of options.headers
         if key is "Content-Type"
-          contentTypeHeader = options.customHeaders[key]
+          contentTypeHeader = options.headers[key]
         else
-          customHeaderTemp[key] = options.customHeaders[key]
+          customHeaderTemp[key] = options.headers[key]
 
-      options.customHeaders = customHeaderTemp
+      options.headers = customHeaderTemp
       contentTypeHeader;
     )()
     beforeSend: (xhr) ->
-      if options.customHeaders
-        setCustomHeaders(xhr, options.customHeaders)
+      if options.headers
+        setCustomHeaders(xhr, options.headers)
       showLoader()
     success: (response) ->
       goToTop()
       options.success(response)
     error: () ->
       showLoader()
-      options.failure()
+      options.failure() if options.failure?
     complete: hideLoader
 
 calatrava.bridge.web.page = (pageName, proxyId) ->

data/lib/calatrava/templates/web/app/source/init.coffee

@@ -3,7 +3,7 @@ root.calatrava ?= {}
 calatrava = root.calatrava
 
 # Hide all the sub-pages when first launching the app
-$(document.ready) ->
+$(document).ready ->
   $('body > .container > .page').hide()
 
 window.onpopstate = (event) ->

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.6.3"
+  Version = "0.6.4"
 end