rufus-verbs 1.0.0 → 1.0.1

data/CHANGELOG.txt

@@ -2,8 +2,15 @@
 = rufus-verbs CHANGELOG.txt
 
 
-== rufus-verbs - 1.0.0   not yet released
+== rufus-verbs - 1.0.1   released 2012/02/01
 
+- digest auth fix, thanks Pierre 'Catwell' Chapuis
+
+
+== rufus-verbs - 1.0.0   released 2010/01/10
+
+- Parses the response body if a parser in defined for its content-type (Dirk Geurs)
+- EndPoint params merge with Request params (Dirk Geurs)
 - todo : upgraded to Rakefile, thanks Kenneth Kalmer
 - bug : poor escaping of parameters (URI -> CGI) fixed, thanks nmaisonneuve
 

data/CREDITS.txt

@@ -1,6 +1,13 @@
 
 = CREDITS.txt
 
+
+== contributors
+
+Pierre 'Catwell' Chapuis - https://github.com/catwell
+Dirk Geurs - https://github.com/Dirklectisch
+
+
 == Feedback
 
 Nicolas Maisonneuve : http://github.com/nmaisonneuve

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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

data/{README.txt → README.md}

@@ -1,7 +1,7 @@
 
-= 'rufus-verbs'
+# 'rufus-verbs'
 
-== what is it ?
+## what is it ?
 
 'rufus-verbs' is an extended HTTP client library (gem). It provides the four main HTTP "verbs" as Ruby methods : get, put, post and delete.
 
@@ -10,7 +10,7 @@ It wraps a certain number of techniques that make it a decent tool for manipulat
 Head and Options are supported as well.
 
 
-== features
+## features
 
 currently :
 
@@ -36,14 +36,14 @@ maybe later :
 * persistent cookie jar
 
 
-== getting it
+## getting it
 
     gem install rufus-verbs
 
 or download[http://rubyforge.org/frs/?group_id=4812] it from RubyForge.
 
 
-== usage
+## usage
 
 The arguments to the "verbs" follow the schema <tt>method_name(uri, opts)</tt> or <tt>method_name(opts)</tt>. Post and put accept an optional block parameter.
 
@@ -62,14 +62,14 @@ using get(), post(), put() and delete() directly
 
     post "http://resta.farian.server:7080/inventory/tools/0", :d => "hammer"
         # passing the data via the :d (or :data) option
-    
+
     res = post "http://resta.farian.server:7080/inventory/tools/1" do
         "sliver bullet"
     end
         # the data is generated by a block
 
     puts res.code.to_i
-        # 201... resource created, note that by default, 
+        # 201... resource created, note that by default,
         # an instance of Net::HTTPResponse is returned
 
     puts get("http://resta.farian.server:7080/inventory/tools/0", :body => true)
@@ -102,8 +102,8 @@ using get(), post(), put() and delete() directly
 Using get() and co via an EndPoint to share common options for a set of requests
 
     ep = EndPoint.new(
-        :host => "resta.farian.host", 
-        :port => 7080, 
+        :host => "resta.farian.host",
+        :port => 7080,
         :resource => "inventory/tools")
 
     res = ep.get :id => 1
@@ -116,15 +116,15 @@ Using get() and co via an EndPoint to share common options for a set of requests
 A ConditionalEndPoint is an EndPoint that will use conditional GETs whenever possible
 
     ep = ConditionalEndPoint.new(
-        :host => "resta.farian.zion", 
-        :port => 7080, 
+        :host => "resta.farian.zion",
+        :port => 7080,
         :resource => "inventory/tools")
 
     res = ep.get :id => 1
         # first call will retrieve the representation completely
 
     res = ep.get :id => 1
-        # the server (provided that it supports conditional GETs) only 
+        # the server (provided that it supports conditional GETs) only
         # returned a 304 answer, the response is returned from the
         # ConditionalEndPoint cache
 
@@ -146,7 +146,7 @@ Digest authentication and basic authentication are available at request or endpo
     res = get "http://server/doc0", :hba => [ "toto", "secretpass" ]
 
     res = get(
-        "http://server/doc1", 
+        "http://server/doc1",
         :digest_authentication => [ "toto", "secretpass" ])
 
 The Rufus::Verbs module provides as well a <tt>fopen</tt> method, which mostly feels like the <tt>open</tt> method of open-uri.
@@ -169,7 +169,7 @@ This fopen() method makes sure to return an object that has a read() method (lik
 The tests may provide good intel as on 'rufus-verbs' usage as well : http://rufus.rubyforge.org/svn/trunk/verbs/test/
 
 
-== the options
+## the options
 
 A list of options supported by rufus-verbs, in alphabetical order.
 
@@ -190,8 +190,8 @@ see :http_basic_authentication for the basic HTTP authentication mechanism
 * <b>:base</b> (string, RE)
 the base of a resource path
 
-    :base / :resource / :id --> 
-    "inventory" / "tools" / "7" --> 
+    :base / :resource / :id -->
+    "inventory" / "tools" / "7" -->
     "/inventory/tools/7"
 
 * <b>:body</b> (boolean, RE)
@@ -213,7 +213,7 @@ the data (request body) for a put or a post.
 * <b>:digest_authentication</b> (pair of strings, RE)
 the pair username/password to be used for digest authentication.
 
-* <b>:dry_run</b> (boolean, RE) 
+* <b>:dry_run</b> (boolean, RE)
 when <tt>:dry_run => true</tt>, the request will be prepared but not executed and will be returned instead of the HTTP response (used for testing)
 
 * <b>:fake_put</b> (boolean, RE)
@@ -225,13 +225,13 @@ the short version of :form_data
 * <b>:form_data</b>
 this option expects a hash. The (post or put) request body will then be built with this hash.
 
-* <b>:h</b> (a hash String => String, RE) 
+* <b>:h</b> (a hash String => String, RE)
 short for :headers
 
-* <b>:headers</b> (a hash String => String, RE) 
+* <b>:headers</b> (a hash String => String, RE)
 A Hash of additional request headers to pass
 
-* <b>:hba</b> (pair of strings, RE) 
+* <b>:hba</b> (pair of strings, RE)
 short for :http_basic_authentication
 
 * <b>:host</b> (string, RE)
@@ -311,42 +311,42 @@ can be set to true or to an IO instance. If set to true, messages will be direct
 Will produces verbose messages similar to those of the fine cURL utility.
 
 
-== dependencies
+## dependencies
 
 the gem rufus-lru[http://rufus.rubyforge.org/rufus-lru]
 
 
-== mailing list
+## mailing list
 
 On the Rufus-Ruby list[http://groups.google.com/group/rufus-ruby] :
 
   http://groups.google.com/group/rufus-ruby
 
 
-== issue tracker
+## issue tracker
 
   http://github.com/jmettraux/rufus-verbs/issues
 
 
-== source
+## source
 
 http://github.com/jmettraux/rufus-verbs
 
   git clone git://github.com/jmettraux/rufus-verbs.git
 
 
-== author
+## author
 
 John Mettraux, jmettraux@gmail.com,
 http://jmettraux.wordpress.com
 
 
-== the rest of Rufus
+## the rest of Rufus
 
 http://rufus.rubyforge.org
 
 
-== license
+## license
 
 MIT
 

data/Rakefile

@@ -1,80 +1,87 @@
 
-
-require 'lib/rufus/verbs/version.rb'
+$:.unshift('.') # 1.9.2
 
 require 'rubygems'
+require 'rubygems/user_interaction' if Gem::RubyGemsVersion == '1.5.0'
+
 require 'rake'
+require 'rake/clean'
+#require 'rake/rdoctask'
+require 'rdoc/task'
 
 
 #
-# CLEAN
+# clean
 
-require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'html')
-task :default => [ :clean ]
+CLEAN.include('pkg', 'rdoc')
 
 
 #
-# GEM
+# test / spec
 
-require 'jeweler'
+#task :spec => :check_dependencies do
+task :spec do
+  exec 'rspec spec/'
+end
+task :test => :spec
 
-Jeweler::Tasks.new do |gem|
+task :default => :spec
 
-  gem.version = Rufus::Verbs::VERSION
-  gem.name = 'rufus-verbs'
-  gem.summary = 'GET, POST, PUT, DELETE, with something around'
 
-  gem.description = %{
-GET, POST, PUT, DELETE, with something around.
+#
+# gem
 
-An HTTP client Ruby gem, with conditional GET, basic auth, and more.
-  }
-  gem.email = 'jmettraux@gmail.com'
-  gem.homepage = 'http://github.com/jmettraux/rufus-verbs/'
-  gem.authors = [ 'John Mettraux' ]
-  gem.rubyforge_project = 'rufus'
+GEMSPEC_FILE = Dir['*.gemspec'].first
+GEMSPEC = eval(File.read(GEMSPEC_FILE))
+GEMSPEC.validate
 
-  gem.test_file = 'test/test.rb'
 
-  gem.add_dependency 'rufus-lru'
-  gem.add_development_dependency 'yard', '>= 0'
+desc %{
+  builds the gem and places it in pkg/
+}
+task :build do
 
-  # gemspec spec : http://www.rubygems.org/read/chapter/20
+  sh "gem build #{GEMSPEC_FILE}"
+  sh "mkdir pkg" rescue nil
+  sh "mv #{GEMSPEC.name}-#{GEMSPEC.version}.gem pkg/"
 end
-Jeweler::GemcutterTasks.new
 
+desc %{
+  builds the gem and pushes it to rubygems.org
+}
+task :push => :build do
+
+  sh "gem push pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem"
+end
 
-#
-# DOC
 
-begin
+#
+# rdoc
+#
+# make sure to have rdoc 2.5.x to run that
 
-  require 'yard'
+Rake::RDocTask.new do |rd|
 
-  YARD::Rake::YardocTask.new do |doc|
-    doc.options = [
-      '-o', 'html/rufus-verbs', '--title',
-      "rufus-verbs #{Rufus::Verbs::VERSION}"
-    ]
-  end
+  rd.main = 'README.txt'
+  rd.rdoc_dir = "rdoc/#{GEMSPEC.name}"
 
-rescue LoadError
+  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
 
-  task :yard do
-    abort "YARD is not available : sudo gem install yard"
-  end
+  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
 end
 
 
 #
-# TO THE WEB
+# upload_rdoc
 
-task :upload_website => [ :clean, :yard ] do
+desc %{
+  upload the rdoc to rubyforge
+}
+task :upload_rdoc => [ :clean, :rdoc ] do
 
   account = 'jmettraux@rubyforge.org'
   webdir = '/var/www/gforge-projects/rufus'
 
-  sh "rsync -azv -e ssh html/rufus-verbs #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name} #{account}:#{webdir}/"
 end
 

data/lib/rufus/verbs.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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

data/lib/rufus/verbs/conditional.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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

data/lib/rufus/verbs/cookies.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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

data/lib/rufus/verbs/digest.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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
@@ -110,6 +110,8 @@ module Verbs
 
       op[:digest_authentication] = false
         # preventing an infinite loop
+      op[:body] = false
+        # we want to check the error code
 
       method = req.class.const_get(:METHOD).downcase.to_sym
       #method = :get
@@ -142,7 +144,7 @@ module Verbs
       user, pass = o(opts, :digest_authentication)
       realm = @challenge.realm || ""
       method = req.class.const_get(:METHOD)
-      path = opts[:path]
+      path = req.path
 
       a1 = if @challenge.algorithm == 'MD5-sess'
         h(h(user, realm, pass), @challenge.nonce, @cnonce)

data/lib/rufus/verbs/endpoint.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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
@@ -68,10 +68,19 @@ module Verbs
     # The endpoint initialization opts (Hash instance)
     #
     attr_reader :opts
+    
+    #
+    # Configure default parsers for this EndPoint, example:
+    # ep.parsers['application/json'] = Yajl::Parser
+    # ep.parsers['application/xhtml+xml'] = Nokogiri::HTML::Document
+    #
+    
+    attr_reader :parsers
 
     def initialize (opts)
 
       @opts = opts
+      @parsers = {}
 
       compute_target @opts
 
@@ -270,11 +279,19 @@ module Verbs
       opts[:host] = r[1] || @opts[:host]
       opts[:port] = r[2] || @opts[:port]
       opts[:path] = r[3] || @opts[:path]
-
+      
+      # Merge EndPoint params and Request params
+      
+      def_params = @opts[:query] || @opts[:params]
+      req_params = opts[:query] || opts[:params]
+      
+      mer_params = def_params.merge req_params if def_params && req_params
+      
       opts[:query] =
         r[4] ||
-        opts[:params] || opts[:query] ||
-        @opts[:query] || @opts[:params] ||
+        mer_params ||
+        req_params ||
+        def_params ||
         {}
 
       opts.delete :path if opts[:path] == ''
@@ -569,9 +586,11 @@ module Verbs
           #
           # following the redirection
       end
-
+      
       decompress res
 
+      parse_body res
+
       res
     end
 
@@ -635,6 +654,35 @@ module Verbs
         gz.close
       end
     end
+    
+    #
+    # Parses the response body if a parser in defined for it's content-type
+    #
+
+    def parse_body (res)
+      
+      content_type = res.header['content-type']
+      
+      if content_parser = self.parsers[content_type]
+      
+        class << res
+          attr_accessor :parsed_body
+        
+          alias :old_body :body
+
+          def body
+            parsed_body || old_body
+          end
+        end
+        
+        res.parsed_body = content_parser.send(:parse, res.body)
+        
+      end
+      
+      res
+      
+    end
+    
   end
 end
 end

data/lib/rufus/verbs/verbose.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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

data/lib/rufus/verbs/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2012, John Mettraux, jmettraux@gmail.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
@@ -29,7 +29,7 @@ module Verbs
   #
   # The version of this rufus-verbs [gem]
   #
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end
 end
 

data/rufus-verbs.gemspec

@@ -1,87 +1,39 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rufus-verbs}
-  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mettraux"]
-  s.date = %q{2010-01-11}
-  s.description = %q{
+  s.name = 'rufus-verbs'
+
+  s.version = File.read(
+    File.expand_path('../lib/rufus/verbs/version.rb', __FILE__)
+  ).match(/ VERSION *= *['"]([^'"]+)/)[1]
+    # avoiding requiring version.rb...
+
+  s.platform = Gem::Platform::RUBY
+  s.authors = [ 'John Mettraux' ]
+  s.email = [ 'jmettraux@gmail.com' ]
+  s.homepage = 'http://github.com/jmettraux/rufus-verbs'
+  s.rubyforge_project = 'rufus'
+  s.summary = 'GET, POST, PUT, DELETE, with something around'
+
+  s.description = %{
 GET, POST, PUT, DELETE, with something around.
 
-An HTTP client Ruby gem, with conditional GET, basic auth, and more.
-  }
-  s.email = %q{jmettraux@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-     "README.txt"
-  ]
-  s.files = [
-    "CHANGELOG.txt",
-     "CREDITS.txt",
-     "LICENSE.txt",
-     "README.txt",
-     "Rakefile",
-     "doc/rdoc-style.css",
-     "lib/rufus-verbs.rb",
-     "lib/rufus/verbs.rb",
-     "lib/rufus/verbs/conditional.rb",
-     "lib/rufus/verbs/cookies.rb",
-     "lib/rufus/verbs/digest.rb",
-     "lib/rufus/verbs/endpoint.rb",
-     "lib/rufus/verbs/verbose.rb",
-     "lib/rufus/verbs/version.rb",
-     "rufus-verbs.gemspec",
-     "test/auth0_test.rb",
-     "test/auth1_test.rb",
-     "test/base.rb",
-     "test/block_test.rb",
-     "test/bm.rb",
-     "test/conditional_test.rb",
-     "test/cookie0_test.rb",
-     "test/cookie1_test.rb",
-     "test/dryrun_test.rb",
-     "test/escape_test.rb",
-     "test/fopen_test.rb",
-     "test/https_test.rb",
-     "test/iconditional_test.rb",
-     "test/items.rb",
-     "test/proxy_test.rb",
-     "test/redir_test.rb",
-     "test/simple_test.rb",
-     "test/test.htdigest",
-     "test/test.rb",
-     "test/timeout_test.rb",
-     "test/uri_test.rb"
-  ]
-  s.homepage = %q{http://github.com/jmettraux/rufus-verbs/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{GET, POST, PUT, DELETE, with something around}
-  s.test_files = [
-    "test/test.rb"
+A HTTP client Ruby gem, with conditional GET, basic auth, and more.
+  }.strip
+
+  #s.required_ruby_version = '>= 1.8.6'
+
+  #s.files = `git ls-files`.split("\n")
+  s.files = Dir[
+    'Rakefile',
+    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency 'rufus-lru'
+
+  s.add_development_dependency 'rake'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rufus-lru>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<rufus-lru>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rufus-lru>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
+  s.require_path = 'lib'
 end
 

data/test/auth0_test.rb

@@ -41,3 +41,4 @@ class Auth0Test < Test::Unit::TestCase
       :http_basic_authentication => [ "toto", "toto" ])
   end
 end
+

data/test/merge_test.rb

@@ -0,0 +1,23 @@
+
+require File.dirname(__FILE__) + '/base.rb'
+
+
+class MergeTest < Test::Unit::TestCase
+
+  include Rufus::Verbs
+
+
+  def test_0
+    
+    ep = EndPoint.new(
+      :dry_run => true,
+      :uri => 'http://host/path',
+      :params => { 'token' => 'apiaccess'})
+
+    req = ep.get(
+      :params => { 'extra' => 'param'})
+
+    assert_equal "/path?token=apiaccess&extra=param", req.path
+    
+  end
+end

data/test/parse_test.rb

@@ -0,0 +1,47 @@
+
+require File.dirname(__FILE__) + '/base.rb'
+
+class PlainText
+  
+  def self.parse text
+    self.new text
+  end
+  
+  def initialize text
+    @text = text
+  end
+  
+end
+
+class ParseTest < Test::Unit::TestCase
+  include TestBaseMixin
+  include Rufus::Verbs
+  
+  # def test_0
+  #   ep = EndPoint.new(
+  #     :host => "localhost", 
+  #     :port => 7777,
+  #     :headers => {'Accept' => 'text/plain'})
+  #     
+  #   ep.parsers['text/plain'] = PlainText
+  #   
+  #   resp = ep.get(:resource => "items")
+  #   
+  #   assert_equal 'text/plain', resp.header['content-type']
+  #   assert_equal PlainText, resp.body.class
+  #       
+  # end
+  
+  def test_1
+    require 'nokogiri'
+    
+    ep = EndPoint.new(:host => 'rufus.rubyforge.org')
+    ep.parsers['text/html'] = Nokogiri::HTML::Document
+    
+    res = ep.get
+    
+    assert_equal Nokogiri::HTML::Document, res.body.class
+    
+  end  
+  
+end

data/test/test.rb

@@ -1,24 +1,3 @@
 
-#require 'dryrun_test'
-#require 'iconditional_test'
-#require 'simple_test'
-#require 'auth0_test'
-#require 'auth1_test'
-#require 'redir_test'
-#require 'block_test'
-#require 'https_test'
-#require 'proxy_test'
-#require 'conditional_test'
-#require 'cookie0_test'
-#require 'cookie1_test'
-#require 'escape_test'
-#require 'uri_test'
-#require 'fopen_test'
-#require 'timeout_test'
-
-dirpath = File.dirname(__FILE__)
-
-tests = Dir.new(dirpath).entries.select { |e| e.match(/\_test\.rb$/) }.sort
-
-tests.each { |t| load "#{dirpath}/#{t}" }
+Dir[File.expand_path("../*_test.rb", __FILE__)].each { |path| load(path) }
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-verbs
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 21
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,56 +15,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +09:00
+date: 2012-02-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rufus-lru
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: "\n\
-  GET, POST, PUT, DELETE, with something around.\n\n\
-  An HTTP client Ruby gem, with conditional GET, basic auth, and more.\n  "
-email: jmettraux@gmail.com
+  type: :development
+  version_requirements: *id002
+description: |-
+  GET, POST, PUT, DELETE, with something around.
+  
+  A HTTP client Ruby gem, with conditional GET, basic auth, and more.
+email: 
+- jmettraux@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- README.txt
 - Rakefile
-- doc/rdoc-style.css
-- lib/rufus-verbs.rb
-- lib/rufus/verbs.rb
 - lib/rufus/verbs/conditional.rb
 - lib/rufus/verbs/cookies.rb
 - lib/rufus/verbs/digest.rb
 - lib/rufus/verbs/endpoint.rb
 - lib/rufus/verbs/verbose.rb
 - lib/rufus/verbs/version.rb
-- rufus-verbs.gemspec
+- lib/rufus/verbs.rb
+- lib/rufus-verbs.rb
 - test/auth0_test.rb
 - test/auth1_test.rb
 - test/base.rb
@@ -73,40 +82,52 @@ files:
 - test/https_test.rb
 - test/iconditional_test.rb
 - test/items.rb
+- test/merge_test.rb
+- test/parse_test.rb
 - test/proxy_test.rb
 - test/redir_test.rb
 - test/simple_test.rb
-- test/test.htdigest
 - test/test.rb
 - test/timeout_test.rb
 - test/uri_test.rb
+- rufus-verbs.gemspec
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
+- README.md
 has_rdoc: true
-homepage: http://github.com/jmettraux/rufus-verbs/
+homepage: http://github.com/jmettraux/rufus-verbs
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: GET, POST, PUT, DELETE, with something around
-test_files: 
-- test/test.rb
+test_files: []
+

data/doc/rdoc-style.css

@@ -1,320 +0,0 @@
-html, body {
-  height: 100%; }
-
-body {
-  font-family: Helvetica Neue, Helvetica, sans-serif;
-  font-size: 85%;
-  margin: 0;
-  padding: 0;
-  background: white;
-  color: black; }
-
-#wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -43px; }
-
-#footer-push {
-  height: 43px; }
-
-div.header, #footer {
-  background: #eee; }
-
-#footer {
-  border-top: 1px solid silver;
-  margin-top: 12px;
-  padding: 0 2em;
-  line-height: 30px;
-  text-align: center;
-  font-variant: small-caps;
-  font-size: 95%; }
-
-.clearing:after {
-  content: ".";
-  visibility: hidden;
-  height: 0;
-  display: block;
-  clear: both; }
-* html .clearing {
-  height: 1px; }
-.clearing *:first-child + html {
-  overflow: hidden; }
-
-h1, h2, h3, h4, h5, h6 {
-  margin: 0;
-  font-weight: normal; }
-
-a {
-  color: #0b3e71; }
-  a:hover {
-    background: #336699;
-    text-decoration: none;
-    color: #eef; }
-
-#diagram img {
-  border: 0; }
-
-#description a, .method .description a, .header a {
-  color: #336699; }
-  #description a:hover,   .method .description a:hover,   .header a:hover {
-    color: #eee; }
-#description h1 a, #description h2 a, #description h3 a, #description h4 a, #description h5 a, #description h6 a, .method .description h1 a, .method .description h2 a, .method .description h3 a, .method .description h4 a, .method .description h5 a, .method .description h6 a, .header h1 a, .header h2 a, .header h3 a, .header h4 a, .header h5 a, .header h6 a {
-  color: #0b3e71; }
-
-ol {
-  margin: 0;
-  padding: 0;
-  list-style: none; }
-  ol li {
-    margin-left: 0;
-    white-space: nowrap; }
-    ol li.other {
-      display: none; }
-
-ol.expanded li.other {
-  display: list-item; }
-
-table {
-  margin-bottom: 1em;
-  font-size: 1em;
-  border-collapse: collapse; }
-  table td, table th {
-    padding: .4em .8em; }
-  table thead {
-    background-color: #e8e8e8; }
-    table thead th {
-      font-variant: small-caps;
-      color: #666666; }
-  table tr {
-    border-bottom: 1px solid silver; }
-
-#index a.show, div.header a.show {
-  text-decoration: underline;
-  font-style: italic;
-  color: #666666; }
-  #index a.show:after,   div.header a.show:after {
-    content: " ..."; }
-  #index a.show:hover,   div.header a.show:hover {
-    color: black;
-    background: #ffe; }
-
-#index {
-  font: 85%/1.2 Helvetica neue, Helvetica, sans-serif; }
-  #index a {
-    text-decoration: none; }
-  #index h1 {
-    padding: .2em .5em .1em;
-    background: #ccc;
-    font: small-caps 1.2em Helvetica Neue, Helvetica, sans-serif;
-    color: #333;
-    border-bottom: 1px solid gray; }
-  #index form {
-    margin: 0;
-    padding: 0; }
-    #index form input {
-      margin: .4em;
-      margin-bottom: 0;
-      width: 90%; }
-    #index form #search.untouched {
-      color: #777777; }
-  #index ol {
-    padding: .4em .5em; }
-    #index ol li {
-      white-space: nowrap; }
-  #index #index-entries li a {
-    padding: 1px 2px; }
-  #index #index-entries.classes {
-    font-size: 1.1em; }
-    #index #index-entries.classes ol {
-      padding: 0; }
-    #index #index-entries.classes span.nodoc {
-      display: none; }
-    #index #index-entries.classes span.nodoc, #index #index-entries.classes a {
-      font-weight: bold; }
-    #index #index-entries.classes .parent {
-      font-weight: normal; }
-  #index #index-entries.methods li,   #index #search-results.methods li {
-    margin-bottom: 0.2em; }
-    #index #index-entries.methods li a .method_name,     #index #search-results.methods li a .method_name {
-      margin-right: 0.25em; }
-    #index #index-entries.methods li a .module_name,     #index #search-results.methods li a .module_name {
-      color: #666666; }
-    #index #index-entries.methods li a:hover .module_name,     #index #search-results.methods li a:hover .module_name {
-      color: #ddd; }
-
-div.header {
-  font-size: 80%;
-  padding: .5em 2%;
-  font-family: Helvetica, sans-serif;
-  border-bottom: 1px solid silver; }
-  div.header .name {
-    font-size: 1.6em;
-    font-family: Helvetica, sans-serif; }
-    div.header .name .type {
-      color: #666666;
-      font-size: 80%;
-      font-variant: small-caps; }
-  div.header h1.name {
-    font-size: 2.2em; }
-  div.header .paths, div.header .last-update, div.header .parent {
-    color: #666666; }
-  div.header .last-update .datetime {
-    color: #484848; }
-  div.header .parent {
-    margin-top: .3em; }
-    div.header .parent strong {
-      font-weight: normal;
-      color: #484848; }
-
-#content {
-  padding: 12px 2%; }
-  div.class #content {
-    position: relative;
-    width: 72%; }
-  #content pre, #content .method .synopsis {
-    font: 14px Monaco, DejaVu Sans Mono , Bitstream Vera Sans Mono , Courier New , monospace; }
-  #content pre {
-    color: black;
-    background: #eee;
-    border: 1px solid silver;
-    padding: .5em .8em;
-    overflow: auto; }
-  #content p code, #content p tt,   #content li code, #content li tt,   #content dl code, #content dl tt {
-    font: 14px Monaco, DejaVu Sans Mono , Bitstream Vera Sans Mono , Courier New , monospace;
-    background: #ffffe3;
-    padding: 2px 3px;
-    line-height: 1.4; }
-  #content h1 code, #content h1 tt,   #content h2 code, #content h2 tt,   #content h3 code, #content h3 tt,   #content h4 code, #content h4 tt,   #content h5 code, #content h5 tt,   #content h6 code, #content h6 tt {
-    font-size: 1.1em; }
-  #content #text {
-    position: relative; }
-  #content #description p {
-    margin-top: .5em; }
-  #content #description h1, #content #description h2, #content #description h3, #content #description h4, #content #description h5, #content #description h6 {
-    font-family: Helvetica Neue, Helvetica, sans-serif; }
-  #content #description h1 {
-    font-size: 2.2em;
-    margin-bottom: .2em;
-    border-bottom: 3px double #d8d8d8;
-    padding-bottom: .1em; }
-  #content #description h2 {
-    font-size: 1.8em;
-    color: #0e3062;
-    margin: .8em 0 .3em 0; }
-  #content #description h3 {
-    font-size: 1.6em;
-    margin: .8em 0 .3em 0;
-    color: #666666; }
-  #content #description h4 {
-    font-size: 1.4em;
-    margin: .8em 0 .3em 0; }
-  #content #description h5 {
-    font-size: 1.2em;
-    margin: .8em 0 .3em 0;
-    color: #0e3062; }
-  #content #description h6 {
-    font-size: 1.0em;
-    margin: .8em 0 .3em 0;
-    color: #666666; }
-  #content #description ul, #content #description ol,   #content .method .description ul, #content .method .description ol {
-    margin: .8em 0;
-    padding-left: 1.5em; }
-  #content #description ol,   #content .method .description ol {
-    list-style: decimal; }
-    #content #description ol li,     #content .method .description ol li {
-      white-space: normal; }
-
-#method-list {
-  position: absolute;
-  top: 0px;
-  right: -33%;
-  width: 28%;
-  background: #eee;
-  border: 1px solid silver;
-  padding: .4em 1%;
-  overflow: hidden; }
-  #method-list h2 {
-    font-size: 1.3em; }
-  #method-list h3 {
-    font-variant: small-caps;
-    text-transform: capitalize;
-    font-family: Helvetica Neue, Helvetica, sans-serif;
-    color: #666;
-    font-size: 1.1em; }
-  #method-list ol {
-    padding: 0 0 .5em .5em; }
-
-#context {
-  border-top: 1px dashed silver;
-  margin-top: 1em;
-  margin-bottom: 1em; }
-
-#context h2, #section h2 {
-  font: small-caps 1.2em Helvetica Neue, Helvetica, sans-serif;
-  color: #444;
-  margin: 1em 0 .2em 0; }
-
-#methods .method {
-  border: 1px solid silver;
-  margin-top: .5em;
-  background: #eee; }
-  #methods .method .synopsis {
-    color: black;
-    background: silver;
-    padding: .2em 1em; }
-    #methods .method .synopsis .name {
-      font-weight: bold; }
-    #methods .method .synopsis a {
-      text-decoration: none; }
-  #methods .method .description {
-    padding: 0 1em; }
-    #methods .method .description pre {
-      background: #f8f8f8; }
-  #methods .method .source {
-    margin: .5em 0; }
-  #methods .method .source-toggle {
-    font-size: 85%;
-    margin-left: 1em; }
-#methods .public-class {
-  background: #ffffe4; }
-#methods .public-instance .synopsis {
-  color: #eee;
-  background: #336699; }
-
-#content .method .source pre {
-  font-size: 90%;
-  background: #262626;
-  color: #ffdead;
-  margin: 1em;
-  padding: 0.5em;
-  border: 1px dashed #999;
-  overflow: auto; }
-  #content .method .source pre .ruby-constant {
-    color: #7fffd4;
-    background: transparent; }
-  #content .method .source pre .ruby-keyword {
-    color: #00ffff;
-    background: transparent; }
-  #content .method .source pre .ruby-ivar {
-    color: #eedd82;
-    background: transparent; }
-  #content .method .source pre .ruby-operator {
-    color: #00ffee;
-    background: transparent; }
-  #content .method .source pre .ruby-identifier {
-    color: #ffdead;
-    background: transparent; }
-  #content .method .source pre .ruby-node {
-    color: #ffa07a;
-    background: transparent; }
-  #content .method .source pre .ruby-comment {
-    color: #b22222;
-    font-weight: bold;
-    background: transparent; }
-  #content .method .source pre .ruby-regexp {
-    color: #ffa07a;
-    background: transparent; }
-  #content .method .source pre .ruby-value {
-    color: #7fffd4;
-    background: transparent; }

data/test/test.htdigest

@@ -1 +0,0 @@
-test:test_realm:fbab5e064c6fa79c414735bcdcf2ce4a