pusher 0.6.0 → 0.7.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.bundle

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: .
+  specs:
+    pusher (0.6.0)
+      crack (~> 0.1.0)
+      json (~> 1.4.0)
+      ruby-hmac (~> 0.4.0)
+      signature (~> 0.1.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.2)
+    crack (0.1.8)
+    diff-lcs (1.1.2)
+    em-http-request (0.2.14)
+      addressable (>= 2.0.0)
+      eventmachine (>= 0.12.9)
+    eventmachine (0.12.10)
+    json (1.4.6)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    ruby-hmac (0.4.0)
+    signature (0.1.2)
+      ruby-hmac
+    webmock (1.4.0)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  crack (~> 0.1.0)
+  em-http-request (~> 0.2.7)
+  json (~> 1.4.0)
+  pusher!
+  rspec (~> 2.0)
+  ruby-hmac (~> 0.4.0)
+  signature (~> 0.1.2)
+  webmock

data/README.md

@@ -47,6 +47,14 @@ The Pusher Gem also deals with signing requests for authenticated private channe
     
 Read more about private channels in [the docs](http://pusherapp.com/docs/private_channels).
 
+Developing
+----------
+
+Use bundler in order to run specs with the correct dependencies.
+
+    bundle
+    bundle exec rspec spec/*_spec.rb
+
 Copyright
 ---------
 

data/Rakefile

@@ -1,59 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "pusher"
-    gem.summary = %Q{Pusher App client}
-    gem.description = %Q{Wrapper for pusherapp.com REST api}
-    gem.email = "support@pusherapp.com"
-    gem.homepage = "http://github.com/newbamboo/pusher-gem"
-    gem.authors = ["New Bamboo"]
-    # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency "json"
-    gem.add_dependency "crack"
-    gem.add_dependency "ruby-hmac"
-    gem.add_dependency 'signature'
-    # gem.add_dependency 'em-http-request', ">= 0.2.7"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "webmock"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-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 :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "test #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/lib/pusher.rb

@@ -7,7 +7,7 @@ module Pusher
   class ConfigurationError < Error; end
 
   class << self
-    attr_accessor :host, :port
+    attr_accessor :scheme, :host, :port
     attr_writer :logger
     attr_accessor :app_id, :key, :secret
 
@@ -25,7 +25,8 @@ module Pusher
 
     # Builds a connection url for Pusherapp
     def url
-      @url ||= URI::HTTP.build({
+      URI::Generic.build({
+        :scheme => self.scheme,
         :host => self.host,
         :port => self.port,
         :path => "/apps/#{self.app_id}"
@@ -42,15 +43,23 @@ module Pusher
       self.port   = uri.port
     end
 
+    # Configure ssl by setting Pusher.encrypted = true
+    def encrypted=(boolean)
+      Pusher.scheme = boolean ? 'https' : 'http'
+      # Configure port if it hasn't already been configured
+      Pusher.port ||= boolean ? 443 : 80
+    end
+
     private
 
     def configured?
-      host && port && key && secret && app_id
+      host && scheme && key && secret && app_id
     end
   end
 
+  # Defaults
+  self.scheme = 'http'
   self.host = 'api.pusherapp.com'
-  self.port = 80
 
   if ENV['PUSHER_URL']
     self.url = ENV['PUSHER_URL']

data/lib/pusher/channel.rb

@@ -45,8 +45,14 @@ module Pusher
 
     def trigger!(event_name, data, socket_id = nil)
       require 'net/http' unless defined?(Net::HTTP)
+      require 'net/https' if (ssl? && !defined?(Net::HTTPS))
 
-      @http_sync ||= Net::HTTP.new(@uri.host, @uri.port)
+      @http_sync ||= begin
+        http = Net::HTTP.new(@uri.host, @uri.port)
+        http.use_ssl = true if ssl?
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ssl?
+        http
+      end
 
       request = Pusher::Request.new(@uri, event_name, data, socket_id)
 
@@ -110,5 +116,9 @@ module Pusher
         raise Error, "Unknown error in Pusher: #{body}"
       end
     end
+
+    def ssl?
+      @uri.scheme == 'https'
+    end
   end
 end

data/pusher.gemspec

@@ -1,75 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{pusher}
-  s.version = "0.6.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["New Bamboo"]
-  s.date = %q{2010-08-09}
+  s.name        = "pusher"
+  s.version     = "0.7.0"
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["New Bamboo"]
+  s.email       = ["support@pusherapp.com"]
+  s.homepage    = "http://github.com/newbamboo/pusher-gem"
+  s.summary     = %q{Pusherapp client}
   s.description = %q{Wrapper for pusherapp.com REST api}
-  s.email = %q{support@pusherapp.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/pusher.rb",
-     "lib/pusher/channel.rb",
-     "lib/pusher/json.rb",
-     "lib/pusher/request.rb",
-     "pusher.gemspec",
-     "spec/channel_spec.rb",
-     "spec/pusher_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/newbamboo/pusher-gem}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Pusher App client}
-  s.test_files = [
-    "spec/channel_spec.rb",
-     "spec/pusher_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  
+  s.add_dependency "json", "~> 1.4.0"
+  s.add_dependency "crack", "~> 0.1.0"
+  s.add_dependency "ruby-hmac", "~> 0.4.0"
+  s.add_dependency 'signature', "~> 0.1.2"
+  
+  s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "webmock"
+  s.add_development_dependency "em-http-request", "~> 0.2.7"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<crack>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
-      s.add_runtime_dependency(%q<signature>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<crack>, [">= 0"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0"])
-      s.add_dependency(%q<signature>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<crack>, [">= 0"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0"])
-    s.add_dependency(%q<signature>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/spec/channel_spec.rb

@@ -7,6 +7,7 @@ describe Pusher::Channel do
     Pusher.secret = '12345678900000001'
     Pusher.host = 'api.pusherapp.com'
     Pusher.port = 80
+    Pusher.encrypted = false
   end
 
   after do
@@ -17,6 +18,7 @@ describe Pusher::Channel do
   
   describe 'trigger!' do
     before :each do
+      WebMock.disable_net_connect!
       WebMock.stub_request(
         :post, %r{/apps/20/channels/test_channel/events}
       ).to_return(:status => 202)
@@ -25,17 +27,21 @@ describe Pusher::Channel do
 
     it 'should configure HTTP library to talk to pusher API' do
       @channel.trigger!('new_event', 'Some data')
-      WebMock.request(:post, %r{api.pusherapp.com}).should have_been_made
+      WebMock.should have_requested(:post, %r{http://api.pusherapp.com})
     end
 
-    it 'should POST with the correct parameters and convert data to JSON' do
+    it "should POST to https api if ssl enabled" do
+      Pusher.encrypted = true
+      Pusher::Channel.new(Pusher.url, 'test_channel').trigger('new_event', 'Some data')
+      WebMock.should have_requested(:post, %r{https://api.pusherapp.com})
+    end
+
+    it 'should POST hashes by encoding as JSON in the request body' do
       @channel.trigger!('new_event', {
         :name => 'Pusher',
         :last_name => 'App'
       })
-      WebMock.request(:post, %r{/apps/20/channels/test_channel/events}).
-      with do |req|
-
+      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with do |req|
         query_hash = req.uri.query_values
         query_hash["name"].should == 'new_event'
         query_hash["auth_key"].should == Pusher.key
@@ -48,18 +54,18 @@ describe Pusher::Channel do
         }
 
         req.headers['Content-Type'].should == 'application/json'
-      end.should have_been_made
+      end
     end
 
-    it "should handle string data by sending unmodified in body" do
+    it "should POST string data unmodified in request body" do
       string = "foo\nbar\""
       @channel.trigger!('new_event', string)
-      WebMock.request(:post, %r{/apps/20/channels/test_channel/events}).with do |req|
+      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with do |req|
         req.body.should == "foo\nbar\""
-      end.should have_been_made
+      end
     end
 
-    it "should raise error if an object sent which canot be JSONified" do
+    it "should raise error on non string values with cannot be jsonified" do
       lambda {
         @channel.trigger!('new_event', Object.new)
       }.should raise_error(JSON::GeneratorError)
@@ -126,57 +132,42 @@ describe Pusher::Channel do
 
   describe "trigger_async" do
     before :each do
-      EM.send(:remove_const, :HttpRequest)
-      EM::HttpRequest = EM::MockHttpRequest
-      
-      #in order to match URLs when testing http requests
-      #override the method that converts query hash to string
-      #to include a sort so URL is consistent
-      module EventMachine
-        module HttpEncoding
-          def encode_query(path, query, uri_query)
-            encoded_query = if query.kind_of?(Hash)
-            query.sort{|a, b| a.to_s <=> b.to_s}.
-              map { |k, v| encode_param(k, v) }.
-              join('&')
-            else
-              query.to_s
-            end
-            if !uri_query.to_s.empty?
-              encoded_query = [encoded_query, uri_query].reject {|part| part.empty?}.join("&")
-            end
-            return path if encoded_query.to_s.empty?
-            "#{path}?#{encoded_query}"
-          end
-        end
-      end
-      
-      EM::HttpRequest.reset_registry!
-      EM::HttpRequest.reset_counts!
-      EM::HttpRequest.pass_through_requests = false
-    end
+      WebMock.reset_webmock
+      WebMock.disable_net_connect!
 
-    it "should return a deferrable which succeeds in success case" do
-      Time.stub(:now).and_return(123)
-
-      url = 'http://api.pusherapp.com:80/apps/20/channels/test_channel/events?auth_key=12345678900000001&auth_signature=0ffe2a3749f886ca69c3f516a30c7bc9a12d2ebd8bda5b718b90ad58507c8261&auth_timestamp=123&auth_version=1.0&body_md5=5b82f8bf4df2bfb0e66ccaa7306fd024&name=new_event'
+      @pusher_url_regexp = %r{/apps/20/channels/test_channel/events}
+    end
 
-      data = <<-RESPONSE.gsub(/^ +/, '')
-        HTTP/1.1 202 Accepted
-        Content-Type: text/html
-        Content-Length: 13
-        Connection: keep-alive
-        Server: thin 1.2.7 codename No Hup
+    it "should by default POST to http api" do
+      EM.run {
+        stub_request(:post, @pusher_url_regexp).to_return(:status => 202)
+        channel = Pusher::Channel.new(Pusher.url, 'test_channel')
+        channel.trigger_async('new_event', 'Some data').callback {
+          WebMock.should have_requested(:post, %r{http://api.pusherapp.com})
+          EM.stop
+        }
+      }
+    end
 
-        202 ACCEPTED
-      RESPONSE
+    it "should POST to https api if ssl enabled" do
+      Pusher.encrypted = true
+      EM.run {
+        stub_request(:post, @pusher_url_regexp).to_return(:status => 202)
+        channel = Pusher::Channel.new(Pusher.url, 'test_channel')
+        channel.trigger_async('new_event', 'Some data').callback {
+          WebMock.should have_requested(:post, %r{https://api.pusherapp.com})
+          EM.stop
+        }
+      }
+    end
 
-      EM::HttpRequest.register(url, :post, data)
+    it "should return a deferrable which succeeds in success case" do
+      stub_request(:post, @pusher_url_regexp).to_return(:status => 202)
 
       EM.run {
         d = Pusher['test_channel'].trigger_async('new_event', 'Some data')
         d.callback {
-          EM::HttpRequest.count(url, :post).should == 1
+          WebMock.should have_requested(:post, @pusher_url_regexp)
           EM.stop
         }
         d.errback {
@@ -187,21 +178,7 @@ describe Pusher::Channel do
     end
 
     it "should return a deferrable which fails (with exception) in fail case" do
-      Time.stub(:now).and_return(123)
-
-      url = 'http://api.pusherapp.com:80/apps/20/channels/test_channel/events?auth_key=12345678900000001&auth_signature=0ffe2a3749f886ca69c3f516a30c7bc9a12d2ebd8bda5b718b90ad58507c8261&auth_timestamp=123&auth_version=1.0&body_md5=5b82f8bf4df2bfb0e66ccaa7306fd024&name=new_event'
-
-      data = <<-RESPONSE.gsub(/^ +/, '')
-        HTTP/1.1 401 Unauthorized
-        Content-Type: text/html
-        Content-Length: 130
-        Connection: keep-alive
-        Server: thin 1.2.7 codename No Hup
-
-        401 UNAUTHORIZED: Timestamp expired: Given timestamp (2010-05-05T11:24:42Z) not within 600s of server time (2010-05-05T11:51:42Z)
-      RESPONSE
-
-      EM::HttpRequest.register(url, :post, data)
+      stub_request(:post, @pusher_url_regexp).to_return(:status => 401)
 
       EM.run {
         d = Pusher['test_channel'].trigger_async('new_event', 'Some data')
@@ -209,7 +186,7 @@ describe Pusher::Channel do
           fail
         }
         d.errback { |error|
-          EM::HttpRequest.count(url, :post).should == 1
+          WebMock.should have_requested(:post, @pusher_url_regexp)
           error.should be_kind_of(Pusher::AuthenticationError)
           EM.stop
         }

data/spec/pusher_spec.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-require 'webmock/rspec'
 require 'em-http'
-require 'em-http/mock'
 
 describe Pusher do
   describe 'configuration' do

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
+require 'em-http' # As of webmock 1.4.0, em-http must be loaded first
+require 'webmock/rspec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -9,6 +11,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'pusher'
 require 'eventmachine'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  config.include WebMock::API
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +01:00
+date: 2010-11-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,11 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 4
         - 0
-        version: "0"
+        version: 1.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -34,11 +36,13 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -46,11 +50,13 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -58,11 +64,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -70,13 +78,12 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -91,22 +98,37 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  type: :development
+  version_requirements: *id007
 description: Wrapper for pusherapp.com REST api
-email: support@pusherapp.com
+email: 
+- support@pusherapp.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/pusher.rb
 - lib/pusher/channel.rb
 - lib/pusher/json.rb
@@ -114,15 +136,14 @@ files:
 - pusher.gemspec
 - spec/channel_spec.rb
 - spec/pusher_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/newbamboo/pusher-gem
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -145,7 +166,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Pusher App client
+summary: Pusherapp client
 test_files: 
 - spec/channel_spec.rb
 - spec/pusher_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.6.0

data/spec/spec.opts

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