tinder 1.4.0 → 1.4.1

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+1.4.1 - 2010-10-09
+* Make SSL the default since it is available for all Campfire accounts.
+* Added MIT License
+
 1.4 - 2010-05-11
 * Remove methods no longer supported by API
   Campfire#available_transcripts, Room#ping, Room#destroy, Room#toggle_guest_access

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2006-2010 Brandon Keepers, Collective Idea
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
+NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -44,7 +44,7 @@ end
 task :spec => :check_dependencies
 
 task :default do
-  %w(2.3.5 3.0.0.beta3).each do |version|
+  %w(2.3.5 2.3.9 3.0.0).each do |version|
     puts "Running specs with Rails #{version}"
     system("RAILS_VERSION=#{version} rake -s spec;")
   end

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/tinder/connection.rb

@@ -23,7 +23,7 @@ module Tinder
     
     def initialize(subdomain, options = {})
       @subdomain = subdomain
-      @options = { :ssl => false, :proxy => ENV['HTTP_PROXY'] }.merge(options)
+      @options = { :ssl => true, :proxy => ENV['HTTP_PROXY'] }.merge(options)
       @uri = URI.parse("#{@options[:ssl] ? 'https' : 'http' }://#{subdomain}.#{HOST}")
       @token = options[:token]
       

data/lib/tinder/room.rb

@@ -18,6 +18,7 @@ module Tinder
     # Leave a room
     def leave
       post 'leave'
+      stop_listening
     end
 
     # Get the url for guest access
@@ -46,7 +47,7 @@ module Tinder
     def topic=(topic)
       update :topic => topic
     end
-    
+
     def update(attrs)
       connection.put("/room/#{@id}.json", :body => {:room => attrs}.to_json)
     end
@@ -94,11 +95,11 @@ module Tinder
           user_data = connection.get("/users/#{id}.json")
           user = user_data && user_data[:user]
         end
-        user[:created_at] = Time.parse(user[:created_at])        
+        user[:created_at] = Time.parse(user[:created_at])
         user
       end
     end
-    
+
     # Listen for new messages in the room, yielding them to the provided block as they arrive.
     # Each message is a hash with:
     # * +:body+: the body of the message
@@ -118,12 +119,12 @@ module Tinder
     #     room.speak "Go away!" if m[:body] =~ /Java/i
     #   end
     def listen(options = {})
-      raise "no block provided" unless block_given?
+      raise ArgumentError, "no block provided" unless block_given?
 
       join # you have to be in the room to listen
 
       require 'twitter/json_stream'
-      
+
       auth = connection.default_options[:basic_auth]
       options = {
         :host => "streaming.#{Connection::HOST}",
@@ -133,18 +134,29 @@ module Tinder
         :ssl => connection.options[:ssl]
       }.merge(options)
       EventMachine::run do
-        stream = Twitter::JSONStream.connect(options)
-        stream.each_item do |message|
+        @stream = Twitter::JSONStream.connect(options)
+        @stream.each_item do |message|
           message = HashWithIndifferentAccess.new(JSON.parse(message))
           message[:user] = user(message.delete(:user_id))
           message[:created_at] = Time.parse(message[:created_at])
           yield(message)
         end
-        # if we really get disconnected 
+        # if we really get disconnected
         raise ListenFailed.new("got disconnected from #{@name}!") if !EventMachine.reactor_running?
       end
     end
 
+    def listening?
+      @stream != nil
+    end
+
+    def stop_listening
+      return unless listening?
+
+      @stream.stop
+      @stream = nil
+    end
+
     # Get the transcript for the given date (Returns a hash in the same format as #listen)
     #
     #   room.transcript(room.available_transcripts.first)

data/spec/tinder/campfire_spec.rb

@@ -7,7 +7,7 @@ describe Tinder::Campfire do
   
   describe "rooms" do
     before do
-      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/rooms.json",
+      FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/rooms.json",
         :body => fixture('rooms.json'), :content_type => "application/json")
     end
     
@@ -25,10 +25,10 @@ describe Tinder::Campfire do
   
   describe "users" do
     before do
-      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/rooms.json",
+      FakeWeb.register_uri(:get, "https://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",
+        FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/room/#{id}.json",
         :body => fixture("rooms/room#{id}.json"), :content_type => "application/json")
       end
     end
@@ -42,7 +42,7 @@ describe Tinder::Campfire do
   
   describe "me" do
     before do
-      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/users/me.json",
+      FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/users/me.json",
         :body => fixture('users/me.json'), :content_type => "application/json")
     end
     

data/spec/tinder/connection_spec.rb

@@ -3,14 +3,14 @@ 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",
+      FakeWeb.register_uri(:get, "https://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",
+      FakeWeb.register_uri(:get, "https://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"
@@ -18,7 +18,7 @@ describe Tinder::Connection do
     
     
     it "should use basic auth for credentials" do
-      FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/rooms.json",
+      FakeWeb.register_uri(:get, "https://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

data/spec/tinder/room_spec.rb

@@ -2,14 +2,21 @@ require 'spec_helper'
 
 describe Tinder::Room do
   before do
-    FakeWeb.register_uri(:get, "http://mytoken:X@test.campfirenow.com/room/80749.json",
+    FakeWeb.register_uri(:get, "https://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)
+
+    # Get EventMachine out of the way. We could be using em-spec, but seems like overkill
+    require 'twitter/json_stream'
+    module EventMachine; def self.run; yield end end
+    EventMachine.stub!(:reactor_running?).and_return(true)
+    @stream = mock(Twitter::JSONStream)
+    @stream.stub!(:each_item)
   end
-  
+
   describe "join" do
-    FakeWeb.register_uri(:post, "http://mytoken:X@test.campfirenow.com/room/80749/join.json", :status => '200')
-    
+    FakeWeb.register_uri(:post, "https://mytoken:X@test.campfirenow.com/room/80749/join.json", :status => '200')
+
     it "should post to join url" do
       @room.join
     end
@@ -17,83 +24,112 @@ describe Tinder::Room do
 
   describe "leave" do
     before do
-      FakeWeb.register_uri(:post, "http://mytoken:X@test.campfirenow.com/room/80749/leave.json", :status => '200')
+      FakeWeb.register_uri(:post, "https://mytoken:X@test.campfirenow.com/room/80749/leave.json", :status => '200')
     end
-    
+
     it "should post to leave url" do
       @room.leave
     end
+
+    it "stops listening" do
+      @room.should_receive(:stop_listening)
+      @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')
+      FakeWeb.register_uri(:post, "https://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')
+      FakeWeb.register_uri(:post, "https://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"
+      @room.guest_url.should == "https://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",
+      FakeWeb.register_uri(:put, "https://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}).
+        with({:host=>"streaming.campfirenow.com", :path=>"/room/80749/live.json", :auth=>"mytoken:X", :timeout=>6, :ssl=>true}).
         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")
+      }.should raise_error(ArgumentError, "no block provided")
+    end
+
+    it "marks the room as listening" do
+      Twitter::JSONStream.stub!(:connect).and_return(@stream)
+      lambda {
+        @room.listen { }
+      }.should change(@room, :listening?).from(false).to(true)
+    end
+  end
+
+  describe "stop_listening" do
+    before do
+      Twitter::JSONStream.stub!(:connect).and_return(@stream)
+      @stream.stub!(:stop)
+    end
+
+    it "changes a listening room to a non-listening room" do
+      @room.listen { }
+      lambda {
+        @room.stop_listening
+      }.should change(@room, :listening?).from(true).to(false)
+    end
+
+    it "tells the json stream to stop" do
+      @room.listen { }
+      @stream.should_receive(:stop)
+      @room.stop_listening
+    end
+
+    it "does nothing if the room is not listening" do
+      @room.listen { }
+      @room.stop_listening
+      @room.stop_listening
     end
   end
 end

data/tinder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinder}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2010-05-11}
+  s.date = %q{2010-10-09}
   s.description = %q{A Ruby API for interfacing with Campfire, the 37Signals chat application.}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "CHANGELOG.txt",
+     "MIT-LICENSE",
      "README.markdown",
      "Rakefile",
      "VERSION",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -04:00
+date: 2010-10-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - CHANGELOG.txt
+- MIT-LICENSE
 - README.markdown
 - Rakefile
 - VERSION