plezi 0.14.6 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c8948c97b16b27b2927f7e312ece24486a09235
-  data.tar.gz: b0bbc7bc1398dbcc74e8d793bdb35012564d9e4f
+  metadata.gz: 4a8e174219fac070cbd73f2fa53f858edeab9aa8
+  data.tar.gz: 9ac861a092def65bb48ae3c86fc1491d1c47a51e
 SHA512:
-  metadata.gz: 7f006cf1fe90702a3d0ab2cf0464f7e7c3b3a3eb3604b95f6cb5af3b4a3fe508288800a377863ec58f51c15a551beb563e9fad5538843e91ea58cdbe59ec3875
-  data.tar.gz: 527c3686b12b9e82f19ae22cbff9018d9cc08fc18df859aa48c4fcf7408ef2c7ef67065946292b48217b7027ef85760483515d9a7048683aa475f74977355f62
+  metadata.gz: 2033fbcdcae672753ad07ff8c0c80688728766ab1da4e6b35326f21318051124cf6f12429362ec80644211628c2231ff34e7d0a65667c2043842904db7a99e17
+  data.tar.gz: 342cf32db1bc7233b5f55ee8308b93af181646dc9804414b95e221470684b57d1b97185b156d5c032d25bbf63cae5c3a5d2930c105fe43e1b2cceab64b72612c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ***
 
+Change log v.0.14.7
+
+**Fix**: Tested against Iodine 0.3.0.
+
+***
+
 Change log v.0.14.6
 
 **Fix**: Fixed Plezi client SSL URL scheme for auto-url connections.

data/bin/ws_shootout

@@ -8,6 +8,7 @@
 Dir.chdir(File.expand_path(File.join('..', '..', 'lib'), __FILE__))
 require 'bundler/setup'
 require 'plezi'
+
 class ShootoutApp
   # the default HTTP response
   def index
@@ -19,12 +20,19 @@ class ShootoutApp
     if cmd == 'echo'
       write({type: 'echo', payload: payload}.to_json)
     else
+      # data = {type: 'broadcast', payload: payload}.to_json
+      # broadcast :push2client, data
       ShootoutApp.write2everyone({type: 'broadcast', payload: payload}.to_json)
       write({type: "broadcastResult", payload: payload}.to_json)
     end
   rescue
     puts "Incoming message format error - not JSON?"
   end
+
+  def push2client data
+    write data
+  end
+
 end
 
 Plezi.route '*', ShootoutApp

data/exe/plezi

@@ -72,8 +72,8 @@ module Builder
       app_tree['Gemfile'] << IO.read(Root.join('resources', 'gemfile'))
       app_tree['Gemfile'] << "\n\nruby '#{RUBY_VERSION}'\n"
       app_tree['rakefile'] ||= IO.read(Root.join('resources', 'rakefile'))
-      app_tree['app'] ||= {}
-      app_tree['app']['my_controler.rb'] ||= IO.read(Root.join('resources', 'ctrlr.rb')).gsub('appname', app_name)
+      app_tree['controllers'] ||= {}
+      app_tree['controllers']['example.rb'] ||= IO.read(Root.join('resources', 'ctrlr.rb')).gsub('appname', app_name)
       app_tree['views'] ||= {}
       app_tree['views']['welcome.html.erb'] ||= IO.read(Root.join('resources', 'mini_welcome_page.html')).gsub('appname', app_name)
       app_tree['views']['404.html.erb'] ||= IO.read(Root.join('resources', '404.erb'))
@@ -83,6 +83,7 @@ module Builder
       app_tree['public']['javascripts'] ||= {}
       app_tree['public']['javascripts']['client.js'] ||= IO.read(Root.join('resources', 'client.js')).gsub('appname', app_name)
       app_tree['public']['javascripts']['simple-client.js'] ||= IO.read(Root.join('resources', 'simple-client.js')).gsub('appname', app_name)
+      app_tree['test'] ||= {}
 
       begin
          Dir.mkdir app_name

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-   VERSION = '0.14.6'.freeze
+   VERSION = '0.14.7'.freeze
 end

data/plezi.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'iodine', '~> 0.2', '>= 0.2.14'
+  spec.add_dependency 'iodine', '~> 0.3', '>= 0.3.0'
   spec.add_dependency 'rack', '>= 2.0.0'
   spec.add_dependency 'bundler', '~> 1.14'
   # spec.add_dependency 'redcarpet', '> 3.3.0'
   # spec.add_dependency 'slim', '> 3.0.0'
 
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
 end

data/resources/client.js

@@ -176,8 +176,7 @@ PleziClient.prototype.___dispatch =
   console.log(this);
 }
 
-                    PleziClient.prototype.reconnect =
-                        function() {
+                    PleziClient.prototype.reconnect = function() {
   this.connected = NaN;
   this.ws = new WebSocket(this.url);
   // lets us access the client from the callbacks
@@ -190,21 +189,14 @@ PleziClient.prototype.___dispatch =
   this.ws.onerror = this.___on_error;
   // The Websocket onmessage callback
   this.ws.onmessage = this.___on_message;
-}
+};
 
-                        PleziClient.prototype.close =
-                            function() {
+PleziClient.prototype.close = function() {
   this.autoreconnect = false;
   this.ws.close();
-}
+};
 
-                            PleziClient.origin =
-                                (self.location.protocol.match(/https/) ? 'wss'
-                                                                       : 'ws') +
-                                '://' + self.location.hostname +
-                                (self.location.port == ''
-                                     ? ''
-                                     : (':' + self.location.port));
+PleziClient.origin = document.location.origin.replace(/^http/i, "ws");
 
 PleziClient.prototype.sendraw =
     function(data) {

data/resources/ctrlr.rb

@@ -1,5 +1,5 @@
 # Replace this sample with real code.
-class RootController
+class ExampleCtrl
    # HTTP
    def index
       # any String returned will be appended to the response. We return a String.

data/resources/mini_app.rb

@@ -12,7 +12,9 @@ require 'bundler'
 Bundler.require(:default, ENV['ENV'].to_s.to_sym)
 
 # Load all the code from a subfolder called 'app'
-Dir[File.join '{app}', '**', '*.rb'].each { |file| load File.expand_path(file) }
+Dir[File.join '{controllers}', '**', '*.rb'].each { |file| load File.expand_path(file) }
+# Load all the code from a subfolder called 'lib'
+Dir[File.join '{lib}', '**', '*.rb'].each { |file| load File.expand_path(file) }
 
 ## Logging
 Iodine::Rack.log = 1 if Iodine::Rack.log.nil?

data/resources/mini_welcome_page.html

@@ -75,7 +75,7 @@ h1 a:hover, h2 a:hover, h3 a:hover
 {
     color: #EBD7A6;
 }
-p
+p, li
 {
     font-size: 1em;
     padding: 0 1em;
@@ -103,7 +103,7 @@ a:hover
 
 #wrapper p{ padding: 0 2%;}
 .bold { font-weight: bold; }
-#wrapper ol li{ padding: 0 2%;}
+#wrapper li{ padding: 0 1em;}
 pre
 {
     border-radius: 20px;
@@ -250,12 +250,13 @@ function send_text()
         <li>
             <p class="bold">Reviewing the sample code and feeding <a href="http://www.plezi.io/">Plezi</a> your code:</p>
             <ul>
-                <li>Review and update your first Controller in <span class="bold">'appname/app/my_controller.rb'</span>.</li>
+                <li>Review and update your first Controller in <span class="bold">'appname/controllers/example.rb'</span>.</li>
                 <li>Edit or delete this file (appname/views/welcome.html.erb).</li>
-                <li>Write new controllers and code, maybe adding sub-folders to 'appname/app'.</li>
                 <li>Set up your routes in the 'appname/routes.rb' file.</li>
-                <li>Add WebSocket support to appname using 'appname/public/javascripts/client.js'.</li>
-                <li>Create some beautiful layouts for appname.</li>
+                <li>Write new controllers that tanslate between your application's API and the internet layer.</li>
+                <li>Save the actual application logic in the 'appname/lib' folder, seperating it from the network layer.</li>
+                <li>Add WebSocket support, just because it's easy and fun.</li>
+                <li>Write a beautiful client to access appname through the web.</li>
                 <li>Update the error templates at 'appname/views/' to use your app's layout.</li>
             </ul>
         </li>

data/resources/routes.rb

@@ -18,4 +18,4 @@
 # Plezi.route "/:format" , /^(html|json|xml)$/
 
 # # The root Controller
-Plezi.route '/', RootController
+Plezi.route '/', ExampleCtrl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.14.7
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iodine
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The Plezi.io Ruby Framework for real time web applications.