tinder 1.3.1 → 1.4.0

data/spec/fixtures/rooms.json

@@ -0,0 +1,18 @@
+{"rooms": [
+  {
+    "name": "Room 1",
+    "created_at": "2007/03/16 18:03:21 +0000",
+    "updated_at": "2007/03/16 18:03:21 +0000",
+    "topic": "Testing",
+    "id": 80749,
+    "membership_limit": 4
+  },
+  {
+    "name": "Room 2",
+    "created_at": "2007/03/16 18:04:54 +0000",
+    "updated_at": "2007/03/16 18:04:54 +0000",
+    "topic": "test",
+    "id": 80751,
+    "membership_limit": 4
+  }]
+}

data/spec/fixtures/rooms/room80749.json

@@ -0,0 +1,21 @@
+{
+    "room": {
+        "full": false,
+        "name": "Room 1",
+        "created_at": "2007/03/16 18:03:21 +0000",
+        "updated_at": "2007/03/16 18:03:21 +0000",
+        "users": [{
+            "type": "Member",
+            "created_at": "2006/12/07 21:20:39 +0000",
+            "email_address": "jane@example.com",
+            "admin": true,
+            "id": 1,
+            "name": "Jane Doe"
+        }],
+        "topic": "Testing",
+        "active_token_value": "90cf7",
+        "id": 80749,
+        "open_to_guests": true,
+        "membership_limit": 4
+    }
+}

data/spec/fixtures/rooms/room80751.json

@@ -0,0 +1,21 @@
+{
+    "room": {
+        "full": false,
+        "name": "Room 2",
+        "created_at": "2007/03/16 18:03:21 +0000",
+        "updated_at": "2007/03/16 18:03:21 +0000",
+        "users": [{
+            "type": "Member",
+            "created_at": "2006/12/07 21:20:39 +0000",
+            "email_address": "john@example.com",
+            "admin": true,
+            "id": 2,
+            "name": "John Doe"
+        }],
+        "topic": "Testing",
+        "active_token_value": "90cf7",
+        "id": 80751,
+        "open_to_guests": true,
+        "membership_limit": 4
+    }
+}

data/spec/fixtures/rooms/show.json

@@ -0,0 +1,21 @@
+{
+    "room": {
+        "full": false,
+        "name": "Room 1",
+        "created_at": "2007/03/16 18:03:21 +0000",
+        "updated_at": "2007/03/16 18:03:21 +0000",
+        "users": [{
+            "type": "Member",
+            "created_at": "2006/12/07 21:20:39 +0000",
+            "email_address": "brandon@opensoul.org",
+            "admin": true,
+            "id": 129553,
+            "name": "Brandon Keepers"
+        }],
+        "topic": "Testing",
+        "active_token_value": "90cf7",
+        "id": 80749,
+        "open_to_guests": true,
+        "membership_limit": 4
+    }
+}

data/spec/fixtures/users/me.json

@@ -0,0 +1,11 @@
+{
+    "user": {
+        "email_address": "user@example.com",
+        "type": "Member",
+        "created_at": "2006/04/06 00:38:28 +0000",
+        "admin": true,
+        "id": 12345,
+        "name": "John Doe",
+        "api_auth_token": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    }
+}

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--backtrace

data/spec/spec_helper.rb

@@ -1,3 +1,13 @@
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
 require 'rubygems'
 require 'spec'
+gem 'activesupport', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 require 'tinder'
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
+
+def fixture(name)
+  File.read(File.dirname(__FILE__) + "/fixtures/#{name}")
+end

data/spec/tinder/campfire_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Tinder::Campfire do
+  before do
+    @campfire = Tinder::Campfire.new('test', :token => 'mytoken')
+  end
+  
+  describe "rooms" do
+    before do
+      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/rooms.json",
+        :body => fixture('rooms.json'), :content_type => "application/json")
+    end
+    
+    it "should return rooms" do
+      @campfire.rooms.size.should == 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
+    end
+  end
+  
+  describe "users" do
+    before do
+      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/rooms.json",
+        :body => fixture('rooms.json'), :content_type => "application/json")
+      [80749, 80751].each do |id|
+        FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/room/#{id}.json",
+        :body => fixture("rooms/room#{id}.json"), :content_type => "application/json")
+      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"
+    end
+  end
+  
+  describe "me" do
+    before do
+      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/users/me.json",
+        :body => fixture('users/me.json'), :content_type => "application/json")
+    end
+    
+    it "should return the current user's information" do
+      @campfire.me["name"].should == "John Doe"
+    end
+  end
+end

data/spec/tinder/connection_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Tinder::Connection do
+  describe "authentication" do
+    it "should raise an exception with bad credentials" do
+      FakeWeb.register_uri(:get, "http://foo:X@test.campfirenow.com/rooms.json",
+        :status => ["401", "Unauthorized"])
+      connection = Tinder::Connection.new('test', :token => 'foo')
+      lambda { connection.get('/rooms.json') }.should raise_error(Tinder::AuthenticationFailed)
+    end
+    
+    it "should lookup token when username/password provided" do
+      FakeWeb.register_uri(:get, "http://user:pass@test.campfirenow.com/users/me.json",
+        :body => fixture('users/me.json'), :content_type => "application/json")
+      connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass')
+      connection.token.should.should == "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    end
+    
+    
+    it "should use basic auth for credentials" do
+      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/rooms.json",
+        :body => fixture('rooms.json'), :content_type => "application/json")
+      connection = Tinder::Connection.new('test', :token => 'mytoken')
+      lambda { connection.get('/rooms.json') }.should_not raise_error
+    end
+  end
+  
+  
+end

data/spec/tinder/room_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Tinder::Room do
+  before do
+    FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/room/80749.json",
+      :body => fixture('rooms/show.json'), :content_type => "application/json")
+    @room = Tinder::Room.new(Tinder::Connection.new('test', :token => 'mytoken'), 'id' => 80749)
+  end
+  
+  describe "join" do
+    FakeWeb.register_uri(:post, "http://mytoken:X@test.campfirenow.com/room/80749/join.json", :status => '200')
+    
+    it "should post to join url" do
+      @room.join
+    end
+  end
+
+  describe "leave" do
+    before do
+      FakeWeb.register_uri(:post, "http://mytoken:X@test.campfirenow.com/room/80749/leave.json", :status => '200')
+    end
+    
+    it "should post to leave url" do
+      @room.leave
+    end
+  end
+  
+  describe "lock" do
+    before do
+      FakeWeb.register_uri(:post, "http://mytoken:X@test.campfirenow.com/room/80749/lock.json", :status => '200')
+    end
+    
+    it "should post to lock url" do
+      @room.lock
+    end
+  end
+  
+  describe "unlock" do
+    before do
+      FakeWeb.register_uri(:post, "http://mytoken:X@test.campfirenow.com/room/80749/unlock.json", :status => '200')
+    end
+    
+    it "should post to unlock url" do
+      @room.unlock
+    end
+  end
+  
+  describe "guest_url" do
+    it "should use guest_invite_code if active" do
+      @room.stub!(:guest_access_enabled? => true, :guest_invite_code => '123')
+      @room.guest_url.should == "http://test.campfirenow.com/123"
+    end
+    
+    it "should return nil when guest access is not enabled" do
+      @room.stub!(:guest_access_enabled?).and_return(false)
+      @room.guest_url.should be_nil
+    end
+  end
+  
+  it "should set guest_invite_code" do
+    @room.guest_invite_code.should == "90cf7"
+  end
+  
+  it "should set guest_access_enabled?" do
+    @room.guest_access_enabled?.should be_true
+  end
+  
+  describe "name=" do
+    it "should put to update the room" do
+      FakeWeb.register_uri(:put, "http://mytoken:X@test.campfirenow.com/room/80749.json",
+        :status => '200')
+      @room.name = "Foo"
+    end
+  end
+  
+  describe "listen" do
+    before do
+      require 'twitter/json_stream'
+      # Get EventMachine out of the way. We could be using em-spec, but seems like overkill for testing one method.
+      module EventMachine; def self.run; yield end end
+      EventMachine.stub!(:reactor_running?).and_return(true)
+      @stream = mock(Twitter::JSONStream)
+      @stream.stub!(:each_item)
+    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=>false}).
+        and_return(@stream)
+      @room.listen { }
+    end
+    
+    it "should raise an exception if no block is given" do
+      lambda {
+        @room.listen
+      }.should raise_error("no block provided")
+    end
+  end
+end

data/tinder.gemspec

@@ -5,21 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinder}
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2009-12-17}
-  s.description = %q{An API for interfacing with Campfire, the 37Signals chat application.}
+  s.date = %q{2010-05-11}
+  s.description = %q{A Ruby API for interfacing with Campfire, the 37Signals chat application.}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
-    "README.txt"
+    "README.markdown"
   ]
   s.files = [
     ".gitignore",
      "CHANGELOG.txt",
-     "Manifest.txt",
-     "README.txt",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "init.rb",
@@ -30,28 +29,29 @@ Gem::Specification.new do |s|
      "lib/tinder/room.rb",
      "site/index.html",
      "site/stylesheets/style.css",
-     "spec/campfire_spec.rb",
-     "spec/html/full_lobby.html",
-     "spec/html/normal_lobby.html",
-     "spec/html/transcript.html",
+     "spec/fixtures/rooms.json",
+     "spec/fixtures/rooms/room80749.json",
+     "spec/fixtures/rooms/room80751.json",
+     "spec/fixtures/rooms/show.json",
+     "spec/fixtures/users/me.json",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "test/remote/credentials.rb.example",
-     "test/remote/remote_campfire_test.rb",
-     "test/test_helper.rb",
+     "spec/tinder/campfire_spec.rb",
+     "spec/tinder/connection_spec.rb",
+     "spec/tinder/room_spec.rb",
      "tinder.gemspec"
   ]
   s.homepage = %q{http://github.com/collectiveidea/tinder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{tinder}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{An (unofficial) Campfire API}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby wrapper for the Campfire API}
   s.test_files = [
-    "spec/campfire_spec.rb",
-     "spec/spec_helper.rb",
-     "test/remote/remote_campfire_test.rb",
-     "test/test_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/tinder/campfire_spec.rb",
+     "spec/tinder/connection_spec.rb",
+     "spec/tinder/room_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -62,18 +62,27 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_runtime_dependency(%q<twitter-stream>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<twitter-stream>, [">= 0"])
+      s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<twitter-stream>, [">= 0"])
+    s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tinder
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,62 +14,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -05:00
+date: 2010-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mime-types
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: twitter-stream
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: An API for interfacing with Campfire, the 37Signals chat application.
+  type: :development
+  version_requirements: *id007
+description: A Ruby API for interfacing with Campfire, the 37Signals chat application.
 email: brandon@opensoul.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.markdown
 files: 
 - .gitignore
 - CHANGELOG.txt
-- Manifest.txt
-- README.txt
+- README.markdown
 - Rakefile
 - VERSION
 - init.rb
@@ -75,15 +123,16 @@ files:
 - lib/tinder/room.rb
 - site/index.html
 - site/stylesheets/style.css
-- spec/campfire_spec.rb
-- spec/html/full_lobby.html
-- spec/html/normal_lobby.html
-- spec/html/transcript.html
+- spec/fixtures/rooms.json
+- spec/fixtures/rooms/room80749.json
+- spec/fixtures/rooms/room80751.json
+- spec/fixtures/rooms/show.json
+- spec/fixtures/users/me.json
 - spec/spec.opts
 - spec/spec_helper.rb
-- test/remote/credentials.rb.example
-- test/remote/remote_campfire_test.rb
-- test/test_helper.rb
+- spec/tinder/campfire_spec.rb
+- spec/tinder/connection_spec.rb
+- spec/tinder/room_spec.rb
 - tinder.gemspec
 has_rdoc: true
 homepage: http://github.com/collectiveidea/tinder
@@ -98,23 +147,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: tinder
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: An (unofficial) Campfire API
+summary: Ruby wrapper for the Campfire API
 test_files: 
-- spec/campfire_spec.rb
 - spec/spec_helper.rb
-- test/remote/remote_campfire_test.rb
-- test/test_helper.rb
+- spec/tinder/campfire_spec.rb
+- spec/tinder/connection_spec.rb
+- spec/tinder/room_spec.rb