calatrava 0.5.0 → 0.6.0

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

@@ -0,0 +1,61 @@
+package com.calatrava.bridge;
+
+import com.calatrava.CalatravaPlugin;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.DialogInterface;
+import android.app.AlertDialog;
+
+import java.util.Map;
+
+@CalatravaPlugin(name = "alert")
+public class AlertPlugin implements RegisteredPlugin
+{
+  private PluginRegistry registry;
+  private Context ctxt;
+  private String currentOkCallbackHandle;
+  
+  public void setContext(PluginRegistry registry, Context ctxt)
+  {
+    this.registry = registry;
+    this.ctxt = ctxt;
+    registry.installCommand("alert", new PluginCommand() {
+        @Override
+        public void execute(Intent action, RegisteredActivity frontmost)
+        {
+          AlertDialog.Builder builder = new AlertDialog.Builder(frontmost);
+          final boolean isConfirmDialog = action.getExtras().getString("method").equals("displayConfirm");
+          builder.setMessage(action.getExtras().getString("message"))
+            .setCancelable(isConfirmDialog)
+            .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                  dialogInterface.dismiss();
+                  if (isConfirmDialog) {
+                    AlertPlugin.this.registry.invokeCallback(currentOkCallbackHandle, 1);
+                  }
+                }
+              });
+          if (isConfirmDialog) {
+            builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                  dialogInterface.dismiss();
+                }
+              });
+          }
+          AlertDialog dialog = builder.create();
+          dialog.show();
+        }
+      });
+  }
+  
+  public void call(String method, Map<String, Object> args)
+  {
+    currentOkCallbackHandle = (String)args.get("okHandler");
+    ctxt.sendBroadcast(registry.pluginCommand("alert")
+                       .putExtra("method", method)
+                       .putExtra("message", (String)args.get("message")));
+  }
+}

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

@@ -0,0 +1,71 @@
+package com.calatrava.bridge;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.pm.PackageManager.NameNotFoundException;
+
+import dalvik.system.DexFile;
+import dalvik.system.PathClassLoader;
+import dalvik.system.DexClassLoader;
+
+import java.lang.annotation.Annotation;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+public class AnnotationRegistrar
+{
+  private String packageName;
+  private HashSet<String> searchScope = new HashSet<String>();
+  private Context context;
+
+  public AnnotationRegistrar(String packageName, Context context, String... searchScope)
+  {
+    this.packageName = packageName;
+    this.context = context;
+    
+    this.searchScope.add(this.packageName);
+    for (String pkg : searchScope)
+    {
+      this.searchScope.add(pkg);
+    }
+  }
+
+  public void register(Registration receiver)
+    throws IOException, URISyntaxException, ClassNotFoundException, NameNotFoundException
+  {
+    String apkName = context.getPackageManager().getApplicationInfo(packageName, 0).sourceDir;
+    DexFile dexFile = new DexFile(apkName);
+    PathClassLoader pathBasedLoader = new PathClassLoader(apkName, Thread.currentThread().getContextClassLoader());
+    DexClassLoader classLoader = new DexClassLoader(apkName, new ContextWrapper(context).getCacheDir().getAbsolutePath(), null, pathBasedLoader);
+
+    Enumeration<String> entries = dexFile.entries();
+    while (entries.hasMoreElements())
+    {
+      String entry = entries.nextElement();
+      boolean inScope = false;
+      Iterator<String> it = searchScope.iterator();
+      while (!inScope && it.hasNext())
+      {
+        if (entry.startsWith(it.next()))
+        {
+          inScope = true;
+        }
+      }
+      if (inScope)
+      {
+        Class<?> entryClass = classLoader.loadClass(entry);
+        if (entryClass != null)
+        {
+          Annotation[] annotations = entryClass.getAnnotations();
+          for (Annotation annotation : annotations)
+          {
+            receiver.install(annotation, entryClass);
+          }
+        }
+      }               
+    }
+  }
+}

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

@@ -12,12 +12,11 @@ public class KernelBridge {
     this.rhinoService = rhinoService;
 
     //load js libraries
-    loadLibrary("hybrid/scripts/underscore.js");
+    loadLibrary("calatrava/scripts/underscore.js");
 
     //load bridge
-    loadLibrary("hybrid/scripts/env.js");
-    loadLibrary("hybrid/scripts/bridge.js");
-    loadLibrary("hybrid/scripts/calatrava.js");
+    loadLibrary("calatrava/scripts/env.js");
+    loadLibrary("calatrava/scripts/bridge.js");
   }
 
   public void loadLibrary(String libraryName) throws IOException {

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

@@ -28,6 +28,7 @@ public class Launcher {
       {
         rhino = ((RhinoService.LocalBinder) iBinder).getService();
         PageRegistry.setSharedRegistry(new PageRegistry(appName, appContext, application, rhino));
+        PluginRegistry.setSharedRegistry(new PluginRegistry(appName, appContext, rhino));
         AjaxRequestManager.setSharedManager(new AjaxRequestManager(appContext, rhino));
         initBridge();
         startUp.run();
@@ -71,7 +72,7 @@ public class Launcher {
       Log.d(TAG, "About to load and start kernel");
       // Load all the application JS
       KernelBridge bridge = new KernelBridge(assets, rhino);
-      BufferedReader loadFileReader = new BufferedReader(new InputStreamReader(appContext.getAssets().open("hybrid/load_file.text")), 8192);
+      BufferedReader loadFileReader = new BufferedReader(new InputStreamReader(appContext.getAssets().open("calatrava/load_file.txt")), 8192);
       String line = null;
       while ((line = loadFileReader.readLine()) != null)
       {

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

@@ -3,7 +3,6 @@ package com.calatrava.bridge;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
-import android.content.ContextWrapper;
 import android.net.Uri;
 import android.util.Log;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -17,10 +16,6 @@ import java.util.*;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import dalvik.system.DexFile;
-import dalvik.system.PathClassLoader;
-import dalvik.system.DexClassLoader;
-
 import java.lang.annotation.Annotation;
 
 public class PageRegistry {
@@ -56,34 +51,18 @@ public class PageRegistry {
   private void addPages(String packageName, Context context)
     throws IOException, URISyntaxException, ClassNotFoundException, NameNotFoundException
   {
-    String apkName = context.getPackageManager().getApplicationInfo(packageName, 0).sourceDir;
-    DexFile dexFile = new DexFile(apkName);
-    PathClassLoader classLoader2 = new PathClassLoader(apkName, Thread.currentThread().getContextClassLoader());
-    DexClassLoader classLoader = new DexClassLoader(apkName, new ContextWrapper(context).getCacheDir().getAbsolutePath(), null, classLoader2);
-
-    Enumeration<String> entries = dexFile.entries();
-    while (entries.hasMoreElements())
-    {
-      String entry = entries.nextElement();
-      // only check items that exist in source package and not in libraries, etc.
-      if (entry.startsWith(packageName))
-      {
-        Class<?> entryClass = classLoader.loadClass(entry);
-        if (entryClass != null)
+    AnnotationRegistrar registrar = new AnnotationRegistrar(packageName, context);
+    registrar.register(new Registration() {
+        public void install(Annotation annotation, Class<?> toRegister)
         {
-          Annotation[] annotations = entryClass.getAnnotations();
-          for (Annotation annotation : annotations)
+          if (annotation instanceof CalatravaPage)
           {
-            if (annotation instanceof CalatravaPage)
-            {
-              String pageName = ((CalatravaPage)annotation).name();
-              Log.d(TAG, "Registering Calatrava page: " + pageName);
-              pageFactories.put(pageName, entryClass);
-            }
+            String pageName = ((CalatravaPage)annotation).name();
+            Log.d(TAG, "Registering Calatrava page: " + pageName);
+            pageFactories.put(pageName, toRegister);
           }
         }
-      }               
-    }
+    });
   }
 
   public void registerProxyForPage(String pageName, String proxyId) {

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

@@ -0,0 +1,8 @@
+package com.calatrava.bridge;
+
+import android.content.Intent;
+
+public interface PluginCommand
+{
+  void execute(Intent action, RegisteredActivity frontmost);
+}

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

@@ -0,0 +1,112 @@
+package com.calatrava.bridge;
+
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.content.pm.PackageManager.NameNotFoundException;
+
+import org.codehaus.jackson.map.ObjectMapper;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import com.calatrava.CalatravaPlugin;
+
+public class PluginRegistry {
+  public static String TAG = PluginRegistry.class.getSimpleName();
+  private static PluginRegistry sharedRegistry;
+
+  private Context appContext;
+  private RhinoService rhino;
+  private Map<String, RegisteredPlugin> registeredPlugins = new HashMap<String, RegisteredPlugin>();
+  private Map<String, PluginCommand> installedCmds = new HashMap<String, PluginCommand>();
+  private ObjectMapper jsonMapper = new ObjectMapper();
+
+  public static PluginRegistry sharedRegistry() {
+    return sharedRegistry;
+  }
+
+  public static void setSharedRegistry(PluginRegistry shared)
+  {
+    sharedRegistry = shared;
+  }
+
+  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
+    addPlugins(packageName, appContext);
+  }
+
+  private void addPlugins(String packageName, Context context)
+    throws IOException, URISyntaxException, ClassNotFoundException, NameNotFoundException
+  {
+    Log.d(TAG, "Searching for Calatrava plugins in '" + packageName + "'");
+    AnnotationRegistrar registrar = new AnnotationRegistrar(packageName, context, "com.calatrava.bridge");
+    registrar.register(new Registration() {
+        public void install(Annotation annotation, Class<?> toRegister)
+        {
+          if (annotation instanceof CalatravaPlugin)
+          {
+            String pluginName = ((CalatravaPlugin)annotation).name();
+            Log.d(TAG, "Registering Calatrava plugin: " + pluginName);
+            try
+            {
+              RegisteredPlugin plugin = (RegisteredPlugin)toRegister.newInstance();
+              plugin.setContext(PluginRegistry.this, appContext);
+              registeredPlugins.put(pluginName, plugin);
+            }
+            catch (Exception e)
+            {
+              Log.e(TAG, "Unable to instantiate plugin: " + pluginName, e);
+            }
+          }
+        }
+    });
+  }
+
+  public void installCommand(String cmd, PluginCommand handler)
+  {
+    installedCmds.put(cmd, handler);
+  }
+
+  public void runCommand(Intent intent, RegisteredActivity frontmost)
+  {
+    installedCmds.get(intent.getExtras().getString("command")).execute(intent, frontmost);
+  }
+
+  public Intent pluginCommand(String cmd)
+  {
+    return new Intent("com.calatrava.command").putExtra("command", cmd);
+  }
+
+  public void call(String plugin, String method, String argsJson)
+  {
+    try
+    {
+      if (registeredPlugins.get(plugin) != null)
+      {
+        registeredPlugins.get(plugin).call(method, jsonMapper.readValue(argsJson, Map.class));
+      }
+      else
+      {
+        Log.e(TAG, "No plugin registered: " + plugin);
+      }
+    }
+    catch (IOException e)
+    {
+      Log.e(TAG, "Unable to deserialize JSON for plugin args.", e);
+    }
+  }
+
+  public void invokeCallback(String callbackHandle, Object data)
+  {
+    rhino.callJsFunction("calatrava.inbound.invokePluginCallback", new String[] {callbackHandle, data.toString()});
+  }
+}

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

@@ -1,7 +1,6 @@
 package com.calatrava.bridge;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.*;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -31,18 +30,8 @@ public abstract class RegisteredActivity extends Activity {
         spinner.onLoadingStart();
       } else if (intent.getAction().endsWith("finish")) {
         spinner.onLoadingFinish();
-      } else {
-        AlertDialog.Builder builder = new AlertDialog.Builder(RegisteredActivity.this);
-        builder.setMessage(intent.getExtras().getString("message"))
-            .setCancelable(false)
-            .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialogInterface, int i) {
-                dialogInterface.dismiss();
-              }
-            });
-        AlertDialog dialog = builder.create();
-        dialog.show();
+      } else if (intent.getAction().equals("com.calatrava.command")) {
+        PluginRegistry.sharedRegistry().runCommand(intent, RegisteredActivity.this);
       }
     }
   };
@@ -59,7 +48,7 @@ public abstract class RegisteredActivity extends Activity {
     super.onResume();
     registerReceiver(receiver, new IntentFilter("com.calatrava.ajax.start"));
     registerReceiver(receiver, new IntentFilter("com.calatrava.ajax.finish"));
-    registerReceiver(receiver, new IntentFilter("com.calatrava.alert"));
+    registerReceiver(receiver, new IntentFilter("com.calatrava.command"));
   }
 
   @Override

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

@@ -0,0 +1,10 @@
+package com.calatrava.bridge;
+
+import android.content.Context;
+import java.util.Map;
+
+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/Registration.java

@@ -0,0 +1,8 @@
+package com.calatrava.bridge;
+
+import java.lang.annotation.Annotation;
+
+public interface Registration
+{
+  void install(Annotation annotation, Class<?> toRegister);
+}

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

@@ -42,6 +42,7 @@ public class RhinoService extends Service {
 
       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);

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

@@ -152,7 +152,7 @@ public abstract class WebViewActivity extends RegisteredActivity {
       }
     });
 
-    webView.loadUrl("file:///android_asset/hybrid/views/" + getPageName() + ".html");
+    webView.loadUrl("file:///android_asset/calatrava/views/" + getPageName() + ".html");
     pageHasOpened();
   }
 

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

@@ -2,4 +2,9 @@ platform :ios, '5.0'
 
 xcodeproj '{{ project_name}}.xcodeproj'
 
-pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios'
+{{^dev?}}
+pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => '7a57332b1bd74726240247f22d48dae89fdfce4a'
+{{/dev?}}
+{{#dev?}}
+pod 'calatrava', :local => '../../../calatrava-ios'
+{{/dev?}}

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

@@ -73,7 +73,7 @@
   } else if ([field isEqualToString:@"out_currency"]) {
     return [[_outCurrencyData objectAtIndex:[outCurrencyPicker selectedRowInComponent:0]] objectForKey:@"code"];
   } else if ([field isEqualToString:@"in_amount"]) {
-    return [NSNumber numberWithInt:[[inAmount text] integerValue]];
+    return [inAmount text];
   }
 }
 

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

@@ -18,7 +18,7 @@ calatrava.inbound =
     proxyPage = calatrava.bridge.pages.pageByProxyId(proxyId)
     proxyPage.fieldRead(getId, fieldValue)
 
