patron 0.4.10 → 0.4.11

data/.autotest

@@ -0,0 +1,15 @@
+Autotest.add_hook :initialize do |at|
+  at.clear_mappings
+
+  at.add_mapping(%r{^spec/.+_spec\.rb$}) do |filename,_|
+    filename
+  end
+
+  at.add_mapping(%r{^lib/patron/(.+)\.rb$}) do |_,match|
+    [ "spec/#{match[1]}_spec.rb" ]
+  end
+
+  at.add_mapping(%r{^spec/spec_helper\.rb$}) do
+    at.files_matching(%r{^spec/.+_spec\.rb$})
+  end
+end

data/.gitignore

@@ -0,0 +1,6 @@
+*.bundle
+coverage
+rdoc
+doc
+pkg
+tmp

data/.rvmrc

@@ -0,0 +1 @@
+rvm gemset use patron

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: .
+  specs:
+    patron (0.4.10)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rake (0.8.7)
+    rake-compiler (0.7.5)
+      rake
+    rcov (0.9.9)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  patron!
+  rake-compiler (~> 0.7.5)
+  rcov (~> 0.9.9)
+  rspec (~> 2.3.0)

data/Rakefile

@@ -21,73 +21,22 @@
 ## THE SOFTWARE.
 ##
 ## -------------------------------------------------------------------
-require 'yaml'
 require 'rake/clean'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
-require 'jeweler'
-require 'yard'
-
-require 'rbconfig'
-include Config
-
-EXT_DIR     = 'ext/patron'
-SESSION_SO  = "#{EXT_DIR}/session_ext.#{CONFIG['DLEXT']}"
-SESSION_SRC = "#{EXT_DIR}/session_ext.c"
-
-CLEAN.include FileList["#{EXT_DIR}/*"].exclude(/^.*\.(rb|c)$/)
-CLOBBER.include %w( doc coverage pkg )
-
-module Git
-  class Lib
-    def tag(tag)
-      # Force an annotated tag
-      command('tag', [tag, '-a', '-m', tag])
-    end
-  end
-end
-
-Jeweler::Tasks.new do |s|
-  s.name              = 'patron'
-  s.platform          = Gem::Platform::RUBY
-  s.author            = 'Phillip Toland'
-  s.email             = 'phil.toland@gmail.com'
-  s.homepage          = 'http://github.com/toland/Patron'
-  s.rubyforge_project = 'patron'
-  s.summary           = 'Patron HTTP client'
-  s.description       = 'Ruby HTTP client library based on libcurl'
-
-  s.extensions    << 'ext/patron/extconf.rb'
-  s.require_paths << 'ext'
-
-  s.files = FileList['README.txt',
-                     'VERSION.yml',
-                     'LICENSE',
-                     'Rakefile',
-                     'lib/**/*',
-                     'spec/*',
-                     'ext/patron/*.{rb,c}']
-
-  # rdoc
-  s.has_rdoc         = true
-  s.extra_rdoc_files = ['README.txt']
-  s.rdoc_options     = ['--quiet',
-                        '--title', "Patron documentation",
-                        '--opname', 'index.html',
-                        '--line-numbers',
-                        '--main', 'README.txt',
-                        '--inline-source']
+require 'rake/extensiontask'
+require 'rspec/core/rake_task'
+require 'bundler'
+
+Rake::ExtensionTask.new do |ext|
+  ext.name = 'session_ext'           # indicate the name of the extension.
+  ext.ext_dir = 'ext/patron'         # search for 'hello_world' inside it.
+  ext.lib_dir = 'lib/patron'         # put binaries into this folder.
 end
 
-file SESSION_SO => SESSION_SRC do
-  cd EXT_DIR do
-    ruby 'extconf.rb'
-    sh 'make'
-  end
-end
+Bundler::GemHelper.install_tasks
 
-desc "Compile extension"
-task :compile => SESSION_SO
+CLEAN.include FileList["ext/patron/*"].exclude(/^.*\.(rb|c)$/)
+CLOBBER.include %w( doc coverage pkg )
 
 desc "Start an IRB shell"
 task :shell => :compile do
@@ -98,33 +47,23 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = 'Patron documentation'
   rdoc.main = 'README.txt'
-  rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.txt')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
-  t.options = ['--readme', 'README.txt']
-end
-
 desc "Run specs"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w( --colour --format progress )
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 task :spec => [:compile]
 
 desc "Run specs with RCov"
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new('spec:rcov') do |t|
+  t.pattern = 'spec/**/*_spec.rb'
   t.rcov = true
-  t.rcov_opts << '--sort coverage'
-  t.rcov_opts << '--comments'
-  t.rcov_opts << '--exclude spec'
-  t.rcov_opts << '--exclude lib/magneto.rb'
-  t.rcov_opts << '--exclude /Library/Ruby/Gems'
+  t.rcov_opts = %q(--sort coverage --comments --exclude "spec")
 end
 
 task :default => :spec

data/ext/patron/.gitignore

@@ -0,0 +1,4 @@
+*.bundle
+*.o
+mkmf.log
+Makefile

data/lib/patron.rb

@@ -22,7 +22,6 @@
 ## THE SOFTWARE.
 ##
 ## -------------------------------------------------------------------
-require 'yaml'
 require 'pathname'
 
 cwd = Pathname(__FILE__).dirname
@@ -33,11 +32,6 @@ require 'patron/session'
 module Patron #:nodoc:
   # Returns the version number of the Patron library as a string
   def self.version
-    cwd = Pathname(__FILE__).dirname.expand_path.to_s
-    yaml = YAML.load_file(cwd + '/../VERSION.yml')
-    major = (yaml['major'] || yaml[:major]).to_i
-    minor = (yaml['minor'] || yaml[:minor]).to_i
-    patch = (yaml['patch'] || yaml[:patch]).to_i
-    "#{major}.#{minor}.#{patch}"
+    VERSION
   end
 end

data/lib/patron/request.rb

@@ -23,6 +23,8 @@
 ##
 ## -------------------------------------------------------------------
 
+require 'cgi'
+
 module Patron
 
   # Represents the information necessary for an HTTP request.
@@ -144,6 +146,7 @@ module Patron
       recursive = Proc.new do |h, prefix|
         h.each_pair do |k,v|
           key = prefix == '' ? k : "#{prefix}[#{k}]"
+                                    @action == :post ? v = CGI::escape(v.to_s) : v
           v.is_a?(Hash) ? recursive.call(v, key) : pairs << "#{key}=#{v}"
         end
       end

data/lib/patron/version.rb

@@ -0,0 +1,3 @@
+module Patron
+  VERSION = "0.4.11"
+end

data/patron.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/patron/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "patron"
+  s.version     = Patron::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Phillip Toland"]
+  s.email       = ["phil.toland@gmail.com"]
+  s.homepage    = "https://github.com/toland/patron"
+  s.summary     = "Patron HTTP Client"
+  s.description = "Ruby HTTP client library based on libcurl"
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project = "patron"
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rake-compiler", "~> 0.7.5"
+  s.add_development_dependency "rspec", "~> 2.3.0"
+  s.add_development_dependency "rcov", "~> 0.9.9"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_paths = ["lib", "ext"]
+  s.extensions   = ["ext/patron/extconf.rb"]
+end
+

data/script/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+cwd = File.dirname(__FILE__)
+
+libs =  " -I#{cwd + '/../lib'} -I#{cwd + '/../ext'}"
+libs << " -r patron -r irb/completion"
+
+puts "Loading Patron"
+exec "#{irb} #{libs} --simple-prompt"

data/script/test_server

@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+## -------------------------------------------------------------------
+##
+## Patron HTTP Client: HTTP test server for integration tests
+## Copyright (c) 2008 The Hive http://www.thehive.com/
+##
+## 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 PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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.
+##
+## -------------------------------------------------------------------
+require 'yaml'
+require 'webrick'
+include WEBrick
+
+# This ugly little hack is necessary to make the specs pass when running
+# the test_server script under Ruby 1.9. URI::Parser#to_yaml generates
+# regexp representations that YAML.parse cannot parse.
+class URI::Parser
+  def to_yaml(opts = {})
+    {}.to_yaml(opts)
+  end
+end
+
+class TestServlet < HTTPServlet::AbstractServlet
+  def respond_with(method, req, res)
+    res.body = req.to_yaml
+    res['Content-Type'] = "text/plain"
+  end
+
+  def do_GET(req,res)
+    respond_with(:GET, req, res)
+  end
+
+  def do_POST(req,res)
+    respond_with(:POST, req, res)
+  end
+
+  def do_PUT(req,res)
+    respond_with(:PUT, req, res)
+  end
+
+  def do_DELETE(req,res)
+    respond_with(:DELETE, req, res)
+  end
+
+  def do_COPY(req,res)
+    respond_with(:COPY, req, res)
+  end
+end
+
+class TimeoutServlet < HTTPServlet::AbstractServlet
+  def do_GET(req,res)
+    sleep(1.1)
+  end
+end
+
+class RedirectServlet < HTTPServlet::AbstractServlet
+  def do_GET(req,res)
+    res['Location'] = "http://localhost:9001/test"
+    res.status = 301
+  end
+end
+
+class SetCookieServlet < HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res['Set-Cookie'] = "session_id=foo123"
+    res['Location'] = "http://localhost:9001/test"
+    res.status = 301
+  end
+end
+
+class RepetitiveHeaderServlet < HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    # the only way to get webrick to output two headers with the same name is using cookies, so that's what we'll do:
+    res.cookies << Cookie.new('a', '1')
+    res.cookies << Cookie.new('b', '2')
+    res['Content-Type'] = "text/plain"
+    res.body = "Hi."
+  end
+end
+
+server = WEBrick::HTTPServer.new :Port => 9001
+server.mount("/test", TestServlet)
+server.mount("/timeout", TimeoutServlet)
+server.mount("/redirect", RedirectServlet)
+server.mount("/setcookie", SetCookieServlet)
+server.mount("/repetitiveheader", RepetitiveHeaderServlet)
+
+exit_code = lambda do
+  begin
+    server.shutdown unless server.nil?
+  rescue Object => e
+    puts "Error #{__FILE__}:#{__LINE__}\n#{e.message}"
+  end
+end
+
+trap("INT"){exit_code.call}
+server.start

data/spec/session_spec.rb

@@ -142,7 +142,7 @@ describe Patron::Session do
   end
 
   it "should upload a file with :put" do
-    response = @session.put_file("/test", "VERSION.yml")
+    response = @session.put_file("/test", "LICENSE")
     body = YAML::load(response.body)
     body.request_method.should == "PUT"
   end
@@ -152,7 +152,7 @@ describe Patron::Session do
   end
 
   it "should use chunked encoding when uploading a file with :put" do
-    response = @session.put_file("/test", "VERSION.yml")
+    response = @session.put_file("/test", "LICENSE")
     body = YAML::load(response.body)
     body.header['transfer-encoding'].first.should == "chunked"
   end
@@ -170,15 +170,15 @@ describe Patron::Session do
   end
 
   it "should upload a file with :post" do
-    response = @session.post_file("/test", "VERSION.yml")
+    response = @session.post_file("/test", "LICENSE")
     body = YAML::load(response.body)
     body.request_method.should == "POST"
   end
-  
+
   it "should upload a multipart with :post" do
-    response = @session.post_multipart("/test", { :test_data => "123" }, { :test_file => "VERSION.yml" } )
+    response = @session.post_multipart("/test", { :test_data => "123" }, { :test_file => "LICENSE" } )
     body = YAML::load(response.body)
-    body.request_method.should == "POST"    
+    body.request_method.should == "POST"
   end
 
   it "should raise when no file is provided to :post" do
@@ -186,7 +186,7 @@ describe Patron::Session do
   end
 
   it "should use chunked encoding when uploading a file with :post" do
-    response = @session.post_file("/test", "VERSION.yml")
+    response = @session.post_file("/test", "LICENSE")
     body = YAML::load(response.body)
     body.header['transfer-encoding'].first.should == "chunked"
   end
@@ -220,17 +220,17 @@ describe Patron::Session do
       threads << Thread.new do
         session = Patron::Session.new
         session.base_url = "http://localhost:9001"
-        session.post_file("/test", "VERSION.yml")
+        session.post_file("/test", "LICENSE")
       end
     end
     threads.each {|t| t.join }
   end
 
   it "should limit the buffer_size" do
-    # Buffer size is tricky to test, as it only affects the buffer size for each 
-    # read and it's not really visible at this, higher level. It's also only a 
-    # suggestion rather than a command so it may not even take affect. Currently 
-    # we just test that the response completes without any issues, it would be nice 
+    # Buffer size is tricky to test, as it only affects the buffer size for each
+    # read and it's not really visible at this, higher level. It's also only a
+    # suggestion rather than a command so it may not even take affect. Currently
+    # we just test that the response completes without any issues, it would be nice
     # to have a more robust test here.
     @session.buffer_size = 1
 

data/spec/spec_helper.rb

@@ -21,15 +21,7 @@
 ## THE SOFTWARE.
 ##
 ## -------------------------------------------------------------------
-require 'test/unit'
-
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
+require 'rspec'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../ext')

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: patron
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Phillip Toland
@@ -15,24 +14,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 -05:00
+date: 2010-12-31 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 5
+        version: 0.7.5
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 9
+        version: 0.9.9
+  type: :development
+  version_requirements: *id004
 description: Ruby HTTP client library based on libcurl
-email: phil.toland@gmail.com
+email: 
+- phil.toland@gmail.com
 executables: []
 
 extensions: 
 - ext/patron/extconf.rb
-- ext/patron/extconf.rb
-extra_rdoc_files: 
-- README.txt
+extra_rdoc_files: []
+
 files: 
+- .autotest
+- .gitignore
+- .rspec
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.txt
 - Rakefile
-- VERSION.yml
+- ext/patron/.gitignore
 - ext/patron/extconf.rb
 - ext/patron/session_ext.c
 - lib/patron.rb
@@ -41,37 +105,30 @@ files:
 - lib/patron/request.rb
 - lib/patron/response.rb
 - lib/patron/session.rb
+- lib/patron/version.rb
+- patron.gemspec
+- script/console
+- script/test_server
 - spec/patron_spec.rb
 - spec/request_spec.rb
 - spec/response_spec.rb
 - spec/session_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/toland/Patron
+homepage: https://github.com/toland/patron
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --quiet
-- --title
-- Patron documentation
-- --opname
-- index.html
-- --line-numbers
-- --main
-- README.txt
-- --inline-source
+rdoc_options: []
+
 require_paths: 
 - lib
 - ext
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -80,20 +137,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: patron
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Patron HTTP client
-test_files: 
-- spec/patron_spec.rb
-- spec/request_spec.rb
-- spec/response_spec.rb
-- spec/session_spec.rb
-- spec/spec_helper.rb
+summary: Patron HTTP Client
+test_files: []
+

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 0
-:minor: 4
-:patch: 10
-:build: 

data/spec/spec.opts

@@ -1,6 +0,0 @@
---colour
---format
-progress
---loadby
-mtime
---reverse