appjam 0.1.0.pre11 → 0.1.1

data/lib/appjam/generators/project/Classes/contacts/view/components/UserList.m.tt

@@ -1,18 +1,18 @@
 //
-//  UserList.m
+//  <%= @class_name %>List.m
 //  PureMVC_ObjectiveC
 //
-//  PureMVC Port to ObjectiveC by Brian Knorr <brian.knorr@puremvc.org>
-//  PureMVC - Copyright(c) 2006-2008 Futurescale, Inc., Some rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
-#import "UserList.h"
+#import "<%= @class_name %>List.h"
 
-#define USER_CELL_ID @"UserCellID"
+#define USER_CELL_ID @"<%= @class_name %>CellID"
 
-@implementation UserList
+@implementation <%= @class_name %>List
 
-@synthesize users, delegate;
+@synthesize <%= @project_name %>s, delegate;
 
 -(id)init {
 	return [super initWithStyle:UITableViewStylePlain];
@@ -20,55 +20,55 @@
 
 - (void)loadView {
 	[super loadView];
-	self.users = [NSMutableArray array];
+	self.<%= @project_name %>s = [NSMutableArray array];
 	//self.navigationItem.leftBarButtonItem = self.editButtonItem;
-	self.navigationItem.title = @"Users";
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(newUser)];
+	self.navigationItem.title = @"<%= @class_name %>s";
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(new<%= @class_name %>)];
 }
 
 -(void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	[delegate userListAppeared];
+	[delegate <%= @project_name %>ListAppeared];
 }
 
--(void)reloadUsers:(NSMutableArray *)_users {
-	self.users = _users;
+-(void)reload<%= @class_name %>s:(NSMutableArray *)_<%= @project_name %>s {
+	self.<%= @project_name %>s = _<%= @project_name %>s;
 	[self.tableView reloadData];
 }
 
 - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
-	UserVO *userVO = [[users objectAtIndex:indexPath.row] retain];
-	[users removeObjectAtIndex:indexPath.row];
+	<%= @class_name %>VO *<%= @project_name %>VO = [[<%= @project_name %>s objectAtIndex:indexPath.row] retain];
+	[<%= @project_name %>s removeObjectAtIndex:indexPath.row];
 	[self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
-	[delegate deleteUserSelected:userVO];
-	[userVO release];
+	[delegate delete<%= @class_name %>Selected:<%= @project_name %>VO];
+	[<%= @project_name %>VO release];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	UITableViewCell *userCell = [tableView dequeueReusableCellWithIdentifier:USER_CELL_ID];
-	if (userCell == nil) {
-		userCell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:USER_CELL_ID] autorelease];
-		userCell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+	UITableViewCell *<%= @project_name %>Cell = [tableView dequeueReusableCellWithIdentifier:USER_CELL_ID];
+	if (<%= @project_name %>Cell == nil) {
+		<%= @project_name %>Cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:USER_CELL_ID] autorelease];
+		<%= @project_name %>Cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 	}
-	UserVO *userVO = [users objectAtIndex:indexPath.row];
-	userCell.textLabel.text = [userVO givenName];
-	return userCell;
+	<%= @class_name %>VO *<%= @project_name %>VO = [<%= @project_name %>s objectAtIndex:indexPath.row];
+	<%= @project_name %>Cell.textLabel.text = [<%= @project_name %>VO givenName];
+	return <%= @project_name %>Cell;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-	return [users count];
+	return [<%= @project_name %>s count];
 }
 
--(void)newUser {
-	[delegate newUserSelected];
+-(void)new<%= @class_name %> {
+	[delegate new<%= @class_name %>Selected];
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	[delegate userSelected:[users objectAtIndex:indexPath.row]];
+	[delegate <%= @project_name %>Selected:[<%= @project_name %>s objectAtIndex:indexPath.row]];
 }
 
 - (void)dealloc {
-	self.users = nil;
+	self.<%= @project_name %>s = nil;
 	self.delegate = nil;
     [super dealloc];
 }

data/lib/appjam/generators/project/Classes/org/puremvc/objectivec/patterns/command/SimpleCommand.m

@@ -23,7 +23,7 @@
  * 
  * <P>
  * In the Command Pattern, an application use-case typically
- * begins with some user action, which results in an <code>INotification</code> being broadcast, which 
+ * begins with some <%= @project_name %> action, which results in an <code>INotification</code> being broadcast, which 
  * is handled by business logic in the <code>execute</code> method of an
  * <code>ICommand</code>.</P>
  * 

data/lib/appjam/generators/project/Contacts_Prefix.pch.tt

@@ -1,5 +1,5 @@
 //
-// Prefix header for all source files of the 'Contacts' target in the '<%= @class_name %>' project
+// Prefix header for all source files of the '<%= @class_name %>' target in the '<%= @project_name %>' project
 //
 
 #ifdef __OBJC__

data/lib/appjam/generators/project/main.m.tt

@@ -1,9 +1,9 @@
 //
 //  main.m
-//  Contacts
+//  <%= @class_name %>
 //
-//  Created by eiffel on 11-2-16.
-//  Copyright 2011 Redsafi. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -11,7 +11,7 @@
 int main(int argc, char *argv[]) {
     
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"ContactsAppDelegate");
+    int retVal = UIApplicationMain(argc, argv, nil, @"<%= @class_name %>AppDelegate");
     [pool release];
     return retVal;
 }

data/lib/appjam/generators/project/utils/NSStringWhiteSpace.h

@@ -2,8 +2,8 @@
 //  NSStringWhiteSpace.h
 //  YueBao
 //
-//  Created by eiffel on 10-4-8.
-//  Copyright 2010 www.likenote.com. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/appjam/generators/project/utils/NSStringWhiteSpace.m

@@ -2,8 +2,8 @@
 //  NSStringWhiteSpace.m
 //  YueBao
 //
-//  Created by eiffel on 10-4-8.
-//  Copyright 2010 www.likenote.com. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import "NSStringWhiteSpace.h"

data/lib/appjam/generators/project/utils/UIDevice.h

@@ -2,8 +2,8 @@
 //  UIDevice.h
 //  EarthShake
 //
-//  Created by eiffel on 10-4-2.
-//  Copyright 2010 www.likenote.com. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/appjam/generators/project/utils/UIDevice.m

@@ -2,8 +2,8 @@
 //  UIDevice.m
 //  EarthShake
 //
-//  Created by eiffel on 10-4-2.
-//  Copyright 2010 www.likenote.com. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import "UIDevice.h"

data/lib/appjam/generators/project/utils/URLEncodeString.h

@@ -2,8 +2,8 @@
 //  URLEncodeString.h
 //  YueBao
 //
-//  Created by eiffel on 10-4-27.
-//  Copyright 2010 www.likenote.com. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/appjam/generators/project/utils/URLEncodeString.m

@@ -2,8 +2,8 @@
 //  URLEncodeString.m
 //  YueBao
 //
-//  Created by eiffel on 10-4-27.
-//  Copyright 2010 www.likenote.com. All rights reserved.
+//  Created by <%= @developer.capitalize %> on <%= @created_on %>
+//  Copyright(c) <%= Time.now.year %>, All rights reserved.
 //
 
 #import "URLEncodeString.h"

data/lib/appjam/version.rb

@@ -2,9 +2,9 @@ module Appjam
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
-    BUILD = 'pre11'
-
-    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+    PATCH = 1
+    BUILD = ''
+    
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').chomp('.')
   end
 end

data/test/test_model_generator.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestProjectGenerator < Test::Unit::TestCase
+  def setup
+    @apptmp = "#{Dir.tmpdir}/appjam-tests/#{UUID.new.generate}"
+    `mkdir -p #{@apptmp}`
+  end
+
+  def teardown
+    `rm -rf #{@apptmp}`
+    `rm -rf /tmp/project`
+  end
+  
+  context 'the project generator' do  
+  
+    should "do not allow create model outside iphone project folder" do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") } }
+      assert_raise(::NameError) { silence_logger { generate(:model, "user") } }
+    end  
+    
+    should "raise an Error when given invalid constant names for model" do
+      assert_raise(::NameError) { silence_logger { generate(:model, "123asdf") } }
+      assert_raise(::NameError) { silence_logger { generate(:model, "./sample_project") } }
+    end    
+    
+  end
+  
+end

data/test/test_project_generator.rb

@@ -22,13 +22,13 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") } }
       assert_file_exists("#{@apptmp}/sample_project")
       assert_file_exists("#{@apptmp}/sample_project/Classes")
-      assert_file_exists("#{@apptmp}/sample_project/Contacts_Prefix.pch")
-      assert_file_exists("#{@apptmp}/sample_project/Contacts-Info.plist")
-      assert_file_exists("#{@apptmp}/sample_project/Contacts.xcodeproj")
-      assert_file_exists("#{@apptmp}/sample_project/main.m")
+      # assert_file_exists("#{@apptmp}/sample_project/Contacts_Prefix.pch")
+      # assert_file_exists("#{@apptmp}/sample_project/Contacts-Info.plist")
+      # assert_file_exists("#{@apptmp}/sample_project/Contacts.xcodeproj")
+      # assert_file_exists("#{@apptmp}/sample_project/main.m")
     end  
     
-    should "raise an Error when given invalid constant names" do
+    should "raise an Error when given invalid constant names for project" do
       assert_raise(::NameError) { silence_logger { generate(:project, "123asdf", "--root=#{@apptmp}") } }
       assert_raise(::NameError) { silence_logger { generate(:project, "./sample_project", "--root=#{@apptmp}") } }
     end    

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appjam
 version: !ruby/object:Gem::Version 
-  hash: 1923831983
-  prerelease: 6
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  - pre
-  - 11
-  version: 0.1.0.pre11
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Eiffel Q
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 Z
+date: 2011-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -328,12 +326,12 @@ files:
 - lib/appjam/generators/project/Classes/contacts/model/UserProxy.m.tt
 - lib/appjam/generators/project/Classes/contacts/model/vo/UserVO.h.tt
 - lib/appjam/generators/project/Classes/contacts/model/vo/UserVO.m.tt
-- lib/appjam/generators/project/Classes/contacts/view/ContactsMediator.h.tt
-- lib/appjam/generators/project/Classes/contacts/view/ContactsMediator.m.tt
 - lib/appjam/generators/project/Classes/contacts/view/UserFormMediator.h.tt
 - lib/appjam/generators/project/Classes/contacts/view/UserFormMediator.m.tt
 - lib/appjam/generators/project/Classes/contacts/view/UserListMediator.h.tt
 - lib/appjam/generators/project/Classes/contacts/view/UserListMediator.m.tt
+- lib/appjam/generators/project/Classes/contacts/view/UserMediator.h.tt
+- lib/appjam/generators/project/Classes/contacts/view/UserMediator.m.tt
 - lib/appjam/generators/project/Classes/contacts/view/components/Contacts.h.tt
 - lib/appjam/generators/project/Classes/contacts/view/components/Contacts.m.tt
 - lib/appjam/generators/project/Classes/contacts/view/components/UserForm.h.tt
@@ -388,6 +386,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - test/helper.rb
+- test/test_model_generator.rb
 - test/test_project_generator.rb
 - bin/appjam
 homepage: http://github.com/eiffelqiu/appjam
@@ -410,14 +409,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -427,4 +424,5 @@ specification_version: 3
 summary: an iphone app generator
 test_files: 
 - test/helper.rb
+- test/test_model_generator.rb
 - test/test_project_generator.rb

data/lib/appjam/generators/project/Classes/contacts/view/ContactsMediator.h.tt

@@ -1,15 +0,0 @@
-//
-//  ContactsMediator.h
-//  PureMVC_ObjectiveC
-//
-//  PureMVC Port to ObjectiveC by Brian Knorr <brian.knorr@puremvc.org>
-//  PureMVC - Copyright(c) 2006-2008 Futurescale, Inc., Some rights reserved.
-//
-
-#import "Mediator.h"
-
-@interface ContactsMediator : Mediator {
-	
-}
-
-@end

data/lib/appjam/generators/project/Classes/contacts/view/ContactsMediator.m.tt

@@ -1,43 +0,0 @@
-//
-//  ContactsMediator.m
-//  PureMVC_ObjectiveC
-//
-//  PureMVC Port to ObjectiveC by Brian Knorr <brian.knorr@puremvc.org>
-//  PureMVC - Copyright(c) 2006-2008 Futurescale, Inc., Some rights reserved.
-//
-
-#import "ContactsMediator.h"
-#import "Contacts.h"
-#import "ApplicationFacade.h"
-
-@implementation ContactsMediator
-
-+(NSString *)NAME {
-	return @"ContactsMediator";
-}
-
--(Contacts *)viewComponent {
-	return viewComponent;
-}
-
--(void)initializeMediator {
-	self.mediatorName = [ContactsMediator NAME];
-}
-
--(NSArray *)listNotificationInterests {
-	return [NSArray arrayWithObjects:ShowUserForm, ShowUserList, ShowError, nil];
-}
-
--(void)handleNotification:(id<INotification>)notification {
-	
-	if ([[notification name] isEqualToString:ShowUserForm]) {
-		[self.viewComponent showUserForm];
-	} else if ([[notification name] isEqualToString:ShowUserList]) {
-		[self.viewComponent showUserList];
-	} else if ([[notification name] isEqualToString:ShowError]) {
-		[self.viewComponent showError:[notification body]];
-	} 
-}
-
-
-@end