Whitespace and semi-colon cleanup.

Leave Ruby files with two space indents only; everything else as
tabs only (most files had a bit of both). Semi-colons: add
missing ones and remove redundant ones.

Author: paulpref

Gemfile

@@ -4,9 +4,9 @@ gem 'sinatra'
 gem 'pony'
 
 group :development do
-	gem 'shotgun'
+  gem 'shotgun'
 end
 
 group :production do
-	gem 'thin'
+  gem 'thin'
 end

app.rb

@@ -14,7 +14,7 @@
   erb :contact
 end
 
-post '/contact' do 
+post '/contact' do
   require 'pony'
     Pony.mail(
       :from => params[:name] + " <" + params[:email] + ">",
@@ -23,14 +23,14 @@
       :body => params[:message],
       :via => :smtp,
       :via_options => { 
-        :address              => 'smtp.' + settings.email_service, 
-        :port                 => '587', 
-        :enable_starttls_auto => true, 
-        :user_name            => settings.email_username, 
-        :password             => settings.email_password, 
-        :authentication       => :plain, 
+        :address              => 'smtp.' + settings.email_service,
+        :port                 => '587',
+        :enable_starttls_auto => true,
+        :user_name            => settings.email_username,
+        :password             => settings.email_password,
+        :authentication       => :plain,
         :domain               => settings.email_domain
       }
     )
-  'Many thanks for your mail!' 
+  'Many thanks for your mail!'
 end

public/css/style.css

@@ -1,6 +1,6 @@
-form{padding: 1em;}
-#name{width: 25%;}
-#email{width: 25%;}
-#message{width: 50%;height:300px;} 
-#ciphertext{width: 50%;height:100px;display:none;}
-.pure-form  textarea[readonly] {background: #fff;border-color: #fff;}
+form {padding: 1em;}
+#name {width: 25%;}
+#email {width: 25%;}
+#message {width: 50%; height: 300px;}
+#ciphertext {width: 50%; height: 100px; display: none;}
+.pure-form textarea[readonly] {background: #fff; border-color: #fff;}

public/js/app.js

@@ -1,30 +1,30 @@
-document.addEventListener('DOMContentLoaded', function(){	
-  if (window.crypto && window.crypto.getRandomValues) {
+document.addEventListener('DOMContentLoaded', function() {
+	if (window.crypto && window.crypto.getRandomValues) {
 		// form ready
 		document.getElementById("name").focus();
 		var message = document.getElementById("message");
-		var ciphertext = document.getElementById("ciphertext");				
+		var ciphertext = document.getElementById("ciphertext");
 		// encrypt on the fly
-		message.addEventListener("input", function(){
-			ciphertext.style.display = "block";			
-			ciphertext.value = cleanup(encrypt(message.value));			
-		});		
+		message.addEventListener("input", function() {
+			ciphertext.style.display = "block";
+			ciphertext.value = cleanup(encrypt(message.value));
+		});
 		// encrypt on submit
-		document.forms[0].addEventListener("submit", function(evt){
-		  if( form.elements['message'].value == '') {
-		    evt.preventDefault();
-		    alert('Please enter a message!');
-		  } else {
-		  	form.elements['message'].value = encrypt(message.value);
-				return true
-		  }
-		});		    
-  } else {
+		document.forms[0].addEventListener("submit", function(evt) {
+			if( form.elements['message'].value == '') {
+				evt.preventDefault();
+				alert('Please enter a message!');
+			} else {
+				form.elements['message'].value = encrypt(message.value);
+				return true;
+			}
+		});
+	} else {
 		// not ready
 		document.getElementById("button").disabled = true;
-    window.alert("Error: Browser not supported\nReason: We need a cryptographically secure PRNG to be implemented (i.e. the window.crypto method)\nSolution: Use Chrome >= 11, Safari >= 3.1, Firefox >= 21, Opera >= 15 or IE >= 11.");   
-    return false;
-  }
+		window.alert("Error: Browser not supported\nReason: We need a cryptographically secure PRNG to be implemented (i.e. the window.crypto method)\nSolution: Use Chrome >= 11, Safari >= 3.1, Firefox >= 21, Opera >= 15 or IE >= 11.");
+		return false;
+	}
 });
 
 function cleanup(msg) {
@@ -33,9 +33,9 @@ function cleanup(msg) {
 
 function encrypt(msg) {
 	if (msg.indexOf("-----BEGIN PGP MESSAGE-----") !== -1 && msg.indexOf("-----END PGP MESSAGE-----") !== -1) {
-		return msg;		
+		return msg;
 	} else {
 		var publickey = openpgp.key.readArmored(document.getElementById("pubkey").innerHTML).keys[0];
-		return openpgp.encryptMessage([publickey],msg);;
-	}  
+		return openpgp.encryptMessage([publickey],msg);
+	}
 }

views/contact.erb

@@ -1,17 +1,18 @@
-<form id="form" class="pure-form pure-form-stacked" name="contact" method="post" action="/contact"> 
-    <fieldset>
-        <legend>Secure Contact Form</legend>
-        <label for="name">Your Name</label>
-        <input id="name" name="name" type="text" required>
-        <label for="email">Your Email</label>
-        <input id="email" name="email" type="email" required>
-        <label for="message">Message</label>
-        <textarea id="message" name="message"></textarea>				
-				<br />
-        <button id="button" type="submit" class="pure-button pure-button-primary">Send</button>				
-				<br /><br />				
-				<textarea id="ciphertext" readonly></textarea>
-    </fieldset>
+<form id="form" class="pure-form pure-form-stacked" name="contact" method="post" action="/contact">
+	<fieldset>
+		<legend>Secure Contact Form</legend>
+		<label for="name">Your Name</label>
+		<input id="name" name="name" type="text" required>
+		<label for="email">Your Email</label>
+		<input id="email" name="email" type="email" required>
+		<label for="message">Message</label>
+		<textarea id="message" name="message"></textarea>
+		<br />
+		<button id="button" type="submit" class="pure-button pure-button-primary">Send</button>
+		<br />
+		<br />
+		<textarea id="ciphertext" readonly></textarea>
+	</fieldset>
 </form>
 <!-- your pgp public key -->
 <div id="pubkey" hidden="true">

views/layout.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Secure Contact Form</title>
+	<title>Secure Contact Form</title>
 	<script src="/js/openpgp.min.js" type="text/javascript"></script>
 	<script src="/js/app.js" type="text/javascript"></script>
 	<link href="/css/pure-min.css" rel="stylesheet" >