calatrava 0.6.9 → 0.6.10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODkyZmFkMmE4M2ZkZDdlOTkwZGQyYzg5OWRjMGM4NDRhZmRkZGYyYg==
+  data.tar.gz: !binary |-
+    ZDRlNjk1ZWZiMjhmOWRhNjk4ZDQ3NWE5YTFhMzE4MmE0ZGJmMDVmMw==
+SHA512:
+  metadata.gz: !binary |-
+    OGFjZjJiNjgyMTg4OTI2ZWNhM2Y4MjE1M2ZhZmNjYzVhOGJiYzA1ZjZjNDY3
+    Y2VhMGFlMDBhOWZmYjhjZTFkN2IyMWI1MzQ2ZDQwYWJmYTUyNzY3Y2IyZmU3
+    MDRkZjM2ZWQ3ZGI1YzE2NjM3OTEyMjcxNTdmYWE0ODBlYTE1YjI=
+  data.tar.gz: !binary |-
+    ODdiZmI1YjIzZDBiNmRkZTg3OGQwMTIxZWJmOTg0NTFiYjQ0MWJhZWIyNGM0
+    M2FjODdlMmI5MzkyZGE0Mjg2YmNjZDg5YjgwMzA0NzFjY2I5OWY0MjU3NDk3
+    ZTA1YzI5MGI3OGM4ODYyY2ZkZWVhNDhlMGE0Zjc1OWVhNjA4MDg=

data/CHANGES.markdown

@@ -1,3 +1,10 @@
+## v0.6.10
+
+Bugs Fixed:
+* [Issue #103][i103]: Fix file references in generated iOS project
+* [Issue #104][i104]: Fix Xcode 5 compilation errors for sample
+  project
+
 ## v0.6.9
 
 Bugs Fixed:
@@ -216,3 +223,5 @@ Changes that will affect existing projects:
 [i96]: https://github.com/calatrava/calatrava/issues/96
 [i94]: https://github.com/calatrava/calatrava/issues/94
 [i100]: https://github.com/calatrava/calatrava/pull/100
+[i103]: https://github.com/calatrava/calatrava/pull/103
+[i104]: https://github.com/calatrava/calatrava/pull/104

data/lib/calatrava/project_script.rb

@@ -183,13 +183,16 @@ module Calatrava
 
     def create_ios_tree(template)
       base_dir = Pathname.new(@name) + "ios"
-      proj = create_ios_project((base_dir + "#{@name}.xcodeproj").to_s)
+      xcodeproj = "#{@name}.xcodeproj"
+      proj_save_location = (base_dir + xcodeproj).to_s
+
+      proj = create_ios_project(xcodeproj)
 
       target = create_ios_project_target(proj)
       create_ios_project_groups(base_dir, proj, target)
       create_ios_folder_references(base_dir, proj, target)
 
-      proj.save
+      proj.save(proj_save_location)
     end
   end
 

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

@@ -9,8 +9,8 @@
 #import "ConversionFormViewController.h"
 
 @interface ConversionFormViewController (){
-  NSArray *_inCurrencyData; 
-  NSArray *_outCurrencyData;
+  NSMutableArray *_inCurrencyData;
+  NSMutableArray *_outCurrencyData;
 }
 
 @property (retain, nonatomic) IBOutlet UIPickerView *outCurrencyPicker;
@@ -29,22 +29,12 @@
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil{
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   if (self) {
-    _inCurrencyData = [[NSArray alloc] init];
-    _outCurrencyData = [[NSArray alloc] init]; 
+    _inCurrencyData = [[NSMutableArray alloc] init];
+    _outCurrencyData = [[NSMutableArray alloc] init];
   }
   return self; 
 }
 
-- (void)dealloc {
-  [outCurrencyPicker release];
-  [inCurrencyPicker release];
-  [_inCurrencyData release];
-  [_outCurrencyData release];
-  [inAmount release];
-  [outAmount release];
-  [super dealloc];
-}
-
 -(void)viewDidLoad{
   [super viewDidLoad];
   inCurrencyPicker.delegate = self;
@@ -75,6 +65,7 @@
   } else if ([field isEqualToString:@"in_amount"]) {
     return [inAmount text];
   }
+  return nil;
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
@@ -99,10 +90,10 @@
   [inAmount resignFirstResponder];
 }
 
-- (void)renderCurrencyPicker:(UIPickerView *)pickerView usingData:(NSArray *)currencyData to:(NSArray **)pickerStore
+- (void)renderCurrencyPicker:(UIPickerView *)pickerView usingData:(NSArray *)currencyData to:(NSMutableArray *)pickerStore
 {
-  [*pickerStore release];
-  *pickerStore = [currencyData copy];
+  [pickerStore removeAllObjects];
+  [pickerStore addObjectsFromArray:currencyData];
   if( pickerView ){
     [pickerView reloadComponent:0];
     [self updateCurrencyPickerSelection:pickerView usingData:currencyData];
@@ -112,7 +103,6 @@
 - (IBAction)convert:(id)sender {
   [self hideKeyboard];
   [self dispatchEvent:@"convert" withArgs:@[]];
-  return self;
 }
 
 - (void)render:(NSDictionary *)jsViewObject
@@ -121,9 +111,9 @@
   {
     id value =  [jsViewObject objectForKey:key];
     if ([key isEqualToString:@"inCurrencies"]) {
-      [self renderCurrencyPicker:inCurrencyPicker usingData:value to:&_inCurrencyData];
+      [self renderCurrencyPicker:inCurrencyPicker usingData:value to:_inCurrencyData];
     } else if ([key isEqualToString:@"outCurrencies"]) {
-      [self renderCurrencyPicker:outCurrencyPicker usingData:value to:&_outCurrencyData];
+      [self renderCurrencyPicker:outCurrencyPicker usingData:value to:_outCurrencyData];
     } else if ([key isEqualToString:@"in_amount"]) {
       [outAmount setText:[NSString stringWithFormat:@"%@", [jsViewObject objectForKey:@"in_amount"]]];
     } else if ([key isEqualToString:@"out_amount"]) {

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.6.9"
+  Version = "0.6.10"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.9
-  prerelease: 
+  version: 0.6.10
 platform: ruby
 authors:
 - Giles Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -314,33 +295,26 @@ files:
 - tools/janus.jar
 homepage: http://calatrava.github.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3050607410502594598
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3050607410502594598
 requirements: []
 rubyforge_project: calatrava
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cross-platform mobile apps with native UIs
 test_files:
 - features/cli.feature