-  successfulRespone: (requestId, response) ->
+  successfulResponse: (requestId, response) ->
     calatrava.bridge.requests.successfulResponse(requestId, response)
 
   failureResponse: (requestId, errorCode, response) ->
@@ -27,16 +27,16 @@ calatrava.inbound =
   fireTimer: (timerId) ->
     calatrava.bridge.timers.fireTimer(timerId)
 
-  invokeCallback: (widgetName) ->
-    extraArgs = _.map(_.toArray(arguments).slice(1), ((obj) -> obj.valueOf() if obj?))
-    calatrava.bridge.widgets.callback(widgetName).apply(this, extraArgs)
+  invokePluginCallback: (handle, data) ->
+    calatrava.bridge.plugins.invokeCallback(handle, data)
 
 calatrava.bridge.changePage = (target) ->
   calatrava.bridge.runtime.changePage(target)
   target
 
 calatrava.bridge.alert = (message) ->
-  calatrava.bridge.runtime.alert(message)
+  calatrava.bridge.log("WARN: calatrava.bridge.alert is deprecated. Please use calatrava.alert() instead.")
+  calatrava.alert(message)
 
 calatrava.bridge.openUrl = (url) ->
   calatrava.bridge.runtime.openUrl(url)
@@ -149,6 +149,8 @@ calatrava.bridge.requests = (() ->
       method: method
       body: bodyStr
       headers: customHeaders
+      success: success
+      failure: failure
 
   successfulResponse: (requestId, response) ->
     successHandlersById[requestId](response)
@@ -174,3 +176,28 @@ calatrava.bridge.timers = (() ->
   clearTimer: (timerId) ->
     delete callbacks[timerId]
 )()
+
+calatrava.bridge.plugins = (() ->
+  registered = {}
+  callbacks = {}
+
+  call: (pluginName, method, argMessage) ->
+    calatrava.bridge.runtime.callPlugin(pluginName, method, argMessage)
+
+  register: (pluginName, callback) ->
+    registered[pluginName] = callback
+
+  run: (pluginName, method, argMessage) ->
+    registered[pluginName](method, argMessage)
+
+  rememberCallback: (callback) ->
+    _.tap calatravaId(), (handle) ->
+      callbacks[handle] = callback
+
+  invokeCallback: (handle, data) ->
+    callbacks[handle](data)
+    delete callbacks[handle]
+)()
+
+calatrava.bridge.plugin = (name, impl) ->
+  calatrava.bridge.plugins.register(name, impl)

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

@@ -18,12 +18,19 @@ example.converter.controller = ({views, changePage, ajax}) ->
       enabled: c != unselectableCurrency
       selected: c == selectedCurrency
 
+  performConversion = (amount) ->
+    outRate = currencyRate[outCurrency]
+    inRate = currencyRate[inCurrency]
+    views.conversionForm.render
+      out_amount: (Math.round(amount * (outRate / inRate) * 100)) / 100
+
   convert = () ->
     views.conversionForm.get 'in_amount', (inAmount) ->
-      outRate = currencyRate[outCurrency]
-      inRate = currencyRate[inCurrency]
-      views.conversionForm.render
-        out_amount: (Math.round(inAmount * (outRate / inRate) * 100)) / 100
+      if inAmount == ""
+        calatrava.confirm "No amount to convert. Convert one instead?", (convertOne) ->
+          performConversion(1) if convertOne
+      else
+        performConversion(inAmount)
 
   views.conversionForm.bind 'convert', convert
 

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

@@ -0,0 +1,9 @@
+calatrava.alert = (message) ->
+  calatrava.bridge.plugins.call 'alert', 'displayAlert',
+    message: message
+
+calatrava.confirm = (message, onOkExecute) ->
+  okCallbackHandle = calatrava.bridge.plugins.rememberCallback(onOkExecute)
+  calatrava.bridge.plugins.call 'alert', 'displayConfirm',
+    message: message
+    okHandler: okCallbackHandle

data/lib/calatrava/templates/shell/layouts/single_page.haml

@@ -2,17 +2,17 @@
 %html
   %head
     -%w{reset app common device}.each do |filename|
-      %link(type="text/css" rel="stylesheet" media="all" href="file:///android_asset/hybrid/styles/#{filename}.css")
+      %link(type="text/css" rel="stylesheet" media="all" href="../styles/#{filename}.css")
 
     -%w{env zepto ICanHaz underscore calatrava bridge shell pageHelper}.each do |filename|
-      %script(type="text/javascript" src="file:///android_asset/hybrid/scripts/#{filename}.js")
+      %script(type="text/javascript" src="../scripts/#{filename}.js")
 
     :javascript
       $(document).ready(function() {
         window.batSignal = tw.batSignal();
       });
 
-    %script(src="file:///android_asset/hybrid/scripts/page.#{page_name}.js" type="text/javascript")
+    %script(src="../scripts/page.#{page_name}.js" type="text/javascript")
     :javascript
       $(document).ready(function() {
         window.#{page_name}View = calatrava.pageView.#{page_name}();

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

@@ -0,0 +1,13 @@
+calatrava.web ?= {}
+
+calatrava.web.alert = (method, {message, okHandler}) ->
+  if !message?
+    console.log("Unable to display alert.")
+
+  if method == 'displayAlert'
+    window.alert(message)
+  else if method == 'displayConfirm'
+    userPressedOk = window.confirm(message)
+    calatrava.bridge.runtime.invokePluginCallback(okHandler, userPressedOk)
+
+calatrava.bridge.runtime.registerPlugin 'alert', calatrava.web.alert

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

@@ -96,6 +96,7 @@ calatrava.bridge.runtime = (() ->
   pages = {}
   pagesNamed = {}
   currentPage = null
+  plugins = {}
 
   registerProxyForPage: (proxyId, pageName) ->
     pages[proxyId] = calatrava.bridge.web.page(pageName, proxyId)
@@ -123,4 +124,13 @@ calatrava.bridge.runtime = (() ->
 
   startTimerWithTimeout: (timerId, timeout) ->
     window.setTimeout((() -> calatrava.inbound.fireTimer(timerId)), timeout * 1000)
+
+  registerPlugin: (pluginName, callback) ->
+    plugins[pluginName] = callback
+
+  callPlugin: (plugin, method, args) ->
+    plugins[plugin](method, args)
+
+  invokePluginCallback: (handle, data) ->
+    calatrava.inbound.invokePluginCallback(handle, data)
 )()

data/lib/calatrava/templates/web/app/views/index.haml

@@ -1,16 +1,16 @@
 !!!
 %html
   %head
-    -%w{env zepto ICanHaz underscore calatrava bridge pageHelper}.each do |filename|
+    -%w{zepto ICanHaz underscore}.each do |filename|
       %script(type="text/javascript" src="scripts/#{filename}.js")
 
-    %script(type="text/javascript" src="scripts/init.js")
-    -# Load all feature JS files
-    = render_partial 'web/app/views/load_file'
+    - Calatrava::Project.current.mobile_web.scripts.each do |filename|
+      %script(type="text/javascript" src="#{filename}")
 
   %body
     %div#app_container.container
-      = render_page "converter/conversionForm"
+      - Calatrava::Project.current.mobile_web.haml_files.each do |hf|
+        = render_partial hf
 
   :javascript
     $(document).ready(function(){

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.5.0"
+  Version = "0.6.0"
 end

data/lib/calatrava.rb

@@ -1,5 +1,19 @@
+require 'rake'
+require 'rake/file_list'
+
+require 'calatrava/configuration'
+
 require 'calatrava/version'
+require 'calatrava/apache'
 require 'calatrava/app'
-require 'calatrava/project'
+require 'calatrava/app_builder'
+require 'calatrava/droid_app'
+require 'calatrava/ios_app'
+require 'calatrava/kernel'
 require 'calatrava/manifest'
+require 'calatrava/mobile_web_app'
+require 'calatrava/project'
+require 'calatrava/project_script'
+require 'calatrava/resources_build_phase'
+require 'calatrava/shell'
 require 'calatrava/template'