calatrava 0.6.9 → 0.6.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +15 -0
  2. data/CHANGES.markdown +9 -0
  3. data/lib/calatrava/project_script.rb +5 -2
  4. data/lib/calatrava/templates/ios/src/ConversionFormViewController.m +10 -20
  5. data/lib/calatrava/version.rb +1 -1
  6. metadata +5 -31
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ODkyZmFkMmE4M2ZkZDdlOTkwZGQyYzg5OWRjMGM4NDRhZmRkZGYyYg==
5
+ data.tar.gz: !binary |-
6
+ ZDRlNjk1ZWZiMjhmOWRhNjk4ZDQ3NWE5YTFhMzE4MmE0ZGJmMDVmMw==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ OGFjZjJiNjgyMTg4OTI2ZWNhM2Y4MjE1M2ZhZmNjYzVhOGJiYzA1ZjZjNDY3
10
+ Y2VhMGFlMDBhOWZmYjhjZTFkN2IyMWI1MzQ2ZDQwYWJmYTUyNzY3Y2IyZmU3
11
+ MDRkZjM2ZWQ3ZGI1YzE2NjM3OTEyMjcxNTdmYWE0ODBlYTE1YjI=
12
+ data.tar.gz: !binary |-
13
+ ODdiZmI1YjIzZDBiNmRkZTg3OGQwMTIxZWJmOTg0NTFiYjQ0MWJhZWIyNGM0
14
+ M2FjODdlMmI5MzkyZGE0Mjg2YmNjZDg5YjgwMzA0NzFjY2I5OWY0MjU3NDk3
15
+ ZTA1YzI5MGI3OGM4ODYyY2ZkZWVhNDhlMGE0Zjc1OWVhNjA4MDg=
data/CHANGES.markdown CHANGED
@@ -1,3 +1,10 @@
1
+ ## v0.6.10
2
+
3
+ Bugs Fixed:
4
+ * [Issue #103][i103]: Fix file references in generated iOS project
5
+ * [Issue #104][i104]: Fix Xcode 5 compilation errors for sample
6
+ project
7
+
1
8
  ## v0.6.9
2
9
 
3
10
  Bugs Fixed:
@@ -216,3 +223,5 @@ Changes that will affect existing projects:
216
223
  [i96]: https://github.com/calatrava/calatrava/issues/96
217
224
  [i94]: https://github.com/calatrava/calatrava/issues/94
218
225
  [i100]: https://github.com/calatrava/calatrava/pull/100
226
+ [i103]: https://github.com/calatrava/calatrava/pull/103
227
+ [i104]: https://github.com/calatrava/calatrava/pull/104
data/lib/calatrava/project_script.rb CHANGED
@@ -183,13 +183,16 @@ module Calatrava
183
183
 
184
184
  def create_ios_tree(template)
185
185
  base_dir = Pathname.new(@name) + "ios"
186
- proj = create_ios_project((base_dir + "#{@name}.xcodeproj").to_s)
186
+ xcodeproj = "#{@name}.xcodeproj"
187
+ proj_save_location = (base_dir + xcodeproj).to_s
188
+
189
+ proj = create_ios_project(xcodeproj)
187
190
 
188
191
  target = create_ios_project_target(proj)
189
192
  create_ios_project_groups(base_dir, proj, target)
190
193
  create_ios_folder_references(base_dir, proj, target)
191
194
 
192
- proj.save
195
+ proj.save(proj_save_location)
193
196
  end
194
197
  end
195
198
 
data/lib/calatrava/templates/ios/src/ConversionFormViewController.m CHANGED
@@ -9,8 +9,8 @@
9
9
  #import "ConversionFormViewController.h"
10
10
 
11
11
  @interface ConversionFormViewController (){
12
- NSArray *_inCurrencyData;
13
- NSArray *_outCurrencyData;
12
+ NSMutableArray *_inCurrencyData;
13
+ NSMutableArray *_outCurrencyData;
14
14
  }
15
15
 
16
16
  @property (retain, nonatomic) IBOutlet UIPickerView *outCurrencyPicker;
@@ -29,22 +29,12 @@
29
29
  - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil{
30
30
  self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
31
31
  if (self) {
32
- _inCurrencyData = [[NSArray alloc] init];
33
- _outCurrencyData = [[NSArray alloc] init];
32
+ _inCurrencyData = [[NSMutableArray alloc] init];
33
+ _outCurrencyData = [[NSMutableArray alloc] init];
34
34
  }
35
35
  return self;
36
36
  }
37
37
 
38
- - (void)dealloc {
39
- [outCurrencyPicker release];
40
- [inCurrencyPicker release];
41
- [_inCurrencyData release];
42
- [_outCurrencyData release];
43
- [inAmount release];
44
- [outAmount release];
45
- [super dealloc];
46
- }
47
-
48
38
  -(void)viewDidLoad{
49
39
  [super viewDidLoad];
50
40
  inCurrencyPicker.delegate = self;
@@ -75,6 +65,7 @@
75
65
  } else if ([field isEqualToString:@"in_amount"]) {
76
66
  return [inAmount text];
77
67
  }
68
+ return nil;
78
69
  }
79
70
 
80
71
  - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
@@ -99,10 +90,10 @@
99
90
  [inAmount resignFirstResponder];
100
91
  }
101
92
 
102
- - (void)renderCurrencyPicker:(UIPickerView *)pickerView usingData:(NSArray *)currencyData to:(NSArray **)pickerStore
93
+ - (void)renderCurrencyPicker:(UIPickerView *)pickerView usingData:(NSArray *)currencyData to:(NSMutableArray *)pickerStore
103
94
  {
104
- [*pickerStore release];
105
- *pickerStore = [currencyData copy];
95
+ [pickerStore removeAllObjects];
96
+ [pickerStore addObjectsFromArray:currencyData];
106
97
  if( pickerView ){
107
98
  [pickerView reloadComponent:0];
108
99
  [self updateCurrencyPickerSelection:pickerView usingData:currencyData];
@@ -112,7 +103,6 @@
112
103
  - (IBAction)convert:(id)sender {
113
104
  [self hideKeyboard];
114
105
  [self dispatchEvent:@"convert" withArgs:@[]];
115
- return self;
116
106
  }
117
107
 
118
108
  - (void)render:(NSDictionary *)jsViewObject
@@ -121,9 +111,9 @@
121
111
  {
122
112
  id value = [jsViewObject objectForKey:key];
123
113
  if ([key isEqualToString:@"inCurrencies"]) {
124
- [self renderCurrencyPicker:inCurrencyPicker usingData:value to:&_inCurrencyData];
114
+ [self renderCurrencyPicker:inCurrencyPicker usingData:value to:_inCurrencyData];
125
115
  } else if ([key isEqualToString:@"outCurrencies"]) {
126
- [self renderCurrencyPicker:outCurrencyPicker usingData:value to:&_outCurrencyData];
116
+ [self renderCurrencyPicker:outCurrencyPicker usingData:value to:_outCurrencyData];
127
117
  } else if ([key isEqualToString:@"in_amount"]) {
128
118
  [outAmount setText:[NSString stringWithFormat:@"%@", [jsViewObject objectForKey:@"in_amount"]]];
129
119
  } else if ([key isEqualToString:@"out_amount"]) {
data/lib/calatrava/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Calatrava
2
- Version = "0.6.9"
2
+ Version = "0.6.10"
3
3
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: calatrava
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.9
5
- prerelease:
4
+ version: 0.6.10
6
5
  platform: ruby
7
6
  authors:
8
7
  - Giles Alexander
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-09-23 00:00:00.000000000 Z
11
+ date: 2013-10-20 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rspec
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ! '>='
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :development
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ! '>='
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: aruba
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ! '>='
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ! '>='
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: rake
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ! '>='
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ! '>='
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: thor
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ~>
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ~>
76
67
  - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: haml
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ~>
84
74
  - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ~>
92
81
  - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: sass
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ~>
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ~>
108
95
  - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: mustache
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - ~>
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - ~>
124
109
  - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: cucumber
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - ~>
132
116
  - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
134
118
  type: :runtime
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - ~>
140
123
  - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: watir-webdriver
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
129
  - - ~>
148
130
  - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
150
132
  type: :runtime
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
136
  - - ~>
156
137
  - !ruby/object:Gem::Version
@@ -314,33 +295,26 @@ files:
314
295
  - tools/janus.jar
315
296
  homepage: http://calatrava.github.com
316
297
  licenses: []
298
+ metadata: {}
317
299
  post_install_message:
318
300
  rdoc_options: []
319
301
  require_paths:
320
302
  - lib
321
303
  required_ruby_version: !ruby/object:Gem::Requirement
322
- none: false
323
304
  requirements:
324
305
  - - ! '>='
325
306
  - !ruby/object:Gem::Version
326
307
  version: '0'
327
- segments:
328
- - 0
329
- hash: -3050607410502594598
330
308
  required_rubygems_version: !ruby/object:Gem::Requirement
331
- none: false
332
309
  requirements:
333
310
  - - ! '>='
334
311
  - !ruby/object:Gem::Version
335
312
  version: '0'
336
- segments:
337
- - 0
338
- hash: -3050607410502594598
339
313
  requirements: []
340
314
  rubyforge_project: calatrava
341
- rubygems_version: 1.8.23
315
+ rubygems_version: 2.1.9
342
316
  signing_key:
343
- specification_version: 3
317
+ specification_version: 4
344
318
  summary: Cross-platform mobile apps with native UIs
345
319
  test_files:
346
320
  - features/cli.feature