tinder 1.4.3 → 1.4.4

data/.gitignore

@@ -1,3 +1,4 @@
-pkg
-rdoc
-test/remote/credentials.rb
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Rakefile

@@ -1,52 +1,10 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "tinder"
-    gem.summary = "Ruby wrapper for the Campfire API"
-    gem.description = "A Ruby API for interfacing with Campfire, the 37Signals chat application."
-    gem.authors = ['Brandon Keepers']
-    gem.email = 'brandon@opensoul.org'
-    gem.homepage = 'http://github.com/collectiveidea/tinder'
-    gem.rubyforge_project = "tinder"
-    gem.add_dependency "activesupport"
-    gem.add_dependency "faraday", "~> 0.5.1"
-    gem.add_dependency "multipart-post"
-    gem.add_dependency "mime-types"
-    gem.add_dependency "twitter-stream"
-    gem.add_dependency "eventmachine"
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "fakeweb"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "tinder #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'rspec/core/rake_task'
+desc 'Run the specs'
+RSpec::Core::RakeTask.new do |r|
+  r.verbose = false
 end
 
-require 'spec/rake/spectask'
-desc "Run the specs under spec"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-task :spec => :check_dependencies
-
-task :default do
-  %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
-end
+task :default => :spec

data/lib/tinder/room.rb

@@ -140,11 +140,20 @@ module Tinder
       EventMachine::run do
         @stream = Twitter::JSONStream.connect(options)
         @stream.each_item do |message|
-          message = HashWithIndifferentAccess.new(JSON.parse(message))
+          message = HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(message))
           message[:user] = user(message.delete(:user_id))
           message[:created_at] = Time.parse(message[:created_at])
           yield(message)
         end
+
+        @stream.on_error do |message|
+          raise ListenFailed.new("got an error! #{message.inspect}!") 
+        end
+
+        @stream.on_max_reconnects do |timeout, retries|
+          raise ListenFailed.new("Tried #{retries} times to connect. Got disconnected from #{@name}!")
+        end
+        
         # if we really get disconnected
         raise ListenFailed.new("got disconnected from #{@name}!") if !EventMachine.reactor_running?
       end

data/lib/tinder/version.rb

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

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 gem 'activesupport', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 require 'tinder'
 require 'fakeweb'

data/spec/tinder/room_spec.rb

@@ -16,6 +16,8 @@ describe Tinder::Room do
     EventMachine.stub!(:reactor_running?).and_return(true)
     @stream = mock(Twitter::JSONStream)
     @stream.stub!(:each_item)
+    @stream.stub!(:on_error)
+    @stream.stub!(:on_max_reconnects)
   end
 
   describe "join" do

data/tinder.gemspec

@@ -1,59 +1,24 @@
-# 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__)
+require "tinder/version"
 
 Gem::Specification.new do |s|
   s.name = %q{tinder}
-  s.version = "1.4.3"
-
+  s.version = Tinder::VERSION
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2010-12-07}
   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.markdown"
   ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.txt",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/tinder.rb",
-     "lib/tinder/campfire.rb",
-     "lib/tinder/connection.rb",
-     "lib/tinder/middleware.rb",
-     "lib/tinder/room.rb",
-     "site/index.html",
-     "site/stylesheets/style.css",
-     "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",
-     "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.6}
   s.summary = %q{Ruby wrapper for the Campfire API}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/tinder/campfire_spec.rb",
-     "spec/tinder/connection_spec.rb",
-     "spec/tinder/room_spec.rb"
-  ]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
+  s.require_paths = ["lib"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -05:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,17 +125,19 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- .rspec
 - CHANGELOG.txt
+- Gemfile
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - init.rb
 - lib/tinder.rb
 - lib/tinder/campfire.rb
 - lib/tinder/connection.rb
 - lib/tinder/middleware.rb
 - lib/tinder/room.rb
+- lib/tinder/version.rb
 - site/index.html
 - site/stylesheets/style.css
 - spec/fixtures/rooms.json
@@ -143,7 +145,6 @@ files:
 - spec/fixtures/rooms/room80751.json
 - spec/fixtures/rooms/show.json
 - spec/fixtures/users/me.json
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/tinder/campfire_spec.rb
 - spec/tinder/connection_spec.rb
@@ -154,8 +155,8 @@ homepage: http://github.com/collectiveidea/tinder
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -180,6 +181,11 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for the Campfire API
 test_files: 
+- 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_helper.rb
 - spec/tinder/campfire_spec.rb
 - spec/tinder/connection_spec.rb

data/VERSION

@@ -1 +0,0 @@
-1.4.3