calatrava 0.6.6 → 0.6.7

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm: 1.9.3
 script: 
   - bundle exec rake test:rspec test:features:travis
+  - java -jar tools/janus.jar --verify contracts/rate-exchange.jns | grep "(0 failed)"

data/CHANGES.markdown

@@ -1,3 +1,24 @@
+## v0.6.7
+
+New features:
+* Compile Kernel/Shell coffeescript files automatically upon change,
+  when apache is running
+* Enhance currency converter sample app to start using a remote service
+
+Bugs Fixed:
+* [Issue #54][i54]: [droid] Ajax IOExceptions aren't properly passed
+  around
+* [Issue #71][i71]: [web] Passed forward the error response in a ajax
+  call failure
+* [iOS Issue #9][ios-i9]: Fixes a startup crash
+* [Issue #75][i75]: calatrava.confirm callback argument is not defined
+* [Issue #63][i63]: Update stub namespace of the calatrava brigde for
+  template spec files
+* [Issue #76][i76]: Enable render for Native Android views
+* [Issue #33][i33]: 'env: node: No such file or directory" build error
+  in xcode trying to run base project
+* [Issue #83][i83]: Bundler might install multiple cocoapods version
+
 ## v0.6.6
 * Fix to add mac specific dependencies conditionally
 
@@ -124,6 +145,10 @@ Changes that will affect existing projects:
 * [James Gregory](https://github.com/jagregory)
 * [Sneha Venkatesh](https://github.com/snehayv)
 * [Dan Tao](https://github.com/dtao)
+* [Priyank Gupta](https://github.com/priyaaank)
+* [Rick Carragher](https://github.com/rcarragher)
+* [Pedro Leal](https://github.com/pedrombl)
+* [Prasanna Pendse](https://github.com/prasanna)
 
 [i5]: https://github.com/calatrava/calatrava/issues/5
 [i12]: https://github.com/calatrava/calatrava/issues/12
@@ -147,3 +172,13 @@ Changes that will affect existing projects:
 [i43]: https://github.com/calatrava/calatrava/issues/43
 [ios-i1]: https://github.com/calatrava/calatrava-ios/issues/1
 [ios-i4]: https://github.com/calatrava/calatrava-ios/pull/4
+[i67]: https://github.com/calatrava/calatrava/pull/67
+[i72]: https://github.com/calatrava/calatrava/issues/72
+[i71]: https://github.com/calatrava/calatrava/pull/71
+[i54]: https://github.com/calatrava/calatrava/pull/54
+[ios-i9]: https://github.com/calatrava/calatrava-ios/pull/9
+[i75]: https://github.com/calatrava/calatrava/issues/75
+[i63]: https://github.com/calatrava/calatrava/pull/63
+[i76]: https://github.com/calatrava/calatrava/pull/76
+[i33]: https://github.com/calatrava/calatrava/issues/33
+[i83]: https://github.com/calatrava/calatrava/issues/83

data/Gemfile

@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in calatrava.gemspec
 gemspec
-xcodeproj
-cocoapods
+if RUBY_PLATFORM =~ /darwin/
+  gem "xcodeproj"
+  gem "cocoapods"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calatrava (0.6.5)
+    calatrava (0.6.6)
       cucumber (~> 1.2.1)
       haml (~> 3.1.7)
       mustache (~> 0.99.4)
@@ -13,6 +13,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    addressable (2.3.4)
     aruba (0.5.1)
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
@@ -20,19 +24,55 @@ GEM
     builder (3.1.4)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
+    claide (0.2.0)
+    cocoapods (0.19.1)
+      activesupport (~> 3.2.13)
+      claide (~> 0.2.0)
+      cocoapods-core (= 0.19.1)
+      cocoapods-downloader (~> 0.1.0)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      faraday (~> 0.8.1)
+      json (~> 1.7.3)
+      octokit (~> 1.7)
+      open4 (~> 1.3.0)
+      rake (~> 10.0.0)
+      xcodeproj (~> 0.5.5)
+    cocoapods-core (0.19.1)
+      activesupport (~> 3.2.13)
+      rake (~> 10.0.0)
+    cocoapods-downloader (0.1.0)
+    colored (1.2)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.11.0)
       json (>= 1.4.6)
     diff-lcs (1.1.3)
+    escape (0.0.4)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
     ffi (1.2.0)
     gherkin (2.11.5)
       json (>= 1.4.6)
     haml (3.1.8)
+    hashie (2.0.5)
+    i18n (0.6.1)
     json (1.7.5)
     multi_json (1.7.3)
+    multipart-post (1.2.0)
     mustache (0.99.4)
+    netrc (0.7.7)
+    octokit (1.24.0)
+      addressable (~> 2.2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 2.0)
+      multi_json (~> 1.3)
+      netrc (~> 0.7.7)
+    open4 (1.3.0)
     rake (10.0.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -53,6 +93,9 @@ GEM
     watir-webdriver (0.6.4)
       selenium-webdriver (>= 2.18.0)
     websocket (1.0.7)
+    xcodeproj (0.5.5)
+      activesupport (~> 3.2.13)
+      colored (~> 1.2)
 
 PLATFORMS
   ruby
@@ -60,4 +103,6 @@ PLATFORMS
 DEPENDENCIES
   aruba
   calatrava!
+  cocoapods
   rspec
+  xcodeproj

data/contracts/rate-exchange.jns

@@ -0,0 +1,12 @@
+(service
+  "Rate Exchange"
+
+  (contract "Get currency exchange rate"
+    (method :get)
+    (url "http://rate-exchange.appspot.com/currency?from=USD&to=INR")
+
+    (should-have :path "$.to" :equal-to "INR")
+    (should-have :path "$.from" :equal-to "USD")
+    (should-have :path "$.rate" :of-type :number)
+  )
+)

data/lib/calatrava/apache.rb

@@ -75,7 +75,7 @@ module Calatrava
       end
 
       desc "launch a non-daemon apache instance on port 8888 which will serve our local app and also proxy to backend services"
-      task :start => ['web:build', apache_public_dir, apache_logs_dir, "#{apache_conf_dir}/httpd.conf"] do
+      task :start => ['web:build', apache_public_dir, apache_logs_dir, "#{apache_conf_dir}/httpd.conf", 'web:autocompile'] do
         launch_apache
       end
 

data/lib/calatrava/mobile_web_app.rb

@@ -69,6 +69,13 @@ module Calatrava
         rm_rf build_dir
       end
 
+      desc "Auto compile shell and kernel files"
+      task :autocompile do
+        fork do
+          exec "ruby ./.auto_compile.rb"
+        end
+      end
+
       namespace :apache do
         @apache.install_tasks
       end

data/lib/calatrava/templates/.auto_compile.rb

@@ -0,0 +1,11 @@
+if Gem::Specification.find_all_by_name('filewatcher').count > 0
+  require 'filewatcher'
+  FileWatcher.new(Dir["kernel/app/**/*.coffee", "kernel/plugins/**/*coffee", "shell/**/*.coffee"]).watch do |filename|
+    puts "Recompiling file " + filename
+    system "node_modules/coffee-script/bin/coffee --compile --output web/public/scripts #{filename}"
+  end
+else
+  $stderr.puts("*"*100)
+  $stderr.puts("File watcher gem is not present as part of gem set. Your kernel and shell files won't be auto compiled.")
+  $stderr.puts("*"*100)
+end

data/lib/calatrava/templates/.gitignore

@@ -0,0 +1,24 @@
+artifacts/
+config/result/
+droid/*/ant/
+droid/*/ivy/
+droid/*/assets/calatrava/
+droid/*/bin/
+droid/*/gen/
+node_modules/
+.idea/
+.node_updated
+ios/public/
+ios/*.xcworkspace/
+.sass-cache/
+.rake/
+web/apache/conf/httpd.conf
+web/apache/logs/
+web/apache/public
+web/public/
+*.iml
+.DS_Store
+*.apk
+*.ap_
+*.dex
+*.class

data/lib/calatrava/templates/Gemfile.calatrava

@@ -1,6 +1,9 @@
 source :rubygems
 
-gem "rake"
+gem "rake", ">= 0.9.5"
 gem "calatrava"{{#dev?}}, :path => '../'{{/dev?}}
-{{#mac?}}gem "xcodeproj"
-gem "cocoapods"{{/mac?}}
+{{#mac?}}gem "xcodeproj", ">= 0.4.0"
+gem "cocoapods", ">= 0.16.0"{{/mac?}}
+
+#auto compile shell and kernel for webapp. If you remove this, it'll stop auto compiling
+gem "filewatcher"

data/lib/calatrava/templates/build_env.sh

@@ -1,2 +1,3 @@
+export PATH=$PATH:/usr/local/bin
 source ~/.rvm/scripts/rvm
-rvm rvmrc load
+rvm rvmrc load

data/lib/calatrava/templates/config/environments.yml

@@ -1,17 +1,17 @@
 local:
-  api_endpoint    : "http://localhost:8081"
+  api_endpoint    : "http://rate-exchange.appspot.com"
   web_port        : 8888
 
 development:
-  api_endpoint    : "http://localhost:8081"
+  api_endpoint    : "http://rate-exchange.appspot.com"
   web_port        : 8888
 
 test:
-  api_endpoint    : "http://localhost:8081"
+  api_endpoint    : "http://rate-exchange.appspot.com"
   web_port        : 8888
 
 automation:
-  api_endpoint    : "http://localhost:8081"
+  api_endpoint    : "http://rate-exchange.appspot.com"
   web_port        : 8889
 
 production:

data/lib/calatrava/templates/config/templates/env.coffee.erb

@@ -1,7 +1,4 @@
-root = exports ? this
-root.tw = root.tw ? {}
-tw = root.tw
-tw.bridge = tw.bridge ? {}
+example ?= {}
+example.converter ?= {}
 
-tw.bridge.environment = () ->
-  serviceEndpoint: "<%= configuration['service_endpoint'] %>"
+example.converter.apiEndpoint = "<%= configuration['api_endpoint'] %>" if _.isUndefined(example.converter.apiEndpoint)

data/lib/calatrava/templates/config/templates/httpd.conf.erb

@@ -24,7 +24,7 @@ Listen <%= configuration['web_port'] %>
 
 ProxyRequests off
 
-ProxyPass /api <%= configuration['api_endpoint'] %>/api
+ProxyPass /currency <%= configuration['api_endpoint'] %>/currency
 
 SSLProxyEngine On
 

data/lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/AndroidManifest.xml.calatrava

@@ -3,6 +3,7 @@
       package="com.{{ project_slug }}"
       android:versionCode="1"
       android:versionName="1.0">
+    <uses-permission android:name="android.permission.INTERNET" />
     <application android:label="@string/app_name"
                  android:name="{{ project_title }}">
         <activity android:name=".Bootstrap"

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

@@ -110,7 +110,7 @@ public class AjaxRequestManager {
       } catch (IOException e) {
         Log.d(TAG, "Request threw exception", e);
         Log.d(TAG, "requestId: " + requestId);
-        rhino.invokeFailureCallback(requestId, 500, "IOException");
+        rhino.invokeFailureCallback(requestId, 500, e.toString());
       } finally {
         Log.d(TAG, "About to hide loader");
         context.sendBroadcast(new Intent("com.calatrava.ajax.finish"));

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

@@ -0,0 +1,32 @@
+package com.calatrava.bridge;
+
+import android.app.Activity;
+
+public class NativePageStateManager implements PageStateManager {
+
+  private RegisteredActivity activity;
+
+  public NativePageStateManager(Activity activity) {
+    this.activity = (RegisteredActivity) activity;
+  }
+
+  @Override
+  public void onCreateProcessing() {
+    activity.registerPage();
+  }
+
+  @Override
+  public void onResumeProcessing() {
+    activity.pageOnScreen();
+  }
+
+  @Override
+  public void onPauseProcessing() {
+    activity.pageOffScreen();
+  }
+
+  @Override
+  public void onDestroyProcessing() {
+    activity.unRegisterPage();
+  }
+}

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

@@ -0,0 +1,13 @@
+package com.calatrava.bridge;
+
+public interface PageStateManager {
+
+  public void onCreateProcessing();
+
+  public void onResumeProcessing();
+
+  public void onPauseProcessing();
+
+  public void onDestroyProcessing();
+
+}

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

@@ -8,9 +8,10 @@ import android.util.Log;
 
 public abstract class RegisteredActivity extends Activity {
   private String TAG = RegisteredActivity.class.getSimpleName();
-
   private RhinoService rhino;
+
   private RequestLoader spinner = new RequestLoader(this);
+  protected PageStateManager pageStateManager;
 
   private BroadcastReceiver receiver = new BroadcastReceiver() {
     @Override
@@ -29,7 +30,13 @@ public abstract class RegisteredActivity extends Activity {
   @Override
   protected void onCreate(Bundle availableData) {
     super.onCreate(availableData);
+    initializePageStateManager();
     rhino = ((CalatravaApplication)getApplication()).getRhino();
+    pageStateManager.onCreateProcessing();
+  }
+
+  protected void initializePageStateManager() {
+    pageStateManager = new NativePageStateManager(this);
   }
 
   @Override
@@ -38,27 +45,46 @@ public abstract class RegisteredActivity extends Activity {
     registerReceiver(receiver, new IntentFilter("com.calatrava.ajax.start"));
     registerReceiver(receiver, new IntentFilter("com.calatrava.ajax.finish"));
     registerReceiver(receiver, new IntentFilter("com.calatrava.command"));
+    pageStateManager.onResumeProcessing();
   }
 
   @Override
   protected void onPause() {
     super.onPause();
     unregisterReceiver(receiver);
+    pageStateManager.onPauseProcessing();
   }
 
   @Override
   public void onDestroy() {
     super.onDestroy();
+    pageStateManager.onDestroyProcessing();
   }
 
   public void triggerEvent(String event, String... extraArgs) {
     PageRegistry.sharedRegistry().triggerEvent(getPageName(), event, extraArgs);
   }
-  
+
   public void invokeWidgetCallback(String...args) {
     rhino.callJsFunction("calatrava.inbound.invokeCallback", args);
   }
 
+  public void pageOnScreen() {
+    PageRegistry.sharedRegistry().pageOnscreen(getPageName());
+  }
+
+  public void pageOffScreen() {
+    PageRegistry.sharedRegistry().pageOffscreen(getPageName());
+  }
+
+  public void registerPage() {
+    PageRegistry.sharedRegistry().registerPage(getPageName(), this);
+  }
+
+  public void unRegisterPage() {
+    PageRegistry.sharedRegistry().unregisterPage(getPageName());
+  }
+
   protected abstract String getPageName();
 
   public abstract String getFieldValue(String field);

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

@@ -7,15 +7,10 @@ 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.PageStateManager;
 import com.calatrava.bridge.RegisteredActivity;
 import com.calatrava.bridge.RhinoService;
-import com.calatrava.bridge.PageRegistry;
 
 import java.util.HashMap;
 import java.util.List;
@@ -45,17 +40,18 @@ public abstract class WebViewActivity extends RegisteredActivity {
   protected void onCreate(Bundle data)
   {
     super.onCreate(data);
+  }
+
+  @Override
+  protected void initializePageStateManager() {
     jsContainer = new JSContainer(getRhino(), getPageName());
-    loadPage();
+    webView = new WebView(this);
+    pageStateManager = new WebViewPageStateManager(this, jsContainer, getPageName(), webView);
   }
 
   @Override
   protected void onResume() {
     super.onResume();
-
-    onPageLoadCompleted();
-    pageHasOpened();
-
     registerReceiver(receiver, new IntentFilter("com.calatrava.dialog"));
   }
 
@@ -63,15 +59,12 @@ public abstract class WebViewActivity extends RegisteredActivity {
   protected void onPause() {
     super.onPause();
 
-    PageRegistry.sharedRegistry().pageOffscreen(getPageName());
     unregisterReceiver(receiver);
   }
 
   @Override
   public void onDestroy() {
     super.onDestroy();
-
-    PageRegistry.sharedRegistry().unregisterPage(getPageName());
   }
 
   public String getFieldValue(final String field) {
@@ -115,60 +108,17 @@ public abstract class WebViewActivity extends RegisteredActivity {
   protected abstract List<String> getEvents();
 
   protected abstract List<String> getFields();
-    
+
   protected int getBackgroundColor(){
     return Color.TRANSPARENT;
   }
 
-  protected void loadPage() {
-    PageRegistry.sharedRegistry().registerPage(getPageName(), this);
-
-    webView = new WebView(this);
-    setContentView(webView);
-
-    webView.getSettings().setJavaScriptEnabled(true);
-    webView.getSettings().setDomStorageEnabled(true);
-    webView.setScrollBarStyle(webView.SCROLLBARS_OUTSIDE_OVERLAY);
-    webView.setScrollbarFadingEnabled(true);
-    webView.addJavascriptInterface(jsContainer, "container");
-
-    webView.setWebViewClient(new WebViewClient() {
-      @Override
-      public void onPageFinished(WebView view, String url) {
-        super.onPageFinished(view, url);
-        Log.d(TAG, "Webview finished loading a URL");
-
-        pageReady = true;
-        onPageLoadCompleted();
-      }
-    });
-
-    webView.setWebChromeClient(new WebChromeClient() {
-      @Override
-      public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-        Log.d(TAG, "Received JS alert: '" + message + "'");
-        return false;
-      }
-    });
-
-    webView.loadUrl("file:///android_asset/calatrava/views/" + getPageName() + ".html");
-    pageHasOpened();
+  public void pageReadiness(boolean pageState) {
+    this.pageReady = pageState;
   }
 
-  private void pageHasOpened() {
-    triggerEvent("pageOpened", new String[] {});
-  }
-
-  private void onPageLoadCompleted() {
-    if (jsContainer != null && pageReady) {
-      jsContainer.onRenderComplete(null);
-
-      for (String field : getFields()) {
-        jsContainer.hasField(field);
-      }
-
-      PageRegistry.sharedRegistry().pageOnscreen(getPageName());
-    }
+  public boolean pageState() {
+    return pageReady;
   }
 
   public class JSContainer {

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

@@ -0,0 +1,89 @@
+package com.calatrava.shell;
+
+import android.app.Activity;
+import android.util.Log;
+import android.webkit.JsResult;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import com.calatrava.bridge.PageStateManager;
+
+public class WebViewPageStateManager implements PageStateManager {
+
+  private static final String TAG = WebViewPageStateManager.class.getSimpleName();
+  private WebViewActivity webViewActivity;
+  private WebViewActivity.JSContainer jsContainer;
+  private final String pageName;
+  private final WebView webView;
+
+  public WebViewPageStateManager(Activity activity, WebViewActivity.JSContainer jsContainer, String pageName, WebView webView) {
+    this.webViewActivity = (WebViewActivity) activity;
+    this.jsContainer = jsContainer;
+    this.pageName = pageName;
+    this.webView = webView;
+  }
+
+  public void onCreateProcessing() {
+    webViewActivity.registerPage();
+
+    webViewActivity.setContentView(webView);
+
+    webView.getSettings().setJavaScriptEnabled(true);
+    webView.getSettings().setDomStorageEnabled(true);
+    webView.setScrollBarStyle(webView.SCROLLBARS_OUTSIDE_OVERLAY);
+    webView.setScrollbarFadingEnabled(true);
+    webView.addJavascriptInterface(jsContainer, "container");
+
+    webView.setWebViewClient(new WebViewClient() {
+      @Override
+      public void onPageFinished(WebView view, String url) {
+        super.onPageFinished(view, url);
+        Log.d(TAG, "Webview finished loading a URL");
+
+        webViewActivity.pageReadiness(true);
+        onPageLoadCompleted();
+      }
+    });
+
+    webView.setWebChromeClient(new WebChromeClient() {
+      @Override
+      public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
+        Log.d(TAG, "Received JS alert: '" + message + "'");
+        return false;
+      }
+    });
+
+    webView.loadUrl("file:///android_asset/calatrava/views/" + pageName + ".html");
+    pageHasOpened();
+  }
+
+  public void onResumeProcessing() {
+    onPageLoadCompleted();
+    pageHasOpened();
+  }
+
+  public void onPauseProcessing() {
+    webViewActivity.pageOffScreen();
+  }
+
+  public void onDestroyProcessing() {
+    webViewActivity.unRegisterPage();
+  }
+
+  private void onPageLoadCompleted() {
+    if (jsContainer != null && webViewActivity.pageState()) {
+      jsContainer.onRenderComplete(null);
+
+      for (String field : webViewActivity.getFields()) {
+        jsContainer.hasField(field);
+      }
+
+      webViewActivity.pageOnScreen();
+    }
+  }
+
+  private void pageHasOpened() {
+    webViewActivity.triggerEvent("pageOpened", new String[]{});
+  }
+
+}

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 => '236a7395bbd90186a9359602ac77a982c5962e44'
+pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => '50b05d43055bc6680ea55ce888ab692c00193c28'
 {{/dev?}}
 {{#dev?}}
 pod 'calatrava', :local => '../../../calatrava-ios'

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

@@ -22,7 +22,7 @@ calatrava.inbound =
     calatrava.bridge.requests.successfulResponse(requestId, response)
 
   failureResponse: (requestId, errorCode, response) ->
-    calatrava.bridge.requests.failureResponse(requestId,errorCode, response)
+    calatrava.bridge.requests.failureResponse(requestId, errorCode, response)
 
   fireTimer: (timerId) ->
     calatrava.bridge.timers.fireTimer(timerId)
@@ -165,8 +165,8 @@ calatrava.bridge.requests = (() ->
     successHandlersById[requestId](response) if successHandlersById[requestId]
     clearHandlers(requestId)
 
-  failureResponse: (requestId, response) ->
-    failureHandlersById[requestId](response) if failureHandlersById[requestId]
+  failureResponse: (requestId, errorCode, response) ->
+    failureHandlersById[requestId](errorCode, response) if failureHandlersById[requestId]
     clearHandlers(requestId)
 )()
 

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

@@ -1,7 +1,7 @@
 example ?= {}
 example.converter ?= {}
 
-example.converter.controller = ({views, changePage, ajax}) ->
+example.converter.controller = ({views, changePage, repository}) ->
   currencies = ['USD', 'AUD', 'GBP', 'INR']
   currencyRate =
     USD: 1
@@ -19,10 +19,12 @@ example.converter.controller = ({views, changePage, ajax}) ->
       selected: c == selectedCurrency
 
   performConversion = (amount) ->
-    outRate = currencyRate[outCurrency]
-    inRate = currencyRate[inCurrency]
-    views.conversionForm.render
-      out_amount: (Math.round(amount * (outRate / inRate) * 100)) / 100
+    repository.exchangeRate
+      from: inCurrency
+      to: outCurrency
+      ifSucceeded: (rate) ->
+        views.conversionForm.render
+          out_amount: (Math.round(amount * rate * 100)) / 100
 
   convert = () ->
     views.conversionForm.get 'in_amount', (inAmount) ->

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

@@ -6,6 +6,6 @@ example.converter.start = ->
     views:
       conversionForm: calatrava.bridge.pages.pageNamed "conversionForm"
     changePage: calatrava.bridge.changePage
-    ajax: calatrava.bridge.request
+    repository: example.converter.repository calatrava.bridge.request
 
   calatrava.bridge.changePage "conversionForm"

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

@@ -0,0 +1,11 @@
+example ?= {}
+example.converter ?= {}
+
+example.converter.repository = (ajax) ->
+  exchangeRate: (options) ->
+    ajax
+      url: "#{example.converter.apiEndpoint}/currency?from=#{options.from}&to=#{options.to}"
+      method: "GET"
+      success: (response) ->
+        options.ifSucceeded JSON.parse(response).rate
+      failure: options.elseFailed

data/lib/calatrava/templates/kernel/features/support/bridge.coffee

@@ -1,5 +1,5 @@
-tw ?= {}
-tw.bridge = tw.bridge ? {}
+calatrava ?= {}
+calatrava.bridge = calatrava.bridge ? {}
 
 generateRandomString = () ->
   str = ''
@@ -8,15 +8,10 @@ generateRandomString = () ->
     str = str + r.toString(16)
   return str.toUpperCase();
 
-tw.bridge.environment = () ->
-  serviceEndpoint: "http://localhost:4568"
-  apiEndpoint: "http://localhost:4568"
-  sessionTimeout: 10
+calatrava.bridge.dispatchEvent = (page, event) ->
+  calatrava.bridge.pages.pageNamed(page).dispatch(event)
 
-tw.bridge.dispatchEvent = (page, event) ->
-  tw.bridge.pages.pageNamed(page).dispatch(event)
-
-class tw.bridge.Page
+class calatrava.bridge.Page
   constructor: (@pageName) ->
     @fieldValues = {}
     @handlerRegistry = {}
@@ -51,24 +46,24 @@ class tw.bridge.Page
   allRenderObjects: () ->
     @renderObjects
 
-tw.bridge.changePage = (target) ->
-  tw.bridge.pages.setCurrent(target)
-  tw.bridge.changedPage = target
+calatrava.bridge.changePage = (target) ->
+  calatrava.bridge.pages.setCurrent(target)
+  calatrava.bridge.changedPage = target
 
-tw.bridge.pages = (() ->
+calatrava.bridge.pages = (() ->
   pagesByName = {}
   current = ""
 
   pageNamed: (pageName) ->
     if (!pagesByName[pageName])
-      pagesByName[pageName] = new tw.bridge.Page(pageName)
+      pagesByName[pageName] = new calatrava.bridge.Page(pageName)
     pagesByName[pageName]
 
   current: () -> pagesByName[current]
   setCurrent: (newPage) -> current = newPage
 )()
 
-class tw.bridge.Widget
+class calatrava.bridge.Widget
   constructor: (@name, @options, @callback) ->
 
   getCallback: ->
@@ -77,16 +72,16 @@ class tw.bridge.Widget
   getOptions: ->
     @options
 
-tw.bridge.widgets = (()->
+calatrava.bridge.widgets = (()->
   widgets = {}
   display: (name, options, callback) ->
-    widgets[name] = new tw.bridge.Widget(name, options, callback)
+    widgets[name] = new calatrava.bridge.Widget(name, options, callback)
 
   widget: (name) ->
     widgets[name]
 )()
 
-tw.bridge.timers = (() ->
+calatrava.bridge.timers = (() ->
   timers = {}
   start: (timeout, callback) ->
     timers["searchResultsExpired"] = callback
@@ -97,19 +92,19 @@ tw.bridge.timers = (() ->
     timers[name]()
 )()
 
-tw.bridge.dialog = (() ->
+calatrava.bridge.dialog = (() ->
   display: (name) ->
 )()
 
-tw.bridge.request = (reqOptions) ->
+calatrava.bridge.request = (reqOptions) ->
   # mock this for kernel features
-  response = tw.bridge.requests.issue reqOptions
+  response = calatrava.bridge.requests.issue reqOptions
   if response.status == 'successful'
     reqOptions.success(response.body)
   else
     reqOptions.failure(response.body)
 
-tw.bridge.requests = (() ->
+calatrava.bridge.requests = (() ->
   storedRequests = []
 
   stubRequest: (options) ->
@@ -119,6 +114,6 @@ tw.bridge.requests = (() ->
     _.tap _.chain(storedRequests).filter((sr) -> sr.url.test(options.url)).last().value().response, (v) ->
 )()
 
-tw.bridge.alert = (message) ->
+calatrava.bridge.alert = (message) ->
 
-tw.bridge.trackEvent = () ->
+calatrava.bridge.trackEvent = () ->

data/lib/calatrava/templates/kernel/features/support/spec_helper.js

@@ -14,7 +14,7 @@ date = require('date');
 underscore = require('underscore');
 _ = underscore;
 
-exports.tw = require('bridge').tw;
+exports.calatrava = require('bridge').calatrava;
 
 function recursiveExtend(moduleToExtend, module) {
   _.each(module, function (value, key) {
@@ -33,15 +33,15 @@ function getPageObjectForPageName(pageName){
 }
 
 function getWidget(name) {
-  return tw.bridge.widgets.widget(name)
+  return calatrava.bridge.widgets.widget(name)
 }
 
 function showDialog(name) {
-  return tw.bridge.dialog.display(name)
+  return calatrava.bridge.dialog.display(name)
 }
 
 function triggerTimer(name){
-  return tw.bridge.timers.triggerTimer(name)
+  return calatrava.bridge.timers.triggerTimer(name)
 }
 
 exports.getPageObjectForPageName = getPageObjectForPageName;

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

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

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

@@ -4,34 +4,57 @@ example = exports.example
 stubView = exports.stubView
 
 describe 'converter controller', ->
-  ajax = null
-  changePage = null
-  views = null
-
   beforeEach ->
-    ajax = jasmine.createSpy("ajax requester")
-    changePage = jasmine.createSpy('page changer').andCallFake (targetPage) ->
-      if views[targetPage].boundEvents['pageOpened']?
-        views[targetPage].trigger 'pageOpened'
-    views =
+    @changePage = jasmine.createSpy('page changer').andCallFake (targetPage) ->
+      if @views[targetPage].boundEvents['pageOpened']?
+        @views[targetPage].trigger 'pageOpened'
+    @views =
       conversionForm: stubView.create('converterForm')
+    @exchangeRateRepository = jasmine.createSpy "fake repository"
 
-    subject = example.converter.controller
-      changePage: changePage
-      views: views
-      ajax: ajax
+    example.converter.controller
+      changePage: @changePage
+      views: @views
+      repository:
+        exchangeRate: @exchangeRateRepository
 
   it 'should bind the convert event', ->
-    expect(views.conversionForm.boundEvents['convert']).not.toBeUndefined()
+    expect(@views.conversionForm.boundEvents['convert']).not.toBeUndefined()
 
   describe 'converting', ->
 
     beforeEach ->
-      views.conversionForm.fieldContains 'in_currency', 'USD'
-      views.conversionForm.fieldContains 'out_currency', 'AUD'
-      views.conversionForm.fieldContains 'in_amount', 100
-      views.conversionForm.trigger 'convert'
+      @views.conversionForm.fieldContains 'in_currency', 'USD'
+      @views.conversionForm.fieldContains 'out_currency', 'AUD'
 
     it 'should render the correctly converted amount', ->
-      expect(views.conversionForm.lastMessage()).toEqual
+      @views.conversionForm.fieldContains 'in_amount', 100
+      @views.conversionForm.trigger 'convert'
+      @exchangeRateRepository.mostRecentCall.args[0].ifSucceeded(.96)
+      expect(@views.conversionForm.lastMessage()).toEqual
         out_amount: 96
+
+    it 'should round-off amount to 2 decimal places', ->
+      @views.conversionForm.fieldContains 'in_amount', 1
+      @views.conversionForm.trigger 'convert'
+      @exchangeRateRepository.mostRecentCall.args[0].ifSucceeded(.3663)
+      expect(@views.conversionForm.lastMessage()).toEqual
+        out_amount: .37
+
+    it 'should confirm when amount is absent', ->
+      calatrava.confirm = jasmine.createSpy("confirmation dialog")
+      @views.conversionForm.fieldContains 'in_amount', ""
+      @views.conversionForm.trigger 'convert'
+
+      expect(calatrava.confirm).toHaveBeenCalled()
+
+    it 'should consider amount as 1 if amount is absent and confirmation accepted', ->
+      calatrava.confirm = jasmine.createSpy("confirmation dialog")
+      @views.conversionForm.fieldContains 'in_amount', ""
+      @views.conversionForm.trigger 'convert'
+      calatrava.confirm.mostRecentCall.args[1](true)
+      @exchangeRateRepository.mostRecentCall.args[0].ifSucceeded(.96)
+
+      expect(@views.conversionForm.lastMessage()).toEqual
+        out_amount: 0.96
+

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

@@ -0,0 +1,27 @@
+exports = require 'spec_helper'
+
+example = exports.example
+
+describe 'converter repository', ->
+
+  beforeEach ->
+    @ajax = jasmine.createSpy "ajax requester"
+    @onSuccess = jasmine.createSpy "success callback"
+    @onFailure = jasmine.createSpy "failure callback"
+    example.converter.apiEndpoint = "//endpoint"
+    example.converter.repository(@ajax).exchangeRate
+      from: "USD"
+      to: "INR"
+      ifSucceeded: @onSuccess
+      elseFailed: @onFailure
+
+  it 'should call appropriate API for exchange rate', ->
+    expect(@ajax.mostRecentCall.args[0].url).toEqual "//endpoint/currency?from=USD&to=INR"
+
+  it 'should call success callback with rate when request is successful', ->
+    @ajax.mostRecentCall.args[0].success "{\"rate\": 55}"
+    expect(@onSuccess).toHaveBeenCalledWith 55
+
+  it 'should call failure callback when request fails', ->
+    @ajax.mostRecentCall.args[0].failure "failure response"
+    expect(@onFailure).toHaveBeenCalledWith("failure response")

data/lib/calatrava/templates/kernel/spec/environment.spec_helper.coffee

@@ -1,11 +1,7 @@
-tw ?= {}
+calatrava ?= {}
 
-tw =
+calatrava =
   bridge:
-    environment: () ->
-      serviceEndpoint: "test env"
-      sessionTimeout: 10
-
     changePage: (page) ->
       page.show()
 
@@ -22,4 +18,4 @@ tw =
     dialog:
       display: () ->
 
-exports.tw = tw
+exports.calatrava = calatrava

data/lib/calatrava/templates/kernel/spec/spec_helper.js

@@ -12,7 +12,7 @@ _ = underscore;
 
 stubView = require('stubView.coffee').stubView;
 
-tw = require('environment.spec_helper').tw;
+calatrava = require('environment.spec_helper').calatrava;
 
 function recursiveExtend(moduleToExtend, module) {
   _.each(module, function (value, key) {
@@ -27,9 +27,10 @@ function recursiveExtend(moduleToExtend, module) {
 
 example = {};
 recursiveExtend(example, require('controller.converter').example);
+recursiveExtend(example, require('repository.converter').example);
 
 exports.stubView = stubView;
-exports.tw = tw;
+exports.calatrava = calatrava;
 exports.appDir = __dirname + "/../app";
 exports.example = example;
 

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

@@ -2,11 +2,6 @@ calatrava ?= {}
 calatrava.bridge = calatrava.bridge ? {}
 calatrava.bridge.web = calatrava.bridge.web ? {}
 
-calatrava.bridge.environment = () ->
-  sessionTimeout: 600
-  serviceEndpoint: ""
-  apiEndpoint: ""
-
 calatrava.bridge.web.ajax = (options) ->
   loader = $("#loader")
 
@@ -63,10 +58,11 @@ calatrava.bridge.web.ajax = (options) ->
       showLoader()
     success: (response) ->
       goToTop()
+      response = JSON.stringify(response) if  _.isObject(response)
       options.success(response)
-    error: () ->
+    error: (response) ->
       showLoader()
-      options.failure() if options.failure?
+      options.failure(response.status, response.responseText) if options.failure?
     complete: hideLoader
 
 calatrava.bridge.web.page = (pageName, proxyId) ->

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

@@ -1,6 +1,9 @@
-root = this
-root.calatrava ?= {}
-calatrava = root.calatrava
+example ?= {}
+example.converter ?= {}
+calatrava ?= {}
+
+#cross-domain calls would fail for web. Using ProxyPass in httpd.conf instead.
+example.converter.apiEndpoint = ""
 
 # Hide all the sub-pages when first launching the app
 $(document).ready ->

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.6.6"
+  Version = "0.6.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -178,6 +178,7 @@ files:
 - Vagrantfile
 - bin/calatrava
 - calatrava.gemspec
+- contracts/rate-exchange.jns
 - ext/mkrf_conf.rb
 - features/cli.feature
 - features/project.feature
@@ -211,6 +212,8 @@ files:
 - lib/calatrava/tasks/rake.rb
 - lib/calatrava/tasks/release.rb
 - lib/calatrava/template.rb
+- lib/calatrava/templates/.auto_compile.rb
+- lib/calatrava/templates/.gitignore
 - lib/calatrava/templates/.ruby-gemset.calatrava
 - lib/calatrava/templates/.ruby-version
 - lib/calatrava/templates/Gemfile.calatrava
@@ -239,7 +242,9 @@ files:
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/AssetRepository.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/CalatravaApplication.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/KernelBridge.java
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/NativePageStateManager.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PageRegistry.java
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PageStateManager.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PluginCommand.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PluginRegistry.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RegisteredActivity.java
@@ -248,6 +253,7 @@ files:
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RequestLoader.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RhinoService.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/shell/WebViewActivity.java
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/shell/WebViewPageStateManager.java
 - lib/calatrava/templates/droid/manifest.yml
 - lib/calatrava/templates/ios/Podfile.calatrava
 - lib/calatrava/templates/ios/manifest.yml
@@ -269,11 +275,13 @@ files:
 - lib/calatrava/templates/kernel/app/calatrava.coffee
 - lib/calatrava/templates/kernel/app/converter/controller.converter.coffee
 - lib/calatrava/templates/kernel/app/converter/init.converter.coffee
+- lib/calatrava/templates/kernel/app/converter/repository.converter.coffee
 - lib/calatrava/templates/kernel/app/pageHelper.coffee
 - lib/calatrava/templates/kernel/features/support/bridge.coffee
 - lib/calatrava/templates/kernel/features/support/spec_helper.js
 - lib/calatrava/templates/kernel/plugins/alert.coffee
 - lib/calatrava/templates/kernel/spec/converter/controller.converter.spec.coffee
+- lib/calatrava/templates/kernel/spec/converter/repository.converter.spec.coffee
 - lib/calatrava/templates/kernel/spec/environment.spec_helper.coffee
 - lib/calatrava/templates/kernel/spec/spec_helper.js
 - lib/calatrava/templates/kernel/spec/stubView.coffee
@@ -298,6 +306,7 @@ files:
 - spec/output_file_spec.rb
 - spec/shell_spec.rb
 - spec/spec_helper.rb
+- tools/janus.jar
 homepage: http://calatrava.github.com
 licenses: []
 post_install_message: