socket2me 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807d92d069e30d179e6e36b8d6e9b9c1ec749c2b
-  data.tar.gz: ae06a77b29065e8a749bb953f54a16aa5b440c31
+  metadata.gz: 6a2549d6b2f5aca33cf3810f499e6ec2e73072a0
+  data.tar.gz: cc57ef2e4563c038d70ae47dbc062b53a39b364d
 SHA512:
-  metadata.gz: 8751a7bdcde5669e49b0849fbfff96e739a107b84da42bfd645daaad78b37d5727993b4dda549231a8b55d281914d387433d6516cc3cd49fc4a4ff3b4ec59547
-  data.tar.gz: be38362051e7e6988857af1560b1b866626529dfd8dfd7c7704514c835783a2f3add8eb7c5e16475f59e0ce245b64a46c3a1d6eef0bd7e8200de3f583185841e
+  metadata.gz: b35633bd814e20f2a019da3a2180759aa85e4c6ffb07ac37ad8651227b7b6cb24485c76b5b296d3faea05b54ca1922880f67044ae83901e20287c4bc13386d34
+  data.tar.gz: efd5dccf618c0f67f27446c41fdb008193045989456ca19eb2e13fce1b6840e8c3bc4585588c1969b15661dfe11383333305c899bcb9458095fbd414cd6d995c

data/README.md

@@ -45,16 +45,16 @@ Or install it yourself as:
 
 ## Usage
 
-A full rack example is in `example/dummy.ru`. That app simply creates
+A full rack example is in `examples/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 every second in a background thread.
 
-To run `example/dummy.ru`:
+To run `examples/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/dummy.ru`
+4. start a rack server with the example: `rackup examples/dummy.ru`
 
 ### Rack
 ```ruby
@@ -80,7 +80,7 @@ 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/dummy.ru`. The browser
+Spot check everything works by running `rackup examples/dummy.ru`. The browser
 should continually append a timestamp below the header.
 
 ## Contributing

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "socket2me"
+require 'bundler/setup'
+require 'socket2me'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-require "pry"
+require 'pry'
 Pry.start

data/lib/socket2me/configuration.rb

@@ -1,7 +1,6 @@
 require 'logger'
 
 module Socket2me
-
   class Configuration
     # @attr [String] ws_host for the WebSocket listener
     attr_accessor :ws_host
@@ -20,17 +19,13 @@ module Socket2me
     end
 
     # @param [Logger] logger to use
-    def logger=(logger)
-      @logger = logger
-    end
+    attr_writer :logger
   end
 
   # @yield [Configuration]
   def self.configure(&block)
     @config ||= Configuration.new
-    if block_given?
-      block.call @config
-    end
+    block.call @config if block_given?
   end
 
   # @return [Configuration] current configuration

data/lib/socket2me/middleware/add_script_tag.rb

@@ -3,7 +3,6 @@ require 'em-websocket'
 module Socket2me
   module Middleware
     class AddScriptTag
-
       def initialize(app)
         @app = app
         @ws_url = "ws://#{Socket2me.config.ws_host}:#{Socket2me.config.ws_port}"
@@ -18,12 +17,14 @@ module Socket2me
         response = @app.call(env)
         status, headers, body = *response
 
-        return response unless headers['Content-Type'] == 'text/html'
+        return response unless headers['Content-Type'].include?('text/html')
 
         # replace the last body with script
-        new_body = body.join.gsub(%r{(</body>)}i,"#{script_tag}\\1")
+        orig_body = body.respond_to?(:body) ? body.body : body.join
+        
+        new_body = orig_body.gsub(%r{(</body>)}i, "#{script_tag}\\1")
 
-        return status, headers, [new_body]
+        [status, headers, [new_body]]
       end
 
       # @return [String] the outer Javascript tag with WS client script
@@ -40,4 +41,4 @@ module Socket2me
       end
     end
   end
-end
+end

data/lib/socket2me/version.rb

@@ -1,3 +1,3 @@
 module Socket2me
-  VERSION = "0.5.2"
+  VERSION = '0.5.3'.freeze
 end

data/lib/socket2me/ws_server.rb

@@ -16,8 +16,8 @@ module Socket2me
     # @return [Hash] hash of options compatible with EM::WebSocket#start
     def ws_options
       {
-          host: Socket2me.config.ws_host,
-          port: Socket2me.config.ws_port
+        host: Socket2me.config.ws_host,
+        port: Socket2me.config.ws_port
       }
     end
 

data/lib/socket2me.rb

@@ -4,7 +4,6 @@ require 'socket2me/middleware/add_script_tag'
 require 'socket2me/ws_server'
 
 module Socket2me
-
   def self.start_ws_server
     WsServer.instance.start
   end

data/socket2me.gemspec

@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'socket2me/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "socket2me"
+  spec.name          = 'socket2me'
   spec.version       = Socket2me::VERSION
-  spec.authors       = ["Scott Pierce"]
-  spec.email         = ["ddrscott@gmail.com"]
+  spec.authors       = ['Scott Pierce']
+  spec.email         = ['ddrscott@gmail.com']
 
-  spec.summary       = %q{Execute Javascript in the browser from the server using WebSockets}
-  spec.homepage      = "https://github.com/ddrscott/socket2me"
-  spec.license       = "MIT"
+  spec.summary       = 'Execute Javascript in the browser from the server using WebSockets'
+  spec.homepage      = 'https://github.com/ddrscott/socket2me'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples)/}) }
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'rack', '~> 1.6'
   spec.add_dependency 'em-websocket', '~> 0.5'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socket2me
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Scott Pierce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -110,7 +110,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- example/dummy.ru
 - lib/socket2me.rb
 - lib/socket2me/configuration.rb
 - lib/socket2me/middleware/add_script_tag.rb

data/example/dummy.ru

@@ -1,51 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'socket2me'
-
-class Stub
-
-  def initialize
-    Socket2me.configure do |config|
-      config.ws_host = '0.0.0.0'
-      config.ws_port = '3002'
-    end
-
-    Socket2me.start_ws_server
-  end
-
-  def call(_)
-    [200, {'Content-Type' => 'text/html'}, [<<-HTML]]
-<html>
-<body>
-<h1>Stub <small>generated by #{__FILE__}</small></h1>
-<script>
-function appendP(text) {
-  var p = document.createElement("p");
-  p.innerHTML = text;
-  document.body.appendChild(p);
-}
-</script>
-</body>
-</html>
-    HTML
-  end
-
-  def start_counter
-    Thread.abort_on_exception = true
-    Thread.new do
-      while true
-        sleep 1
-        Socket2me.exec_js("appendP('#{Time.now}')")
-      end
-    end
-  end
-end
-
-use Socket2me::Middleware::AddScriptTag
-
-stub = Stub.new
-stub.start_counter
-
-run stub
-
-