radiowaves 0.0.1 → 0.0.2

data/Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in radiowaves.gemspec
 gemspec
 
+gem 'rack-contrib'
 gem 'em-websocket'
 gem 'web-socket-ruby', :require => 'web_socket'

data/lib/radiowaves.rb

@@ -1,6 +1,9 @@
 require 'radiowaves/version'
+require 'radiowaves/config'
+require 'radiowaves/logging'
 require 'radiowaves/transmitter'
 require 'radiowaves/server'
+require 'radiowaves/railtie'
 
 module Radiowaves
 end

data/lib/radiowaves/config.rb

@@ -0,0 +1,13 @@
+module Radiowaves
+  module Config
+
+    def host
+      'localhost'
+    end
+
+    def port
+      12017
+    end
+
+  end
+end

data/lib/radiowaves/logging.rb

@@ -0,0 +1,7 @@
+module Radiowaves
+  module Logging
+    def logger
+      @logger ||= Logger.new("#{Rails.root}/log/radiowaves.log")
+    end
+  end
+end

data/lib/radiowaves/railtie.rb

@@ -0,0 +1,30 @@
+require 'rack/contrib/response_headers'
+
+module Radiowaves
+  class Railtie < ::Rails::Railtie
+
+    include Config
+
+    rake_tasks do
+      load "tasks/radiowaves.tasks"
+    end
+
+    initializer 'radiowaves.add_uri_to_headers' do |app|
+      app.middleware.use Rack::ResponseHeaders do |headers|
+        headers['X-Radiowaves-URI'] = "ws://#{host}:#{port}"
+      end
+    end
+
+    initializer 'radiowaves.start_server' do
+      Thread.new {
+        Radiowaves::Server.new(host, port).start
+      }
+    end
+
+    initializer 'radiowaves.start_transmitter' do
+      Radiowaves::Transmitter.new(host, port).start
+    end
+
+  end
+end
+

data/lib/radiowaves/server.rb

@@ -1,28 +1,36 @@
 require 'em-websocket'
 
 module Radiowaves
-  class Server < ::Rails::Railtie
+  class Server
 
-    rake_tasks do
-      load "tasks/radiowaves.tasks"
+    include Logging
+
+    def initialize(host, port)
+      @host = host
+      @port = port
     end
 
-    def self.start!(host='localhost', port=12010)
+    def start
       EventMachine.run {
         @channel = EM::Channel.new
-        EventMachine::WebSocket.start(:host => host, :port => port) do |ws|
-            ws.onopen {
-              sid = @channel.subscribe { |msg| ws.send msg }
-              ws.onmessage { |msg|
-                @channel.push "#{msg}"
-              }
-              ws.onclose {
-                @channel.unsubscribe(sid)
-              }
+        EventMachine::WebSocket.start(:host => @host, :port => @port) do |ws|
+          ws.onopen {
+            logger.debug "*** ws.onopen"
+            sid = @channel.subscribe { |msg| 
+              ws.send msg 
+            }
+            ws.onmessage { |msg|
+              @channel.push "#{msg}"
             }
+            ws.onclose {
+              logger.debug "*** ws.onclose: #{sid}"
+              @channel.unsubscribe(sid)
+            }
+          }
         end
       }
     end
+
   end
 end
 

data/lib/radiowaves/transmitter.rb

@@ -1,18 +1,21 @@
 require 'web_socket'
 
 module Radiowaves
-  class Transmitter < ::Rails::Railtie
+  class Transmitter
 
-    initializer "radiowaves.transmitter" do
-      Radiowaves::Transmitter.start!
+    include Logging
+
+    def initialize(host, port)
+      @client = WebSocket.new("ws://#{host}:#{port}/")
     end
 
-    def self.start!(host='localhost', port=12010)
+    def start
       ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
-        client = WebSocket.new("ws://#{host}:#{port}/")
-        client.send(ActiveSupport::Notifications::Event.new(*args).to_json)
+        event = ActiveSupport::Notifications::Event.new(*args).to_json
+        @client.send(event)
       end
     end
+
   end
 end
 

data/lib/radiowaves/version.rb

@@ -1,3 +1,3 @@
 module Radiowaves
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/radiowaves.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Transmits notifications in Rails to a websocket. Born as a supporting gem for "Rails panel" extension in Chrome.}
   gem.homepage      = "https://github.com/dejan/radiowaves"
 
+  gem.add_dependency('rack-contrib')
   gem.add_dependency('em-websocket')
   gem.add_dependency('web-socket-ruby')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiowaves
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +72,9 @@ files:
 - README.md
 - Rakefile
 - lib/radiowaves.rb
+- lib/radiowaves/config.rb
+- lib/radiowaves/logging.rb
+- lib/radiowaves/railtie.rb
 - lib/radiowaves/server.rb
 - lib/radiowaves/transmitter.rb
 - lib/radiowaves/version.rb