rack-test 0.5.0 → 0.5.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.5.1 / 2009-10-27
+
+* Bug fixes
+
+  * Escape cookie values (John Pignata)
+  * Close the response body after each request, as per the Rack spec (Elomar França)
+
 == 0.5.0 / 2009-09-19
 
 * Bug fixes

data/Rakefile

@@ -1,57 +1,5 @@
 require "rubygems"
 
-begin
-  require "jeweler"
-rescue LoadError
-  desc "Install gem using sudo"
-  task(:install) do
-    $stderr.puts "Jeweler not available. `gem install jeweler` to install this gem"
-  end
-else
-  Jeweler::Tasks.new do |s|
-    s.name      = "rack-test"
-    s.author    = "Bryan Helmkamp"
-    s.email     = "bryan" + "@" + "brynary.com"
-    s.homepage  = "http://github.com/brynary/rack-test"
-    s.summary   = "Simple testing API built on Rack"
-    s.description  = <<-EOS.strip
-Rack::Test is a small, simple testing API for Rack apps. It can be used on its
-own or as a reusable starting point for Web frameworks and testing libraries
-to build on. Most of its initial functionality is an extraction of Merb 1.0's
-request helpers feature.
-    EOS
-    s.rubyforge_project = "rack-test"
-    s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt]
-  end
-
-  Jeweler::RubyforgeTasks.new
-
-  task :spec => :check_dependencies
-
-  namespace :version do
-    task :verify do
-      $LOAD_PATH.unshift "lib"
-      require "rack/test"
-
-      jeweler_version = Gem::Version.new(File.read("VERSION").strip)
-      lib_version = Gem::Version.new(Rack::Test::VERSION)
-
-      if jeweler_version != lib_version
-        raise <<-EOS
-
-  Error: Version number mismatch!
-
-    VERSION: #{jeweler_version}
-    Rack::Test::VERSION: #{lib_version}
-
-        EOS
-      end
-    end
-  end
-
-  task :gemspec => "version:verify"
-end
-
 begin
   require "spec/rake/spectask"
 rescue LoadError
@@ -89,4 +37,3 @@ desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
-

data/Thorfile

@@ -0,0 +1,114 @@
+module GemHelpers
+
+  def generate_gemspec
+    $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "lib")))
+    require "rack/test"
+
+    Gem::Specification.new do |s|
+      s.name      = "rack-test"
+      s.version   = Rack::Test::VERSION
+      s.author    = "Bryan Helmkamp"
+      s.email     = "bryan@brynary.com"
+      s.homepage  = "http://github.com/brynary/rack-test"
+      s.summary   = "Simple testing API built on Rack"
+      s.description  = <<-EOS.strip
+Rack::Test is a small, simple testing API for Rack apps. It can be used on its
+own or as a reusable starting point for Web frameworks and testing libraries
+to build on. Most of its initial functionality is an extraction of Merb 1.0's
+request helpers feature.
+      EOS
+      s.rubyforge_project = "rack-test"
+
+      require "git"
+      repo = Git.open(".")
+
+      s.files      = normalize_files(repo.ls_files.keys - repo.lib.ignored_files)
+      s.test_files = normalize_files(Dir['spec/**/*.rb'] - repo.lib.ignored_files)
+
+      s.has_rdoc = true
+      s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt]
+
+      s.add_dependency "rack", ">= 1.0"
+    end
+  end
+
+  def normalize_files(array)
+    # only keep files, no directories, and sort
+    array.select do |path|
+      File.file?(path)
+    end.sort
+  end
+
+  # Adds extra space when outputting an array. This helps create better version
+  # control diffs, because otherwise it is all on the same line.
+  def prettyify_array(gemspec_ruby, array_name)
+    gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
+      leadin, files = match[0..-2].split("[")
+      leadin + "[\n    #{files.split(",").join(",\n   ")}\n  ]"
+    end
+  end
+
+  def read_gemspec
+    @read_gemspec ||= eval(File.read("rack-test.gemspec"))
+  end
+
+  def sh(command)
+    puts command
+    system command
+  end
+end
+
+class Default < Thor
+  include GemHelpers
+
+  desc "gemspec", "Regenerate rack-test.gemspec"
+  def gemspec
+    File.open("rack-test.gemspec", "w") do |file|
+      gemspec_ruby = generate_gemspec.to_ruby
+      gemspec_ruby = prettyify_array(gemspec_ruby, :files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :test_files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :extra_rdoc_files)
+
+      file.write gemspec_ruby
+    end
+
+    puts "Wrote gemspec to rack-test.gemspec"
+    read_gemspec.validate
+  end
+
+  desc "build", "Build a rack-test gem"
+  def build
+    sh "gem build rack-test.gemspec"
+    FileUtils.mkdir_p "pkg"
+    FileUtils.mv read_gemspec.file_name, "pkg"
+  end
+
+  desc "install", "Install the latest built gem"
+  def install
+    sh "gem install --local pkg/#{read_gemspec.file_name}"
+  end
+
+  desc "release", "Release the current branch to GitHub and Gemcutter"
+  def release
+    gemspec
+    build
+    Release.new.tag
+    Release.new.gem
+  end
+end
+
+class Release < Thor
+  include GemHelpers
+
+  desc "tag", "Tag the gem on the origin server"
+  def tag
+    release_tag = "v#{read_gemspec.version}"
+    sh "git tag -a #{release_tag} -m 'Tagging #{release_tag}'"
+    sh "git push origin #{release_tag}"
+  end
+
+  desc "gem", "Push the gem to Gemcutter"
+  def gem
+    sh "gem push pkg/#{read_gemspec.file_name}"
+  end
+end

data/lib/rack/mock_session.rb

@@ -28,6 +28,8 @@ module Rack
       env["HTTP_COOKIE"] ||= cookie_jar.for(uri)
       @last_request = Rack::Request.new(env)
       status, headers, body = @app.call(@last_request.env)
+      body.close if body.respond_to?(:close)
+
       @last_response = MockResponse.new(status, headers, body, env["rack.errors"].flush)
       cookie_jar.merge(last_response.headers["Set-Cookie"], uri)
 

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"

data/lib/rack/test/cookie_jar.rb

@@ -110,8 +110,7 @@ module Rack
       end
 
       def []=(name, value)
-        # TODO: needs proper escaping
-        merge("#{name}=#{value}")
+        merge("#{name}=#{Rack::Utils.escape(value)}")
       end
 
       def merge(raw_cookies, uri = nil)

data/lib/rack/test/uploaded_file.rb

@@ -1,4 +1,5 @@
 require "tempfile"
+require "fileutils"
 
 module Rack
   module Test

data/rack-test.gemspec

@@ -1,64 +1,61 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-09-19}
+  s.date = %q{2009-10-27}
   s.description = %q{Rack::Test is a small, simple testing API for Rack apps. It can be used on its
 own or as a reusable starting point for Web frameworks and testing libraries
 to build on. Most of its initial functionality is an extraction of Merb 1.0's
 request helpers feature.}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = [
-    "MIT-LICENSE.txt",
-     "README.rdoc"
+    "README.rdoc",
+    "MIT-LICENSE.txt"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "History.txt",
-     "MIT-LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "lib/rack/mock_session.rb",
-     "lib/rack/test.rb",
-     "lib/rack/test/cookie_jar.rb",
-     "lib/rack/test/methods.rb",
-     "lib/rack/test/mock_digest_request.rb",
-     "lib/rack/test/uploaded_file.rb",
-     "lib/rack/test/utils.rb",
-     "rack-test.gemspec",
-     "spec/fixtures/config.ru",
-     "spec/fixtures/fake_app.rb",
-     "spec/fixtures/foo.txt",
-     "spec/rack/test/cookie_spec.rb",
-     "spec/rack/test/digest_auth_spec.rb",
-     "spec/rack/test/multipart_spec.rb",
-     "spec/rack/test/utils_spec.rb",
-     "spec/rack/test_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".gitignore",
+    "History.txt",
+    "MIT-LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "Thorfile",
+    "lib/rack/mock_session.rb",
+    "lib/rack/test.rb",
+    "lib/rack/test/cookie_jar.rb",
+    "lib/rack/test/methods.rb",
+    "lib/rack/test/mock_digest_request.rb",
+    "lib/rack/test/uploaded_file.rb",
+    "lib/rack/test/utils.rb",
+    "rack-test.gemspec",
+    "spec/fixtures/config.ru",
+    "spec/fixtures/fake_app.rb",
+    "spec/fixtures/foo.txt",
+    "spec/rack/test/cookie_spec.rb",
+    "spec/rack/test/digest_auth_spec.rb",
+    "spec/rack/test/multipart_spec.rb",
+    "spec/rack/test/utils_spec.rb",
+    "spec/rack/test_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/brynary/rack-test}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rack-test}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple testing API built on Rack}
   s.test_files = [
     "spec/fixtures/fake_app.rb",
-     "spec/rack/test/cookie_spec.rb",
-     "spec/rack/test/digest_auth_spec.rb",
-     "spec/rack/test/multipart_spec.rb",
-     "spec/rack/test/utils_spec.rb",
-     "spec/rack/test_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/rack/test/cookie_spec.rb",
+    "spec/rack/test/digest_auth_spec.rb",
+    "spec/rack/test/multipart_spec.rb",
+    "spec/rack/test/utils_spec.rb",
+    "spec/rack/test_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -66,8 +63,11 @@ request helpers feature.}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
+      s.add_dependency(%q<rack>, [">= 1.0"])
     end
   else
+    s.add_dependency(%q<rack>, [">= 1.0"])
   end
 end

data/spec/rack/test/cookie_spec.rb

@@ -25,6 +25,12 @@ describe Rack::Test::Session do
       last_request.cookies.should == {}
     end
 
+    it "escapes cookie values" do
+      jar = Rack::Test::CookieJar.new
+      jar["value"] = "foo;abc"
+      jar["value"].should == "foo;abc"
+    end
+
     it "doesn't send cookies with the wrong domain" do
       get "http://www.example.com/cookies/set", "value" => "1"
       get "http://www.other.example/cookies/show"

data/spec/rack/test_spec.rb

@@ -106,6 +106,15 @@ describe Rack::Test::Session do
       last_request.env["rack.input"].read.should == "foo[bar]=1"
     end
 
+    it "closes response's body" do
+      body = "Hello, World!"
+      body.should_receive(:close)
+      app = lambda {|env| 
+        [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, body]
+      }
+      Rack::Test::Session.new(Rack::MockSession.new(app)).request("/")
+    end
+
     context "when input is given" do
       it "should send the input" do
         request "/", :method => "POST", :input => "foo"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-19 00:00:00 -04:00
+date: 2009-10-27 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
 description: |-
   Rack::Test is a small, simple testing API for Rack apps. It can be used on its
   own or as a reusable starting point for Web frameworks and testing libraries
@@ -24,8 +33,8 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- MIT-LICENSE.txt
 - README.rdoc
+- MIT-LICENSE.txt
 files: 
 - .document
 - .gitignore
@@ -33,6 +42,7 @@ files:
 - MIT-LICENSE.txt
 - README.rdoc
 - Rakefile
+- Thorfile
 - lib/rack/mock_session.rb
 - lib/rack/test.rb
 - lib/rack/test/cookie_jar.rb
@@ -56,8 +66,8 @@ homepage: http://github.com/brynary/rack-test
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement