calatrava 0.0.1 → 0.5.0

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

@@ -4,8 +4,8 @@ example.converter ?= {}
 example.converter.start = ->
   example.converter.controller
     views:
-      conversionForm: tw.bridge.pages.pageNamed "conversionForm"
-    changePage: tw.bridge.changePage
-    ajax: tw.bridge.request
+      conversionForm: calatrava.bridge.pages.pageNamed "conversionForm"
+    changePage: calatrava.bridge.changePage
+    ajax: calatrava.bridge.request
 
-  tw.bridge.changePage "conversionForm"
+  calatrava.bridge.changePage "conversionForm"

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

@@ -27,11 +27,11 @@ describe 'converter controller', ->
   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'
 
-    it 'should get the amount to convert', ->
-      expect(views.conversionForm.get).toHaveBeenCalledWith('amount')
-    it 'should get the starting currency', ->
-      expect(views.conversionForm.get).toHaveBeenCalledWith('start_currency')
-    it 'should get the ending currency', ->
-      expect(views.conversionForm.get).toHaveBeenCalledWith('end_currency')
+    it 'should render the correctly converted amount', ->
+      expect(views.conversionForm.render).toHaveBeenCalledWith
+        out_amount: 96

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

@@ -3,15 +3,31 @@ stubView ?= {}
 stubView =
   create: (name) ->
     boundEvents: {}
+    fieldValues: {}
     trigger: (event) ->
       @boundEvents[event]()
 
     bind: (event, handler) ->
       @boundEvents[event] = handler
 
-    render: (viewObject) ->
+    render: jasmine.createSpy("#{name} render")
+
+    fieldContains: (name, value) -> @fieldValues[name] = value
+    get: (name, callback) ->
+      callback(@fieldValues[name])
+
+    getMany: (fields, callback) ->
+      results = {}
+      getManyPrime = (remaining) =>
+        if (remaining.length > 0)
+          field = _.first(remaining)
+          @get field, (fieldValue) ->
+            results[field] = fieldValue
+            getManyPrime(_.rest(remaining))
+        else
+          callback(results)
+      getManyPrime(fields)
 
-    get: jasmine.createSpy('get')
 
     hideErrors: ()->
 

data/lib/calatrava/templates/package.json

@@ -11,7 +11,6 @@
     , "ws"            : "0.4.8"
     , "jasmine-node"  : "*"
     , "should"        : "*"
-    , "underscore"    : "*"
     , "jasmine-reporters" : "*"
     , "walkdir"       : "*"
     , "request"       : "*"

data/lib/calatrava/templates/shell/pages/converter/conversionForm.haml

@@ -6,7 +6,9 @@
     {{/currencies}}
 
   %h3 THE BEST CURRENCY CONVERTER EVER
-  %select.in_currency
-  %input.in_amount(type='number' placeholder='amount')
-  %select.out_currency
-  %button GO
+  %select#in_currency
+  %input#in_amount(type='number' placeholder='amount')
+  %select#out_currency
+  %br
+  %button#convert GO
+  %input#out_amount(placeholder='no result' readonly="true" )

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

@@ -4,39 +4,33 @@ calatrava.pageView.conversionForm = ->
 
   #TODO: refactor out
   $page = $('#conversionForm')
-  $p = (sel)-> $(sel,$page)
-
-  eventHandlers = {}
-
-  trigger = (event, args...) ->
-    eventHandlers[event](args...)
+  $p = (sel)-> $(sel, $page)
 
   renderCurrencyDropdown = ($select, currencies)->
     $select.empty().html ich.currencyDropdownTmpl
       currencies: currencies
 
-  renderSection = (key,data) ->
+  renderSection = (key, data) ->
     switch key
-      when 'inCurrencies' then renderCurrencyDropdown( $p('.in_currency'), data )
-      when 'outCurrencies' then renderCurrencyDropdown( $p('.out_currency'), data )
-      else console.warn( "unrecognized render section #{key}" )
-
-
-  $p(".out_currency").on 'change', ->
-    selectedCurrencyCode = $(this).val()
-    trigger("selectedOutCurrency", selectedCurrencyCode)
-  $p(".in_currency").on 'change', ->
-    selectedCurrencyCode = $(this).val()
-    trigger("selectedInCurrency", selectedCurrencyCode)
+      when 'inCurrencies' then renderCurrencyDropdown($p('#in_currency'), data)
+      when 'outCurrencies' then renderCurrencyDropdown($p('#out_currency'), data)
+      else $p("#" + key).val(data)
 
   bind: (event, handler) ->
-    eventHandlers[event] = handler
+    console.log "event: #{event}"
+    switch event
+      when 'selectedInCurrency' then $p("#in_currency").off('change').on 'change', handler
+      when 'selectedOutCurrency' then $p("#out_currency").off('change').on 'change', handler
+      else
+        $p("#" + event).off('click').on 'click', handler
 
   render: (message) ->
     console.log('rendering...', message)
-    renderSection(section,data) for own section,data of message
+    renderSection(section, data) for own section,data of message
+
+  get: (field) ->
+    console.log('getting...', field)
+    $page.find("#" + field).val()
 
-  get: (field) -> console.log( 'getting...', field )
-  
-  show: -> console.log( 'showing...' )
-  hide: -> console.log( 'hiding...' )
+  show: -> console.log('showing...')
+  hide: -> console.log('hiding...')

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

@@ -1,101 +1,13 @@
-tw ?= {}
-tw.bridge = tw.bridge ? {}
+calatrava ?= {}
+calatrava.bridge = calatrava.bridge ? {}
+calatrava.bridge.web = calatrava.bridge.web ? {}
 
-tw.bridge.environment = () ->
+calatrava.bridge.environment = () ->
   sessionTimeout: 600
   serviceEndpoint: ""
   apiEndpoint: ""
 
-tw.bridge.pageProxy = (name, real) ->
-  handlers = {}
-  methods =
-    bind: (event, callback) ->
-      if event == 'pageOpened'
-        handlers.pageOpened = callback
-      else
-        real.bind(event, callback)
-
-    trigger: (event) ->
-      handlers[event]() if handlers[event]?
-
-    get: (field) -> String(real.get(field))
-
-  # Most functions just route through to the original
-  _.each ['render', 'show', 'hide', 'showDialog'], (method) ->
-    methods[method] = () -> real[method].apply(real, arguments)
-
-  methods
-
-class tw.bridge.pages
-  pageObjects = {}
-
-  pages.pageNamed = (pageName) ->
-    if !pageObjects[pageName]
-      pageView = calatrava.pageView[pageName]()
-      pageObjects[pageName] = tw.bridge.pageProxy(pageName, pageView)
-    pageObjects[pageName]
-
-tw.bridge.changePage = (page, options = {}) ->
-  pageObject = tw.bridge.pages.pageNamed page
-  if !options.back
-    history.pushState({page: page}, "", "")
-  tw.currentPage.hide() if tw.currentPage
-  pageObject.show()
-  tw.currentPage = pageObject
-  pageObject.trigger 'pageOpened'
-  page
-
-tw.bridge.widgets = (() ->
-  displayDateWidget = (options, callback) ->
-    options["month"] = Number(options["month"])+1
-    _.each ["year", "month", "day"], (val) -> $("#dummy_" + val).val(options[val]) if !$("#dummy_" + val).val()
-    $("#dummy_date_picker").show()
-
-    $("#dummy_date_button").unbind().bind 'click', () ->
-      $("#dummy_date_picker").hide()
-      callback $("#dummy_year").val(), $("#dummy_month").val() - 1, $("#dummy_day").val()
-
-  displayAirportWidget = (callback) ->
-    $("#dummy_airport_select_widget").show()
-
-    $("#dummy_airport_set_button").unbind().bind 'click', () ->
-      $("#dummy_airport_select_widget").hide()
-      airportCode = $("#dummy_airport_code").val()
-      airportMap = {ORD: "Chicago", ATL: "Atlanta", DEL: "Delhi", BOM: "Mumbai"}
-      callback airportCode, airportMap[airportCode]
-
-
-  display: (widget, options, callback) ->
-    if widget == "date"
-      displayDateWidget options.selectedDate, callback
-    else if widget == "airport"
-      displayAirportWidget callback
-)()
-
-tw.bridge.alert = (msg) -> alert(msg)
-
-tw.bridge.openUrl = (url) ->
-  window.open(url)
-
-tw.bridge.trackEvent = (pageName, channel, eventName, variables, properties) ->
-  describedKeyValuePairs = (pairs) -> _.map(pairs, (val, key) -> "#{key}: '#{val}'").join('; ')
-  console.log "Omniture track event: page: '#{pageName}'; channel: '#{channel}'; events: '#{eventName}'"
-  console.log "Omniture variables: #{describedKeyValuePairs(variables)}"
-  console.log "Omniture properties: #{describedKeyValuePairs(properties)}"
-
-tw.bridge.timers = (() ->
-  start: (timeout, callback) ->
-    window.setTimeout(callback, timeout * 1000)
-
-  clearTimer: (timerId) ->
-)()
-
-tw.bridge.dialog = (() ->
-  display: (dialogName) ->
-    tw.currentPage.showDialog dialogName
-)()
-
-tw.bridge.request = (options) ->
+calatrava.bridge.web.ajax = (options) ->
   loader = $("#loader")
 
   errorHandler = () ->
@@ -156,3 +68,59 @@ tw.bridge.request = (options) ->
       showLoader()
       options.failure()
     complete: hideLoader
+
+calatrava.bridge.web.page = (pageName, proxyId) ->
+  real = calatrava.pageView[pageName]()
+  handlers = {}
+  methods =
+    bind: (event, callback) ->
+      if event == 'pageOpened'
+        handlers.pageOpened = callback
+      else
+        real.bind(event, callback)
+
+    trigger: (event) ->
+      handlers[event]() if handlers[event]?
+
+    get: (field, getId) ->
+      calatrava.inbound.fieldRead(proxyId, getId, String(real.get(field)))
+
+  # Most functions just route through to the original
+  _.each ['render', 'show', 'hide'], (method) ->
+    methods[method] = () -> real[method].apply(real, arguments)
+
+  methods
+
+calatrava.bridge.runtime = (() ->
+
+  pages = {}
+  pagesNamed = {}
+  currentPage = null
+
+  registerProxyForPage: (proxyId, pageName) ->
+    pages[proxyId] = calatrava.bridge.web.page(pageName, proxyId)
+    pagesNamed[pageName] = pages[proxyId]
+
+  changePage: (page, options = {}) ->
+    pageObject = pagesNamed[page]
+    if !options.back
+      history.pushState({page: page}, "", "")
+    currentPage.hide() if currentPage
+    pageObject.show()
+    currentPage = pageObject
+    pageObject.trigger 'pageOpened'
+
+  attachProxyEventHandler: (proxyId, event) ->
+    pages[proxyId].bind event, () ->
+      args = [proxyId, event].concat(_.toArray(arguments))
+      calatrava.inbound.dispatchEvent.apply(calatrava.inbound, args)
+
+  valueOfProxyField: (proxyId, field, getId) -> pages[proxyId].get(field, getId)
+  renderProxy: (viewObject, proxyId) -> pages[proxyId].render(viewObject)
+  issueRequest: calatrava.bridge.web.ajax
+  openUrl: (url) -> window.open(url)
+  log: (message) -> console.log(message)
+
+  startTimerWithTimeout: (timerId, timeout) ->
+    window.setTimeout((() -> calatrava.inbound.fireTimer(timerId)), timeout * 1000)
+)()

data/lib/calatrava/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70361649032740 !ruby/object:Gem::Requirement
+  requirement: &70314197260240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361649032740
+  version_requirements: *70314197260240
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70361649032320 !ruby/object:Gem::Requirement
+  requirement: &70314197259820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361649032320
+  version_requirements: *70314197259820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70361649031900 !ruby/object:Gem::Requirement
+  requirement: &70314197259400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361649031900
+  version_requirements: *70314197259400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70361649031480 !ruby/object:Gem::Requirement
+  requirement: &70314197258980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361649031480
+  version_requirements: *70314197258980
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70361649031060 !ruby/object:Gem::Requirement
+  requirement: &70314197258560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361649031060
+  version_requirements: *70314197258560
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70361649030640 !ruby/object:Gem::Requirement
+  requirement: &70314197258140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361649030640
+  version_requirements: *70314197258140
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70361648294920 !ruby/object:Gem::Requirement
+  requirement: &70314197257720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361648294920
+  version_requirements: *70314197257720
 - !ruby/object:Gem::Dependency
   name: xcoder
-  requirement: &70361648292960 !ruby/object:Gem::Requirement
+  requirement: &70314197257300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361648292960
+  version_requirements: *70314197257300
 - !ruby/object:Gem::Dependency
   name: xcodeproj
-  requirement: &70361648290200 !ruby/object:Gem::Requirement
+  requirement: &70314197256880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361648290200
+  version_requirements: *70314197256880
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70361655819580 !ruby/object:Gem::Requirement
+  requirement: &70314197256460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361655819580
+  version_requirements: *70314197256460
 - !ruby/object:Gem::Dependency
   name: frank-cucumber
-  requirement: &70361655819160 !ruby/object:Gem::Requirement
+  requirement: &70314197256040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361655819160
+  version_requirements: *70314197256040
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70361655818740 !ruby/object:Gem::Requirement
+  requirement: &70314197255620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361655818740
+  version_requirements: *70314197255620
 - !ruby/object:Gem::Dependency
   name: cocoapods
-  requirement: &70361655818320 !ruby/object:Gem::Requirement
+  requirement: &70314197255200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,11 +153,11 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361655818320
+  version_requirements: *70314197255200
 description: A framework to build cross-platform mobile apps with high quality native
   UIs.
 email:
-- gga@thoughtworks.com
+- giles.alexander@gmail.com
 executables:
 - calatrava
 extensions: []
@@ -174,7 +174,10 @@ files:
 - calatrava.gemspec
 - features/cli.feature
 - features/project.feature
+- features/sample_app.feature
+- features/step_definitions/app_steps.rb
 - features/step_definitions/template_steps.rb
+- features/support/calatrava_app.rb
 - features/support/env.rb
 - lib/calatrava.rb
 - lib/calatrava/app.rb
@@ -209,11 +212,11 @@ files:
 - lib/calatrava/templates/config/templates/env.coffee.erb
 - lib/calatrava/templates/config/templates/httpd.conf.erb
 - lib/calatrava/templates/droid/app/bridge.coffee
+- lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/AndroidManifest.xml.calatrava
+- lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/build.xml.calatrava
 - lib/calatrava/templates/droid/calatrava/ant/calatrava.xml
-- lib/calatrava/templates/droid/calatrava/calatrava-build.xml
 - lib/calatrava/templates/droid/calatrava/ivy.xml
 - lib/calatrava/templates/droid/calatrava/ivysettings.xml
-- lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/AndroidManifest.xml.calatrava
 - lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/ConversionForm.java.calatrava
 - lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/Title.java.calatrava
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/CalatravaPage.java
@@ -229,7 +232,6 @@ files:
 - lib/calatrava/templates/droid/manifest.yml
 - lib/calatrava/templates/ios/Podfile.calatrava
 - lib/calatrava/templates/ios/manifest.yml
-- lib/calatrava/templates/ios/res/js/bridge.js
 - lib/calatrava/templates/ios/res/xibs/ProgressViewController.xib
 - lib/calatrava/templates/ios/res/xibs/WebViewController.xib
 - lib/calatrava/templates/ios/src/AppDelegate.h
@@ -262,7 +264,7 @@ files:
 - lib/calatrava/templates/shell/layouts/single_page.haml
 - lib/calatrava/templates/shell/pages/converter/conversionForm.haml
 - lib/calatrava/templates/shell/pages/converter/page.conversionForm.coffee
-- lib/calatrava/templates/shell/shell.scss
+- lib/calatrava/templates/shell/stylesheets/shell.scss
 - lib/calatrava/templates/shell/support/shell.coffee
 - lib/calatrava/templates/web/apache/conf/mime.types
 - lib/calatrava/templates/web/app/source/bridge.coffee
@@ -271,7 +273,7 @@ files:
 - lib/calatrava/templates/web/deploy/instance.sh
 - lib/calatrava/templates/web/manifest.yml
 - lib/calatrava/version.rb
-homepage: ''
+homepage: http://calatrava.github.com
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -298,5 +300,8 @@ summary: Cross-platform mobile apps with native UIs
 test_files:
 - features/cli.feature
 - features/project.feature
+- features/sample_app.feature
+- features/step_definitions/app_steps.rb
 - features/step_definitions/template_steps.rb
+- features/support/calatrava_app.rb
 - features/support/env.rb