wrest 1.4.4 → 1.4.5

data/CHANGELOG

@@ -2,6 +2,9 @@ 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.5
+ * GH#107 alias :deserialize :deserialise
+
 == 1.4.4
  * GH#105 Reduce Rubgems version requirements to 1.3.x or greater from > 1.5
  

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.4.4
+= Wrest 1.4.5
 
 (c) Copyright 2009-2011 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 

data/lib/wrest/components/translators/json.rb

@@ -13,13 +13,21 @@ module Wrest
     module Translators::Json
       extend self
 
-      def deserialise(response,options = {})
+      def deserialise(response, options = {})
         ActiveSupport::JSON.decode(response.body)
       end
 
+      def deserialize(response, options = {})
+        deserialise(response, options)
+      end
+      
       def serialise(hash, options = {})
         hash.to_json(options)
       end
+      
+      def serialize(hash, options = {})
+        serialise(hash, options)
+      end
     end
   end
 end

data/lib/wrest/components/translators/xml.rb

@@ -19,9 +19,17 @@ module Wrest
         end
       end
 
+      def deserialize(response, options = {})
+        deserialise(response, options)
+      end
+
       def serialise(hash, options = {})
         hash.to_xml(options)
       end
+      
+      def serialize(hash, options = {})
+        serialise(hash, options)
+      end
     end
   end
 end

data/lib/wrest/curl/response.rb

@@ -37,12 +37,20 @@ module Wrest #:nodoc:
       end
 
       def deserialise(options = {})
-          @deserialised_body ||= deserialise_using(Wrest::Components::Translators.lookup(content_type),options)
+        @deserialised_body ||= deserialise_using(Wrest::Components::Translators.lookup(content_type),options)
       end
-
-      def deserialise_using(translator,options={})
+      
+      def deserialize(options = {})
+        deserialise(options)
+      end
+      
+      def deserialise_using(translator, options={})
         translator.deserialise(@http_response,options)
       end
+
+      def deserialize_using(options = {})
+        deserialise_using(options)
+      end
       
       def code
         @http_response.status

data/lib/wrest/http_shared/standard_tokens.rb

@@ -13,6 +13,7 @@ module Wrest
       Close = 'close'
       KeepAlive = 'keep-alive'
       FormEncoded = 'application/x-www-form-urlencoded'
+      ApplicationXml = 'application/xml'
     end
   end
 end

data/lib/wrest/native/response.rb

@@ -74,13 +74,21 @@ module Wrest #:nodoc:
 
 
       def deserialise(options = {})
-          @deserialised_body ||= deserialise_using(Wrest::Components::Translators.lookup(@http_response.content_type),options)
+        @deserialised_body ||= deserialise_using(Wrest::Components::Translators.lookup(@http_response.content_type),options)
+      end
+
+      def deserialize(options = {})
+        deserialise(options)
       end
 
       def deserialise_using(translator,options = {})
         translator.deserialise(@http_response,options)
       end
 
+      def deserialize_using(options = {})
+        deserialise_using(options)
+      end
+
       # Gives a hash of the response headers. The keys of the hash are case-insensitive.
       def headers
         return @headers if @headers

data/lib/wrest/uri.rb

@@ -81,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)

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.4"
+  VERSION = "1.4.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: wrest
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors: 
 - Sidu Ponnappa
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +05:30
+date: 2011-05-26 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency