wrest 1.4.2-universal-java-1.6 → 1.5.0-universal-java-1.6

data/lib/wrest/uri.rb

@@ -22,22 +22,38 @@ module Wrest #:nodoc:
   #
   # You can find examples that use real APIs (like delicious) under the wrest/examples directory.
   class Uri
-    attr_reader :uri, :username, :password, :uri_string, :uri_path, :query 
-        
-    # See Wrest::Native::Request for the available options and their default values.
+    attr_reader :uri, :username, :password, :uri_string, :uri_path, :query, :default_headers
+    
+    # Valid tuples for the options are:
+    #   :asynchronous_backend => Can currently be set to either Wrest::AsyncRequest::EventMachineBackend.new
+    #                            or Wrest::AsyncRequest::ThreadBackend.new. Easier to do using Uri#using_em and
+    #                            Uri#using_threads.
+    #   :callback             => Accepts a hash where the keys are response codes or ranges of response codes and
+    #                            the values are the corresponding blocks that will be invoked should the response
+    #                            code match the key.
+    #   :default_headers      => Accepts a hash containing a set of default request headers with which the headers
+    #                            passed to Uri#get, Uri#post etc. are merged. Incoming headers will override the
+    #                            defaults if there are any clashes. Use this to set cookies or use OAuth2 Authorize
+    #                            headers. When extending or cloning a Uri, passing in a new set of default_headers
+    #                            will result in the old set being overridden.
+    # See Wrest::Native::Request for other available options and their default values.
     def initialize(uri_string, options = {})
-        @options = options.clone
-        @uri_string = uri_string.to_s
-        @uri = URI.parse(@uri_string)
-        uri_scheme = URI.split(@uri_string)
-        @uri_path = uri_scheme[-4].split('?').first || ''
-        @uri_path = (@uri_path.empty? ? '/' : @uri_path) 
-        @query = uri_scheme[-2] || ''
-        @username = (@options[:username] ||= @uri.user)
-        @password = (@options[:password] ||= @uri.password)
-        @options[:callback] = Callback.new(@options[:callback]) if @options[:callback]
+      @options = options.clone
+      @uri_string = uri_string.to_s
+      @uri = URI.parse(@uri_string)
+      uri_scheme = URI.split(@uri_string)
+      @uri_path = uri_scheme[-4].split('?').first || ''
+      @uri_path = (@uri_path.empty? ? '/' : @uri_path) 
+      @query = uri_scheme[-2] || ''
+      @username = (@options[:username] ||= @uri.user)
+      @password = (@options[:password] ||= @uri.password)
+      @asynchronous_backend = @options[:asynchronous_backend] || Wrest::AsyncRequest.default_backend
+      @options[:callback] = Callback.new(@options[:callback]) if @options[:callback]
+      @default_headers = @options[:default_headers] || {}
     end 
     
+    # Builds a Wrest::UriTemplate by extending the current URI 
+    # with the pattern passed to it.
     def to_template(pattern)
       template_pattern = URI.join(uri_string,pattern).to_s
       UriTemplate.new(template_pattern, @options)
@@ -65,7 +81,9 @@ module Wrest #:nodoc:
     # Clones a Uri, building a new instance with exactly the same uri string.
     # You can however change the Uri options or add new ones.
     def clone(opts = {})
-      Uri.new(@uri_string, @options.merge(opts))
+      merged_options =  @options.merge(opts)
+      merged_options[:default_headers] = opts[:default_headers] ? @default_headers.merge(opts[:default_headers]) : {}
+      Uri.new(@uri_string, merged_options)
     end
 
     def eql?(other)
@@ -88,49 +106,39 @@ module Wrest #:nodoc:
       uri_string
     end
     
-    # Returns a Uri object that uses threads to perform asynchronous requests.
-    def using_threads
-      options = @options.clone
-      options[:asynchronous_backend] = Wrest::AsyncRequest::ThreadBackend.new
-      Uri.new(uri_string, options)
+    #:nodoc:
+    def build_get(parameters = {}, headers = {}, &block)
+      Http::Get.new(self, parameters, default_headers.merge(headers), block ? @options.merge(:callback_block => block) : @options)
     end
-
-    # Returns a Uri object that uses eventmachine to perform asynchronous requests.
-    def using_em
-      options = @options.clone
-      Wrest::AsyncRequest.enable_em
-      options[:asynchronous_backend] = Wrest::AsyncRequest::EventMachineBackend.new
-      Uri.new(uri_string, options)
+    
+    #:nodoc:
+    def build_put(body = '', headers = {}, parameters = {}, &block)
+      Http::Put.new(self, body.to_s, default_headers.merge(headers), parameters, block ? @options.merge(:callback_block => block) : @options)
     end
-
-    # Returns a Uri object that uses hash for caching responses.
-    def using_hash
-      options = @options.clone
-      options[:cache_store] = Hash.new
-      Uri.new(uri_string, options)
+    
+    #:nodoc:
+    def build_post(body = '', headers = {}, parameters = {}, &block)
+      Http::Post.new(self, body.to_s, default_headers.merge(headers), parameters, block ? @options.merge(:callback_block => block) : @options)
     end
 
-    # Returns a Uri object that uses memcached for caching responses.
-    def using_memcached
-      options = @options.clone
-      Wrest::Caching.enable_memcached
-      options[:cache_store] = Wrest::Caching::Memcached.new
-      Uri.new(uri_string, options)
+    #:nodoc:
+    def build_post_form(parameters ={}, headers = {}, &block)
+      headers = default_headers.merge(headers).merge(Wrest::H::ContentType => Wrest::T::FormEncoded)
+      body = parameters.to_query
+      Http::Post.new(self, body, headers, {}, block ? @options.merge(:callback_block => block) : @options)
     end
 
-    def disable_cache
-      options = @options.clone
-      Wrest::Caching.enable_memcached
-      options[:disable_cache] = true 
-      Uri.new(uri_string, options)
+    #:nodoc:
+    def build_delete(parameters = {}, headers = {}, &block)
+      Http::Delete.new(self, parameters, default_headers.merge(headers), block ? @options.merge(:callback_block => block) : @options)
     end
-
+    
     # Make a GET request to this URI. This is a convenience API
     # that creates a Wrest::Native::Get, executes it and returns a Wrest::Native::Response.
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def get(parameters = {}, headers = {}, &block)
-      Http::Get.new(self, parameters, headers, block ? @options.merge(:callback_block => block) : @options).invoke
+      build_get(parameters, headers, &block).invoke
     end
 
     # Make a GET request to this URI. This is a convenience API
@@ -141,8 +149,7 @@ module Wrest #:nodoc:
     # Note: get_async does not return a response and the response should be accessed through callbacks.
     # This implementation of asynchronous get is currently in alpha. Hence, it should not be used in production.
     def get_async(parameters = {}, headers = {}, &block)
-      (@options[:asynchronous_backend] || Wrest::AsyncRequest.default_backend).execute(Http::Get.new(self, parameters, headers, block ? @options.merge(:callback_block => block) : @options))
-      nil
+      @asynchronous_backend.execute(build_get(parameters, headers, &block))
     end
 
     # Make a PUT request to this URI. This is a convenience API
@@ -150,7 +157,7 @@ module Wrest #:nodoc:
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def put(body = '', headers = {}, parameters = {}, &block)
-      Http::Put.new(self, body.to_s, headers, parameters, block ? @options.merge(:callback_block => block) : @options).invoke
+      build_put(body, headers, parameters, &block).invoke
     end
 
     # Make a PUT request to this URI. This is a convenience API
@@ -161,8 +168,7 @@ module Wrest #:nodoc:
     # Note: put_async does not return a response and the response should be accessed through callbacks.
     # This implementation of asynchronous put is currently in alpha. Hence, it should not be used in production.
     def put_async(body = '', headers = {}, parameters = {}, &block)
-      (@options[:asynchronous_backend] || Wrest::AsyncRequest.default_backend).execute(Http::Put.new(self, body.to_s, headers, parameters, block ? @options.merge(:callback_block => block) : @options))
-      nil
+      @asynchronous_backend.execute(build_put(body, headers, parameters, &block))
     end
 
     # Makes a POST request to this URI. This is a convenience API
@@ -171,7 +177,7 @@ module Wrest #:nodoc:
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def post(body = '', headers = {}, parameters = {}, &block)
-      Http::Post.new(self, body.to_s, headers, parameters, block ? @options.merge(:callback_block => block) : @options).invoke
+      build_post(body, headers, parameters, &block).invoke
     end
 
     # Makes a POST request to this URI. This is a convenience API
@@ -183,8 +189,7 @@ module Wrest #:nodoc:
     # Note: post_async does not return a response and the response should be accessed through callbacks.
     # This implementation of asynchronous post is currently in alpha. Hence, it should not be used in production.
     def post_async(body = '', headers = {}, parameters = {}, &block)
-      (@options[:asynchronous_backend] || Wrest::AsyncRequest.default_backend).execute(Http::Post.new(self, body.to_s, headers, parameters, block ? @options.merge(:callback_block => block) : @options))
-      nil
+      @asynchronous_backend.execute(build_post(body, headers, parameters, &block))
     end
     
     # Makes a POST request to this URI. This is a convenience API
@@ -195,9 +200,7 @@ module Wrest #:nodoc:
     # in the body, as well as setting the Content-Type header to
     # application/x-www-form-urlencoded
     def post_form(parameters = {}, headers = {}, &block)
-      headers = headers.merge(Wrest::H::ContentType => Wrest::T::FormEncoded)
-      body = parameters.to_query
-      Http::Post.new(self, body, headers, {}, block ? @options.merge(:callback_block => block) : @options).invoke
+      build_post_form(parameters, headers, &block).invoke
     end
 
     # Makes a POST request to this URI. This is a convenience API
@@ -211,10 +214,7 @@ module Wrest #:nodoc:
     # Note: post_form_async does not return a response and the response should be accessed through callbacks.
     # This implementation of asynchronous post_form is currently in alpha. Hence, it should not be used in production.
     def post_form_async(parameters = {}, headers = {}, &block)
-      headers = headers.merge(Wrest::H::ContentType => Wrest::T::FormEncoded)
-      body = parameters.to_query
-      (@options[:asynchronous_backend] || Wrest::AsyncRequest.default_backend).execute(Http::Post.new(self, body, headers, {}, block ? @options.merge(:callback_block => block) : @options))
-      nil
+      @asynchronous_backend.execute(build_post_form(parameters, headers, &block))
     end
 
     # Makes a DELETE request to this URI. This is a convenience API
@@ -222,7 +222,7 @@ module Wrest #:nodoc:
     #
     # Remember to escape all parameter strings if necessary, using URI.escape
     def delete(parameters = {}, headers = {}, &block)
-      Http::Delete.new(self, parameters, headers, block ? @options.merge(:callback_block => block) : @options).invoke
+      build_delete(parameters, headers, &block).invoke
     end
 
     # Makes a DELETE request to this URI. This is a convenience API
@@ -233,8 +233,7 @@ module Wrest #:nodoc:
     # Note: delete_async does not return a response and the response should be accessed through callbacks.
     # This implementation of asynchronous delete is currently in alpha. Hence, it should not be used in production.
     def delete_async(parameters = {}, headers = {}, &block)
-      (@options[:asynchronous_backend] || Wrest::AsyncRequest.default_backend).execute(Http::Delete.new(self, parameters, headers, block ? @options.merge(:callback_block => block) : @options))
-      nil
+      @asynchronous_backend.execute(build_delete(parameters, headers, &block))
     end
 
     # Makes an OPTIONS request to this URI. This is a convenience API
@@ -269,5 +268,6 @@ module Wrest #:nodoc:
     end
     
     include Http::ConnectionFactory
+    include Uri::Builders
   end
 end

data/lib/wrest/version.rb

@@ -8,5 +8,5 @@
 # See the License for the specific language governing permissions and limitations under the License. 
 
 module Wrest
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/lib/wrest/xml_mini.rb

@@ -6,5 +6,3 @@ module ActiveSupport
     delegate :filter, :to => :backend
   end
 end
-
-

data/lib/wrest.rb

@@ -6,9 +6,6 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-require 'rubygems'
-gem 'activesupport', '~> 3.0'
-
 require 'net/http'
 require 'net/https'
 require 'forwardable'
@@ -17,6 +14,7 @@ require 'cgi'
 require 'base64'
 require 'logger'
 require 'benchmark'
+require 'multi_json'
 require 'active_support'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash'
@@ -37,7 +35,7 @@ module Wrest
   end
 
   def self.enable_evented_requests!
-    require "#{Wrest::Root}/wrest/event_machine_backend"
+    require "wrest/event_machine_backend"
   end
 
   # Switch Wrest to using Net::HTTP.
@@ -47,7 +45,7 @@ module Wrest
 
   # Switch Wrest to using libcurl.
   def self.use_curl!
-    require "#{Wrest::Root}/wrest/curl"
+    require "wrest/curl"
     silence_warnings{ Wrest.const_set('Http', Wrest::Curl) }
   end
 end
@@ -55,38 +53,32 @@ end
 Wrest.logger = ActiveSupport::BufferedLogger.new(STDOUT)
 Wrest.logger.level = Logger::DEBUG
 
-gem('json', '~> 1.5')
-ActiveSupport::JSON.backend = "JSONGem"
-
-require "#{Wrest::Root}/wrest/core_ext/string"
-require "#{Wrest::Root}/wrest/hash_with_case_insensitive_access"
+require "wrest/core_ext/string"
+require "wrest/hash_with_case_insensitive_access"
 
 # Load XmlMini Extensions
-require "#{Wrest::Root}/wrest/xml_mini"
+require "wrest/xml_mini"
 
 # Load Wrest Core
-require "#{Wrest::Root}/wrest/version"
-require "#{Wrest::Root}/wrest/cache_proxy"
-require "#{Wrest::Root}/wrest/http_shared"
-require "#{Wrest::Root}/wrest/http_codes"
-require "#{Wrest::Root}/wrest/callback"
-require "#{Wrest::Root}/wrest/native"
-
-require "#{Wrest::Root}/wrest/async_request"
-require "#{Wrest::Root}/wrest/async_request/thread_backend"
+require "wrest/version"
+require "wrest/cache_proxy"
+require "wrest/http_shared"
+require "wrest/http_codes"
+require "wrest/callback"
+require "wrest/native"
+
+require "wrest/async_request"
+require "wrest/async_request/thread_backend"
 Wrest::AsyncRequest.default_to_threads!
 
-require "#{Wrest::Root}/wrest/caching"
+require "wrest/caching"
 
 # Load Wrest Wrappers
-require "#{Wrest::Root}/wrest/uri"
-require "#{Wrest::Root}/wrest/uri_template"
-require "#{Wrest::Root}/wrest/exceptions"
-require "#{Wrest::Root}/wrest/components"
+require "wrest/uri/builders"
+require "wrest/uri"
+require "wrest/uri_template"
+require "wrest/exceptions"
+require "wrest/components"
 
 # Load Wrest::Resource
-# require "#{Wrest::Root}/wrest/resource"
-
-# if (ENV['RAILS_ENV'] == 'test' || (Kernel.const_defined?(:RAILS_ENV) && (RAILS_ENV == 'test')))
-#   require "#{Wrest::Root}/wrest/test"
-# end
+# require "wrest/resource"

metadata

@@ -2,7 +2,7 @@
 name: wrest
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.2
+  version: 1.5.0
 platform: universal-java-1.6
 authors: 
   - Sidu Ponnappa
@@ -11,108 +11,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +05:30
-default_executable: 
+date: 2011-12-09 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rubyforge
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id001
+    prerelease: false
     type: :development
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 2.5.0
+            version: "2.6"
+    requirement: *id002
+    prerelease: false
     type: :development
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: sinatra
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.0.0
+    requirement: *id003
+    prerelease: false
     type: :development
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: metric_fu
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: activesupport
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "3.0"
+            version: "3"
+    requirement: *id005
+    prerelease: false
     type: :runtime
-    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: builder
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">"
           - !ruby/object:Gem::Version 
             version: "2.0"
-    type: :runtime
-    version_requirements: *id006
-  - !ruby/object:Gem::Dependency 
-    name: i18n
+    requirement: *id006
     prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "0.4"
     type: :runtime
-    version_requirements: *id007
   - !ruby/object:Gem::Dependency 
-    name: json
-    prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    name: multi_json
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "1.5"
+            version: "1.0"
+    requirement: *id007
+    prerelease: false
     type: :runtime
-    version_requirements: *id008
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
-    prerelease: false
-    requirement: &id009 !ruby/object:Gem::Requirement 
+    version_requirements: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "0.7"
+    requirement: *id008
+    prerelease: false
     type: :runtime
-    version_requirements: *id009
 description: Wrest is a fluent, easy-to-use, object oriented Ruby HTTP/REST client library with support for RFC2616 HTTP caching, multiple HTTP backends and async calls using EventMachine. It runs on CRuby, JRuby and Rubinius.
 email: 
   - sidu@c42.in
@@ -123,10 +111,9 @@ extensions: []
 extra_rdoc_files: 
   - README.rdoc
 files: 
+  - bin/rdoc
   - bin/wrest
-  - bin/wrest.compiled.rbc
   - bin/wrest_shell.rb
-  - bin/wrest_shell.rbc
   - lib/wrest.rb
   - lib/wrest_no_ext.rb
   - lib/wrest/async_request.rb
@@ -160,6 +147,7 @@ files:
   - lib/wrest/components/mutators/xml_simple_type_caster.rb
   - lib/wrest/components/translators/content_types.rb
   - lib/wrest/components/translators/json.rb
+  - lib/wrest/components/translators/txt.rb
   - lib/wrest/components/translators/xml.rb
   - lib/wrest/core_ext/hash.rb
   - lib/wrest/core_ext/string.rb
@@ -191,6 +179,7 @@ files:
   - lib/wrest/native/response.rb
   - lib/wrest/native/session.rb
   - lib/wrest/test/request_patches.rb
+  - lib/wrest/uri/builders.rb
   - lib/wrest/xml_mini/jdom.rb
   - lib/wrest/xml_mini/libxml.rb
   - lib/wrest/xml_mini/nokogiri.rb
@@ -202,7 +191,6 @@ files:
   - README.rdoc
   - CHANGELOG
   - LICENCE
-has_rdoc: true
 homepage: http://c42.in/open_source
 licenses: []
 
@@ -216,20 +204,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.5"
+        version: 1.3.0
 requirements: 
   - To use Memcached as caching back-end, install the 'dalli' gem.
   - To use multipart post, install the 'multipart-post' gem.
   - To use curl as the http engine, install the 'patron' gem. This feature is not available (and should be unneccessary) on jruby.
   - To use eventmachine as a parallel backend, install the 'eventmachine' gem.
 rubyforge_project: wrest
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Wrest is a fluent, object oriented HTTP client library for 1.8, 1.9, JRuby and Rubinius.

data/bin/wrest.compiled.rbc

@@ -1,78 +0,0 @@
-!RBIX
-0
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-23
-5
-45
-0
-1
-65
-49
-2
-0
-49
-3
-1
-7
-4
-64
-81
-5
-47
-49
-6
-1
-15
-2
-11
-I
-3
-I
-0
-I
-0
-I
-0
-n
-p
-7
-x
-4
-File
-n
-x
-11
-active_path
-x
-7
-dirname
-s
-15
-/wrest_shell.rb
-x
-1
-+
-x
-4
-load
-p
-3
-I
-0
-I
-3
-I
-17
-x
-32
-/Users/sidu/Work/wrest/bin/wrest
-p
-0