VERSION tinder.gemspec @@ -1,2 +1,3 @@ -doc +pkg +rdoc test/remote/credentials.rb \ No newline at end of file .gitignore @@ -1,41 +1,68 @@ -require 'rubygems' -require 'hoe' begin - require 'spec/rake/spectask' + require 'jeweler' + Jeweler::Tasks.new do |gem| + gem.name = "tinder" + gem.summary = "An (unofficial) Campfire API" + gem.description = "An 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 "hpricot" + gem.add_dependency "mime-types" + gem.add_development_dependency "rspec" + end + Jeweler::GemcutterTasks.new + Jeweler::RubyforgeTasks.new do |rubyforge| + rubyforge.doc_task = "rdoc" + end rescue LoadError - puts 'To use rspec for testing you must install rspec gem:' - puts '$ sudo gem install rspec' - exit + puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler" end -require File.join(File.dirname(__FILE__), 'lib', 'tinder', 'version') -# RDOC_OPTS = ['--quiet', '--title', "Tinder", -# "--opname", "index.html", -# "--line-numbers", -# "--main", "README", -# "--inline-source"] -# -# Generate all the Rake tasks +require 'rake/testtask' +Rake::TestTask.new(:test) do |test| + test.libs << 'lib' << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true +end + +begin + require 'rcov/rcovtask' + Rcov::RcovTask.new do |test| + test.libs << 'test' + test.pattern = 'test/**/*_test.rb' + test.verbose = true + end +rescue LoadError + task :rcov do + abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov" + end +end + +task :test => :check_dependencies + +require 'rake/rdoctask' +Rake::RDocTask.new do |rdoc| + if File.exist?('VERSION') + version = File.read('VERSION') + else + version = "" + end -hoe = Hoe.new('tinder', ENV['VERSION'] || Tinder::VERSION::STRING) do |p| - p.rubyforge_name = 'tinder' - p.summary = "An (unofficial) Campfire API" - p.description = "An API for interfacing with Campfire, the 37Signals chat application." - p.author = 'Brandon Keepers' - p.email = 'brandon@opensoul.org' - p.url = 'http://tinder.rubyforge.org' - p.test_globs = ["test/**/*_test.rb"] - p.changes = p.paragraphs_of('CHANGELOG.txt', 0..1).join("\n\n") - p.extra_deps << ['activesupport'] - p.extra_deps << ['hpricot'] - p.extra_deps << ['mime-types'] + rdoc.rdoc_dir = 'rdoc' + rdoc.title = "tinder #{version}" + rdoc.rdoc_files.include('README*') + rdoc.rdoc_files.include('lib/**/*.rb') 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 -desc "Default task is to run specs" -task :default => :spec +desc "Run tests" +task :default => [:spec, :test] Rakefile @@ -6,7 +6,9 @@ require 'net/https' require 'open-uri' require 'hpricot' -Dir[File.join(File.dirname(__FILE__), 'tinder/**/*.rb')].sort.each { |lib| require lib } +require 'tinder/multipart' +require 'tinder/campfire' +require 'tinder/room' module Tinder class Error < StandardError; end lib/tinder.rb @@ -153,7 +153,7 @@ module Tinder def prepare_request(request, options = {}) returning request do - request.add_field 'User-Agent', "Tinder/#{Tinder::VERSION::STRING} (http://tinder.rubyforge.org)" + request.add_field 'User-Agent', "Tinder (http://tinder.rubyforge.org)" request.add_field 'Cookie', @cookie if @cookie request.add_field 'X-Requested-With', 'XMLHttpRequest' if options[:ajax] lib/tinder/campfire.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb' -context "Preparing a campfire request" do - setup do +describe "Preparing a campfire request" do + before do @campfire = Tinder::Campfire.new("foobar") @request = Net::HTTP::Get.new("does_not_matter") end @@ -10,23 +10,23 @@ context "Preparing a campfire request" do @campfire.send(:prepare_request, @request) end - specify "should return the request" do + it "should return the request" do prepare_request.should equal(@request) end - specify "should set the cookie" do + it "should set the cookie" do @campfire.instance_variable_set("@cookie", "foobar") prepare_request['Cookie'].should == 'foobar' end - specify "should set the user agent" do + it "should set the user agent" do prepare_request['User-Agent'].should =~ /^Tinder/ end end -# context "Performing a campfire request" do +# describe "Performing a campfire request" do # -# setup do +# before do # @response = mock("response") # Net::HTTP.any_instance.stubs(:request).returns(response) # request = Net::HTTP::Get.new("does_not_matter") @@ -34,65 +34,65 @@ end # @campfire.send(:perform_request) { request } # end # -# specify "should set cookie" do +# it "should set cookie" do # @campfire.instance_variable_get("@cookie").should == 'foobar' # end # # end -context "Verifying a 200 response" do +describe "Verifying a 200 response" do - setup do + before do @campfire = Tinder::Campfire.new("foobar") @response = mock("response") @response.should_receive(:code).and_return(200) end - specify "should return true when expecting success" do + it "should return true when expecting success" do @campfire.send(:verify_response, @response, :success).should equal(true) end - specify "should return false when expecting a redirect" do + it "should return false when expecting a redirect" do @campfire.send(:verify_response, @response, :redirect).should equal(false) end - specify "should return false when expecting a redirect to a specific path" do + it "should return false when expecting a redirect to a specific path" do @campfire.send(:verify_response, @response, :redirect_to => '/foobar').should equal(false) end end -context "Verifying a 302 response" do +describe "Verifying a 302 response" do - setup do + before do @campfire = Tinder::Campfire.new("foobar") @response = mock("response") @response.should_receive(:code).and_return(302) end - specify "should return true when expecting redirect" do + it "should return true when expecting redirect" do @campfire.send(:verify_response, @response, :redirect).should equal(true) end - specify "should return false when expecting success" do + it "should return false when expecting success" do @campfire.send(:verify_response, @response, :success).should equal(false) end - specify "should return true when expecting a redirect to a specific path" do + it "should return true when expecting a redirect to a specific path" do @response.should_receive(:[]).with('location').and_return("/foobar") @campfire.send(:verify_response, @response, :redirect_to => '/foobar').should equal(true) end - specify "should return false when redirecting to a different path than expected" do + it "should return false when redirecting to a different path than expected" do @response.should_receive(:[]).with('location').and_return("/baz") @campfire.send(:verify_response, @response, :redirect_to => '/foobar').should equal(false) end end -context "A failed login" do +describe "A failed login" do - setup do + before do @campfire = Tinder::Campfire.new 'foobar' @response = mock("response") @campfire.should_receive(:post).and_return(@response) @@ -100,29 +100,29 @@ context "A failed login" do @response.should_receive(:[]).with("location").and_return("/login") end - specify "should raise an error" do + it "should raise an error" do lambda do @campfire.login "doesn't", "matter" end.should raise_error(Tinder::Error) end - specify "should not set logged in status" do + it "should not set logged in status" do @campfire.login 'foo', 'bar' rescue @campfire.logged_in?.should equal(false) end end -context "Accessing a room with guest access" do +describe "Accessing a room with guest access" do - setup do + before do @room_id = 123 @campfire = Tinder::Campfire.new 'foobar' @response = mock("response") @campfire.stub!(:post).and_return(@response) end - specify "should return a room for the public room" do + it "should return a room for the public room" do @response.should_receive(:code).and_return(302) @response.should_receive(:[]).with("location").and_return("/rooms/#{@room_id}") @@ -130,7 +130,7 @@ context "Accessing a room with guest access" do room.should be_kind_of(Tinder::Room) end - specify "should raise an error if given an invalid room hash" do + it "should raise an error if given an invalid room hash" do @response.should_receive(:code).and_return(500) room = @campfire.find_room_by_guest_hash "invalid_hash", "John Doe" spec/campfire_spec.rb @@ -1,6 +1,3 @@ -$:.unshift(File.dirname(__FILE__) + '/mocks') require 'test/unit' require 'rubygems' -require 'active_support' require File.dirname(__FILE__) + '/../lib/tinder.rb' -require 'mocha' test/test_helper.rb lib/tinder/version.rb ed53208800557e78cda9ef1e066203ca801abd6d Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/tinder/commit/2ecb22ba2422637f954663421ef46b8cf111ca2e 2ecb22ba2422637f954663421ef46b8cf111ca2e 2009-09-11T22:45:25-07:00 2009-09-11T22:45:25-07:00 Convert to Jewel and clean some things up 975f37683d40cbd84ba07d1ab166a81ee8e7bcde Brandon Keepers brandon@collectiveidea.com