plezi 0.10.14 → 0.10.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2487750b4f8cbcb1de42a7bc91e065da2f94c212
-  data.tar.gz: 7f39f9de1020bc8f3d80113b2dc01d7c59c9d706
+  metadata.gz: ac2ec66d7213346b5414d5e6dda9bfee10d135c5
+  data.tar.gz: 0631b6f21c1f5576ccd6cbc88fafcdb8d47a1638
 SHA512:
-  metadata.gz: c97f85a27d0cce6a6d1df74e31ed9c8fef44377cfb9f0646d097f8917d80137dcddbe951631b2ab2126827595ad9028b53c01ffa3e1d3e1662440c710754ceb3
-  data.tar.gz: 79c93625fcc681835f0db3c87919fa4e4a906a4f4747c42ef3093155ac02489e3d834b2307c1b621a9a5cff43ea0481ecdab6f26b18488ef3dd8068d86ee94a4
+  metadata.gz: eea85e77d2bdf4fe1aaa6877e4945d35834c3c98d42f3b1a10381a7601765e6795273a45ef5eef971f5e6541f8e7ce0a985f4ae298e1cfd3b498f3b162480eae
+  data.tar.gz: 60750c0fea68213ebdc91c1930032e8c7317b5bd4757946139af3d7ffe59f1dee35c3b57917aabd42d909fd0f1c598f1242282115c6b874626847839a4ea99c6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 #Change Log
 
+Change log v.0.10.15
+
+**Fix**: Fixed the autostart feature that was diabled to to changed in the GRHttp server.
+
 Change log v.0.10.14
 
 **Deprecation notice**: Setting the public root folder is now done using the option `public` instead of the option `root`.

data/bin/plezi

@@ -49,8 +49,12 @@ class AppTemplate
 		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"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
-		app_tree["404.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.erb"),  __FILE__))
-		app_tree["500.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.erb"),  __FILE__))
+		app_tree["templates"] ||= {}
+		app_tree["templates"]["404.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.erb"),  __FILE__))
+		app_tree["templates"]["500.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.erb"),  __FILE__))
+		app_tree["templates"]["welcome.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"mini_welcome_page.html"),  __FILE__)).gsub('appname', ARGV[1])
+		app_tree["assets"] ||= {}
+		app_tree["assets"]["websocket.js"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"websockets.js"),  __FILE__)).gsub('appname', ARGV[1])
 		finalize
 	end
 

data/lib/plezi/common/api.rb

@@ -136,4 +136,4 @@ end
 Encoding.default_internal = 'utf-8'
 Encoding.default_external = 'utf-8'
 
-NO_PLEZI_AUTO_START = true if defined?(::Rack)
+NO_PLEZI_AUTO_START = true if defined?(::Rack::Builder)

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.10.14"
+    VERSION = "0.10.15"
 end

data/plezi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "grhttp", "~> 0.0.17"
+  spec.add_dependency "grhttp", "~> 0.0.19"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/resources/mini_app.rb

@@ -34,11 +34,8 @@
 class MyController
 	# HTTP
 	def index
-		"Hello World!\r\n\r\nThis appname mini-app is an example hello world and websocket chatroom.\r\n
-		\r\nplease visit http://www.websocket.org/echo.html and connect to: ws://localhost:3000/nickname"
-	end
-	def websockets
-		redirect_to "http://www.websocket.org/echo.html"
+		# return response << "Hello World!" # for a hello world app
+		render :welcome
 	end
 	# Websockets
 	def on_message data
@@ -62,9 +59,9 @@ end
 # start a web service to listen on the first default port (3000 or the port set by the command-line).
 # you can change some of the default settings here.
 listen 	host: :default,
+		assets: Root.join('assets').to_s,
+		templates: Root.join('templates').to_s,
 		# public: Root.join('public').to_s,
-		# assets: Root.join('assets').to_s,
-		# templates: Root.join('templates').to_s,
 		ssl: false
 
 ## Optional stuff:

data/resources/mini_welcome_page.html

@@ -0,0 +1,268 @@
+<!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'>
+<style type="text/css">
+/*
+med-blue: #44518E
+dark-gray: #424A70
+blue: #1B2864
+light-blue: #818ECE
+light-gray: #99A3CE
+*/
+body, html
+{
+    background-color: #99A3CE;
+    padding: 0; margin: 0;
+    width: 100%;
+    font-size: 1em;
+}
+
+h1
+{
+    font-family: 'Shadows Into Light', cursive;
+    background-color: #1B2864;
+    color: #99A3CE;
+    text-align: center;
+    border-bottom: 4px solid #424A70;
+    margin: 0 0 1em 0;
+    padding: 0.4em 0;
+    width: 100%;
+}
+h2
+{
+    background-color: #44518E;
+    color: #C6CCE7;
+    text-align: left;
+    margin: 0 0 1em 0;
+    padding: 0.5em 5%;
+    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: #99A3CE;
+  padding-right: 0.3em;
+  margin-left: -0.5em;
+}
+h3:before {
+  content: "|||||";
+  color: #99A3CE;
+  padding-right: 0.3em;
+  margin-left: -1em;
+}
+h1 a, h2 a, h3 a
+{
+    color: #EBCD86;
+}
+h1 a:hover, h2 a:hover, h3 a:hover
+{
+    color: #EBD7A6;
+}
+p
+{
+    font-size: 1em;
+    padding: 0 1em;
+    margin: 0.5em 0;        
+}
+a
+{
+    color: #D0AC54;
+    text-decoration: none;
+}
+a:hover
+{
+    color: #927121;
+    text-decoration: underline;
+}
+#wrapper
+{
+    background-color: #fff;
+    margin: 1em 5%;
+    padding: 0 0 2%;
+    border-radius: 20px;
+    min-height: 50%;
+    color: #007;
+}
+
+#wrapper p{ padding: 0 2%;}
+.bold { font-weight: bold; }
+#wrapper ol li{ padding: 0 2%;}
+pre
+{
+    border-radius: 20px;
+    padding: 0.5em 0;
+    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.
+// remember to update to the specific controller's path to your websocket URI.
+var ws_controller_path = '/' // window.location.pathname; // change to '/controller/path'
+var ws_uri = (window.location.protocol.match(/https/) ? 'wss' : 'ws') + '://' + window.document.location.host + ws_controller_path
+// websocket variable.
+var websocket = NaN
+// count failed attempts
+var websocket_fail_count = 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>
+    <div id="wrapper">
+        <h2>Congratulations, <a href='/'>appname</a> is running - What's next?</h2>
+        <p><span class="bold">Congratulations</span>, you're now running appname and it has so much potential!</p>
+        <p>appname started out <a href="https://github.com/boazsegev/plezi">Plezi</a> and it's your quest to feed it your code and make sure appname grows strong and happy.</p>
+        <p>You're the master of this quest, and your next steps might include:</p>
+        <ol><li><p class="bold">Deciding which gems to use:</p>
+            <ul>
+                <li>edit Gemfile in the appname folder.</li>
+            </ul>
+        </li>
+        <li>
+            <p class="bold">Reviewing the sample code and feeding <a href="https://github.com/boazsegev/plezi">Plezi</a> your code:</p>
+            <ul>
+                <li>Review and update MyController in your 'appname.rb'.</li>
+                <li>Delete this file (appname/templates/welcome.html.erb).</li>
+                <li>Write your own controller and code, using a sub-foler as suggested in the 'appname.rb' file.</li>
+                <li>Set up your routes in the 'appname.rb' file.</li>
+                <li>Edit the javascript for the client in your 'appname/websockets.js' file.</li>
+            </ul>
+        </li>
+        <li>
+            <p><span class="bold">Having fun</span> and submitting any issues you discover to the <a href="https://github.com/boazsegev/plezi">Plezi Github Project.</a></p>
+        </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.10.14
+  version: 0.10.15
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grhttp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,7 @@ files:
 - resources/i18n_config.rb
 - resources/mini_app.rb
 - resources/mini_exec.rb
+- resources/mini_welcome_page.html
 - resources/oauth_config.rb
 - resources/plezi_websockets.html
 - resources/rakefile