plezi 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b45fb775eeba5ab996d2581da537e38640f7d4
-  data.tar.gz: 1060b31518ce6e3ee36cfa315ce916f72e7ab1d2
+  metadata.gz: 17d2692e5f98a8cbbfc333e10d61614341562409
+  data.tar.gz: 40ef8b53dc05917ff5cc3dfa86bfbc2525f99e7b
 SHA512:
-  metadata.gz: 030e93b8a30cc04c3ad35c3aae1303e335b5bd1558469e9673cc14e07417c17b43e0a271a4441bee64b53c6785804b2a9460cd391d3402c2cc12e0093fe0a626
-  data.tar.gz: d663be79b8da32121b279848fc2cad6b5b66562ccbeedac9de25a41965bfa40380085a1b43af806f4f5e763a5e86eee7314e1f88fda8d5c43a2ba23d01c7fbc3
+  metadata.gz: 669e3220343b8f2a17a29d5854cc55bac0b49ea434dd0defa76b23bfeab180b2b0f506bf0f72f3d8c0043a678322f7f63d194966309552a3bcaf19cc97834c91
+  data.tar.gz: 728dbb5386131161aea6bb71d27c3a45ada870b9c5094be15b39c9303f388606ff1c9871f3ee0fa27459b50440ec4b898fbbcfe33607724b08a16c5d7d78c5f1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 #Change Log
 
+***
+
+Change log v.0.9.1
+
+**changed**: Template Gemfile now enforces the Plezi version. Also, the template's demo page now demonstrates WebSocket broadcasting.
+
+Minor updates.
+
+
 ***
 
 Change log v.0.9.0

data/bin/plezi

@@ -69,7 +69,9 @@ class AppTemplate
 		app_tree["rakefile"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"rakefile"),  __FILE__)
 		app_tree["Procfile"] ||= ""
 		app_tree["Procfile"] << "\nweb: bundle exec ./#{ARGV[1]} -p $PORT\n"
-		app_tree["Gemfile"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"Gemfile"),  __FILE__)
+		app_tree["Gemfile"] ||= ''
+		app_tree["Gemfile"] << "source 'https://rubygems.org'\n\n####################\n# core gems\n\n# include the basic plezi framework and server\ngem 'plezi', '~> #{Plezi::VERSION}'\n"
+		app_tree["Gemfile"] << IO.read( ::File.expand_path(File.join("..", "..", "resources" ,"Gemfile"),  __FILE__))
 
 		# set up config files
 		app_tree["config"] ||= {}
@@ -217,6 +219,7 @@ end
 if ARGV[0] == 'new' || ARGV[0] == 'n' || ARGV[0] == "force"
 	#########
 	## set up building environment
+	require 'plezi/version'
 	BUILDING_PLEZI_TEMPLATE = true
 	ARGV[1] = ARGV[1].gsub /[^a-zA-Z0-9]/, '_'
 	if Dir.exists?(ARGV[1]) && ARGV[0] != "force"

data/lib/plezi/common/dsl.rb

@@ -180,7 +180,7 @@ end
 # could also be used to define methods with special formatting, such as "humans.txt",
 # until a more refined way to deal with formatting will be implemented.
 def def_special_method name, obj=self, &block
-	obj.instance_eval { define_method name.to_s.to_sym, &block }
+	obj.instance_exec { define_method name.to_s.to_sym, &block }
 end
 
 

data/lib/plezi/eventmachine/connection.rb

@@ -121,7 +121,7 @@ module Plezi
 
 			# returns true if the service is disconnected
 			def disconnected?
-				(@socket.closed? || socket.stat.mode == 0140222) rescue true # if mode is read only, it's the same as closed.
+				(@socket.closed? || socket.stat.mode != 0140666) rescue true # if mode is read only, it's the same as closed.
 			end
 
 			# returns true if the socket has content to be read.
@@ -178,9 +178,9 @@ module Plezi
 			def _send data
 				@active_time += 7200
 				len = data.bytesize
-				act = @socket.send data, 0
-				while len > act
-					act += @socket.send data.byteslice(act..-1) , 0
+				i = act = @socket.send data, 0
+				while len > act && i!=0
+					act += (i = @socket.send data.byteslice(act..-1) , 0)
 				end
 				touch
 			end

data/lib/plezi/eventmachine/ssl_connection.rb

@@ -52,7 +52,7 @@ module Plezi
 
 			# returns true if the service is disconnected
 			def disconnected?
-				(@socket.closed? || @ssl_socket.closed? || @socket.stat.mode == 0140222) rescue true # if mode is read only, it's the same as closed.
+				(@socket.closed? || @ssl_socket.closed? || @socket.stat.mode != 0140666) rescue true # if mode is read only, it's the same as closed.
 			end
 
 			# identification markers

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
 end

data/resources/Gemfile

@@ -1,10 +1,3 @@
-source "https://rubygems.org"
-
-####################
-# core gems
-
-# include the basic plezi framework and server
-gem 'plezi'
 
 ####################
 # development gems

data/resources/controller.rb

@@ -98,18 +98,18 @@ class SampleController
 	# called before the protocol is swithed from HTTP to WebSockets.
 	#
 	# this allows setting headers, cookies and other data (such as authentication)
-	# prior to opening a WebSocket.
+	# prior to allowing a WebSocket to open.
 	#
 	# if the method returns false, the connection will be refused and the remaining routes will be attempted.
 	def pre_connect
-		false
+		# false
+		true
 	end
 
 	# called immediately after a WebSocket connection has been established.
-	# here we simply close the connection.
 	def on_connect
-		response.close
-		false
+		# response.close
+		# false
 	end
 
 	# called when new data is recieved
@@ -120,6 +120,7 @@ class SampleController
 	def on_message data
 		# broadcast sends an asynchronous message to all sibling instances, but not to self.
 		broadcast :_print_out, data
+		response << "You said: #{data}"
 	end
 
 	# called when a disconnect packet has been recieved or the connection has been cut
@@ -133,7 +134,7 @@ class SampleController
 	# BUT, broadcasted methods must be public (or the broadcast will quietly fail)... so we have to use
 	# the _underscore for this method.
 	def _print_out data
-		response << "Someone said #{data}"			
+		response << "Someone said: #{data}"			
 	end
 
 end

data/resources/welcome_page.html

@@ -1,7 +1,8 @@
-<!DOCTYPE html><head><title>appname - Feed Me!</title>
+<!DOCTYPE html>
+<head>
+<title>appname - Feed Me!</title>
+<meta content="width=device-width, initial-scale=1, maximum-scale=2.0, user-scalable=yes, minimal-ui=yes" name="viewport">
 <link href='http://fonts.googleapis.com/css?family=Shadows+Into+Light|Architects+Daughter' rel='stylesheet' type='text/css'>
-
-<link href="https://fonts.googleapis.com/css?family=Architects+Daughter" rel="stylesheet" type="text/css">
 <style type="text/css">
 /*
 med-blue: #44518E
@@ -20,37 +21,50 @@ body, html
 
 h1
 {
-    font-family: 'Indie Flower', cursive;
+    font-family: 'Shadows Into Light', cursive;
     background-color: #1B2864;
     color: #99A3CE;
     text-align: center;
-    border-bottom: 1px solid #424A70;
+    border-bottom: 4px solid #424A70;
     margin: 0 0 1em 0;
-    padding: 0.5em 0;
+    padding: 0.4em 0;
     width: 100%;
-
 }
-h2, h3
+h2
 {
     background-color: #44518E;
-    color: #99A3CE;
+    color: #C6CCE7;
     text-align: left;
     margin: 0 0 1em 0;
     padding: 0.5em 5%;
-    border-radius: 20px;
-    font-family: 'Shadows Into Light', cursive;
+    border-radius: 20px 20px 0 0;
+    font-family: 'Architects Daughter', cursive;
+    border-bottom: 3px solid #424A70;
+    font-size: 1.2em;
+}
+h3
+{
+    font-family: 'Architects Daughter', cursive;    
+    background-color: #44518E;
+    color: #C6CCE7;
+    text-align: left;
+    margin: 0 0 1em 0;
+    padding: 0.5em 5%;
+    border-radius: 1em 1em 0 0;
+    border-bottom: 2px solid #424A70;
+    font-size: 1.1em;
 }
 h2:before {
   content: "|||";
-  color: #424A70;
+  color: #99A3CE;
   padding-right: 0.3em;
-  margin-left: -1.5em;
+  margin-left: -0.5em;
 }
 h3:before {
   content: "|||||";
-  color: #424A70;
+  color: #99A3CE;
   padding-right: 0.3em;
-  margin-left: -2em;
+  margin-left: -1em;
 }
 h1 a, h2 a, h3 a
 {
@@ -64,7 +78,7 @@ p
 {
     font-size: 1em;
     padding: 0 1em;
-    margin: 0.5em 0;		
+    margin: 0.5em 0;        
 }
 a
 {
@@ -96,8 +110,125 @@ pre
     background-color: #444;
     color: #ddd;
 }
+input[type=text]
+{
+    width: 60%;
+    font-size: 1.1em;
+    display: inline-block;
+    background-color: #fff;
+    color: #424A70;
+    border-radius: 0.5em;
+    border: 1px solid #424A70;
+    outline: none;
+    box-sizing: border-box;
+    padding: 0 1em;
+}
+input[type=submit]
+{
+    font-size: 1.1em;
+    color: #424A70;
+    border-radius: 0.5em;
+    box-sizing: border-box;
+    border: 1px solid #424A70;
+    background-color: #fff;
+    padding: 0 0.4em;
+}
+input[type=submit]:hover
+{
+    background-color: #818ECE; color:#fff;
+}
+input[type=submit]:active
+{
+    background-color: #1B2864; color:#fff;
+}
+
+#monitor
+{
+    margin: 0 5%; padding: 0.5em 3em;
+    box-sizing: border-box;
+    width: 90%;
+    font-size: 1.1em;
+    display: inline-block;
+    background-color: #C6CCE7;
+    color: #424A70;
+    border-radius: 0.5em;
+    border: 1px solid #424A70;    
+}
+#monitor p
+{
+    text-align: center;
+}
+.system_message { color: #1B2864; font-style: italic;}
+@media screen and (max-width: 680px)
+{
+    input[type=submit], input[type=text] {
+        font-size: 1em;
+    }
+    input[type=text] { width: 100%;}
+    #monitor
+    {
+        margin: 0 3%; padding: 0.5em 1em;
+    }
+    ul {padding: 0 1em;}
+}
 
 </style>
+<script type="text/javascript">
+// Your websocket URI should be an absolute path. The following sets the base URI.
+var ws_uri = 'ws://' + window.location.hostname + (window.location.port == '' ? '' : (':' + window.location.port) );
+// remember to add the specific controller's path to your websocket URI.
+ws_uri += "/";
+// websocket variable.
+var websocket = NaN
+// count failed attempts
+var websocket_fail = 0
+
+function init_websocket()
+{
+    websocket = new WebSocket(ws_uri);
+    websocket.onopen = function(e) {
+        //restart fail count
+        websocket_fail = 0
+        // what do you want to do now?
+        var msg = document.createElement("li");
+        msg.className = 'system_message'
+        msg.innerHTML = "Connected.";
+        document.getElementById("output").appendChild(msg);
+    };
+
+    websocket.onclose = function(e) {
+        // what do you want to do now?
+        if(websocket_fail == 0) {
+            var msg = document.createElement("li");
+            msg.className = 'system_message'
+            msg.innerHTML = "Disconnected.";
+            document.getElementById("output").appendChild(msg);
+        };
+        // you probably want to reopen the websocket if it closes (unless the issue repeats).
+        if(websocket_fail <= 5) {websocket_fail += 1; init_websocket(); };
+    };
+    websocket.onerror = function(e) {
+        // what do you want to do now?
+    };
+    websocket.onmessage = function(e) {
+        // what do you want to do now?
+        console.log(e.data);
+        var msg = document.createElement("li");
+        msg.innerHTML = e.data;
+        document.getElementById("output").appendChild(msg);
+        // to use JSON, use:
+        // msg = JSON.parse(e.data); // remember to use JSON also in your Plezi controller.
+    };
+}
+window.addEventListener("load", init_websocket, false); 
+function send_text()
+{
+    var msg = document.getElementById("input").value;
+    document.getElementById("input").value = '';
+    websocket.send(msg);
+    return false;
+}
+</script>
 </head>
 <body>
     <h1>Welcome to  <a href="https://github.com/boazsegev/plezi">Plezi</a></h1>
@@ -125,5 +256,12 @@ pre
         </li>
     </ol>
     <p class="bold">Good Luck!</p>
+    <h3> Did you try our websocket broadcast? </h3>
+    <p>Your appname app can send <span class="bold">WebSocket</span> broadcasts (and unicasts). Why not try them out? You can even try them across multiple windows.</p>
+    <form onsubmit='send_text(); return false;' id='monitor'>
+        <p><input type='text' id='input' placeholder='Your message' /> <input type='submit'  value='Broadcast'/> </p>
+        <ul id='output'>
+        </ul>
+    </form>
 </div>
 </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler