pusher-client 0.2.0 → 0.2.1

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "eventmachine", "~>0.12.10"
-gem "libwebsocket"
+gem "libwebsocket", "~>0.1.0"
 
 group :development do
   gem "bacon", ">= 0"

data/Gemfile.lock

@@ -23,5 +23,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   eventmachine (~> 0.12.10)
   jeweler (~> 1.5.2)
-  libwebsocket
+  libwebsocket (~> 0.1.0)
   rcov

data/README.rdoc

@@ -1,30 +1,34 @@
-= PusherClient
+= pusher-client (Ruby)
 
-pusher-client is a ruby gem for consuming WebSockets from the Pusher webservice[http://pusherapp.com]
+pusher-client is a ruby gem for consuming WebSockets from the Pusher[http://pusherapp.com] web service.
 
-The connection to Pusher can optionally be maintained in its own thread (see Asynchronous Usage)
+The connection to Pusher can optionally be maintained in its own thread (see Asynchronous Usage).
 
-This gem no longer depends on em-http, and is compatible with jruby as of 0.2.
+This gem no longer depends on em-http, and is compatible with jruby since 0.2.
+
+When binding to a global event, note that you still must be subscribed to the channels the event
+may be sent on. You can't just bind a global event without subscribing to any channels and call it a day.
 
 == Installation
   gem install pusher-client
-== Evented Usage
+== Single-Threaded Usage
 The application will pause at socket.connect and handle events from Pusher as they happen.
 
   require 'pusher-client'
   PusherClient.logger = Logger.new(STDOUT)
   socket = PusherClient::Socket.new(YOUR_APPLICATION_KEY)
 
-  # Bind to a global event
+  # Subscribe to two channels
+  socket.subscribe('channel1')
+  socket.subscribe('channel2')
+
+  # Bind to a global event (can occur on either channel1 or channel2)
   socket.bind('globalevent') do |data|
     puts data
   end
 
-  # Subscribe to a channel
-  socket.subscribe('mychannel')
-
-  # Bind to a channel event
-  socket['mychannel'].bind('channelevent') do |data|
+  # Bind to a channel event (can only occur on channel1)
+  socket['channel1'].bind('channelevent') do |data|
     puts data
   end
 
@@ -39,21 +43,22 @@ and you can continue to subscribe/unsubscribe to channels and bind new events.
   socket = PusherClient::Socket.new(YOUR_APPLICATION_KEY)
   socket.connect(true) # Connect asynchronously
 
-  # Bind to a global event
+  # Subscribe to two channels
+  socket.subscribe('channel1')
+  socket.subscribe('channel2')
+
+  # Bind to a global event (can occur on either channel1 or channel2)
   socket.bind('globalevent') do |data|
     puts data
   end
 
-  # Subscribe to a channel
-  socket.subscribe('mychannel')
-
-  # Bind to a channel event
-  socket['mychannel'].bind('channelevent') do |data|
+  # Bind to a channel event (can only occur on channel1)
+  socket['channel1'].bind('channelevent') do |data|
     puts data
   end
 
   loop do
-    sleep(1)
+    sleep(1) # Keep your main thread running
   end
 
 For further documentation, read the source & test suite. Some features of the JavaScript client

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/examples/hello_pusher.rb

@@ -1,11 +1,13 @@
+# Usage: $ PUSHER_KEY=YOURKEY ruby examples/hello_pusher.rb
+
 require 'rubygems'
 require './lib/pusher-client.rb'
 require 'pp'
 
-YOUR_APPLICATION_KEY = ''
+APP_KEY = ENV['PUSHER_KEY'] # || "YOUR_APPLICATION_KEY"
 
 PusherClient.logger = Logger.new('/dev/null')
-socket = PusherClient::Socket.new(YOUR_APPLICATION_KEY)
+socket = PusherClient::Socket.new(APP_KEY)
 
 # Subscribe to a channel
 socket.subscribe('hellopusher')

data/examples/hello_pusher_async.rb

@@ -1,11 +1,13 @@
+# Usage: $ PUSHER_KEY=YOURKEY ruby examples/hello_pusher.rb
+
 require 'rubygems'
 require './lib/pusher-client.rb'
 require 'pp'
 
-YOUR_APPLICATION_KEY = '73c70db2f09b7f279382'
+APP_KEY = ENV['PUSHER_KEY'] # || "YOUR_APPLICATION_KEY"
 
 PusherClient.logger = Logger.new('/dev/null')
-socket = PusherClient::Socket.new(YOUR_APPLICATION_KEY)
+socket = PusherClient::Socket.new(APP_KEY)
 socket.connect(true)
 
 # Subscribe to a channel

data/lib/pusher-client/socket.rb

@@ -12,6 +12,8 @@ module PusherClient
 
     def initialize(application_key, options={})
 
+      raise ArgumentError if (!application_key.is_a?(String) || application_key.size < 1)
+
       @path = "/app/#{application_key}?client=#{CLIENT_ID}&version=#{VERSION}"
       @key = application_key
       @socket_id = nil

data/pusher-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pusher-client}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Logan Koester"]
-  s.date = %q{2010-12-29}
+  s.date = %q{2011-01-07}
   s.description = %q{Ruby client for consuming WebSockets from http://pusherapp.com}
   s.email = %q{logan@logankoester.com}
   s.extra_rdoc_files = [
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".bundle/config",
     ".document",
     "Gemfile",
     "Gemfile.lock",
@@ -25,10 +24,14 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "examples/hello_pusher.rb",
+    "examples/hello_pusher_async.rb",
     "lib/pusher-client.rb",
     "lib/pusher-client/channel.rb",
     "lib/pusher-client/channels.rb",
     "lib/pusher-client/socket.rb",
+    "lib/pusher-client/websocket.rb",
+    "pusher-client.gemspec",
     "test/pusherclient_test.rb",
     "test/test.watchr",
     "test/teststrap.rb"
@@ -39,6 +42,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby client for consuming WebSockets from http://pusherapp.com}
   s.test_files = [
+    "examples/hello_pusher.rb",
+    "examples/hello_pusher_async.rb",
     "test/pusherclient_test.rb",
     "test/teststrap.rb"
   ]
@@ -49,14 +54,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, ["~> 0.12.10"])
-      s.add_runtime_dependency(%q<em-http-request>, ["~> 0.2.15"])
+      s.add_runtime_dependency(%q<libwebsocket>, ["~> 0.1.0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, ["~> 0.12.10"])
-      s.add_dependency(%q<em-http-request>, ["~> 0.2.15"])
+      s.add_dependency(%q<libwebsocket>, ["~> 0.1.0"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -64,7 +69,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<eventmachine>, ["~> 0.12.10"])
-    s.add_dependency(%q<em-http-request>, ["~> 0.2.15"])
+    s.add_dependency(%q<libwebsocket>, ["~> 0.1.0"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/test/pusherclient_test.rb

@@ -71,6 +71,15 @@ describe "A PusherClient::Socket" do
     @socket.connected.should.equal false
   end
 
+  it 'should raise ArgumentError if TEST_APP_KEY is not a nonempty string' do
+    lambda { 
+      @broken_socket = PusherClient::Socket.new('')
+    }.should.raise(ArgumentError)
+    lambda { 
+      @broken_socket = PusherClient::Socket.new(555)
+    }.should.raise(ArgumentError)
+  end
+
   describe "...when connected" do
     before do
       @socket.connect

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Logan Koester
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -05:00
+date: 2011-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,11 +37,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -125,7 +127,6 @@ files:
 - lib/pusher-client/channels.rb
 - lib/pusher-client/socket.rb
 - lib/pusher-client/websocket.rb
-- pkg/pusher-client-0.1.1.gem
 - pusher-client.gemspec
 - test/pusherclient_test.rb
 - test/test.watchr
@@ -144,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2316521902587729957
+      hash: 3350793472905548965
       segments: 
       - 0
       version: "0"