tinder 1.5.0 → 1.6.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ruby-head
+  - rbx
+  - jruby
+only:
+  - master
+notifications:
+  disabled: true

data/lib/faraday/response/remove_whitespace.rb

@@ -0,0 +1,9 @@
+require 'faraday'
+
+module Faraday
+  class Response::RemoveWhitespace < Response::Middleware
+    def parse(body)
+      body =~ /^\s+$/ ? "" : body
+    end
+  end
+end

data/lib/tinder/connection.rb

@@ -1,6 +1,7 @@
 require 'active_support/json'
 require 'faraday'
 require 'faraday/response/raise_on_authentication_failure'
+require 'faraday/response/remove_whitespace'
 require 'faraday_middleware'
 require 'uri'
 
@@ -15,6 +16,7 @@ module Tinder
         builder.use     Faraday::Request::JSON
         builder.use     Faraday::Response::Mashify
         builder.use     Faraday::Response::ParseJson
+        builder.use     Faraday::Response::RemoveWhitespace
         builder.use     Faraday::Response::RaiseOnAuthenticationFailure
         builder.adapter Faraday.default_adapter
       end
@@ -24,6 +26,7 @@ module Tinder
       @raw_connection ||= Faraday.new do |builder|
         builder.use     Faraday::Response::Mashify
         builder.use     Faraday::Response::ParseJson
+        builder.use     Faraday::Response::RemoveWhitespace
         builder.use     Faraday::Response::RaiseOnAuthenticationFailure
         builder.adapter Faraday.default_adapter
       end

data/lib/tinder/room.rb

@@ -10,14 +10,18 @@ module Tinder
       @loaded = false
     end
 
-    # Join the room. Pass +true+ to join even if you've already joined.
-    def join(force = false)
-      post 'join'
+    # Join the room
+    # POST /room/#{id}/join.xml
+    # For whatever reason, #join() and #leave() are still xml endpoints
+    # whereas elsewhere in this API we're assuming json :\
+    def join
+      post 'join', 'xml'
     end
 
     # Leave a room
+    # POST /room/#{id}/leave.xml
     def leave
-      post 'leave'
+      post 'leave', 'xml'
       stop_listening
     end
 
@@ -60,12 +64,12 @@ module Tinder
 
     # Lock the room to prevent new users from entering and to disable logging
     def lock
-      post :lock
+      post 'lock'
     end
 
     # Unlock the room
     def unlock
-      post :unlock
+      post 'unlock'
     end
 
     # Post a new message to the chat room
@@ -135,11 +139,12 @@ module Tinder
       auth = connection.basic_auth_settings
       options = {
         :host => "streaming.#{Connection::HOST}",
-        :path => room_url_for(:live),
+        :path => room_url_for('live'),
         :auth => "#{auth[:username]}:#{auth[:password]}",
         :timeout => 6,
         :ssl => connection.options[:ssl]
       }.merge(options)
+
       EventMachine::run do
         @stream = Twitter::JSONStream.connect(options)
         @stream.each_item do |message|
@@ -241,8 +246,8 @@ module Tinder
       connection.raw_post(room_url_for(action), body)
     end
 
-    def room_url_for(action)
-      "/room/#{@id}/#{action}.json"
+    def room_url_for(action, format="json")
+      "/room/#{@id}/#{action}.#{format}"
     end
 
     def connection

data/lib/tinder/version.rb

@@ -1,3 +1,3 @@
 module Tinder
-  VERSION = '1.5.0' unless defined?(::Tinder::VERSION)
+  VERSION = '1.6.0' unless defined?(::Tinder::VERSION)
 end

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ def stub_connection(object, &block)
     builder.use     Faraday::Request::JSON
     builder.use     Faraday::Response::Mashify
     builder.use     Faraday::Response::ParseJson
+    builder.use     Faraday::Response::RemoveWhitespace
     builder.use     Faraday::Response::RaiseOnAuthenticationFailure
     builder.adapter :test, @stubs
   end

data/spec/tinder/campfire_spec.rb

@@ -8,26 +8,26 @@ describe Tinder::Campfire do
   describe "rooms" do
     before do
       stub_connection(@campfire.connection) do |stub|
-        stub.get('/rooms.json') {[ 200, {}, fixture('rooms.json') ]}
+        stub.get('/rooms.json') {[200, {}, fixture('rooms.json')]}
       end
     end
 
     it "should return rooms" do
-      @campfire.rooms.size.should == 2
+      @campfire.rooms.size.should be == 2
       @campfire.rooms.first.should be_kind_of(Tinder::Room)
     end
 
     it "should set the room name and id" do
       room = @campfire.rooms.first
-      room.name.should == 'Room 1'
-      room.id.should == 80749
+      room.name.should be == 'Room 1'
+      room.id.should be == 80749
     end
   end
 
   describe "find_by_id" do
     before do
       stub_connection(@campfire.connection) do |stub|
-        stub.get('/rooms.json') {[ 200, {}, fixture('rooms.json') ]}
+        stub.get('/rooms.json') {[200, {}, fixture('rooms.json')]}
       end
     end
 
@@ -45,7 +45,7 @@ describe Tinder::Campfire do
   describe "find_room_by_name" do
     before do
       stub_connection(@campfire.connection) do |stub|
-        stub.get('/rooms.json') {[ 200, {}, fixture('rooms.json') ]}
+        stub.get('/rooms.json') {[200, {}, fixture('rooms.json')]}
       end
     end
 
@@ -63,30 +63,30 @@ describe Tinder::Campfire do
   describe "users" do
     before do
       stub_connection(@campfire.connection) do |stub|
-        stub.get('/rooms.json') {[ 200, {}, fixture('rooms.json') ]}
+        stub.get('/rooms.json') {[200, {}, fixture('rooms.json')]}
 
         [80749, 80751].each do |id|
-          stub.get("/room/#{id}.json") {[ 200, {}, fixture("rooms/room#{id}.json") ]}
+          stub.get("/room/#{id}.json") {[200, {}, fixture("rooms/room#{id}.json")]}
         end
       end
     end
 
     it "should return a sorted list of users in all rooms" do
-      @campfire.users.length.should == 2
-      @campfire.users.first[:name].should == "Jane Doe"
-      @campfire.users.last[:name].should == "John Doe"
+      @campfire.users.length.should be == 2
+      @campfire.users.first[:name].should be == "Jane Doe"
+      @campfire.users.last[:name].should be == "John Doe"
     end
   end
 
   describe "me" do
     before do
       stub_connection(@campfire.connection) do |stub|
-        stub.get("/users/me.json") {[ 200, {}, fixture('users/me.json') ]}
+        stub.get("/users/me.json") {[200, {}, fixture('users/me.json')]}
       end
     end
 
     it "should return the current user's information" do
-      @campfire.me["name"].should == "John Doe"
+      @campfire.me["name"].should be == "John Doe"
     end
   end
 end

data/spec/tinder/connection_spec.rb

@@ -4,7 +4,7 @@ describe Tinder::Connection do
   describe "authentication" do
     it "should raise an exception with bad credentials" do
       stub_connection(Tinder::Connection) do |stub|
-        stub.get("/rooms.json") {[ 401, {}, "Unauthorized" ]}
+        stub.get("/rooms.json") {[401, {}, "Unauthorized"]}
       end
 
       connection = Tinder::Connection.new('test', :token => 'foo')
@@ -13,7 +13,7 @@ describe Tinder::Connection do
 
     it "should lookup token when username/password provided" do
       stub_connection(Tinder::Connection) do |stub|
-        stub.get("/users/me.json") {[ 200, {}, fixture('users/me.json') ]}
+        stub.get("/users/me.json") {[200, {}, fixture('users/me.json')]}
       end
 
       connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass')
@@ -23,7 +23,7 @@ describe Tinder::Connection do
 
     it "should use basic auth for credentials" do
       stub_connection(Tinder::Connection) do |stub|
-        stub.get("/rooms.json") {[ 200, {}, fixture('rooms.json') ]}
+        stub.get("/rooms.json") {[200, {}, fixture('rooms.json')]}
       end
       connection = Tinder::Connection.new('test', :token => 'mytoken')
       lambda { connection.get('/rooms.json') }.should_not raise_error

data/spec/tinder/room_spec.rb

@@ -5,7 +5,7 @@ describe Tinder::Room do
     @connection = Tinder::Connection.new('test', :token => 'mytoken')
 
     stub_connection(@connection) do |stub|
-      stub.get('/room/80749.json') {[ 200, {}, fixture('rooms/show.json') ]}
+      stub.get('/room/80749.json') {[200, {}, fixture('rooms/show.json')]}
     end
 
     @room = Tinder::Room.new(@connection, 'id' => 80749)
@@ -23,11 +23,10 @@ describe Tinder::Room do
   describe "join" do
     before do
       stub_connection(@connection) do |stub|
-        stub.post('/room/80749/join.json') {[ 200, {}, "" ]}
+        stub.post('/room/80749/join.json') {[200, {}, ""]}
       end
     end
 
-
     it "should post to join url" do
       @room.join
     end
@@ -36,7 +35,7 @@ describe Tinder::Room do
   describe "leave" do
     before do
       stub_connection(@connection) do |stub|
-        stub.post('/room/80749/leave.json') {[ 200, {}, "" ]}
+        stub.post('/room/80749/leave.json') {[200, {}, ""]}
       end
     end
 
@@ -53,7 +52,7 @@ describe Tinder::Room do
   describe "lock" do
     before do
       stub_connection(@connection) do |stub|
-        stub.post('/room/80749/lock.json') {[ 200, {}, "" ]}
+        stub.post('/room/80749/lock.json') {[200, {}, ""]}
       end
     end
 
@@ -65,7 +64,7 @@ describe Tinder::Room do
   describe "unlock" do
     before do
       stub_connection(@connection) do |stub|
-        stub.post('/room/80749/unlock.json') {[ 200, {}, "" ]}
+        stub.post('/room/80749/unlock.json') {[200, {}, ""]}
       end
     end
 
@@ -97,7 +96,7 @@ describe Tinder::Room do
   describe "name=" do
     it "should put to update the room" do
       stub_connection(@connection) do |stub|
-        stub.put('/room/80749.json') {[ 200, {}, "" ]}
+        stub.put('/room/80749.json') {[200, {}, ""]}
       end
 
       @room.name = "Foo"
@@ -107,14 +106,21 @@ describe Tinder::Room do
   describe "listen" do
     before do
       stub_connection(@connection) do |stub|
-        stub.post('/room/80749/join.json') {[ 200, {}, "" ]}
+        stub.post('/room/80749/join.json') {[200, {}, ""]}
       end
     end
 
     it "should get from the streaming url" do
-      Twitter::JSONStream.should_receive(:connect).
-        with({:host=>"streaming.campfirenow.com", :path=>"/room/80749/live.json", :auth=>"mytoken:X", :timeout=>6, :ssl=>true}).
-        and_return(@stream)
+      Twitter::JSONStream.should_receive(:connect).with(
+        {
+          :host=>"streaming.campfirenow.com",
+          :path=>"/room/80749/live.json",
+          :auth=>"mytoken:X",
+          :timeout=>6,
+          :ssl=>true
+        }
+      ).and_return(@stream)
+
       @room.listen { }
     end
 
@@ -135,7 +141,7 @@ describe Tinder::Room do
   describe "stop_listening" do
     before do
       stub_connection(@connection) do |stub|
-        stub.post('/room/80749/join.json') {[ 200, {}, "" ]}
+        stub.post('/room/80749/join.json') {[200, {}, ""]}
       end
 
       Twitter::JSONStream.stub!(:connect).and_return(@stream)

metadata

@@ -1,235 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tinder
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70097708989480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  name: fakeweb
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708989480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70097708988480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  name: rake
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708988480
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70097708969580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  name: rspec
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708969580
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70097708968580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 4
-        version: "4"
-  name: activesupport
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708968580
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70097708966700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 12
-        version: "0.12"
-  name: eventmachine
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708966700
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70097708965840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  name: faraday
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708965840
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &70097708964040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  name: faraday_middleware
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708964040
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &70097708962360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: hashie
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708962360
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70097708961620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
-  name: mime-types
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
   prerelease: false
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708961620
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70097708956340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: multi_json
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708956340
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: &70097708955420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  name: multipart-post
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70097708955420
+- !ruby/object:Gem::Dependency
+  name: twitter-stream
+  requirement: &70097708954280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
-  name: twitter-stream
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
-  requirement: *id012
+  version_requirements: *70097708954280
 description: A Ruby API for interfacing with Campfire, the 37Signals chat application.
-email: 
+email:
 - brandon@opensoul.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gemtest
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.txt
 - Gemfile
 - MIT-LICENSE
@@ -237,6 +171,7 @@ files:
 - Rakefile
 - init.rb
 - lib/faraday/response/raise_on_authentication_failure.rb
+- lib/faraday/response/remove_whitespace.rb
 - lib/tinder.rb
 - lib/tinder/campfire.rb
 - lib/tinder/connection.rb
@@ -256,40 +191,32 @@ files:
 - tinder.gemspec
 homepage: http://github.com/collectiveidea/tinder
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2278892891730273210
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Campfire API
-test_files: 
+test_files:
 - spec/fixtures/rooms.json
 - spec/fixtures/rooms/room80749.json
 - spec/fixtures/rooms/room80751.json