socket2me 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f123c415850bb1bb171b3927e2b50bda54ef348e
-  data.tar.gz: 6fcc758271404f0e3ccb7e0aea791df36ac33b18
+  metadata.gz: 807d92d069e30d179e6e36b8d6e9b9c1ec749c2b
+  data.tar.gz: ae06a77b29065e8a749bb953f54a16aa5b440c31
 SHA512:
-  metadata.gz: 654b89e9ea16c80b880c1535f24a6d6d111124d8d6d186bbdb554daf606f913f353ae12c995b429d36d0879308fd77183709d6f3e725f4e938a58f527c8ae59c
-  data.tar.gz: 530abc92eafcee8ebba2aa4ee94b099132ef1c4b0431bd6ba4cdee1e5ae19595e0aef56445deeda7ca15406d094262a37660ae6e8ace6b83ae39dd0a3f757722
+  metadata.gz: 8751a7bdcde5669e49b0849fbfff96e739a107b84da42bfd645daaad78b37d5727993b4dda549231a8b55d281914d387433d6516cc3cd49fc4a4ff3b4ec59547
+  data.tar.gz: be38362051e7e6988857af1560b1b866626529dfd8dfd7c7704514c835783a2f3add8eb7c5e16475f59e0ce245b64a46c3a1d6eef0bd7e8200de3f583185841e

data/README.md

@@ -45,17 +45,16 @@ Or install it yourself as:
 
 ## Usage
 
-A full rack example is in `example/counter.ru`. That app simply creates
+A full rack example is in `example/dummy.ru`. That app simply creates
 an HTML page and provides a helper js function to display some output. The
-example then outputs the server time a counter every second in a background
-thread.
+example then outputs the server time every second in a background thread.
 
-To run `example/counter.rb`:
+To run `example/dummy.ru`:
 
 1. checkout the project: `git clone https://github.com/ddrscott/socket2me`
 2. go into the the socket2me directory: `cd socket2me`
 3. install requirements: `./bin/setup`
-4. start a rack server with the example: `rackup example/counter.ru`
+4. start a rack server with the example: `rackup example/dummy.ru`
 
 ### Rack
 ```ruby
@@ -81,8 +80,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-Spot check everything works by running `rackup example/counter.ru`. The browser
-should continually append a timestamp and counter below the header.
+Spot check everything works by running `rackup example/dummy.ru`. The browser
+should continually append a timestamp below the header.
 
 ## Contributing
 

data/example/{counter.ru → dummy.ru}

@@ -33,10 +33,9 @@ function appendP(text) {
   def start_counter
     Thread.abort_on_exception = true
     Thread.new do
-      counter = 0
       while true
         sleep 1
-        Socket2me.exec_js("appendP('[#{Time.now}]: #{counter += 1}')")
+        Socket2me.exec_js("appendP('#{Time.now}')")
       end
     end
   end

data/lib/socket2me/middleware/add_script_tag.rb

@@ -1,5 +1,3 @@
-require 'json'
-require 'erb'
 require 'em-websocket'
 
 module Socket2me
@@ -22,53 +20,23 @@ module Socket2me
 
         return response unless headers['Content-Type'] == 'text/html'
 
-        full_body = body.join
-
         # replace the last body with script
-        full_body.gsub!(%r{(</body>)}i,"#{script_tag}\\1")
+        new_body = body.join.gsub(%r{(</body>)}i,"#{script_tag}\\1")
 
-        return status, headers, [full_body]
+        return status, headers, [new_body]
       end
 
       # @return [String] the outer Javascript tag with WS client script
       def script_tag
-        js = ERB.new(js_erb).result(binding)
-        "<script>#{js}</script>"
-      end
-
-      # Adjust the javascript client code as needed.
-      # @return [String] inner javascript contents.
-      def js_erb
-        <<-JS
-(function () {
-    var socket = new WebSocket("<%= @ws_url %>");
-
-    function log(message) {
-        console.log.apply(console, arguments);
-    }
-
-    try {
-        socket.onopen = function () {
-            log("Socket Status: " + socket.readyState + " (open)");
-        };
-
-        socket.onclose = function () {
-            log("Socket Status: " + socket.readyState + " (closed)");
-        };
-
-        socket.onmessage = function (msg) {
-            try {
-                // execute in an anonymous function
-                new Function(msg.data)();
-            } catch (msgEx){
-                console.error("Could not execute `%s` due to %o", msg.data, msgEx);
-            }
-        }
-    } catch (exception) {
-        console.error("Error: " + exception);
+        <<-HTML
+<script>
+(function (ws) {
+    ws.onmessage = function (msg) {
+      new Function(msg.data)();
     }
-})();
-        JS
+})(new WebSocket("#{@ws_url}"));
+</script>
+        HTML
       end
     end
   end

data/lib/socket2me/version.rb

@@ -1,3 +1,3 @@
 module Socket2me
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/socket2me/ws_server.rb

@@ -41,8 +41,8 @@ module Socket2me
       @thread = Thread.new do
         EM::WebSocket.start(ws_options) do |ws|
           ws.onopen do |handshake|
-            @clients << ws
             log "onopen: #{handshake.headers}"
+            @clients << ws
           end
 
           ws.onclose do |event|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socket2me
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Scott Pierce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -110,7 +110,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- example/counter.ru
+- example/dummy.ru
 - lib/socket2me.rb
 - lib/socket2me/configuration.rb
 - lib/socket2me/middleware/add_script_tag.rb
@@ -142,4 +142,3 @@ signing_key:
 specification_version: 4
 summary: Execute Javascript in the browser from the server using WebSockets
 test_files: []
-has_rdoc: