Gemfile spec/quality_spec.rb @@ -1,6 +1,3 @@ -.DS_Store -*~ -.#* -*.jar -sinatra.log -pkg \ No newline at end of file +pkg +bin +vendor/gems .gitignore @@ -1,5 +1,5 @@ == 0.1.0 / 2009-06-14 - + * 1 major enhancement - + * Birthday! History.txt @@ -14,8 +14,8 @@ h2. Rack responses Rack::Client can be used to make HTTP requests to any type of server, not just ones using Rack. However, when a request is made then a proper -Rack response (specifically a Rack::MockResponse) object is returned. -For Rubyists, this means you don't need to learn yet another interface +Rack response (specifically a Rack::MockResponse) object is returned. +For Rubyists, this means you don't need to learn yet another interface and can just stick with Rack both on the server, test, and client side of things. README.textile @@ -13,7 +13,7 @@ task :default => :spec spec = Gem::Specification.new do |s| s.name = "rack-client" - s.rubyforge_project = s.name + s.rubyforge_project = s.name s.version = Rack::Client::VERSION s.author = "Tim Carey-Smith" s.email = "tim" + "@" + "spork.in" @@ -23,8 +23,12 @@ spec = Gem::Specification.new do |s| s.files = %w[History.txt LICENSE README.textile Rakefile] + Dir["lib/**/*"] + Dir["demo/**/*"] s.test_files = Dir["spec/**/*"] - s.add_dependency 'rack', '~> 1' # 1.X.X - s.add_dependency 'rack-test', '~> 0' # 0.X.X + require 'bundler' + manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile') + manifest.dependencies.each do |d| + next if d.only && d.only.include?('test') + s.add_dependency(d.name, d.version) + end end Rake::GemPackageTask.new(spec) do |package| Rakefile @@ -12,7 +12,7 @@ describe Demo, "/store resource" do Rack::Client.new # Demo::App.new end - before(:all) { delete "http://localhost:9292/store" } + before(:all) { delete "http://localhost:9292/store" } after { delete "http://localhost:9292/store" } it "should return a 404 if a resource does not exist" do @@ -28,8 +28,8 @@ describe Demo, "/store resource" do last_response.status.should == 200 last_response.body.should == "strawberry" get "http://localhost:9292/store/car" - last_response.status.should == 200 - last_response.body.should == "lotus" + last_response.status.should == 200 + last_response.body.should == "lotus" end it "should be able to clear the store of all items" do demo/demo_spec.rb @@ -11,7 +11,7 @@ module Rack VERSION = "0.1.1" include Rack::Test::Methods HTTP_METHODS = [:head, :get, :put, :post, :delete] - + class << self extend Forwardable def_delegators :new, *HTTP_METHODS lib/rack/client.rb @@ -15,7 +15,7 @@ class Rack::Client::HTTP head = Net::HTTP::Head.new(request.path, request_headers) http.request(head) do |response| return parse(response) - end + end when "GET" get = Net::HTTP::Get.new(request.path, request_headers) http.request(get) do |response| @@ -37,7 +37,7 @@ class Rack::Client::HTTP delete = Net::HTTP::Delete.new(request.path, request_headers) http.request(delete) do |response| return parse(response) - end + end else raise "Unsupported method: #{request.request_method.inspect}" end lib/rack/client/http.rb @@ -5,7 +5,7 @@ describe Rack::Client, "with an Auth::Basic middleware" do client = Rack::Client.new do use Rack::Client::Auth::Basic, "username", "password" end - response = client.get("http://localhost:9292/auth/ping") + response = client.get("http://localhost:9292/auth/ping") #, :username => "username") response.status.should == 200 response.headers["Content-Type"].should == "text/html" response.body.should == "pong" spec/auth_spec.rb @@ -13,7 +13,7 @@ describe Rack::Client, "without middleware" do it "returns a 302" do response = Rack::Client.new.get("http://localhost:9292/redirect") response.status.should == 302 - response["Location"].should == "/after-redirect" + response["Location"].should == "http://localhost:9292/after-redirect" end it "heads data" do @@ -25,7 +25,7 @@ describe Rack::Client, "without middleware" do it "puts data" do response = Rack::Client.new.put "http://localhost:9292/shelf/ctm", "some data" response.status.should == 200 - response["Location"].should == "/shelf/ctm" + response["Location"].should == "http://localhost:9292/shelf/ctm" end it "deletes data" do @@ -52,7 +52,7 @@ describe Rack::Client, "without middleware" do it "returns a 302" do response = Rack::Client.get("http://localhost:9292/redirect") response.status.should == 302 - response["Location"].should == "/after-redirect" + response["Location"].should == "http://localhost:9292/after-redirect" end it "heads data" do @@ -64,7 +64,7 @@ describe Rack::Client, "without middleware" do it "puts data" do response = Rack::Client.put "http://localhost:9292/shelf/ctm", "some data" response.status.should == 200 - response["Location"].should == "/shelf/ctm" + response["Location"].should == "http://localhost:9292/shelf/ctm" end it "deletes data" do @@ -82,7 +82,7 @@ describe Rack::Client, "without middleware" do context "at the rack-test level" do include Rack::Test::Methods def app() Rack::Client.new end - + it "returns an empty body" do get "http://localhost:9292/empty" last_response.status.should == 200 @@ -94,7 +94,7 @@ describe Rack::Client, "without middleware" do it "returns a 302" do get "http://localhost:9292/redirect" last_response.status.should == 302 - last_response["Location"].should == "/after-redirect" + last_response["Location"].should == "http://localhost:9292/after-redirect" end it "heads data" do @@ -106,7 +106,7 @@ describe Rack::Client, "without middleware" do it "puts data" do put "http://localhost:9292/shelf/ctm", "some data" last_response.status.should == 200 - last_response["Location"].should == "/shelf/ctm" + last_response["Location"].should == "http://localhost:9292/shelf/ctm" end it "deletes data" do spec/core_spec.rb @@ -30,7 +30,7 @@ describe Rack::Client, "with an Rack app endpoint" do it "only functions for that domain" do client = Rack::Client.new do - run Rack::URLMap.new("http://google.com/" => MyApp) + run Rack::URLMap.new("http://google.com/" => MyApp) end response = client.get("http://example.org/") response.status.should == 404 spec/endpoint_spec.rb @@ -1,6 +1,3 @@ -require 'rubygems' -require 'spec' -require 'rack/contrib' -gem 'rack-test' +Bundler.require_env(:test) require File.expand_path(File.dirname(__FILE__) + "/../lib/rack/client") spec/spec_helper.rb 42d5737043a9bff1cf5bf845760506d4dd851c91 Tim Carey-Smith tim@spork.in http://github.com/halorgium/rack-client/commit/036c4e9c8e16bff8ec5ab65f523c695c68383f44 036c4e9c8e16bff8ec5ab65f523c695c68383f44 2009-10-27T23:34:57-07:00 2009-10-27T23:34:57-07:00 Update the code to use the bundler and make it clean 421e8d35b53292ae662efc647aa0ff43bb8d73f9 Tim Carey-Smith tim@spork.in