wrest 1.4.0-universal-java-1.6 → 1.4.2-universal-java-1.6

data/CHANGELOG

@@ -2,6 +2,12 @@ Features under the section marked 'Current' are completed but pending release as
 
 Features under a numbered section are complete and available in the Wrest gem.
 
+== 1.4.2
+ * GH#102 Code and gemspec mismatch for json-jruby
+
+== 1.4.1
+ * GH#66 HTTPS requests using the Net::HTTP backend failing on Ruby 1.8.x
+
 == 1.4.0 
  * GH#96 Naive implementation of asynchronous requests using Eventmachine
  * GH#93 Since Wrest::Response is immutable, the results of Response#deserialise are cached

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.4.0
+= Wrest 1.4.2
 
 (c) Copyright 2009-2011 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
@@ -243,7 +243,10 @@ You can launch the interactive Wrest shell by running bin/wrest if you have the
 === Testing
 
 Start the Sinatra test server for functional test.
-  rake -f spec/sample_app/Rakefile  
+  rake -f spec/sample_app/Rakefile  # runs on port 3000
+
+Start a memcached daemon/process on port 11211
+  /usr/local/bin/memcached
 
 Run the tests in a different terminal:
 

data/bin/wrest.compiled.rbc

@@ -0,0 +1,78 @@
+!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

data/bin/wrest_shell.rbc

@@ -0,0 +1,642 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+233
+5
+7
+0
+45
+1
+2
+47
+49
+3
+0
+7
+4
+45
+5
+6
+47
+49
+3
+0
+7
+4
+45
+7
+8
+47
+49
+3
+0
+63
+6
+47
+49
+9
+1
+15
+45
+10
+11
+65
+49
+12
+0
+49
+13
+1
+47
+49
+3
+0
+7
+14
+63
+2
+19
+0
+15
+45
+10
+15
+65
+49
+12
+0
+49
+13
+1
+47
+49
+3
+0
+7
+16
+63
+2
+19
+1
+15
+45
+7
+17
+7
+18
+13
+70
+9
+98
+15
+44
+43
+19
+7
+20
+78
+49
+21
+2
+6
+18
+49
+22
+1
+9
+108
+7
+23
+64
+8
+111
+7
+24
+64
+19
+2
+15
+5
+7
+25
+64
+47
+49
+26
+1
+15
+44
+43
+27
+79
+49
+28
+1
+13
+7
+29
+20
+2
+49
+30
+2
+15
+19
+3
+15
+45
+31
+32
+56
+33
+50
+21
+0
+15
+7
+34
+64
+19
+4
+15
+20
+4
+7
+35
+20
+0
+47
+49
+3
+0
+63
+2
+49
+36
+1
+15
+5
+20
+1
+47
+49
+26
+1
+15
+5
+7
+37
+45
+38
+39
+43
+40
+43
+41
+47
+49
+3
+0
+63
+2
+47
+49
+9
+1
+15
+5
+20
+3
+7
+29
+49
+42
+1
+47
+49
+3
+0
+7
+43
+20
+4
+47
+49
+3
+0
+7
+44
+63
+4
+47
+49
+45
+1
+15
+2
+11
+I
+c
+I
+5
+I
+0
+I
+0
+n
+p
+46
+s
+5
+Ruby 
+x
+12
+RUBY_VERSION
+n
+x
+4
+to_s
+s
+2
+, 
+x
+17
+RUBY_RELEASE_DATE
+n
+x
+13
+RUBY_PLATFORM
+n
+x
+4
+puts
+x
+4
+File
+n
+x
+11
+active_path
+x
+7
+dirname
+s
+16
+/../lib/wrest.rb
+n
+s
+24
+/../lib/wrest/version.rb
+n
+n
+x
+6
+Regexp
+s
+15
+(:?mswin|mingw)
+x
+3
+new
+x
+2
+=~
+s
+7
+irb.bat
+s
+3
+irb
+s
+8
+optparse
+x
+7
+require
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+3
+irb
+x
+3
+[]=
+x
+12
+OptionParser
+n
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+50
+57
+19
+0
+15
+20
+0
+7
+0
+64
+13
+18
+2
+49
+1
+1
+15
+15
+20
+0
+7
+2
+21
+1
+2
+47
+49
+3
+0
+7
+4
+63
+3
+7
+5
+64
+56
+6
+50
+7
+2
+15
+20
+0
+45
+8
+9
+49
+10
+1
+11
+I
+6
+I
+1
+I
+1
+I
+1
+n
+p
+11
+s
+24
+Usage: console [options]
+x
+7
+banner=
+s
+7
+--irb=[
+x
+4
+to_s
+s
+1
+]
+s
+23
+Invoke a different irb.
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+19
+57
+19
+0
+15
+21
+2
+3
+7
+0
+20
+0
+13
+18
+3
+49
+1
+2
+15
+11
+I
+6
+I
+1
+I
+1
+I
+1
+n
+p
+2
+x
+3
+irb
+x
+3
+[]=
+p
+3
+I
+0
+I
+c
+I
+13
+x
+41
+/Users/sidu/Work/wrest/bin/wrest_shell.rb
+p
+1
+x
+1
+v
+x
+2
+on
+x
+4
+ARGV
+n
+x
+6
+parse!
+p
+9
+I
+0
+I
+a
+I
+4
+I
+b
+I
+11
+I
+c
+I
+29
+I
+d
+I
+32
+x
+41
+/Users/sidu/Work/wrest/bin/wrest_shell.rb
+p
+1
+x
+3
+opt
+s
+18
+ -r irb/completion
+s
+4
+ -r 
+x
+2
+<<
+s
+14
+Loading Wrest 
+x
+5
+Wrest
+n
+x
+7
+VERSION
+x
+6
+STRING
+x
+2
+[]
+s
+1
+ 
+s
+16
+ --simple-prompt
+x
+4
+exec
+p
+25
+I
+0
+I
+1
+I
+23
+I
+3
+I
+38
+I
+4
+I
+4d
+I
+6
+I
+72
+I
+8
+I
+7b
+I
+9
+I
+8e
+I
+a
+I
+97
+I
+10
+I
+9d
+I
+11
+I
+ad
+I
+13
+I
+b5
+I
+14
+I
+ca
+I
+15
+I
+e9
+x
+41
+/Users/sidu/Work/wrest/bin/wrest_shell.rb
+p
+5
+x
+11
+entry_point
+x
+7
+version
+x
+3
+irb
+x
+7
+options
+x
+4
+libs

data/lib/wrest.rb

@@ -7,7 +7,7 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 require 'rubygems'
-gem 'activesupport', '>= 3.0.0'
+gem 'activesupport', '~> 3.0'
 
 require 'net/http'
 require 'net/https'
@@ -55,7 +55,7 @@ end
 Wrest.logger = ActiveSupport::BufferedLogger.new(STDOUT)
 Wrest.logger.level = Logger::DEBUG
 
-RUBY_PLATFORM =~ /java/ ? gem('json-jruby', '>= 1.4.2') : gem('json', '>= 1.4.2')
+gem('json', '~> 1.5')
 ActiveSupport::JSON.backend = "JSONGem"
 
 require "#{Wrest::Root}/wrest/core_ext/string"

data/lib/wrest/native/connection_factory.rb

@@ -15,8 +15,8 @@ module Wrest::Native
       connection.read_timeout = options[:timeout]
       if self.https?
         connection.use_ssl     = true
-        connection.verify_mode = options[:verify_mode]? options[:verify_mode] : OpenSSL::SSL::VERIFY_PEER 
-        
+        connection.verify_mode = options[:verify_mode] ? options[:verify_mode] : OpenSSL::SSL::VERIFY_PEER 
+        connection.ca_path = options[:ca_path] if options[:ca_path]
       end
       connection
     end

data/lib/wrest/native/request.rb

@@ -13,7 +13,8 @@ module Wrest::Native
   # or Wrest::Native::Get etc. instead.
   class Request
     attr_reader :http_request, :uri, :body, :headers, :username, :password, :follow_redirects,
-                :follow_redirects_limit, :follow_redirects_count, :timeout, :connection, :parameters, :cache_store, :verify_mode, :options
+                :follow_redirects_limit, :follow_redirects_count, :timeout, :connection, :parameters, 
+                :cache_store, :verify_mode, :options, :ca_path
     # Valid tuples for the options are:
     #   :username => String, defaults to nil
     #   :password => String, defaults to nil
@@ -31,15 +32,15 @@ module Wrest::Native
     #               in the event of a connection failing to open. Defaulted to 60 by Uri#create_connection.
     #   :connection => The HTTP Connection object to use. This is how a keep-alive connection can be
     #                  used for multiple requests.
-    #   :verify_mode => The  verification mode to be used for Net::HTTP https connections. Defaults to OpenSSL::SSL::VERIFY_PEER
     #   :cache_store => The object which should be used as cache store for cacheable responses. If not supplied, caching will be disabled.
-    #   :detailed_http_logging => nil/$stdout/$stderr or File/Logger/IO object. Defaults to nil (recommended).
     #   :callback => A Hash whose keys are the response codes (or Range of response codes),
     #                        and the values are the callback functions to be executed.
     #                        eg: { <response code> => lambda { |response| some_operation } }
-    #
-    # *WARNING* : detailed_http_logging causes a serious security hole. Never use it in production code.
-    #
+    #  The following options are Net::HTTP specific config options
+    #   :detailed_http_logging => nil/$stdout/$stderr or File/Logger/IO object. Defaults to nil (recommended).
+    #                             *WARNING* : detailed_http_logging causes a serious security hole. Never use it in production code.  
+    #   :verify_mode => The verification mode to be used for Net::HTTP https connections. Defaults to OpenSSL::SSL::VERIFY_PEER
+    #   :ca_path => The path to the certificates
     def initialize(wrest_uri, http_request_klass, parameters = {}, body = nil, headers = {}, options = {})
       @uri = wrest_uri
       @headers = headers.stringify_keys
@@ -54,8 +55,9 @@ module Wrest::Native
       @timeout = @options[:timeout]
       @connection = @options[:connection]
       @http_request = self.build_request(http_request_klass, @uri, @parameters, @headers)
-      @cache_store = options[:cache_store]
+      @cache_store = @options[:cache_store]
       @verify_mode = @options[:verify_mode]
+      @ca_path = @options[:ca_path]
       @detailed_http_logging = options[:detailed_http_logging]
       @callback = @options[:callback] || Wrest::Callback.new({})
       @callback = @callback.merge(Wrest::Callback.new(@options[:callback_block] || {}))
@@ -82,7 +84,7 @@ module Wrest::Native
     # This is followed by the response code, the payload size and the time taken.
     def invoke
       response = nil
-      @connection ||= @uri.create_connection({:timeout => timeout, :verify_mode => @verify_mode})
+      @connection ||= @uri.create_connection(:timeout => timeout, :verify_mode => verify_mode, :ca_path => ca_path)
       @connection.set_debug_output @detailed_http_logging
       http_request.basic_auth username, password unless username.nil? || password.nil?
 

data/lib/wrest/uri.rb

@@ -88,14 +88,6 @@ module Wrest #:nodoc:
       uri_string
     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
-    end
-
     # Returns a Uri object that uses threads to perform asynchronous requests.
     def using_threads
       options = @options.clone
@@ -133,6 +125,14 @@ module Wrest #:nodoc:
       Uri.new(uri_string, 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
+    end
+
     # Make a GET request to this URI. This is a convenience API
     # that creates a Wrest::Native::Get.
     # 

data/lib/wrest/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 Sidu Ponnappa
+# Copyright 2009-2011 Sidu Ponnappa
 
 # Licensed under the Apache License, Version 2.0 (the "License"); 
 # you may not use this file except in compliance with the License. 
@@ -8,5 +8,5 @@
 # See the License for the specific language governing permissions and limitations under the License. 
 
 module Wrest
-  VERSION = "1.4.0"
+  VERSION = "1.4.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: wrest
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.0
+  version: 1.4.2
 platform: universal-java-1.6
 authors: 
   - Sidu Ponnappa
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +05:30
+date: 2011-04-05 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -26,80 +26,80 @@ dependencies:
     type: :development
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: hanna
+    name: rspec
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 2.5.0
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: sinatra
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 2.4.0
+            version: 1.0.0
     type: :development
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
-    name: sinatra
+    name: metric_fu
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: "0"
     type: :development
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: metric_fu
+    name: activesupport
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
+            version: "3.0"
+    type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: activesupport
+    name: builder
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 3.0.0
+            version: "2.0"
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
-    name: builder
+    name: i18n
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 2.1.2
+            version: "0.4"
     type: :runtime
     version_requirements: *id007
   - !ruby/object:Gem::Dependency 
-    name: i18n
+    name: json
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.4.1
+            version: "1.5"
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
@@ -110,31 +110,9 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.7.1
+            version: "0.7"
     type: :runtime
     version_requirements: *id009
-  - !ruby/object:Gem::Dependency 
-    name: json-jruby
-    prerelease: false
-    requirement: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.4.3.1
-    type: :runtime
-    version_requirements: *id010
-  - !ruby/object:Gem::Dependency 
-    name: nokogiri
-    prerelease: false
-    requirement: &id011 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.4.3.1
-    type: :runtime
-    version_requirements: *id011
 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
@@ -146,7 +124,9 @@ extra_rdoc_files:
   - README.rdoc
 files: 
   - 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
@@ -240,16 +220,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: 1.3.7
+        version: "1.5"
 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.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Wrest is a fluent, object oriented HTTP client library for 1.8, 1.9, JRuby and Rubinius.