pusher 0.5.0 → 0.5.1

data/CHANGELOG

@@ -0,0 +1,6 @@
+* master *
+
+* Pusher v0.5.1 (20th May, 2010) *
+
+* Use ActiveSupport::JSON.encode instead of #to_json to avoid conflicts with JSON gem. [OL]
+* Support loading Pusher credentials from a PUSHER_URL environment variable. [ML]

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/pusher.rb

@@ -20,18 +20,44 @@ module Pusher
     def authentication_token
       Signature::Token.new(@key, @secret)
     end
+
+    # Builds a connection url for Pusherapp
+    def url
+      @url ||= URI::HTTP.build({
+        :host => self.host,
+        :port => self.port,
+        :path => "/apps/#{self.app_id}"
+      })
+    end
+
+    # Allows configuration from a url
+    def url=(url)
+      uri = URI.parse(url)
+      self.app_id = uri.path.split('/').last
+      self.key    = uri.user
+      self.secret = uri.password
+      self.host   = uri.host
+      self.port   = uri.port
+    end
+
+    private
+
+    def configured?
+      host && port && key && secret && app_id
+    end
   end
 
-  self.app_id = ENV["PUSHER_APP_ID"] if ENV["PUSHER_APP_ID"]
-  self.key    = ENV["PUSHER_KEY"]    if ENV["PUSHER_KEY"]
-  self.secret = ENV["PUSHER_SECRET"] if ENV["PUSHER_SECRET"]
-  self.host = ENV["PUSHER_API_HOST"] || 'api.pusherapp.com'
-  self.port = ENV["PUSHER_API_PORT"] || 80
+  self.host = 'api.pusherapp.com'
+  self.port = 80
+
+  if ENV['PUSHER_URL']
+    self.url = ENV['PUSHER_URL']
+  end
 
   def self.[](channel_name)
-    raise ArgumentError, 'Missing configuration: please check that Pusher.app_id, Pusher.key, and Pusher.secret are all configured' unless @app_id && @key && @secret
+    raise ArgumentError, 'Missing configuration: please check that Pusher.url is configured' unless configured?
     @channels ||= {}
-    @channels[channel_name.to_s] = Channel.new(@app_id, channel_name)
+    @channels[channel_name.to_s] = Channel.new(url, channel_name)
   end
 end
 

data/lib/pusher/channel.rb

@@ -10,13 +10,10 @@ module Pusher
   class Channel
     attr_reader :name
 
-    def initialize(app_id, name)
+    def initialize(base_url, name)
+      @uri = base_url.dup
+      @uri.path = @uri.path + "/channels/#{name}/events"
       @name = name
-      @uri = URI::HTTP.build({
-        :host => Pusher.host,
-        :port => Pusher.port,
-        :path => "/apps/#{app_id}/channels/#{name}/events"
-      })
     end
 
     def trigger_async(event_name, data, socket_id = nil, &block)

data/lib/pusher/request.rb

@@ -29,7 +29,7 @@ module Pusher
 
     def self.turn_into_json(data)
       if Object.const_defined?('ActiveSupport')
-        data.to_json
+        ActiveSupport::JSON.encode(data)
       else
         JSON.generate(data)
       end

data/pusher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pusher}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-05-20}
   s.description = %q{Wrapper for pusherapp.com REST api}
   s.email = %q{support@pusherapp.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.md",
      "Rakefile",

data/spec/pusher_spec.rb

@@ -10,7 +10,7 @@ describe Pusher do
       Pusher.host.should == 'api.pusherapp.com'
     end
 
-    it 'should be preconfigured for pi port 80' do
+    it 'should be preconfigured for port 80' do
       Pusher.port.should == 80
     end
 
@@ -28,6 +28,26 @@ describe Pusher do
     end
   end
 
+  describe "configuration using url" do
+    after do
+      Pusher.app_id = nil
+      Pusher.key = nil
+      Pusher.secret = nil
+      Pusher.host = 'api.pusherapp.com'
+      Pusher.port = 80
+    end
+
+    it "should be possible to configure everything by setting the url" do
+      Pusher.url = "http://somekey:somesecret@api.staging.pusherapp.com:8080/apps/87"
+
+      Pusher.host.should == 'api.staging.pusherapp.com'
+      Pusher.port.should == 8080
+      Pusher.key.should == 'somekey'
+      Pusher.secret.should == 'somesecret'
+      Pusher.app_id.should == '87'
+    end
+  end
+
   describe 'configured' do
     before do
       Pusher.app_id = '20'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - New Bamboo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 +01:00
+date: 2010-05-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile