tinder 1.6.0 → 1.7.0

data/.travis.yml

@@ -1,8 +1,9 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ruby-head
-  - rbx
+  - rbx-2.0
   - jruby
 only:
   - master

data/README.markdown

@@ -7,7 +7,7 @@ Tinder is a library for interfacing with Campfire, the chat application from 37S
     campfire = Tinder::Campfire.new 'mysubdomain', :token => '546884b3d8fee4d80665g561caf7h9f3ea7b999e'
     # or you can still use username/password and Tinder will look up your token
     # campfire = Tinder::Campfire.new 'mysubdomain', :username => 'user', :password => 'pass'
-  
+
     room = campfire.rooms.first
     room.rename 'New Room Names'
     room.speak 'Hello world!'
@@ -15,13 +15,17 @@ Tinder is a library for interfacing with Campfire, the chat application from 37S
 
     room = campfire.find_room_by_guest_hash 'abc123', 'John Doe'
     room.speak 'Hello world!'
-  
+
 See the RDoc for more details.
 
 ## Installation
 
     gem install tinder
-  
+
+## Continuous Integration
+
+[![Build Status](https://secure.travis-ci.org/collectiveidea/tinder.png)](http://travis-ci.org/collectiveidea/tinder)
+
 ## How to contribute
 
 If you find what looks like a bug:

data/lib/faraday/response/raise_on_authentication_failure.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'faraday'
 
 module Faraday

data/lib/faraday/response/remove_whitespace.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'faraday'
 
 module Faraday

data/lib/tinder.rb

@@ -1,10 +1,20 @@
+# encoding: UTF-8
 require 'tinder/connection'
 require 'tinder/campfire'
 require 'tinder/room'
+require 'logger'
 
 module Tinder
   class Error < StandardError; end
   class SSLRequiredError < Error; end
   class AuthenticationFailed < Error; end
   class ListenFailed < Error; end
+
+  def self.logger
+    @logger ||= Logger.new(ENV['TINDER_LOGGING'] ? STDOUT : nil)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
 end

data/lib/tinder/campfire.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Tinder
 
   # == Usage
@@ -17,7 +18,9 @@ module Tinder
     #
     # == Options:
     # * +:ssl+: use SSL for the connection, which is required if you have a Campfire SSL account.
-    #           Defaults to false
+    #           Defaults to true
+    # * +:ssl_verify+: verify SSL certificate if using SSL
+    #           Defaults to true
     # * +:proxy+: a proxy URI. (e.g. :proxy => 'http://user:pass@example.com:8000')
     #
     #   c = Tinder::Campfire.new("mysubdomain", :ssl => true)
@@ -32,7 +35,7 @@ module Tinder
         Room.new(connection, room)
       end
     end
-    
+
     # Find a campfire room by id
     def find_room_by_id(id)
       rooms.detect { |room| room.id == id }

data/lib/tinder/connection.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'active_support/json'
 require 'faraday'
 require 'faraday/response/raise_on_authentication_failure'
@@ -34,7 +35,7 @@ module Tinder
 
     def initialize(subdomain, options = {})
       @subdomain = subdomain
-      @options = { :ssl => true, :proxy => ENV['HTTP_PROXY'] }.merge(options)
+      @options = {:ssl => true, :ssl_verify => true, :proxy => ENV['HTTP_PROXY']}.merge(options)
       @uri = URI.parse("#{@options[:ssl] ? 'https' : 'http' }://#{subdomain}.#{HOST}")
       @token = options[:token]
 
@@ -51,6 +52,9 @@ module Tinder
         conn = self.class.connection.dup
         conn.url_prefix = @uri.to_s
         conn.proxy options[:proxy]
+        if options[:ssl_verify] == false
+          conn.ssl[:verify] = false
+        end
         conn
       end
     end
@@ -60,6 +64,9 @@ module Tinder
         conn = self.class.raw_connection.dup
         conn.url_prefix = @uri.to_s
         conn.proxy options[:proxy]
+        if options[:ssl_verify] == false
+          conn.ssl[:verify] = false
+        end
         conn
       end
     end

data/lib/tinder/room.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Tinder
   # A campfire room
   class Room
@@ -129,6 +130,7 @@ module Tinder
     def listen(options = {})
       raise ArgumentError, "no block provided" unless block_given?
 
+      Tinder.logger.info "Joining #{@name}…"
       join # you have to be in the room to listen
 
       require 'active_support/json'
@@ -145,8 +147,10 @@ module Tinder
         :ssl => connection.options[:ssl]
       }.merge(options)
 
+      Tinder.logger.info "Starting EventMachine server…"
       EventMachine::run do
         @stream = Twitter::JSONStream.connect(options)
+        Tinder.logger.info "Listening to #{@name}…"
         @stream.each_item do |message|
           message = Hashie::Mash.new(MultiJson.decode(message))
           message[:user] = user(message.delete(:user_id))
@@ -174,6 +178,7 @@ module Tinder
     def stop_listening
       return unless listening?
 
+      Tinder.logger.info "Stopped listening to #{@name}…"
       @stream.stop
       @stream = nil
     end

data/lib/tinder/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Tinder
-  VERSION = '1.6.0' unless defined?(::Tinder::VERSION)
+  VERSION = '1.7.0' unless defined?(::Tinder::VERSION)
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rspec'

data/spec/tinder/campfire_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 describe Tinder::Campfire do

data/spec/tinder/connection_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 describe Tinder::Connection do
@@ -17,10 +18,9 @@ describe Tinder::Connection do
       end
 
       connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass')
-      connection.token.should.should == "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+      connection.token.should == "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
     end
 
-
     it "should use basic auth for credentials" do
       stub_connection(Tinder::Connection) do |stub|
         stub.get("/rooms.json") {[200, {}, fixture('rooms.json')]}
@@ -29,4 +29,24 @@ describe Tinder::Connection do
       lambda { connection.get('/rooms.json') }.should_not raise_error
     end
   end
+
+  describe "ssl" do
+    it "should turn on ssl by default" do
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/users/me.json") {[200, {}, fixture('users/me.json')]}
+      end
+
+      connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass')
+      connection.ssl?.should be_true
+    end
+
+    it "should should allow peer verification to be turned off" do
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/users/me.json") {[200, {}, fixture('users/me.json')]}
+      end
+
+      connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass', :ssl_verify => false)
+      connection.connection.ssl[:verify].should be == false
+    end
+  end
 end

data/spec/tinder/room_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 describe Tinder::Room do
@@ -8,7 +9,7 @@ describe Tinder::Room do
       stub.get('/room/80749.json') {[200, {}, fixture('rooms/show.json')]}
     end
 
-    @room = Tinder::Room.new(@connection, 'id' => 80749)
+    @room = Tinder::Room.new(@connection, 'id' => 80749, 'name' => 'Room 1')
 
     # Get EventMachine out of the way. We could be using em-spec, but seems like overkill
     require 'twitter/json_stream'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinder
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70097708989480 !ruby/object:Gem::Requirement
+  requirement: &70192463323300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70097708989480
+  version_requirements: *70192463323300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70097708988480 !ruby/object:Gem::Requirement
+  requirement: &70192463353520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70097708988480
+  version_requirements: *70192463353520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097708969580 !ruby/object:Gem::Requirement
+  requirement: &70192463353060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70097708969580
+  version_requirements: *70192463353060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70097708968580 !ruby/object:Gem::Requirement
+  requirement: &70192463352560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708968580
+  version_requirements: *70192463352560
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70097708966700 !ruby/object:Gem::Requirement
+  requirement: &70192463351840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: '0.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708966700
+  version_requirements: *70192463351840
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70097708965840 !ruby/object:Gem::Requirement
+  requirement: &70192463351340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708965840
+  version_requirements: *70192463351340
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70097708964040 !ruby/object:Gem::Requirement
+  requirement: &70192463350580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +96,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708964040
+  version_requirements: *70192463350580
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70097708962360 !ruby/object:Gem::Requirement
+  requirement: &70192463349860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,10 +107,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708962360
+  version_requirements: *70192463349860
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70097708961620 !ruby/object:Gem::Requirement
+  requirement: &70192463349400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -118,10 +118,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708961620
+  version_requirements: *70192463349400
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70097708956340 !ruby/object:Gem::Requirement
+  requirement: &70192463348940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -129,10 +129,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708956340
+  version_requirements: *70192463348940
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70097708955420 !ruby/object:Gem::Requirement
+  requirement: &70192463348480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -140,10 +140,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708955420
+  version_requirements: *70192463348480
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &70097708954280 !ruby/object:Gem::Requirement
+  requirement: &70192463348020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -151,7 +151,7 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708954280
+  version_requirements: *70192463348020
 description: A Ruby API for interfacing with Campfire, the 37Signals chat application.
 email:
 - brandon@opensoul.org
@@ -201,9 +201,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2278892891730273210
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: