simple_pusher 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQxMTcwYzBlZDE1NDg4NjY5MGJiYTE3OGNlZjRhMGJmYTQ0NmU4ZQ==
+    ZDIxNTNkOTYxMGQxMGM3MzdlZDE5OTcwYzVkNmVlMGM3ODJhYjFmYg==
   data.tar.gz: !binary |-
-    M2VlNzhkMTE0MWVlN2IwY2ViNjQ0NDY1OGZjZmI0ZDk4NmQxZTA0Ng==
+    YWNkYTc0ZjgzN2UwYWU2OGFlMGMxZGY5ZTFjOGIxOGY2NmU1YjA5OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzQ1YmNhM2YyOTQxZjI2MmZiNmFhN2FjMTEyZjMwYzkwZjU2ZDY2YzBmZjZh
-    MzQxM2Y0NDQ3OTQ1Mzk4ZTMxMWU3MmJlMDM5Yjg0OTNlYzg2NjRlNDM4ZDlk
-    ZWExZDMwNDUxOTU1NWFjNTk3MzkzZjg5NzJkMmZkOThiMmE0NGE=
+    MWFhOTBlMjgxMDc2OTM4ZjFiNWNiZmU3ZTg3OTE1ZTIzNDg2MDUzNzg4YTUx
+    NDMxODhkNTRhNmRlMGM3MGI2ZmY1MjliOTM2MTY1NzgxNjk0YzJlMDkyNWMz
+    ZTY1YThmYjY3MDRmOWYxYTVmZmUyNzRiNThkMTI0MDBmODRiYTY=
   data.tar.gz: !binary |-
-    NWJiMGYyNTQ2NzlmYTdkMDhjNTQ3YjViMmJlMWM2NWIwNjQyY2RjNzU5OTk3
-    MDk0OTIyMmY0MzFmMmJiNTI5YWNkZTcxNGQ1NmI0NWNkZDVlNzhhMjdhMDVh
-    OTMxMzE1MTJkZGYyZjY2MzU0MjI5MGNkNWIxMzlmYjZiOWU4MTg=
+    ZDNiOTc0OTk5N2ZiMzk3MzhjOTQwNTRhZjhlZWU5OGRjMTI0OWFiZDVmMzRi
+    ZGNjNTcyNmM1ZTY2OTIyZTk4MWQyMjdhYjk3YjdkYzBhNjE4Y2YyYmM3YTI0
+    YzhmNDEwNzJhYWZiYjk3MjQzNTYzMTM1YjU0ZDQ5OWQ2OGQ3YjQ=

data/README.md

@@ -1,9 +1,11 @@
-# SimplePusher [![Gem Version](https://badge.fury.io/rb/simple_pusher@2x.png)](http://badge.fury.io/rb/simple_pusher)
+# SimplePusher
 
 SimplePusher is a HTML5 websocket powered realtime messaging tool used in Rails / Sintra project.
 
 ## Installation
 
+[![Gem Version](https://badge.fury.io/rb/simple_pusher@2x.png)](http://badge.fury.io/rb/simple_pusher)
+
 Add this line to your application's Gemfile:
 
     gem 'simple_pusher'
@@ -22,7 +24,6 @@ Then start simple pusher server when rails app boot:
     EventMachine.next_tick do
       SimplePusher.setup do |config|
         config.port = 8088
-        config.debug = false
       end
       SimplePusher.start
     end
@@ -41,14 +42,16 @@ Add code to app/views/layouts/application.html.erb
 ```
 <script type="text/javascript">
     var simple_pusher = new SimplePusher("ws://<%= request.host %>:8088/");
-    simple_pusher.broadcast("Hello everybody.");
+    simple_pusher.on('channel_name', function(message){
+      alert('got message:'+message);
+    });
 </script>
 ```
 
 Broadcast message via server side.
 
 ```
-SimplePusher.broadcast("Time now #{Time.now.to_s(:db}")
+SimplePusher.publish('channel_name', "Time now #{Time.now.to_s(:db}")
 ```
 
 Message callback at server side.

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-   t.libs << "test"
-   t.test_files = FileList['test/*_test.rb']
-   t.verbose = true
+  t.libs << 'test'
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
 end
 
-task :default => :test
+task default: :test

data/lib/simple_pusher/configuration.rb

@@ -7,7 +7,5 @@ module SimplePusher
       @port ||= 8088
       @debug ||= false
     end
-
-
   end
-end
+end

data/lib/simple_pusher/connection.rb

@@ -18,11 +18,11 @@ module SimplePusher
 
     def self.trigger(event)
       callbacks[event] ||= []
-      callbacks[event].each {|callback| callback.call }
+      callbacks[event].each { |callback| callback.call }
     end
 
     def self.add_client(socket)
-      client = self.new(socket)
+      client = new(socket)
       clients[socket] = client
     end
 
@@ -30,9 +30,9 @@ module SimplePusher
       clients.delete(socket)
     end
 
-    def self.broadcast(message)
-      clients.each do |websocket, client|
-        websocket.send message
+    def self.publish(channel, message)
+      clients.each do |websocket, _client|
+        websocket.send "#{channel}:#{message}"
       end
     end
 
@@ -47,6 +47,5 @@ module SimplePusher
     def emit(message)
       @websocket.send(message)
     end
-
   end
-end
+end

data/lib/simple_pusher/engine.rb

@@ -1,5 +1,4 @@
 module SimplePusher
   class Engine < ::Rails::Engine
-
   end
-end
+end

data/lib/simple_pusher/server.rb

@@ -6,45 +6,43 @@ module SimplePusher
   class Server
     include Singleton
 
-    attr :host, :port
+    attr_reader :host, :port
 
     def initialize
-      @host = "0.0.0.0"
+      @host = '0.0.0.0'
       @port = SimplePusher.configuration.port
     end
 
     def self.start
-      $stderr.puts "Start SimplePush ..." if SimplePusher.configuration.debug
-      EM::WebSocket.run(:host => instance.host, :port => instance.port) do |socket|
+      $stderr.puts 'Start SimplePusher ...' if SimplePusher.configuration.debug
+      EM::WebSocket.run(host: instance.host, port: instance.port) do |socket|
         socket.onopen do |handshake|
-          $stderr.puts "on open:" + handshake.inspect if SimplePusher.configuration.debug
+          $stderr.puts 'on open:' + handshake.inspect if SimplePusher.configuration.debug
           Connection.add_client(socket)
         end
 
         socket.onclose do
-          $stderr.puts "on close"
+          $stderr.puts 'on close'
           Connection.remove_client(socket)
         end
 
         socket.onmessage do |raw_message|
-          $stderr.puts "on message: " + raw_message if SimplePusher.configuration.debug
-          action, *message = raw_message.split(":")
+          $stderr.puts 'on message: ' + raw_message if SimplePusher.configuration.debug
+          action, *message = raw_message.split(':')
 
           case action
            when 'broadcast'
-             message = message.join(":")
+             message = message.join(':')
              Connection.broadcast(message)
            when 'emit'
              event = message[0]
              Connection.trigger(event)
            else
-             #TODO
+            # TODO
           end
         end
 
-
       end
     end
-
   end
-end
+end

data/lib/simple_pusher/version.rb

@@ -1,3 +1,3 @@
 module SimplePusher
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

data/lib/simple_pusher.rb

@@ -1,9 +1,8 @@
-require "simple_pusher/version"
+require 'simple_pusher/version'
 require 'em-websocket'
 require 'simple_pusher/engine' if defined?(Rails)
 
 module SimplePusher
-
   class << self
     def setup
       yield configuration
@@ -15,14 +14,16 @@ module SimplePusher
     end
   end
 
-  def start(options={})
+  def start(_options = {})
     EventMachine.next_tick do
       Server.start
     end
   end
 
-  def broadcast(message)
-    Connection.broadcast(message)
+  # Publish message to all connected socket.
+  # And the client websocket which listened 'channel' will get message callback.
+  def publish(channel, message = '')
+    Connection.publish(channel, message)
   end
 
   def on(event, &callback)
@@ -30,11 +31,10 @@ module SimplePusher
   end
 
   module_function :start
-  module_function :broadcast
+  module_function :publish
   module_function :on
-
 end
 
-SimplePusher.autoload :Configuration, "simple_pusher/configuration"
-SimplePusher.autoload :Connection,    "simple_pusher/connection"
-SimplePusher.autoload :Server,        "simple_pusher/server"
+SimplePusher.autoload :Configuration, 'simple_pusher/configuration'
+SimplePusher.autoload :Connection,    'simple_pusher/connection'
+SimplePusher.autoload :Server,        'simple_pusher/server'

data/simple_pusher.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simple_pusher/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "simple_pusher"
+  spec.name          = 'simple_pusher'
   spec.version       = SimplePusher::VERSION
-  spec.authors       = ["qichunren"]
-  spec.email         = ["whyruby@gmail.com"]
-  spec.description   = %q{Simple pusher based on websocket}
-  spec.summary       = %q{Simple pusher based on websocket, build with Eventmachine}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['qichunren']
+  spec.email         = ['whyruby@gmail.com']
+  spec.description   = %q(Simple pusher based on websocket)
+  spec.summary       = %q(Simple pusher based on websocket, build with Eventmachine)
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "em-websocket", "~> 0.5.0"
+  spec.add_dependency 'em-websocket', '~> 0.5.0'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
 end

data/test/configuration_test.rb

@@ -1,14 +1,14 @@
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 describe SimplePusher::Configuration do
-  it "must respond to debug method" do
+  it 'must respond to debug method' do
     configuration = SimplePusher::Configuration.new
-    configuration.debug.must_equal false #default to false
+    configuration.debug.must_equal false # default to false
   end
 
-  it "must respond to port method" do
+  it 'must respond to port method' do
     configuration = SimplePusher::Configuration.new
-    configuration.port.must_equal 8088 #default to 8088
+    configuration.port.must_equal 8088 # default to 8088
   end
 
-end
+end

data/test/simple_pusher_test.rb

@@ -1,12 +1,12 @@
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 describe SimplePusher do
 
-  it "must respond version method" do
+  it 'must respond version method' do
     SimplePusher::VERSION.wont_be_nil
   end
 
-  it "setup method work" do
+  it 'setup method work' do
     # EventMachine.run do
     #
     # end
@@ -16,7 +16,4 @@ describe SimplePusher do
     SimplePusher.configuration.port.must_equal 8888
   end
 
-
-
 end
-

data/test/test_helper.rb

@@ -1,10 +1,9 @@
-ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
 require 'bundler'
 Bundler.setup
 Bundler.require :default, :test
 
 require 'minitest/autorun'
 
-
 lib = File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_pusher
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - qichunren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket