pusher 0.3.2 → 0.3.4

data/README.md

@@ -4,17 +4,19 @@ Pusher gem
 Getting started
 ---------------
 
-Request pusher credentials from <http://pusherapp.com> and configure the gem
+After registering at <http://pusherapp.com> configure your app with the security credentials
 
     Pusher.key = 'your-pusher-key'
-    Pusher.secret = 'your-pusher-key'
+    Pusher.secret = 'your-pusher-secret'
 
 Trigger an event
 
     Pusher['arbitrary-channel-name'].trigger({:some => 'data'})
     
 Logging
-Errors are logger to Pusher.logger. You can set that to any logger you want, ie:
+-------
+
+Errors are logged to `Pusher.logger`. It will by default use `Logger` from stdlib, however you can assign any logger:
 
     Pusher.logger = Rails.logger
 

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/newbamboo/pusher-gem"
     gem.authors = ["New Bamboo"]
     # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency "rest-client"
     gem.add_dependency "json"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.4

data/lib/pusher.rb

@@ -1,68 +1,38 @@
 require 'json'
 require 'uri'
 require 'net/http'
-require 'logger'
 
-class Pusher
-  
+autoload 'Logger', 'logger'
+
+module Pusher
   class ArgumentError < ::ArgumentError
     def message
-      'You must configure both Pusher.key and Pusher.secret in order to authenticate your Pusher app'
+      'You must configure both Pusher.key in order to authenticate your Pusher app'
     end
   end
-  
+
   class << self
-    attr_accessor :host, :port, :logger
-    attr_writer :key, :secret
+    attr_accessor :host, :port
+    attr_writer :logger
+    attr_accessor :key, :secret
+
+    def logger
+      @logger ||= begin
+        log = Logger.new(STDOUT)
+        log.level = Logger::INFO
+        log
+      end
+    end
   end
 
-  self.host   = 'api.pusherapp.com'
-  self.port   = 80
-  self.logger = Logger.new($STDOUT)
+  self.host = 'api.pusherapp.com'
+  self.port = 80
 
   def self.[](channel_id)
     raise ArgumentError unless @key
     @channels ||= {}
     @channels[channel_id.to_s] = Channel.new(@key, channel_id)
   end
-
-  class Channel
-    def initialize(key, id)
-      @uri = URI.parse("http://#{Pusher.host}:#{Pusher.port}/app/#{key}/channel/#{id}")
-      @http = Net::HTTP.new(@uri.host, @uri.port)
-    end
-
-    def trigger(event_name, data, socket_id = nil)
-      begin
-        @http.post( 
-          @uri.path, 
-          self.class.turn_into_json({
-            :event => event_name,
-            :data => data,
-            :socket_id => socket_id
-            }),
-          {'Content-Type'=> 'application/json'}
-        )
-      rescue StandardError => e
-        handle_error e
-      end
-    end
-    
-    def self.turn_into_json(data)
-      j = if Object.const_defined?('ActiveSupport')
-        data.to_json
-      else
-        JSON.generate(data)
-      end
-      j
-    end
-
-    private
-
-    def handle_error(e)
-      self.logger.error(e.backtrace.join("\n"))
-    end
-
-  end
-
 end
+
+require 'pusher/channel'

data/lib/pusher/channel.rb

@@ -0,0 +1,38 @@
+module Pusher
+  class Channel
+    def initialize(key, id)
+      @uri = URI.parse("http://#{Pusher.host}:#{Pusher.port}/app/#{key}/channel/#{id}")
+      @http = Net::HTTP.new(@uri.host, @uri.port)
+    end
+
+    def trigger(event_name, data, socket_id = nil)
+      begin
+        @http.post(
+          @uri.path,
+          self.class.turn_into_json({
+            :event => event_name,
+            :data => data,
+            :socket_id => socket_id
+          }),
+          {'Content-Type'=> 'application/json'}
+        )
+      rescue StandardError => e
+        handle_error e
+      end
+    end
+
+    def self.turn_into_json(data)
+      if Object.const_defined?('ActiveSupport')
+        data.to_json
+      else
+        JSON.generate(data)
+      end
+    end
+
+    private
+
+    def handle_error(e)
+      self.logger.error(e.backtrace.join("\n"))
+    end
+  end
+end

data/pusher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pusher}
-  s.version = "0.3.2"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-14}
   s.description = %q{Wrapper for pusherapp.com REST api}
   s.email = %q{support@pusherapp.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/pusher.rb",
+     "lib/pusher/channel.rb",
      "pusher.gemspec",
      "spec/pusher_spec.rb",
      "spec/spec.opts",
@@ -44,16 +45,13 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end

data/spec/pusher_spec.rb

@@ -1,92 +1,88 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe Pusher do
-  
   describe 'configuration' do
     it 'should be preconfigured for api host' do
       Pusher.host.should == 'api.pusherapp.com'
     end
-    
+
     it 'should be preconfigured for pi port 80' do
       Pusher.port.should == 80
     end
-  end
-  
-  describe 'unconfigured' do
-    describe 'with missing key and secret' do
-      it 'should raise exception' do
-        lambda {
-          Pusher['test-channel']
-        }.should raise_error(Pusher::ArgumentError)
-      end
+
+    it 'should use standard logger if no other logger if defined' do
+      Pusher.logger.debug('foo')
+      Pusher.logger.should be_kind_of(Logger)
     end
 
-    describe 'with missing key' do
-      it 'should raise exception' do
-        lambda {
-          Pusher['test-channel']
-        }.should raise_error(Pusher::ArgumentError)
-      end
+    it "can be configured to use any logger" do
+      logger = mock("ALogger")
+      logger.should_receive(:debug).with('foo')
+      Pusher.logger = logger
+      Pusher.logger.debug('foo')
+    end
+
+    it 'should raise exception if key and secret are missing' do
+      lambda {
+        Pusher['test-channel']
+      }.should raise_error(Pusher::ArgumentError)
+    end
+
+    it 'should raise exception if key is missing' do
+      lambda {
+        Pusher['test-channel']
+      }.should raise_error(Pusher::ArgumentError)
     end
   end
-  
-  
+
   describe 'configured' do
     before do
       Pusher.key    = '12345678900000001'
       Pusher.secret = '12345678900000001'
     end
-    
+
+    after do
+      Pusher.key = nil
+      Pusher.secret = nil
+    end
+
     describe '.[]' do
       before do
         @channel = Pusher['test_channel']
       end
-      
+
       it 'should return a new channel' do
         @channel.should be_kind_of(Pusher::Channel)
       end
     end
-    
-    describe 'calling Channel#trigger' do
 
+    describe 'Channel#trigger' do
       before do
         @http = mock('HTTP', :post => 'posting')
         Net::HTTP.stub!(:new).and_return @http
       end
 
       it 'should configure HTTP library to talk to pusher API' do
-        Net::HTTP.should_receive(:new).with('api.pusherapp.com', 80).and_return @http
-        Pusher['test_channel'].trigger(
-          'new_event',
-          'Some data'
-        )
+        Net::HTTP.should_receive(:new).
+          with('api.pusherapp.com', 80).and_return @http
+        Pusher['test_channel'].trigger('new_event', 'Some data')
       end
-      
-      describe 'POSTing to api.pusherapp.com' do
-        
-        it 'should POST JSON to p# usher API' do
-          @http.should_receive(:post) do |*args|
-            args[0].should == '/app/12345678900000001/channel/test_channel'
-            parsed = JSON.parse(args[1])
-            parsed['event'].should == 'new_event' 
-            parsed['data']['name'].should == 'Pusher'
-            parsed['data']['last_name'].should == 'App'
-            parsed['socket_id'].should == nil
-            args[2].should == {'Content-Type'=> 'application/json'}
-          end
-          Pusher['test_channel'].trigger(
-            'new_event',
-            :name => 'Pusher',
-            :last_name => 'App'
-          )
+
+      it 'should POST JSON to pusher API' do
+        @http.should_receive(:post) do |path, data, headers|
+          path.should == '/app/12345678900000001/channel/test_channel'
+          parsed = JSON.parse(data)
+          parsed['event'].should == 'new_event'
+          parsed['data']['name'].should == 'Pusher'
+          parsed['data']['last_name'].should == 'App'
+          parsed['socket_id'].should == nil
+          headers.should == {'Content-Type'=> 'application/json'}
         end
+        Pusher['test_channel'].trigger('new_event', {
+          :name => 'Pusher',
+          :last_name => 'App'
+        })
       end
     end
-    
-  end
-  
-  after do
-    Pusher.key = nil
-    Pusher.secret = nil
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
+require 'rubygems'
+
+require 'spec'
+require 'spec/autorun'
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'pusher'
-require 'spec'
-require 'spec/autorun'
+
 Spec::Runner.configure do |config|
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - New Bamboo
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +01:00
+date: 2010-04-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -29,22 +29,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -54,7 +42,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: Wrapper for pusherapp.com REST api
 email: support@pusherapp.com
 executables: []
@@ -72,6 +60,7 @@ files:
 - Rakefile
 - VERSION
 - lib/pusher.rb
+- lib/pusher/channel.rb
 - pusher.gemspec
 - spec/pusher_spec.rb
 - spec/spec.opts