pusher 0.3.0 → 0.3.1

data/README.md

@@ -12,6 +12,11 @@ Request pusher credentials from <http://pusherapp.com> and configure the gem
 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:
+
+    Pusher.logger = Rails.logger
 
 Copyright
 ---------

data/Rakefile

@@ -6,13 +6,14 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "pusher"
     gem.summary = %Q{Pusher App client}
-    gem.description = %Q{Pusher App integartion: Use to make your app send messages to Pushr}
+    gem.description = %Q{Pusher App integration: Use to make your app send messages to Pusher}
     gem.email = "info@new-bamboo.co.uk"
     gem.homepage = "http://github.com/newbamboo/pusher-gem"
     gem.authors = ["Wildfalcon", "Ismasan"]
     # 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
   end
   Jeweler::GemcutterTasks.new
@@ -20,36 +21,35 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :test => :check_dependencies
+task :spec => :check_dependencies
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "pusher #{version}"
+  rdoc.title = "test #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/pusher.rb

@@ -1,20 +1,29 @@
 require 'json'
 require 'uri'
 require 'net/http'
+require 'logger'
 
 class Pusher
-
+  
+  class ArgumentError < ::ArgumentError
+    def message
+      'You must configure both Pusher.key and Pusher.secret in order to authenticate your Pusher app'
+    end
+  end
+  
   class << self
-    attr_accessor :host, :port
+    attr_accessor :host, :port, :logger
     attr_writer :key, :secret
   end
 
-  self.host = 'api.pusherapp.com'
-  self.port = 80
+  self.host   = 'api.pusherapp.com'
+  self.port   = 80
+  self.logger = Logger.new($STDOUT)
 
   def self.[](channel_id)
+    raise ArgumentError unless (@key && @secret)
     @channels ||= {}
-    @channels[channel_id.to_s] ||= Channel.new(@key, channel_id)
+    @channels[channel_id.to_s] = Channel.new(@key, channel_id)
   end
 
   class Channel
@@ -51,7 +60,7 @@ class Pusher
     private
 
     def handle_error(e)
-      puts e.inspect
+      self.logger.error(e.backtrace.join("\n"))
     end
 
   end

data/spec/pusher_spec.rb

@@ -0,0 +1,102 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+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
+    end
+
+    describe 'with missing key' do
+      before {Pusher.secret = '1234567890'}
+      it 'should raise exception' do
+        lambda {
+          Pusher['test-channel']
+        }.should raise_error(Pusher::ArgumentError)
+      end
+    end
+
+    describe 'with missing secret' do
+      before {Pusher.key = '1234567890'}
+      it 'should raise exception' do
+        lambda {
+          Pusher['test-channel']
+        }.should raise_error(Pusher::ArgumentError)
+      end
+    end
+  end
+  
+  
+  describe 'configured' do
+    before do
+      Pusher.key    = '12345678900000001'
+      Pusher.secret = '12345678900000001'
+    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
+
+      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'
+        )
+      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'
+          )
+        end
+      end
+    end
+    
+  end
+  
+  after do
+    Pusher.key = nil
+    Pusher.secret = nil
+  end
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/{test/helper.rb → spec/spec_helper.rb}

@@ -1,10 +1,8 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'pusher'
-
-class Test::Unit::TestCase
+require 'spec'
+require 'spec/autorun'
+Spec::Runner.configure do |config|
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Wildfalcon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +00:00
+date: 2010-03-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,21 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: "Pusher App integartion: Use to make your app send messages to Pushr"
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id003
+description: "Pusher App integration: Use to make your app send messages to Pusher"
 email: info@new-bamboo.co.uk
 executables: []
 
@@ -59,8 +73,9 @@ files:
 - Rakefile
 - VERSION
 - lib/pusher.rb
-- test/helper.rb
-- test/test_pusher.rb
+- spec/pusher_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/newbamboo/pusher-gem
 licenses: []
@@ -92,5 +107,5 @@ signing_key:
 specification_version: 3
 summary: Pusher App client
 test_files: 
-- test/helper.rb
-- test/test_pusher.rb
+- spec/pusher_spec.rb
+- spec/spec_helper.rb

data/test/test_pusher.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestPusher < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end