calatrava 0.6.4 → 0.6.5

data/.gitignore

@@ -7,3 +7,4 @@ tmp/*
 test/*
 currencyConverter/*
 /.rake
+/.vagrant

data/CHANGES.markdown

@@ -1,3 +1,13 @@
+## v0.6.5
+
+Bugs fixed:
+* Fix for Android not compiling out of the box
+* [Issue #72][i72]: Fix for cocoapods dependency issue
+* Fix for back button being broken in web apps
+* Pull in fix for calatrava-ios (request body encoding should be UTF-8)
+* Fix for bindAll not working
+* [Issue #67][i67]: Make gemspec more Linux-friendly
+
 ## v0.6.4
 
 New features:
@@ -108,6 +118,9 @@ Changes that will affect existing projects:
 * [Kalyan Akella](https://github.com/KalyanAkella)
 * [Filipe Esperandio](https://github.com/filipesperandio)
 * [Christoph Burgmer](https://github.com/cburgmer)
+* [James Gregory](https://github.com/jagregory)
+* [Sneha Venkatesh](https://github.com/snehayv)
+* [Dan Tao](https://github.com/dtao)
 
 [i5]: https://github.com/calatrava/calatrava/issues/5
 [i12]: https://github.com/calatrava/calatrava/issues/12

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     calatrava (0.6.4)
-      cocoapods (~> 0.16.0)
+      cocoapods (>= 0.16.0)
       cucumber (~> 1.2.1)
       haml (~> 3.1.7)
       mustache (~> 0.99.4)
@@ -26,8 +26,12 @@ GEM
     builder (3.1.4)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
-    cocoapods (0.16.4)
-      activesupport (~> 3.2.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)
@@ -35,7 +39,11 @@ GEM
       octokit (~> 1.7)
       open4 (~> 1.3.0)
       rake (~> 10.0.0)
-      xcodeproj (~> 0.5.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)
@@ -52,10 +60,10 @@ GEM
     gherkin (2.11.5)
       json (>= 1.4.6)
     haml (3.1.8)
-    hashie (2.0.4)
+    hashie (2.0.5)
     i18n (0.6.1)
     json (1.7.5)
-    multi_json (1.7.2)
+    multi_json (1.7.3)
     multipart-post (1.2.0)
     mustache (0.99.4)
     netrc (0.7.7)
@@ -77,14 +85,14 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
     rubyzip (0.9.9)
-    sass (3.2.8)
+    sass (3.2.9)
     selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
     thor (0.16.0)
-    watir-webdriver (0.6.3)
+    watir-webdriver (0.6.4)
       selenium-webdriver (>= 2.18.0)
     websocket (1.0.7)
     xcodeproj (0.5.5)

data/calatrava.gemspec

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8; mode: ruby -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "calatrava/version"
-require "calatrava/platform"
 
 Gem::Specification.new do |s|
   s.name        = "calatrava"
@@ -31,8 +30,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "cucumber", "~> 1.2.1"
   s.add_runtime_dependency "watir-webdriver", "~> 0.6.1"
 
-  if Calatrava.platform == :mac
-    s.add_runtime_dependency "xcodeproj", ">= 0.4.0" 
-    s.add_runtime_dependency "cocoapods", "~> 0.16.0"
-  end
+  s.extensions = ["ext/mkrf_conf.rb"]
 end

data/ext/mkrf_conf.rb

@@ -0,0 +1,29 @@
+# This is a hack to enable platform-specific dependencies in a single gem.
+# For background info see:
+# http://www.programmersparadox.com/2012/05/21/gemspec-loading-dependent-gems-based-on-the-users-system/
+
+# Code primarily borrowed from here:
+# https://github.com/mmzyk/gem_dependency_example
+
+require "rubygems/dependency_installer.rb"
+
+installer = Gem::DependencyInstaller.new
+begin
+
+  # I don't *think* you can use Calatrava.platform == :mac here as it seems
+  # RubyGems builds Ruby extensions without the dependencies declared in the gemspec.
+  if RUBY_PLATFORM =~ /darwin/
+    installer.install "xcodeproj", ">= 0.4.0"
+    installer.install "cocoapods", ">= 0.16.0"
+  end
+
+rescue Exception => ex
+  # Exit with a non-zero value to let RubyGems know something went wrong.
+  exit 1
+end
+
+# Since this is Ruby, RubyGems will attempt to run Rake.
+# If it doesn't find and successfully run a Rakefile, it errors out.
+File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") do |f|
+  f.write "task :default\n"
+end

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

@@ -13,9 +13,10 @@ public class Bootstrap extends Activity
     super.onCreate(savedInstanceState);
     setContentView(R.layout.main);
 
-    ((CalatravaApplication)getApplication()).provideActivityContext(this);
+    CalatravaApplication app = (CalatravaApplication)getApplication();
+    app.provideActivityContext(this);
 
     // And then start your first feature
-    launchFlow("example.converter.start");
+    app.launchFlow("example.converter.start");
   }
 }

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

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

@@ -89,7 +89,7 @@ calatrava.bridge.pageObject = (pageName) ->
     calatrava.bridge.runtime.attachProxyEventHandler(proxyId, event)
 
   bindAll: (options) ->
-    _.each options, (handler, event) => pageObject.bind event, handler
+    _.each options, (handler, event) => @bind event, handler
 
   dispatch: (event) ->
     args = _.toArray(arguments).slice(1)

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

@@ -8,4 +8,4 @@ $(document).ready ->
 
 window.onpopstate = (event) ->
   if event.state
-    tw.bridge.changePage event.state.page
+    calatrava.bridge.changePage event.state.page

data/lib/calatrava/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -155,45 +155,14 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: cocoapods
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.16.0
 description: A framework to build cross-platform mobile apps with high quality native
   UIs.
 email:
 - giles.alexander@gmail.com
 executables:
 - calatrava
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -209,6 +178,7 @@ files:
 - Vagrantfile
 - bin/calatrava
 - calatrava.gemspec
+- ext/mkrf_conf.rb
 - features/cli.feature
 - features/project.feature
 - features/sample_app.feature
@@ -340,18 +310,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -275265347738837271
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -275265347738837271
 requirements: []
 rubyforge_project: calatrava
 rubygems_version: 1.8.25