ass 0.0.17 → 0.0.18

data/README.md

@@ -1,6 +1,6 @@
 ass
 =======
-####Apple Service Server was written with Ruby/Sinatra and Sequel(Sqlite3), it provides push notification and in app purchase service.####
+####Apple Service Server was written with Ruby/Sinatra and Sequel(Sqlite3), it provides push notification with web admin interface ####
 
 Feature:
 =======
@@ -32,48 +32,90 @@ Mac:
     $ port install sqlite # Macport
 
 Installation
-=======
 
-	$ sudo gem install ass
+* Method 1: with OS X builtin Ruby(AKA 'system ruby'), need to run with 'sudo', no extra step
+
+```bash
+$ sudo gem install ass
+```
+
+* Method 2: Install Ruby 1.9 (via RVM or natively) first, no need to run with 'sudo'
+
+```bash
+$ gem install rvm
+$ rvm install 1.9.3
+$ rvm use 1.9.3
+```
+
+* Install ass:
+
+```bash
+$ gem install ass
+```
 	
 Usage
 =======
 
-Prepare pem file:
-
 under the current directory, provide single pem file combined with certificate and key(name pattern: appid_mode.pem), HOWTO ([Check this link](http://www.raywenderlich.com/3443/apple-push-notification-services-tutorial-part-12))
 
-	cert.pem:
-		openssl x509 -in aps_development.cer -inform der -out cert.pem
+How to make development pem file
+-------
+
+dev_cert.pem:
+
+	$ openssl x509 -in aps_development.cer -inform der -out dev_cert.pem
+
+dev_key.pem:
 
-	key.pem:
-		$ openssl pkcs12 -nocerts -in key.p12 -out key.pem
-		$ Enter Import Password: 
-		$ MAC verified OK
-		$ Enter PEM pass phrase: 
-		$ Verifying - Enter PEM pass phrase: 
+	$ openssl pkcs12 -nocerts -in Certificates.p12 -out dev_key.pem
+	$ Enter Import Password: 
+	$ MAC verified OK
+	$ Enter PEM pass phrase: 
+	$ Verifying - Enter PEM pass phrase: 
 
-	Development Profile:
-		cat cert.pem key.pem > appid_development.pem
+Development Pem:
+
+	$ cat dev_cert.pem dev_key.pem > appid_development.pem
+
+How to make produce production pem file	
+-------
 
-	Distribution Profile:
-		cat cert.pem key.pem > appid_production.pem
+prod_cert.pem:
 
+	$ openssl x509 -in aps_production.cer -inform der -out prod_cert.pem
 
-* start ass server, default port is 4567 (sinatra's default port)
+prod_key.pem:
+
+	$ openssl pkcs12 -nocerts -in Certificates.p12 -out prod_key.pem
+	$ Enter Import Password: 
+	$ MAC verified OK
+	$ Enter PEM pass phrase: 
+	$ Verifying - Enter PEM pass phrase: 
+
+Production Pem:
+
+	$ cat prod_cert.pem prod_key.pem > appid_production.pem	
+
+Start Ass server(default port is 4567)
+------- 
+	
+	$ ass
 
 ![ass usage](https://raw.github.com/eiffelqiu/ass/master/doc/capture1.png)
 ![ass usage](https://raw.github.com/eiffelqiu/ass/master/doc/capture2.png)
-
+![ass usage](https://raw.github.com/eiffelqiu/ass/master/doc/capture3.png)
+![ass usage](https://raw.github.com/eiffelqiu/ass/master/doc/capture4.png)
 Configuration (ass.yml)
 =======
 
 when you run 'ass' first time, it will generate 'ass.yml' config file under current directory. ([Check this link](https://raw.github.com/eiffelqiu/ass/master/ass.yml))
 	
 	port: 4567  ## ASS server port, default is sinatra's port number: 4567
-	mode: development ## 'development' or 'production' mode, you should provide pem file ({appid}_{mode}.pem) accordingly(such as, app1_development.pem, app1_production.pem). 
+	mode: development ## 'development' or 'production' mode, you should provide pem file ({appid}_{mode}.pem) accordingly(such as, app1_development.pem, app1_production.pem).
 	cron: cron  ## cron job file name, ASS server will generate a demo 'cron' file for demostration only under current directory.
 	timer: 0	# how often you run the cron job, unit: minute. when set with 0, means no cron job execute.
+	user: admin # admin username
+	pass: pass	# admin password
 	apps:
 	- app1 ## appid you want to supprt APNS, ASS Server can give push notification support for many iOS apps, just list the appid here.
 
@@ -86,29 +128,73 @@ FAQ:
 
 In AppDelegate file, add methods below to register device token
 
-	- (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken
-	{
-	    NSString * tokenAsString = [[[deviceToken description] 
-	                                 stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"<>"]] 
-	                                stringByReplacingOccurrencesOfString:@" " withString:@""];    
-	    NSString *urlAsString = [NSString stringWithFormat:@"http://serverIP:4567/v1/apps/app1/%@", token];
-	    NSURL *url = [NSURL URLWithString:urlAsString];
-	    NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:url]; 
-	    [urlRequest setTimeoutInterval:30.0f];
-	    [urlRequest setHTTPMethod:@"GET"];
-	    NSOperationQueue *queue = [[[NSOperationQueue alloc] init] autorelease];
-	    [NSURLConnection sendAsynchronousRequest:urlRequest queue:queue completionHandler:nil]; 
+	#pragma mark - push notification methods
+
+	- (void)sendToken:(NSString *)token {
+	    
+	    NSString *tokenUrl = [NSString stringWithFormat:@"http://serverIP:4567/v1/apps/app1/%@", token];
+	    NSLog(@"tokenUrl: %@", tokenUrl);
+	    //prepare NSURL with newly created string
+	    NSURL *url = [NSURL URLWithString:tokenUrl];
+	    
+	    //AsynchronousRequest to grab the data
+	    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+	    NSOperationQueue *queue = [[NSOperationQueue alloc] init];
+	    
+	    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse *response, NSData *data, NSError *error) {
+	        if ([data length] > 0 && error == nil) {
+	            //            NSLog(@"send data successfully");
+	        } else if ([data length] == 0 && error == nil) {
+	            //            NSLog(@"No data");
+	        } else if (error != nil && error.code == NSURLErrorTimedOut) { //used this NSURLErrorTimedOut from
+	            //            NSLog(@"Token Time out");
+	        } else if (error != nil) {
+	            //            NSLog(@"Error is: [%@]", [error description]);
+	        }
+	    }];
 	}
 
-	- (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error
+	- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+	    
+	    if ([((AppDelegate *) [[UIApplication sharedApplication] delegate]) checkNetwork1]) {
+	        NSString *tokenAsString = [[[deviceToken description]
+	                                    stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"<>"]]
+	                                   stringByReplacingOccurrencesOfString:@" " withString:@""];
+	        NSLog(@"My token is: [%@]", tokenAsString);
+	        [self sendToken:tokenAsString];
+	    }
+	    
+	}
+
+	- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+	    
+	    NSLog(@"Failed to get token, error: %@", error);
+	}
+
+	- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo
 	{
-		NSLog(@"Failed to get token, error: %@", error);
+	    NSString *message = nil;
+	    NSString *sound = nil;
+	    NSString *extra = nil;
+	    
+	    id aps = [userInfo objectForKey:@"aps"];
+	    extra = [userInfo objectForKey:@"extra"];
+	    if ([aps isKindOfClass:[NSString class]]) {
+	        message = aps;
+	    } else if ([aps isKindOfClass:[NSDictionary class]]) {
+	        message = [aps objectForKey:@"alert"];
+	        sound = [aps objectForKey:@"sound"];
+	        // badge
+	    }
+	    if (aps) {
+	        DLog(@"extra %@",[NSString stringWithFormat:@"sound %@ extra %@", sound, extra ]);
+	    }
 	}
 	
 2. How to send push notification? (Server Side)
 -------
 
-run **curl** command to send push notification message, whatever shell.
+run **curl** command to send push notification message on server' shell.
 
 	$ curl http://localhost:4567/v1/apps/app1/push/{message}/{pid}
 	
@@ -118,7 +204,12 @@ param1 (message): push notification message you want to send, remember the messa
 
 param2 (pid ): unique string to mark the message, for example current timestamp or md5/sha1 digest
 
+3. How to send test push notification on web? 
+-------
+
+open your web browser and access http://localhost:4567/ (localhost should be changed to your server IP address accordingly), click "admin" on top navbar, you will see the Test Sending textbox on the top page, select your app , input your message and click 'send' button to send push notification.
 
+![ass usage](https://raw.github.com/eiffelqiu/ass/master/doc/capture5.png)
 
 Contributing to ass
 =======
@@ -134,5 +225,5 @@ Contributing to ass
 Copyright
 =======
 
-#####Copyright (c) 2012 Eiffel Qiu. See LICENSE.txt for further details.#####
+#####Copyright (c) 2013 Eiffel Qiu. See LICENSE.txt for further details.#####
 

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/lib/ass.rb

@@ -213,7 +213,8 @@ class App < Sinatra::Base
   end  
 
   error do
-    @error = params['captures'].first.inspect
+    @error = "";
+    @error = params['captures'].first.inspect if "#{$mode}".strip == 'development'
   end  
 
   post '/v1/send' do
@@ -228,7 +229,7 @@ class App < Sinatra::Base
     #   puts "#{err.class} ##{err}"  
     # end   
     system "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{message}/#{pid}"  
-    redirect '/' if (params[:app] and  params[:message])
+    redirect '/v1/admin/push' if (params[:app] and  params[:message])
   end  
 
   get "/v1/admin/:db" do
@@ -242,13 +243,14 @@ class App < Sinatra::Base
         @o << Token.where(:app => app).order(:id).reverse.paginate(page, 20)
       }
       erb :token
-    end
-    if (db == 'push') then 
+    elsif (db == 'push') then 
       @p = []
       $apps.each_with_index { |app, index|
         @p << Push.where(:app => app).order(:id).reverse.paginate(page, 20)
       }
       erb :push
+    else
+      erb :not_found
     end
   end  
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ass
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Eiffel Qiu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-27 00:00:00 Z
+date: 2013-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime