calatrava 0.0.1 → 0.5.0

data/Rakefile

@@ -9,7 +9,13 @@ namespace :test do
   end
 
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "features --format pretty"
+    t.cucumber_opts = "features --format pretty --tags ~@wip"
+  end
+
+  namespace :features do
+    Cucumber::Rake::Task.new(:wip) do |t|
+      t.cucumber_opts = "features --format pretty --tags @wip --wip"
+    end
   end
 end
 

data/calatrava.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "calatrava"
   s.version     = Calatrava::Version
   s.authors     = ["Giles Alexander"]
-  s.email       = ["gga@thoughtworks.com"]
-  s.homepage    = ""
+  s.email       = ["giles.alexander@gmail.com"]
+  s.homepage    = "http://calatrava.github.com"
   s.summary     = %q{Cross-platform mobile apps with native UIs}
   s.description = %q{A framework to build cross-platform mobile apps with high quality native UIs.}
 

data/features/sample_app.feature

@@ -0,0 +1,27 @@
+Feature: Sample App
+
+  In order to get started with Calatrava
+  As a new calatrava user
+  I want a new Calatrava project to contain a working sample app
+
+  Scenario: Create a sample project
+    When I create an app named "sample"
+    And  I cd to "sample"
+    And  I run `bundle install`
+    And  I run `rake bootstrap`
+    Then the exit status should be 0
+
+  Scenario: Sample app kernel
+    When I create an app named "sample"
+    And  I cd to "sample"
+    And  I run `bundle install`
+    And  I run `rake bootstrap`
+    And  I run `rake kernel:spec`
+    Then the exit status should be 0
+
+  Scenario: Mobile web sample app
+    When I create an app named "sample"
+    And  I cd to "sample"
+    And  I run `bundle install`
+    And  I run `rake bootstrap`
+    And  I start apache

data/features/step_definitions/app_steps.rb

@@ -0,0 +1,3 @@
+When /^I create an app named "([^"]+)"$/, :create_app
+When /^I start apache$/, :start_apache, :on => lambda { current_app }
+

data/features/support/calatrava_app.rb

@@ -0,0 +1,31 @@
+require 'aruba/api'
+require 'open-uri'
+
+class CalatravaApp
+
+  include Aruba::Api
+
+  def initialize(name)
+    @name = name
+    run_simple("calatrava create #{@name}")
+  end
+
+  def start_apache
+    cd @name
+    run_simple 'rake web:apache:background'
+
+    not_running_yet = true
+    while not_running_yet
+      begin
+        open('http://localhost:8888') { |_| not_running_yet = false }
+      rescue Errno::ECONNREFUSED
+        # still not running
+      end
+    end
+
+    Kernel.at_exit do
+      run_simple 'rake web:apache:stop'
+    end
+  end
+
+end

data/features/support/env.rb

@@ -3,3 +3,21 @@ require 'aruba/cucumber'
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
 ENV['RUBYLIB'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../lib')}#{File::PATH_SEPARATOR}#{ENV['RUBYLIB']}"
+
+Before do
+  @aruba_timeout_seconds = 20
+end
+
+class CalatravaWorld
+
+  def create_app(name)
+    @app = CalatravaApp.new(name)
+  end
+
+  def current_app
+    @app
+  end
+
+end
+
+World { CalatravaWorld.new }

data/lib/calatrava/project.rb

@@ -95,11 +95,14 @@ module Calatrava
           FileUtils.cp(item, target_item) if File.file? item
         end
         Dir.chdir "#{@name}" do
+          Dir.chdir "#{@name}" do
+            FileUtils.mv "build.xml", "../build.xml"
+            FileUtils.mv "AndroidManifest.xml", "../AndroidManifest.xml"
+          end
+          FileUtils.rm_rf "#{@name}"
           Dir.chdir "src/com/#{@name}" do
             FileUtils.mv "Title.java", "#{@title}.java"
-            FileUtils.mv "AndroidManifest.xml", "../../../AndroidManifest.xml"
           end
-          FileUtils.mv "calatrava-build.xml", "build.xml"
         end
 
         FileUtils.rm_rf "calatrava"

data/lib/calatrava/tasks/apache.rb

@@ -16,26 +16,36 @@ else
   LOAD_LOG_MODULE = true
 end
 
-def httpd(command)
-  exec %Q|#{HTTPD} -d #{APACHE_DIR} -f conf/httpd.conf -e DEBUG -k #{command} -DNO_DETACH -DFOREGROUND|
+def httpd(command, opts = {})
+  cmd = %Q{#{HTTPD} -d #{APACHE_DIR} -f conf/httpd.conf -e DEBUG -k #{command} -DNO_DETACH -DFOREGROUND}
+  puts cmd
+  if opts[:background]
+    fork do
+      exec cmd
+    end
+  else
+    exec cmd
+  end
 end
 
 def configure_apache
   cp config_path("httpd.conf"), File.join(APACHE_DIR, 'conf')
 end
 
-def launch_apache
-  puts
-  puts "\t\t" + "*"*40
-  puts "\t\t" + "***   STARTING APACHE ON PORT 8888   ***"
-  puts "\t\t" + "*"*40
-  puts
+def launch_apache(opts = {})
+  if !opts[:background]
+    puts
+    puts "\t\t" + "*"*40
+    puts "\t\t" + "***   STARTING APACHE ON PORT 8888   ***"
+    puts "\t\t" + "*"*40
+    puts
+  end
 
-  httpd :start
+  httpd :start, opts
 end
 
 def stop_apache
-  httpd :stop
+  httpd 'graceful-stop'
 end
 
 def reload_apache

data/lib/calatrava/tasks/droid.rb

@@ -69,7 +69,7 @@ namespace :droid do
 
   desc "Deploy app to device/emulator"
   task :deploy => :publish do
-    sh "adb uninstall com.#{Calatrava::Project.current.name} ; adb install -r artifacts/#{ENV['CALATRAVA_ENV']}/#{Calatrava::Project.current.name}-debug.apk"
+    sh "adb install -r artifacts/#{ENV['CALATRAVA_ENV']}/#{Calatrava::Project.current.name}-debug.apk"
   end
 
   desc "Clean droid public directory"

data/lib/calatrava/tasks/web.rb

@@ -61,6 +61,11 @@ namespace :web do
       launch_apache
     end
 
+    task :background => [:build, 'web/apache/public', APACHE_LOGS_DIR] do
+      configure_apache
+      launch_apache :background => true
+    end
+
     desc "Reload the apache configuration"
     task :reload do
       reload_apache

data/lib/calatrava/templates/droid/app/bridge.coffee

@@ -1,130 +1,31 @@
-tw ?= {}
-tw.bridge = tw.bridge ? {}
+calatrava ?= {}
+calatrava.bridge = calatrava.bridge ? {}
 
-generateRandomString = () ->
-  str = ''
-  for i in [1...32]
-    r = Math.floor(Math.random() * 16)
-    str = str + r.toString(16)
-  str.toUpperCase()
+calatrava.bridge.runtime = (() ->
+  pages = {}
 
-tw.bridge.dispatchEvent = (page, event) ->
-  extraArgs = _.toArray(arguments).slice(1);
-  tw.bridge.pages.pageNamed(page).dispatch.apply(tw.bridge.pages.pageNamed(page), extraArgs)
+  changePage: (target) -> pageRegistry.changePage(target)
 
-class tw.bridge.Page
-  constructor: (@pageName) ->
-    @handlerRegistry = {}
+  registerProxyForPage: (proxyId, pageName) ->
+    pages[proxyId] = pageName
+    pageRegistry.registerProxyForPage(pageName, proxyId)
 
-  bind: (event, handler) ->
-    @handlerRegistry[event] = handler
-    # Register that an event handler has been installed?
+  log: (message) -> androidRuntime.log(message)
+  attachProxyEventHandler: (proxyId, event) ->
+  startTimerWithTimeout: (timerId, timeout) -> pageRegistry.startTimer(timeout, timerId)
+  openUrl: (url) -> pageRegistry.openUrl(url)
 
-  dispatch: (event) ->
-    args = _.toArray(arguments).slice(1)
-    if @handlerRegistry[event]?
-      @handlerRegistry[event].apply(this, args)
+  valueOfProxyField: (proxyId, field, getId) ->
+    value = String(pageRegistry.getValueForField(pages[proxyId], field))
+    calatrava.inbound.fieldRead(proxyId, getId, value)
 
-  get: (field) ->
-    String(pageRegistry.getValueForField(@pageName, field))
+  renderProxy: (viewObject, proxyId) ->
+    pageRegistry.renderPage(pages[proxyId], JSON.stringify(viewObject))
 
-  render: (viewObject) ->
-    viewObject = JSON.stringify(viewObject)
-    pageRegistry.renderPage(@pageName, viewObject)
-
-
-tw.bridge.changePage = (target) ->
-  pageRegistry.changePage(target)
-  target
-
-tw.bridge.pages = (() ->
-  pagesByName = {}
-
-  pageNamed: (pageName) ->
-    if (!pagesByName[pageName])
-      pagesByName[pageName] = new tw.bridge.Page(pageName)
-    pagesByName[pageName]
-)()
-
-tw.bridge.widgets = (()->
-  callbacks = {}
-  display: (name, options, callback) ->
-    pageRegistry.displayWidget(name, JSON.stringify(options))
-    callbacks[name] = callback
-
-  invokeCallback: (name) ->
-    args = _.toArray(arguments).slice(1)
-    callbacks[name].apply(this, args)
-)()
-
-tw.bridge.dialog = (()->
-  display : (name) ->
-    pageRegistry.displayDialog(name)
-)()
-
-tw.bridge.request = (reqOptions) ->
-  tw.bridge.requests.issue reqOptions
-
-tw.bridge.requests = (() ->
-  successHandlers = {}
-  failureHandlers = {}
-
-  issue: (options) ->
-    requestId = generateRandomString()
-    if options.body
-      bodyStr = options.body
-    else
-      bodyStr = ""
-    if (bodyStr.constructor != String)
-      bodyStr = JSON.stringify(body)
-
-    if options.customHeaders
-      headers = JSON.stringify(options.customHeaders)
-    else
-      headers = ""
-
-    successHandlers[requestId] = options.success
-    failureHandlers[requestId] = options.failure
-    ajaxRequestManagerRegistry.makeRequest(requestId,
+  issueRequest: (options) ->
+    ajaxRequestManagerRegistry.makeRequest(options.requestId,
       options.url,
       options.method,
-      bodyStr,
-      headers)
-
-  successfulResponse: (reqId, response) ->
-    successHandlers[reqId](response)
-    @clearHandlers(reqId)
-
-  failureResponse: (reqId, errorCode, response) ->
-    failureHandlers[reqId](errorCode, response)
-    @clearHandlers(reqId)
-
-  clearHandlers: (reqId) ->
-    successHandlers[reqId] = null
-    failureHandlers[reqId] = null
-)()
-
-tw.bridge.alert = (message) ->
-  pageRegistry.alert(message)
-
-tw.bridge.openUrl = (url) ->
-  pageRegistry.openUrl(url)
-
-tw.bridge.trackEvent = (pageName, channel, eventName, variables, properties) ->
-  pageRegistry.track(pageName, channel, eventName, variables, properties)
-
-tw.bridge.timers = (() ->
-  callbacks = {}
-
-  start: (timeout, callback) ->
-    timerId = generateRandomString()
-    callbacks[timerId] = callback
-    pageRegistry.startTimer(timeout, timerId)
-    timerId
-
-  fireTimer: (timerId) ->
-    callbacks[timerId]() if callbacks[timerId]
-
-  clearTimer: (timerId) ->
-    delete callbacks[timerId]
+      options.body,
+      options.headers)
 )()

data/lib/calatrava/templates/droid/calatrava/{src/com/CALATRAVA_TMPL → CALATRAVA_TMPL}/AndroidManifest.xml.calatrava

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.{{ project_name }}"
+      package="com.{{ project_slug }}"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:label="@string/app_name" >
-        <activity android:name="com.{{ project_name }}.{{ project_title }}"
+        <activity android:name="com.{{ project_slug }}.{{ project_title }}"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

data/lib/calatrava/templates/droid/calatrava/{calatrava-build.xml → CALATRAVA_TMPL/build.xml.calatrava}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- A standard Android ant build file, with changes to support calatrava.
      It incorporates ivy to manage dependencies. -->
-<project name="test" default="help">
+<project name="{{ project_slug }}" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into

data/lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/ConversionForm.java.calatrava

@@ -1,4 +1,4 @@
-package com.{{ project_name }};
+package com.{{ project_slug }};
 
 import com.calatrava.CalatravaPage;
 import com.calatrava.shell.WebViewActivity;
@@ -17,11 +17,11 @@ public class ConversionForm extends WebViewActivity
 
   @Override
   protected List<String> getEvents() {
-    return Arrays.asList("selectedInCurrency", "selectedOutCurrency");
+    return Arrays.asList("selectedInCurrency", "selectedOutCurrency", "convert");
   }
 
   @Override
   protected List<String> getFields() {
-    return new ArrayList<String>();
+    return Arrays.asList("in_amount", "in_currency", "out_amount", "out_currency");
   }
-}
+}

data/lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/Title.java.calatrava

@@ -1,4 +1,4 @@
-package com.{{ project_name }};
+package com.{{ project_slug }};
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -14,7 +14,7 @@ public class {{ project_title }} extends Activity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
-        Launcher.launchKernel("com.test", this, getApplication(), new Runnable() {
+        Launcher.launchKernel("com.{{ project_slug }}", this, getApplication(), new Runnable() {
           public void run() {
             Launcher.launchFlow("example.converter.start");
           }

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

@@ -17,6 +17,7 @@ public class KernelBridge {
     //load bridge
     loadLibrary("hybrid/scripts/env.js");
     loadLibrary("hybrid/scripts/bridge.js");
+    loadLibrary("hybrid/scripts/calatrava.js");
   }
 
   public void loadLibrary(String libraryName) throws IOException {

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

@@ -31,6 +31,7 @@ public class PageRegistry {
   private RhinoService rhino;
   private Map<String, Class<?>> pageFactories = new HashMap<String, Class<?>>();
   private Map<String, RegisteredPage> registeredPages = new HashMap<String, RegisteredPage>();
+  private Map<String, String> proxyByPage = new HashMap<String, String>();
 
   public static PageRegistry sharedRegistry() {
     return sharedRegistry;
@@ -84,6 +85,11 @@ public class PageRegistry {
       }               
     }
   }
+
+  public void registerProxyForPage(String pageName, String proxyId) {
+    Log.d(TAG, "Attaching proxy '" + proxyId + "' to name '" + pageName + "'");
+    proxyByPage.put(pageName, proxyId);
+  }
   
   public void changePage(String target) {
     Log.d(TAG, "changePage('" + target + "')");
@@ -92,6 +98,12 @@ public class PageRegistry {
     appContext.startActivity(new Intent(appContext, activityClass));
   }
 
+  public void triggerEvent(String pageName, String event, String... extraArgs) {
+    String proxy = proxyByPage.get(pageName);
+    Log.d(TAG, "Dispatching to proxy '" + proxy + "'");
+    rhino.triggerEvent(proxy, event, extraArgs);
+  }
+
   public void displayWidget(String name, String options) {
     appContext.sendBroadcast(new Intent("com.calatrava.widget").putExtra("name", name).putExtra("options", options));
   }
@@ -120,7 +132,7 @@ public class PageRegistry {
       public void run() {
         timer.cancel();
         timer.purge();
-        rhino.callJsFunction("tw.bridge.timers.fireTimer", new String[] {timerId});
+        rhino.callJsFunction("calatrava.inbound.fireTimer", new String[] {timerId});
       }
     }, 1000 * timeout);
   }

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

@@ -73,13 +73,19 @@ public abstract class RegisteredActivity extends Activity {
     super.onDestroy();
     unbindService(connection);
   }
+
+  public void triggerEvent(String event, String... extraArgs) {
+    PageRegistry.sharedRegistry().triggerEvent(getPageName(), event, extraArgs);
+  }
   
   public void invokeWidgetCallback(String...args) {
-    rhino.callJsFunction("tw.bridge.widgets.invokeCallback", args);
+    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);

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, "androidRuntime", this);
 
       Object wrappedAjaxRequestManagerRegistry = Context.javaToJS(AjaxRequestManager.sharedManager(), mScope);
       ScriptableObject.putProperty(mScope, "ajaxRequestManagerRegistry", wrappedAjaxRequestManagerRegistry);
@@ -75,8 +76,8 @@ public class RhinoService extends Service {
     evaller.load(source, name);
   }
 
-  public void triggerEvent(String page, String eventId, String[] extraArgs) {
-    evaller.triggerEvent(page, eventId, extraArgs);
+  public void triggerEvent(String proxy, String eventId, String[] extraArgs) {
+    evaller.triggerEvent(proxy, eventId, extraArgs);
   }
 
   public void invokeSuccessCallback(String requestId, String response) {
@@ -87,6 +88,10 @@ public class RhinoService extends Service {
     evaller.ajaxFailureResponse(requestId, statusCode, responseBody);
   }
 
+  public void log(String message) {
+    Log.d(TAG, message);
+  }
+
   public void callJsFunction(String function) {
     evaller.callJsFunction(function);
   }
@@ -149,15 +154,15 @@ public class RhinoService extends Service {
       dispatchJs(js);
     }
 
-    public void triggerEvent(String page, String eventId, String[] extraArgs) {
+    public void triggerEvent(String proxy, String eventId, String[] extraArgs) {
       StringBuilder sb = new StringBuilder("");
       for (String arg : extraArgs) {
         sb.append(", '");
         sb.append(arg);
         sb.append("'");
       }
-      String js = "tw.bridge.dispatchEvent('{0}', '{1}'{2});"
-          .replace("{0}", page)
+      String js = "calatrava.inbound.dispatchEvent('{0}', '{1}'{2});"
+          .replace("{0}", proxy)
           .replace("{1}", eventId)
           .replace("{2}", sb.toString());
 
@@ -167,14 +172,14 @@ public class RhinoService extends Service {
     }
 
     public void ajaxSuccessfulResponse(String requestId, String json) {
-      String js = "tw.bridge.requests.successfulResponse('{0}', '{1}');"
+      String js = "calatrava.inbound.successfulResponse('{0}', '{1}');"
           .replace("{0}", requestId)
           .replace("{1}", json);
       dispatchJs(js);
     }
 
     public void ajaxFailureResponse(String requestId, int statusCode, String responseBody) {
-      String js = "tw.bridge.requests.failureResponse('{0}', {1}, '{2}');"
+      String js = "calatrava.inbound.failureResponse('{0}', {1}, '{2}');"
           .replace("{0}", requestId)
           .replace("{1}", Integer.toString(statusCode))
           .replace("{2}", responseBody);

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

@@ -112,8 +112,6 @@ public abstract class WebViewActivity extends RegisteredActivity {
     });
   }
 
-  protected abstract String getPageName();
-
   protected abstract List<String> getEvents();
 
   protected abstract List<String> getFields();
@@ -159,7 +157,7 @@ public abstract class WebViewActivity extends RegisteredActivity {
   }
 
   private void pageHasOpened() {
-    rhino.triggerEvent(getPageName(), "pageOpened", new String[] {});
+    triggerEvent("pageOpened", new String[] {});
   }
 
   private void onPageLoadCompleted() {
@@ -230,7 +228,7 @@ public abstract class WebViewActivity extends RegisteredActivity {
       } else {
         Log.d(TAG, "extraArgs were null!");
       }
-      rhino.triggerEvent(pageName, event, extraArgs);
+      triggerEvent(event, extraArgs);
     }
 
     public void onRenderComplete(Object ignored) {

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

@@ -10,6 +10,10 @@
 
 @interface ConversionFormViewController : BaseUIViewController<UIPickerViewDataSource, UIPickerViewDelegate>
 
+@property (retain, nonatomic) IBOutlet UITextField *inAmount;
+@property (retain, nonatomic) IBOutlet UITextField *outAmount;
+
+- (IBAction)convert:(id)sender;
 - (void)render:(NSDictionary *)jsViewObject;